Changeset 7627 for code/branches/releasetodo

Timestamp:

Nov 9, 2010, 9:53:34 PM (14 years ago)

Author:

dafrick

Message:

Now we have the level description as tooltip. Unforunately for this to work i had to write two additional wrappers for CEGUI lua functions, so I guess it's time to start investigating why some CEGUI functions work in lua and some don't.

Location:

code/branches/releasetodo

Files:

• data/gui/scripts/MultiplayerMenu.lua (modified) (2 diffs)
• data/gui/scripts/SingleplayerMenu.lua (modified) (2 diffs)
• src/libraries/core/GUIManager.cc (modified) (2 diffs)
• src/libraries/core/GUIManager.h (modified) (1 diff)

code/branches/releasetodo/data/gui/scripts/MultiplayerMenu.lua

@@ -81 +81 @@
     local listbox = CEGUI.toListbox(winMgr:getWindow("orxonox/MultiplayerListbox"))
     listbox:resetList()
+    orxonox.GUIManager:setItemTooltipsEnabledHelper(listbox, true)
     local preselect = orxonox.LevelManager:getInstance():getDefaultLevel()
     local size = orxonox.LevelManager:getInstance():getNumberOfLevels()
@@ -105 +106 @@
         P.itemList[k] = listbox:getListboxItemFromIndex(k-1)
         --TODO: The description as tooltip would be nice.
-        --local lItem = tolua.cast("CEGUI::ListboxItem", P.itemList[k])
+        --local lItem = P.itemList[k]
         --lItem:setTooltipText(v:getDescription())
+        orxonox.GUIManager:setTooltipTextHelper(P.itemList[k], v:getDescription())
     end
 end

code/branches/releasetodo/data/gui/scripts/SingleplayerMenu.lua

@@ -19 +19 @@
     local listbox = CEGUI.toListbox(winMgr:getWindow("orxonox/SingleplayerLevelListbox"))
     listbox:resetList()
+    orxonox.GUIManager:setItemTooltipsEnabledHelper(listbox, true)
     local preselect = orxonox.LevelManager:getInstance():getDefaultLevel()
     local size = orxonox.LevelManager:getInstance():getNumberOfLevels()
@@ -45 +46 @@
         --local lItem = tolua.cast("CEGUI::ListboxItem", P.itemList[k])
         --lItem:setTooltipText(v:getDescription())
+        orxonox.GUIManager:setTooltipTextHelper(P.itemList[k], v:getDescription())
     end
 end

code/branches/releasetodo/src/libraries/core/GUIManager.cc

@@ -43 +43 @@
 #include <CEGUIWindow.h>
 #include <CEGUIWindowManager.h>
+#include <CEGUI/elements/CEGUIListbox.h>
+#include <CEGUI/elements/CEGUIListboxItem.h>
 #include <ogreceguirenderer/OgreCEGUIRenderer.h>
 
@@ -440 +442 @@
         window->subscribeScriptedEvent(event, function);
     }
+
+    void GUIManager::setTooltipTextHelper(CEGUI::ListboxItem* item, const std::string& tooltip)
+    {
+        item->setTooltipText(tooltip);
+    }
+
+    void GUIManager::setItemTooltipsEnabledHelper(CEGUI::Listbox* listbox, bool enabled)
+    {
+        listbox->setItemTooltipsEnabled(enabled);
+    }
+
+    
 }

code/branches/releasetodo/src/libraries/core/GUIManager.h

@@ -106 +106 @@
         // TODO: Temporary hack because the tolua exported CEGUI method does not seem to work
         static void subscribeEventHelper(CEGUI::Window* window, const std::string& event, const std::string& function); //tolua_export
+        static void setTooltipTextHelper(CEGUI::ListboxItem* item, const std::string& toooltip); //tolua_export
+        static void setItemTooltipsEnabledHelper(CEGUI::Listbox* listbox, bool enabled); //tolua_export
 
         static GUIManager& getInstance() { return Singleton<GUIManager>::getInstance(); } // tolua_export