From a9ed2ad87876cb32ecde1bce1ebafd7bae82cfd0 Mon Sep 17 00:00:00 2001 From: kremsy Date: Sun, 5 Jan 2014 20:42:16 +0100 Subject: [PATCH] plugin reopened --- .../core/Configurators/Configurator.php | 2 - application/core/Plugins/PluginMenu.php | 120 +++++++++--------- 2 files changed, 59 insertions(+), 63 deletions(-) diff --git a/application/core/Configurators/Configurator.php b/application/core/Configurators/Configurator.php index a185c61e..b36094fe 100644 --- a/application/core/Configurators/Configurator.php +++ b/application/core/Configurators/Configurator.php @@ -76,8 +76,6 @@ class Configurator implements CallbackListener, CommandListener, ManialinkPageAn // Register for callbacks $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MP_PLAYERDISCONNECT, $this, 'handlePlayerDisconnect'); - //$this->maniaControl->callbackManager->registerCallbackListener(ScriptSettings::CB_SCRIPTSETTINGS_CHANGED, $this, 'reopenMenu'); - //$this->maniaControl->callbackManager->registerCallbackListener(ServerSettings::CB_SERVERSETTINGS_CHANGED, $this, 'reopenMenu'); $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MP_PLAYERMANIALINKPAGEANSWER, $this, 'handleManialinkPageAnswer'); // Create server settings diff --git a/application/core/Plugins/PluginMenu.php b/application/core/Plugins/PluginMenu.php index c4ba3bfe..7b67ce2c 100644 --- a/application/core/Plugins/PluginMenu.php +++ b/application/core/Plugins/PluginMenu.php @@ -2,21 +2,21 @@ namespace ManiaControl\Plugins; -use FML\Script\Script; -use ManiaControl\ManiaControl; -use ManiaControl\Players\Player; -use ManiaControl\Configurators\ConfiguratorMenu; -use FML\Script\Pages; -use FML\Script\Tooltips; +use FML\Controls\Control; use FML\Controls\Frame; use FML\Controls\Label; -use FML\Controls\Labels\Label_Text; -use FML\Controls\Control; -use FML\Controls\Quads\Quad_Icons64x64_1; use FML\Controls\Labels\Label_Button; -use ManiaControl\Callbacks\CallbackManager; +use FML\Controls\Labels\Label_Text; +use FML\Controls\Quads\Quad_Icons64x64_1; +use FML\Script\Pages; +use FML\Script\Script; +use FML\Script\Tooltips; use ManiaControl\Callbacks\CallbackListener; +use ManiaControl\Callbacks\CallbackManager; +use ManiaControl\Configurators\ConfiguratorMenu; use ManiaControl\Formatter; +use ManiaControl\ManiaControl; +use ManiaControl\Players\Player; /** * Configurator for enabling and disabling plugins @@ -27,9 +27,9 @@ class PluginMenu implements CallbackListener, ConfiguratorMenu { /** * Constants */ - const ACTION_PREFIX_ENABLEPLUGIN = 'PluginMenu.Enable.'; + const ACTION_PREFIX_ENABLEPLUGIN = 'PluginMenu.Enable.'; const ACTION_PREFIX_DISABLEPLUGIN = 'PluginMenu.Disable.'; - + /** * Private properties */ @@ -42,9 +42,8 @@ class PluginMenu implements CallbackListener, ConfiguratorMenu { */ public function __construct(ManiaControl $maniaControl) { $this->maniaControl = $maniaControl; - - $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MP_PLAYERMANIALINKPAGEANSWER, $this, - 'handleManialinkPageAnswer'); + + $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MP_PLAYERMANIALINKPAGEANSWER, $this, 'handleManialinkPageAnswer'); } /** @@ -61,73 +60,72 @@ class PluginMenu implements CallbackListener, ConfiguratorMenu { */ public function getMenu($width, $height, Script $script) { $pagesId = 'PluginPages'; - $frame = new Frame(); - + $frame = new Frame(); + $pluginClasses = $this->maniaControl->pluginManager->getPluginClasses(); - + // Config - $pagerSize = 9.; - $entryHeight = 5.; + $pagerSize = 9.; + $entryHeight = 5.; $labelTextSize = 2; - $pageMaxCount = 10; - + $pageMaxCount = 10; + // Pagers $pagerPrev = new Quad_Icons64x64_1(); $frame->add($pagerPrev); $pagerPrev->setPosition($width * 0.39, $height * -0.44, 2); $pagerPrev->setSize($pagerSize, $pagerSize); $pagerPrev->setSubStyle(Quad_Icons64x64_1::SUBSTYLE_ArrowPrev); - + $pagerNext = new Quad_Icons64x64_1(); $frame->add($pagerNext); $pagerNext->setPosition($width * 0.45, $height * -0.44, 2); $pagerNext->setSize($pagerSize, $pagerSize); $pagerNext->setSubStyle(Quad_Icons64x64_1::SUBSTYLE_ArrowNext); - + $script->addPager($pagerPrev, -1, $pagesId); $script->addPager($pagerNext, 1, $pagesId); - + $pageCountLabel = new Label_Text(); $frame->add($pageCountLabel); $pageCountLabel->setHAlign(Control::RIGHT); $pageCountLabel->setPosition($width * 0.35, $height * -0.44, 1); $pageCountLabel->setStyle($pageCountLabel::STYLE_TextTitle1); $pageCountLabel->setTextSize(2); - + $script->addPageLabel($pageCountLabel, $pagesId); - + // Plugin pages $pageFrames = array(); - $y = 0.; - foreach ($pluginClasses as $index => $pluginClass) { - if (!isset($pageFrame)) { + $y = 0.; + foreach($pluginClasses as $index => $pluginClass) { + if(!isset($pageFrame)) { $pageFrame = new Frame(); $frame->add($pageFrame); - if (!empty($pageFrames)) { + if(!empty($pageFrames)) { $pageFrame->setVisible(false); } array_push($pageFrames, $pageFrame); $script->addPage($pageFrame, count($pageFrames), $pagesId); $y = $height * 0.41; } - + $active = $this->maniaControl->pluginManager->isPluginActive($pluginClass); - + $pluginFrame = new Frame(); $pageFrame->add($pluginFrame); $pluginFrame->setY($y); - + $activeQuad = new Quad_Icons64x64_1(); $pluginFrame->add($activeQuad); $activeQuad->setPosition($width * -0.45, -0.1, 1); $activeQuad->setSize($entryHeight * 0.9, $entryHeight * 0.9); - if ($active) { + if($active) { $activeQuad->setSubStyle($activeQuad::SUBSTYLE_LvlGreen); - } - else { + } else { $activeQuad->setSubStyle($activeQuad::SUBSTYLE_LvlRed); } - + $nameLabel = new Label_Text(); $pluginFrame->add($nameLabel); $nameLabel->setHAlign(Control::LEFT); @@ -136,7 +134,7 @@ class PluginMenu implements CallbackListener, ConfiguratorMenu { $nameLabel->setStyle($nameLabel::STYLE_TextCardSmall); $nameLabel->setTextSize($labelTextSize); $nameLabel->setText($pluginClass::getName()); - + $descriptionLabel = new Label(); $pageFrame->add($descriptionLabel); $descriptionLabel->setAlign(Control::LEFT, Control::TOP); @@ -150,29 +148,28 @@ class PluginMenu implements CallbackListener, ConfiguratorMenu { $description = "Author: {$pluginClass::getAuthor()}\nVersion: {$pluginClass::getVersion()}\nDesc: {$pluginClass::getDescription()}"; $descriptionLabel->setText($description); $script->addTooltip($nameLabel, $descriptionLabel); - + $statusChangeButton = new Label_Button(); $pluginFrame->add($statusChangeButton); $statusChangeButton->setHAlign(Control::RIGHT); $statusChangeButton->setX($width * 0.45); $statusChangeButton->setStyle($statusChangeButton::STYLE_CardButtonSmall); - if ($active) { + if($active) { $statusChangeButton->setTextPrefix('$f00'); $statusChangeButton->setText('Deactivate'); $statusChangeButton->setAction(self::ACTION_PREFIX_DISABLEPLUGIN . $pluginClass); - } - else { + } else { $statusChangeButton->setTextPrefix('a'); $statusChangeButton->setText('Activate'); $statusChangeButton->setAction(self::ACTION_PREFIX_ENABLEPLUGIN . $pluginClass); } - + $y -= $entryHeight; - if ($index % $pageMaxCount == $pageMaxCount - 1) { + if($index % $pageMaxCount == $pageMaxCount - 1) { unset($pageFrame); } } - + return $frame; } @@ -190,39 +187,40 @@ class PluginMenu implements CallbackListener, ConfiguratorMenu { */ public function handleManialinkPageAnswer(array $callback) { $actionId = $callback[1][2]; - $enable = (strpos($actionId, self::ACTION_PREFIX_ENABLEPLUGIN) === 0); - $disable = (strpos($actionId, self::ACTION_PREFIX_DISABLEPLUGIN) === 0); - if (!$enable && !$disable) { + $enable = (strpos($actionId, self::ACTION_PREFIX_ENABLEPLUGIN) === 0); + $disable = (strpos($actionId, self::ACTION_PREFIX_DISABLEPLUGIN) === 0); + if(!$enable && !$disable) { return; } - $login = $callback[1][1]; + $login = $callback[1][1]; $player = $this->maniaControl->playerManager->getPlayer($login); - if (!$player) { + if(!$player) { return; } - if ($enable) { + if($enable) { $pluginClass = substr($actionId, strlen(self::ACTION_PREFIX_ENABLEPLUGIN)); - $activated = $this->maniaControl->pluginManager->activatePlugin($pluginClass); - if ($activated) { + $activated = $this->maniaControl->pluginManager->activatePlugin($pluginClass); + if($activated) { $this->maniaControl->chat->sendSuccess($pluginClass::getName() . ' activated!', $player->login); $this->maniaControl->configurator->showMenu($player); $this->maniaControl->log(Formatter::stripCodes("{$player->login} activated '{$pluginClass}'!")); - } - else { + } else { $this->maniaControl->chat->sendError('Error activating ' . $pluginClass::getName() . '!', $player->login); } - } - else { + } else { $pluginClass = substr($actionId, strlen(self::ACTION_PREFIX_DISABLEPLUGIN)); $deactivated = $this->maniaControl->pluginManager->deactivatePlugin($pluginClass); - if ($deactivated) { + if($deactivated) { $this->maniaControl->chat->sendSuccess($pluginClass::getName() . ' deactivated!', $player->login); $this->maniaControl->configurator->showMenu($player); $this->maniaControl->log(Formatter::stripCodes("{$player->login} deactivated '{$pluginClass}'!")); - } - else { + } else { $this->maniaControl->chat->sendError('Error deactivating ' . $pluginClass::getName() . '!', $player->login); } } + + //Reopen the Menu + $menuId = $this->maniaControl->configurator->getMenuId($this->getTitle()); + $this->maniaControl->configurator->reopenMenu($menuId); } }