From c644550eff14e85d54b4d5298fd08556e3748284 Mon Sep 17 00:00:00 2001
From: kremsy <lukas@esc-clan.net>
Date: Sat, 4 Jan 2014 21:54:40 +0100
Subject: [PATCH] minor things

---
 application/core/Admin/ActionsMenu.php | 12 +++++++-----
 application/core/Maps/MapCommands.php  |  8 ++++----
 application/plugins/Donations.php      | 17 +++++++++++++++++
 3 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/application/core/Admin/ActionsMenu.php b/application/core/Admin/ActionsMenu.php
index 5ef88072..d1832786 100644
--- a/application/core/Admin/ActionsMenu.php
+++ b/application/core/Admin/ActionsMenu.php
@@ -64,11 +64,11 @@ class ActionsMenu implements CallbackListener, ManialinkPageAnswerListener {
 	 * @param bool    $playerAction
 	 * @param int     $order
 	 */
-	public function addMenuItem(Control $control, $playerAction = true, $order = 0) {
+	public function addMenuItem(Control $control, $playerAction = true, $order = 0, $description = '') {
 		if($playerAction) {
-			$this->addPlayerMenuItem($control, $order);
+			$this->addPlayerMenuItem($control, $order, $description);
 		} else {
-			$this->addAdminMenuItem($control, $order);
+			$this->addAdminMenuItem($control, $order,$description);
 		}
 	}
 
@@ -78,11 +78,12 @@ class ActionsMenu implements CallbackListener, ManialinkPageAnswerListener {
 	 * @param Control $control
 	 * @param int     $order
 	 */
-	public function addPlayerMenuItem(Control $control, $order = 0) {
+	public function addPlayerMenuItem(Control $control, $order = 0, $description = '') {
 		if(!isset($this->playerMenuItems[$order])) {
 			$this->playerMenuItems[$order] = array();
 		}
 		array_push($this->playerMenuItems[$order], $control);
+		//TODO handle description
 	}
 
 	/**
@@ -91,11 +92,12 @@ class ActionsMenu implements CallbackListener, ManialinkPageAnswerListener {
 	 * @param Control $control
 	 * @param int     $order
 	 */
-	public function addAdminMenuItem(Control $control, $order = 0) {
+	public function addAdminMenuItem(Control $control, $order = 0, $description = '') {
 		if(!isset($this->adminMenuItems[$order])) {
 			$this->adminMenuItems[$order] = array();
 		}
 		array_push($this->adminMenuItems[$order], $control);
+		//TODO handle description
 	}
 
 	/**
diff --git a/application/core/Maps/MapCommands.php b/application/core/Maps/MapCommands.php
index ea227bc4..e24e79b8 100644
--- a/application/core/Maps/MapCommands.php
+++ b/application/core/Maps/MapCommands.php
@@ -55,28 +55,28 @@ class MapCommands implements CommandListener, ManialinkPageAnswerListener {
 		$itemQuad = new Quad_Icons64x64_1();
 		$itemQuad->setSubStyle($itemQuad::SUBSTYLE_Browser);
 		$itemQuad->setAction(self::ACTION_OPEN_XLIST);
-		$this->maniaControl->actionsMenu->addMenuItem($itemQuad, true, 3);
+		$this->maniaControl->actionsMenu->addMenuItem($itemQuad, true, 3, 'Open MX List');
 
 		//Menu Open List
 		$this->maniaControl->manialinkManager->registerManialinkPageAnswerListener(self::ACTION_OPEN_MAPLIST, $this, 'command_List');
 		$itemQuad = new Quad_Icons64x64_1();
 		$itemQuad->setSubStyle($itemQuad::SUBSTYLE_Browser);
 		$itemQuad->setAction(self::ACTION_OPEN_MAPLIST);
-		$this->maniaControl->actionsMenu->addMenuItem($itemQuad, true, 4);
+		$this->maniaControl->actionsMenu->addMenuItem($itemQuad, true, 4,'Open MapList');
 
 		//Menu RestartMap
 		$this->maniaControl->manialinkManager->registerManialinkPageAnswerListener(self::ACTION_RESTART_MAP, $this, 'command_RestartMap');
 		$itemQuad = new Quad_Icons64x64_1();
 		$itemQuad->setSubStyle($itemQuad::SUBSTYLE_ArrowFastPrev);
 		$itemQuad->setAction(self::ACTION_RESTART_MAP);
-		$this->maniaControl->actionsMenu->addMenuItem($itemQuad, false, 0);
+		$this->maniaControl->actionsMenu->addMenuItem($itemQuad, false, 0, 'Restart Map');
 
 		//Menu NextMap
 		$this->maniaControl->manialinkManager->registerManialinkPageAnswerListener(self::ACTION_SKIP_MAP, $this, 'command_NextMap');
 		$itemQuad = new Quad_Icons64x64_1();
 		$itemQuad->setSubStyle($itemQuad::SUBSTYLE_ArrowFastNext);
 		$itemQuad->setAction(self::ACTION_SKIP_MAP);
-		$this->maniaControl->actionsMenu->addMenuItem($itemQuad, false, 1);
+		$this->maniaControl->actionsMenu->addMenuItem($itemQuad, false, 1, 'Skip Map');
 	}
 
 	/**
diff --git a/application/plugins/Donations.php b/application/plugins/Donations.php
index 2e98c340..39542aff 100644
--- a/application/plugins/Donations.php
+++ b/application/plugins/Donations.php
@@ -1,6 +1,7 @@
 <?php
 use FML\Controls\Control;
 use FML\Controls\Frame;
+use FML\Controls\Label;
 use FML\Controls\Labels\Label_Button;
 use FML\Controls\Quad;
 use FML\Controls\Quads\Quad_Icons128x128_1;
@@ -235,6 +236,20 @@ class DonationPlugin implements CallbackListener, CommandListener, Plugin {
 
 		$script->addTooltip($itemQuad, $popoutFrame, Script::OPTION_TOOLTIP_STAYONCLICK);
 
+		//Description Label
+		$descriptionFrame = new Frame();
+		$maniaLink->add($descriptionFrame);
+		$descriptionFrame->setPosition($posX - 50, $posY - 15);
+		$descriptionFrame->setHAlign(Control::RIGHT);
+
+		$descriptionLabel = new Label();
+		$frame->add($descriptionLabel);
+		$descriptionLabel->setAlign(Control::RIGHT, Control::TOP);
+		$descriptionLabel->setSize(40, 4);
+		$descriptionLabel->setTextSize(2);
+		$descriptionLabel->setVisible(true);
+
+
 		// Add items
 		$x = -2;
 		foreach(array_reverse($valueArray) as $value) {
@@ -246,6 +261,8 @@ class DonationPlugin implements CallbackListener, CommandListener, Plugin {
 			$label->setTextSize(1.2);
 			$label->setAction(self::ACTION_DONATE_VALUE . "." . $value);
 
+			$script->addTooltip($label, $descriptionLabel, array(Script::OPTION_TOOLTIP_TEXT => "Donate " . $value . " Planets"));
+
 			$x -= strlen($value) * 2 + 1.7;
 		}