Changeset 6564 for code/branches/gamestate/src/orxonox

Timestamp:

Mar 18, 2010, 10:07:48 PM (16 years ago)

Author:

rgrieder

Message:

Changed use of CEGUI widgets: Instead of addressing a type with "TaharezLook/Button" I changed it to "MenuWidgets/MyWidget".
That allows to define multiple skins for the menu and simply load the one we like.
Furthermore the idea is to use "HUDWidgets/MyWidget" for HUD elements. But I haven't added that.

File:

• code/branches/gamestate/src/orxonox/pickup/PickupInventory.cc (modified) (3 diffs)

code/branches/gamestate/src/orxonox/pickup/PickupInventory.cc

@@ -300 +300 @@
         if(!winMgr) { return; }
 
-        CEGUI::Window* frame = winMgr->createWindow("TaharezLook/StaticImage", "orxonox/Inventory/Frame/" + id);
+        CEGUI::Window* frame = winMgr->createWindow("MenuWidgets/StaticImage", "orxonox/Inventory/Frame/" + id);
         frame->setPosition(CEGUI::UVector2(CEGUI::UDim(0, 5 + x * 70), CEGUI::UDim(0, 5 + y * 90)));
         frame->setSize(CEGUI::UVector2(CEGUI::UDim(0, 65), CEGUI::UDim(0, 65)));
@@ -306 +306 @@
         frame->setVisible(false);
 
-        CEGUI::Window* text = winMgr->createWindow("TaharezLook/StaticText", "orxonox/Inventory/Title/" + id);
+        CEGUI::Window* text = winMgr->createWindow("MenuWidgets/StaticText", "orxonox/Inventory/Title/" + id);
         text->setPosition(CEGUI::UVector2(CEGUI::UDim(0, 5 + x * 70), CEGUI::UDim(0, 70 + y * 90)));
         text->setSize(CEGUI::UVector2(CEGUI::UDim(0, 65), CEGUI::UDim(0, 20)));
@@ -316 +316 @@
         text->setVisible(false);
 
-        CEGUI::Window* btn = winMgr->createWindow("TaharezLook/Button", "orxonox/Inventory/Items/" + id);
+        CEGUI::Window* btn = winMgr->createWindow("MenuWidgets/Button", "orxonox/Inventory/Items/" + id);
         btn->setPosition(CEGUI::UVector2(CEGUI::UDim(0, 8 + x * 70), CEGUI::UDim(0, 8 + y * 90)));
         btn->setSize(CEGUI::UVector2(CEGUI::UDim(0, 59), CEGUI::UDim(0, 59)));