From 02a60ac8753f59799b36eb32f85597b0e0140165 Mon Sep 17 00:00:00 2001 From: kremsy Date: Wed, 15 Jan 2014 22:07:09 +0100 Subject: [PATCH] other icon height for shootmania --- application/core/Admin/ActionsMenu.php | 10 ++++++ application/core/Manialinks/StyleManager.php | 35 ++++++++++++++------ application/plugins/CustomVotes.php | 10 ++++++ application/plugins/Donations.php | 10 ++++++ 4 files changed, 54 insertions(+), 11 deletions(-) diff --git a/application/core/Admin/ActionsMenu.php b/application/core/Admin/ActionsMenu.php index 2e2066ac..ac83fd54 100644 --- a/application/core/Admin/ActionsMenu.php +++ b/application/core/Admin/ActionsMenu.php @@ -152,11 +152,21 @@ class ActionsMenu implements CallbackListener, ManialinkPageAnswerListener { $posX = $this->maniaControl->settingManager->getSetting($this, self::SETTING_MENU_POSX); $posY = $this->maniaControl->settingManager->getSetting($this, self::SETTING_MENU_POSY); $itemSize = $this->maniaControl->settingManager->getSetting($this, self::SETTING_MENU_ITEMSIZE); + $shootManiaOffset = $this->maniaControl->manialinkManager->styleManager->getDefaultIconOffsetSM(); $quadStyle = $this->maniaControl->manialinkManager->styleManager->getDefaultQuadStyle(); $quadSubstyle = $this->maniaControl->manialinkManager->styleManager->getDefaultQuadSubstyle(); $itemMarginFactorX = 1.3; $itemMarginFactorY = 1.2; + // Get Title Id + $titleId = $this->maniaControl->server->titleId; + $titlePrefix = strtoupper(substr($titleId, 0, 2)); + + //If game is shootmania lower the icons position by 20 + if($titlePrefix == 'SM') { + $posY -= $shootManiaOffset; + } + $manialink = new ManiaLink(self::MLID_MENU); $script = new Script(); $manialink->setScript($script); diff --git a/application/core/Manialinks/StyleManager.php b/application/core/Manialinks/StyleManager.php index 91591da7..603cb27b 100644 --- a/application/core/Manialinks/StyleManager.php +++ b/application/core/Manialinks/StyleManager.php @@ -14,14 +14,17 @@ class StyleManager { /** * Constants */ - const SETTING_LABEL_DEFAULT_STYLE = 'Default Label Style'; - const SETTING_QUAD_DEFAULT_STYLE = 'Default Quad Style'; + const SETTING_LABEL_DEFAULT_STYLE = 'Default Label Style'; + const SETTING_QUAD_DEFAULT_STYLE = 'Default Quad Style'; const SETTING_QUAD_DEFAULT_SUBSTYLE = 'Default Quad SubStyle'; - const SETTING_MAIN_WIDGET_DEFAULT_STYLE = 'Main Widget Default Quad Style'; + const SETTING_MAIN_WIDGET_DEFAULT_STYLE = 'Main Widget Default Quad Style'; const SETTING_MAIN_WIDGET_DEFAULT_SUBSTYLE = 'Main Widget Default Quad SubStyle'; - const SETTING_LIST_WIDGETS_WIDTH = 'List Widgets Width'; - const SETTING_LIST_WIDGETS_HEIGHT = 'List Widgets Height'; + const SETTING_LIST_WIDGETS_WIDTH = 'List Widgets Width'; + const SETTING_LIST_WIDGETS_HEIGHT = 'List Widgets Height'; + + const SETTING_ICON_DEFAULT_OFFSET_SM = 'Default Icon Offset in Shootmania'; + /** * Private properties */ @@ -30,11 +33,11 @@ class StyleManager { /** * Create a new style manager instance * - * @param ManiaControl $maniaControl + * @param ManiaControl $maniaControl */ public function __construct(ManiaControl $maniaControl) { $this->maniaControl = $maniaControl; - + // Init settings $this->maniaControl->settingManager->initSetting($this, self::SETTING_LABEL_DEFAULT_STYLE, 'TextTitle1'); $this->maniaControl->settingManager->initSetting($this, self::SETTING_QUAD_DEFAULT_STYLE, 'Bgs1InRace'); @@ -45,6 +48,16 @@ class StyleManager { $this->maniaControl->settingManager->initSetting($this, self::SETTING_MAIN_WIDGET_DEFAULT_SUBSTYLE, Quad_BgRaceScore2::SUBSTYLE_HandleSelectable); $this->maniaControl->settingManager->initSetting($this, self::SETTING_LIST_WIDGETS_WIDTH, '150'); $this->maniaControl->settingManager->initSetting($this, self::SETTING_LIST_WIDGETS_HEIGHT, '80'); + $this->maniaControl->settingManager->initSetting($this, self::SETTING_ICON_DEFAULT_OFFSET_SM, '20'); + } + + /** + * Get the default Icon Offset for shootmania + * + * @return string + */ + public function getDefaultIconOffsetSM() { + return $this->maniaControl->settingManager->getSetting($this, self::SETTING_ICON_DEFAULT_OFFSET_SM); } /** @@ -79,7 +92,7 @@ class StyleManager { * * @return string */ - public function getDefaultMainWindowStyle(){ + public function getDefaultMainWindowStyle() { return $this->maniaControl->settingManager->getSetting($this, self::SETTING_MAIN_WIDGET_DEFAULT_STYLE); } @@ -88,7 +101,7 @@ class StyleManager { * * @return string */ - public function getDefaultMainWindowSubStyle(){ + public function getDefaultMainWindowSubStyle() { return $this->maniaControl->settingManager->getSetting($this, self::SETTING_MAIN_WIDGET_DEFAULT_SUBSTYLE); } @@ -97,7 +110,7 @@ class StyleManager { * * @return string */ - public function getListWidgetsWidth(){ + public function getListWidgetsWidth() { return $this->maniaControl->settingManager->getSetting($this, self::SETTING_LIST_WIDGETS_WIDTH); } @@ -106,7 +119,7 @@ class StyleManager { * * @return string */ - public function getListWidgetsHeight(){ + public function getListWidgetsHeight() { return $this->maniaControl->settingManager->getSetting($this, self::SETTING_LIST_WIDGETS_HEIGHT); } diff --git a/application/plugins/CustomVotes.php b/application/plugins/CustomVotes.php index 5769f157..b22cea05 100644 --- a/application/plugins/CustomVotes.php +++ b/application/plugins/CustomVotes.php @@ -578,11 +578,21 @@ class CustomVotesPlugin implements CommandListener, CallbackListener, ManialinkP $posY = $this->maniaControl->settingManager->getSetting($this, self::SETTING_VOTE_ICON_POSY); $width = $this->maniaControl->settingManager->getSetting($this, self::SETTING_VOTE_ICON_WIDTH); $height = $this->maniaControl->settingManager->getSetting($this, self::SETTING_VOTE_ICON_HEIGHT); + $shootManiaOffset = $this->maniaControl->manialinkManager->styleManager->getDefaultIconOffsetSM(); $quadStyle = $this->maniaControl->manialinkManager->styleManager->getDefaultQuadStyle(); $quadSubstyle = $this->maniaControl->manialinkManager->styleManager->getDefaultQuadSubstyle(); $itemMarginFactorX = 1.3; $itemMarginFactorY = 1.2; + // Get Title Id + $titleId = $this->maniaControl->server->titleId; + $titlePrefix = strtoupper(substr($titleId, 0, 2)); + + //If game is shootmania lower the icons position by 20 + if($titlePrefix == 'SM') { + $posY -= $shootManiaOffset; + } + $itemSize = $width; $maniaLink = new ManiaLink(self::MLID_ICON); diff --git a/application/plugins/Donations.php b/application/plugins/Donations.php index 777b78c3..5a1af083 100644 --- a/application/plugins/Donations.php +++ b/application/plugins/Donations.php @@ -186,11 +186,21 @@ class DonationPlugin implements CallbackListener, CommandListener, Plugin { $width = $this->maniaControl->settingManager->getSetting($this, self::SETTING_DONATE_WIDGET_WIDTH); $height = $this->maniaControl->settingManager->getSetting($this, self::SETTING_DONATE_WIDGET_HEIGHT); $values = $this->maniaControl->settingManager->getSetting($this, self::SETTING_DONATION_VALUES); + $shootManiaOffset = $this->maniaControl->manialinkManager->styleManager->getDefaultIconOffsetSM(); $quadStyle = $this->maniaControl->manialinkManager->styleManager->getDefaultQuadStyle(); $quadSubstyle = $this->maniaControl->manialinkManager->styleManager->getDefaultQuadSubstyle(); $itemMarginFactorX = 1.3; $itemMarginFactorY = 1.2; + // Get Title Id + $titleId = $this->maniaControl->server->titleId; + $titlePrefix = strtoupper(substr($titleId, 0, 2)); + + //If game is shootmania lower the icons position by 20 + if($titlePrefix == 'SM') { + $posY -= $shootManiaOffset; + } + $itemSize = $width; $maniaLink = new ManiaLink(self::MLID_DONATE_WIDGET);