beu/TrackManiaControl
1
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity

- static getTitle() function of configurator menu interface

Browse Source 
- removed reopenMenu() configurator function
- use more intelligent showMenu() function
This commit is contained in:
Steffen Schröder
2014-07-24 23:15:25 +02:00
parent 6138274a98
commit d531d97366
7 changed files with 40 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
application/core/Configurators/Configurator.php
View File

@@ -268,17 +268,6 @@ class Configurator implements CallbackListener, CommandListener, ManialinkPageAn
return $manialink;
}
/**
* Reopen the Menu
*
* @param Player $player
* @param int $menuId
*/
public function reopenMenu(Player $player, $menuId = 0) {
// TODO: improve "reopen" to not need the $menuId param by saving the last shown menu
$this->showMenu($player, $menuId);
}
/**
* Handle toggle menu action
*

2
application/core/Configurators/ConfiguratorMenu.php
View File

@@ -19,7 +19,7 @@ interface ConfiguratorMenu {
*
* @return string
*/
public function getTitle();
public static function getTitle();
/**
* Get the Configurator Menu Frame

17
application/core/Configurators/ManiaControlSettings.php
View File

@@ -56,6 +56,13 @@ class ManiaControlSettings implements ConfiguratorMenu, CallbackListener {
$this->maniaControl->authenticationManager->definePermissionLevel(self::SETTING_PERMISSION_CHANGE_MC_SETTINGS, AuthenticationManager::AUTH_LEVEL_ADMIN);
}
/**
* @see \ManiaControl\Configurators\ConfiguratorMenu::getTitle()
*/
public static function getTitle() {
return self::TITLE;
}
/**
* @see \ManiaControl\Configurators\ConfiguratorMenu::getMenu()
*/
@@ -337,14 +344,6 @@ class ManiaControlSettings implements ConfiguratorMenu, CallbackListener {
$this->maniaControl->chat->sendSuccess('Settings saved!', $player);
// Reopen the Menu
$menuId = $this->maniaControl->configurator->getMenuId($this->getTitle());
$this->maniaControl->configurator->reopenMenu($player, $menuId);
}
/**
* @see \ManiaControl\Configurators\ConfiguratorMenu::getTitle()
*/
public function getTitle() {
return self::TITLE;
$this->maniaControl->configurator->showMenu($player, $this);
}
}

19
application/core/Configurators/ScriptSettings.php
View File

@@ -89,6 +89,13 @@ class ScriptSettings implements ConfiguratorMenu, CallbackListener {
return true;
}
/**
* @see \ManiaControl\Configurators\ConfiguratorMenu::getTitle()
*/
public static function getTitle() {
return 'Script Settings';
}
/**
* Handle OnInit callback
*/
@@ -310,9 +317,8 @@ class ScriptSettings implements ConfiguratorMenu, CallbackListener {
$this->maniaControl->chat->sendError('Script Settings Saving failed!', $player);
}
//Reopen the Menu
$menuId = $this->maniaControl->configurator->getMenuId($this->getTitle());
$this->maniaControl->configurator->reopenMenu($player, $menuId);
// Reopen the Menu
$this->maniaControl->configurator->showMenu($player, $this);
}
/**
@@ -396,11 +402,4 @@ class ScriptSettings implements ConfiguratorMenu, CallbackListener {
}
return (string)$value;
}
/**
* @see \ManiaControl\Configurators\ConfiguratorMenu::getTitle()
*/
public function getTitle() {
return 'Script Settings';
}
}