Changeset 7760 for code/branches/presentation/data

Timestamp:

Dec 15, 2010, 10:59:10 AM (14 years ago)

Author:

dafrick

Message:

Making the GUI scheme configurable through a config value.

Location:

code/branches/presentation/data/gui

Files:

• schemes/OrxonoxHUDWidgets.scheme (moved) (moved from code/branches/presentation/data/gui/schemes/OrxonoxLookHUDWidgets.scheme) (1 diff)
• schemes/OrxonoxMenuWidgets.scheme (moved) (moved from code/branches/presentation/data/gui/schemes/OrxonoxLookMenuWidgets.scheme) (1 diff)
• scripts/InitialiseGUI.lua (modified) (2 diffs)

code/branches/presentation/data/gui/schemes/OrxonoxHUDWidgets.scheme

@@ -1 +1 @@
 <?xml version="1.0" ?>
-<GUIScheme Name="OrxonoxLookHUDWidgets">
+<GUIScheme Name="OrxonoxHUDWidgets">
     <WindowAlias Alias="HUDWidgets/StaticImage"              Target="OrxonoxLook/StaticImage" />
     <WindowAlias Alias="HUDWidgets/StaticText"               Target="OrxonoxLook/StaticText" />

code/branches/presentation/data/gui/schemes/OrxonoxMenuWidgets.scheme

@@ -1 +1 @@
 <?xml version="1.0" ?>
-<GUIScheme Name="OrxonoxLookMenuWidgets">
+<GUIScheme Name="OrxonoxMenuWidgets">
     <WindowAlias Alias="MenuWidgets/StaticImage"              Target="OrxonoxLook/StaticImage" />
     <WindowAlias Alias="MenuWidgets/StaticText"               Target="OrxonoxLook/StaticText" />

code/branches/presentation/data/gui/scripts/InitialiseGUI.lua

@@ -5 +5 @@
 winMgr    = CEGUI.WindowManager:getSingleton()
 
+local scheme = orxonox.CommandExecutor:query("getConfig GUIManager guiScheme_")
 -- Load all required skins
-schemeMgr:loadScheme("TaharezGreenLook.scheme")
---schemeMgr:loadScheme("OrxonoxLook.scheme")
+--schemeMgr:loadScheme("TaharezGreenLook.scheme")
+schemeMgr:loadScheme(scheme .. "Look.scheme")
 --schemeMgr:loadScheme("TaharezLook.scheme")
 --schemeMgr:loadScheme("WindowsLook.scheme")
@@ -16 +17 @@
 -- By loading a different file (if there is) you can change the skin
 -- of the menus or the HUD independently
-schemeMgr:loadScheme("TaharezGreenMenuWidgets.scheme")
-menuImageSet = "TaharezGreenLook"
-schemeMgr:loadScheme("TaharezGreenHUDWidgets.scheme")
-hudImageSet = "TaharezGreenLook"
---schemeMgr:loadScheme("OrxonoxLookMenuWidgets.scheme")
---menuImageSet = "OrxonoxLook"
---schemeMgr:loadScheme("OrxonoxLookHUDWidgets.scheme")
---hudImageSet = "OrxonoxLook"
+--schemeMgr:loadScheme("TaharezGreenMenuWidgets.scheme")
+--menuImageSet = "TaharezGreenLook"
+--schemeMgr:loadScheme("TaharezGreenHUDWidgets.scheme")
+--hudImageSet = "TaharezGreenLook"
+schemeMgr:loadScheme(scheme .. "MenuWidgets.scheme")
+menuImageSet = scheme .. "Look"
+schemeMgr:loadScheme(scheme .. "HUDWidgets.scheme")
+hudImageSet = scheme .. "Look"
 
 -- Just a remaining test hack