From 30b11cc46640e58cdddc7fb0eb5ee3f8e6c4ca56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steffen=20Schro=CC=88der?= Date: Tue, 13 May 2014 16:54:32 +0200 Subject: [PATCH] minor fixes --- application/core/Plugins/PluginMenu.php | 6 +++--- application/plugins/MCTeam/KarmaPlugin.php | 4 ++-- application/plugins/MCTeam/LocalRecordsPlugin.php | 2 +- application/plugins/TheM/QueuePlugin.php | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/application/core/Plugins/PluginMenu.php b/application/core/Plugins/PluginMenu.php index 34ee774c..acc85ef2 100644 --- a/application/core/Plugins/PluginMenu.php +++ b/application/core/Plugins/PluginMenu.php @@ -312,10 +312,10 @@ class PluginMenu implements CallbackListener, ConfiguratorMenu, ManialinkPageAns if ($setting->type === Setting::TYPE_BOOL) { - if ($setting->value == "0") { - $substyle = Quad_Icons64x64_1::SUBSTYLE_LvlRed; - } else if ($setting->value == "1") { + if ($setting->value) { $substyle = Quad_Icons64x64_1::SUBSTYLE_LvlGreen; + } else { + $substyle = Quad_Icons64x64_1::SUBSTYLE_LvlRed; } $quad = new Quad_Icons64x64_1(); diff --git a/application/plugins/MCTeam/KarmaPlugin.php b/application/plugins/MCTeam/KarmaPlugin.php index cf4ac6a7..3c1f150a 100644 --- a/application/plugins/MCTeam/KarmaPlugin.php +++ b/application/plugins/MCTeam/KarmaPlugin.php @@ -894,8 +894,8 @@ class KarmaPlugin implements CallbackListener, TimerListener, Plugin { $title = $this->maniaControl->settingManager->getSettingValue($this, self::SETTING_WIDGET_TITLE); $pos_x = $this->maniaControl->settingManager->getSettingValue($this, self::SETTING_WIDGET_POSX); $pos_y = $this->maniaControl->settingManager->getSettingValue($this, self::SETTING_WIDGET_POSY); - $width = $this->maniaControl->settingManager->getSettingValue($this, self::SETTING_WIDGET_WIDTH)->value; - $height = $this->maniaControl->settingManager->getSettingValue($this, self::SETTING_WIDGET_HEIGHT)->value; + $width = $this->maniaControl->settingManager->getSettingValue($this, self::SETTING_WIDGET_WIDTH); + $height = $this->maniaControl->settingManager->getSettingValue($this, self::SETTING_WIDGET_HEIGHT); $labelStyle = $this->maniaControl->manialinkManager->styleManager->getDefaultLabelStyle(); $quadStyle = $this->maniaControl->manialinkManager->styleManager->getDefaultQuadStyle(); $quadSubstyle = $this->maniaControl->manialinkManager->styleManager->getDefaultQuadSubstyle(); diff --git a/application/plugins/MCTeam/LocalRecordsPlugin.php b/application/plugins/MCTeam/LocalRecordsPlugin.php index c17f5440..b29bed84 100644 --- a/application/plugins/MCTeam/LocalRecordsPlugin.php +++ b/application/plugins/MCTeam/LocalRecordsPlugin.php @@ -329,7 +329,7 @@ class LocalRecordsPlugin implements CallbackListener, CommandListener, TimerList * * @param Setting $setting */ - public function handleSettingsChanged(Setting $setting) { + public function handleSettingChanged(Setting $setting) { if (!$setting->belongsToClass($this)) { return; } diff --git a/application/plugins/TheM/QueuePlugin.php b/application/plugins/TheM/QueuePlugin.php index 1b393616..df7abc25 100644 --- a/application/plugins/TheM/QueuePlugin.php +++ b/application/plugins/TheM/QueuePlugin.php @@ -401,9 +401,9 @@ class QueuePlugin implements CallbackListener, ManialinkPageAnswerListener, Time $frame = new Frame(); $maniaLink->add($frame); $frame->setSize(60, 6); - $xPosSetting = $this->maniaControl->settingManager->getSettingValue($this, self::QUEUE_WIDGET_POS_X); - $yPosSetting = $this->maniaControl->settingManager->getSettingValue($this, self::QUEUE_WIDGET_POS_Y); - $frame->setPosition($xPosSetting->value, $yPosSetting->value, 0); + $xPos = $this->maniaControl->settingManager->getSettingValue($this, self::QUEUE_WIDGET_POS_X); + $yPos = $this->maniaControl->settingManager->getSettingValue($this, self::QUEUE_WIDGET_POS_Y); + $frame->setPosition($xPos, $yPos, 0); // Background $backgroundQuad = new Quad();