[Orxonox-commit 1854] r6571 - code/branches/gamestate/data/gui/scripts

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2010-03-19 14:51:39 +0100 (Fri, 19 Mar 2010)
New Revision: 6571

Modified:
   code/branches/gamestate/data/gui/scripts/AudioMenu.lua
   code/branches/gamestate/data/gui/scripts/GameplayMenu.lua
   code/branches/gamestate/data/gui/scripts/GraphicsMenu.lua
   code/branches/gamestate/data/gui/scripts/InitialiseGUI.lua
   code/branches/gamestate/data/gui/scripts/MultiplayerMenu.lua
   code/branches/gamestate/data/gui/scripts/SingleplayerMenu.lua
Log:
Removed last remains of hard coded Taharez references:
Refer to the ImageSets with menuImageSet or hudImageSet from now on (in lua scripts).
(and hope that the image you're looking for is named like that in every look...)

Modified: code/branches/gamestate/data/gui/scripts/AudioMenu.lua
===================================================================
--- code/branches/gamestate/data/gui/scripts/AudioMenu.lua	2010-03-19 13:39:55 UTC (rev 6570)
+++ code/branches/gamestate/data/gui/scripts/AudioMenu.lua	2010-03-19 13:51:39 UTC (rev 6571)
@@ -39,7 +39,7 @@
     table.insert(themeList, "Drum n' Bass")
     for k,v in pairs(themeList) do
         item = CEGUI.createListboxTextItem(v)
-        item:setSelectionBrushImage("TaharezLook", "MultiListSelectionBrush")
+        item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
         CEGUI.toListbox(listboxwindow):addItem(item)
     end
     if orxonox.getConfig("MoodManager", "mood_") == "dnb" then

Modified: code/branches/gamestate/data/gui/scripts/GameplayMenu.lua
===================================================================
--- code/branches/gamestate/data/gui/scripts/GameplayMenu.lua	2010-03-19 13:39:55 UTC (rev 6570)
+++ code/branches/gamestate/data/gui/scripts/GameplayMenu.lua	2010-03-19 13:51:39 UTC (rev 6571)
@@ -16,7 +16,7 @@
     table.insert(themeList, "Theme 3")
     for k,v in pairs(themeList) do
         item = CEGUI.createListboxTextItem(v)
-        item:setSelectionBrushImage("TaharezLook", "MultiListSelectionBrush")
+        item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
         CEGUI.toCombobox(dropdown):addItem(item)
     end
 end

Modified: code/branches/gamestate/data/gui/scripts/GraphicsMenu.lua
===================================================================
--- code/branches/gamestate/data/gui/scripts/GraphicsMenu.lua	2010-03-19 13:39:55 UTC (rev 6570)
+++ code/branches/gamestate/data/gui/scripts/GraphicsMenu.lua	2010-03-19 13:51:39 UTC (rev 6571)
@@ -58,7 +58,7 @@
     table.insert(resolutionList, "1440 x 900")
     for k,v in pairs(resolutionList) do
         item = CEGUI.createListboxTextItem(v)
-        item:setSelectionBrushImage("TaharezLook", "MultiListSelectionBrush")
+        item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
         CEGUI.toListbox(listboxwindow):addItem(item)
     end
     if resolution == "640 x 480" then

Modified: code/branches/gamestate/data/gui/scripts/InitialiseGUI.lua
===================================================================
--- code/branches/gamestate/data/gui/scripts/InitialiseGUI.lua	2010-03-19 13:39:55 UTC (rev 6570)
+++ code/branches/gamestate/data/gui/scripts/InitialiseGUI.lua	2010-03-19 13:51:39 UTC (rev 6571)
@@ -16,12 +16,14 @@
 -- By loading a different file (if there is) you can change the skin
 -- of the menus or the HUD independently
 schemeMgr:loadScheme("TaharezMenuWidgets.scheme")
+menuImageSet = "TaharezLook"
 schemeMgr:loadScheme("TaharezHUDWidgets.scheme")
+hudImageSet = "TaharezLook"
 
 -- Just a remaining test hack
 schemeMgr:loadScheme("OrxonoxGUIScheme.scheme")
 
-system:setDefaultMouseCursor("TaharezLook", "MouseArrow")
+system:setDefaultMouseCursor(menuImageSet, "MouseArrow")
 system:setDefaultFont("BlueHighway-12")
 system:setDefaultTooltip("MenuWidgets/Tooltip")
 

Modified: code/branches/gamestate/data/gui/scripts/MultiplayerMenu.lua
===================================================================
--- code/branches/gamestate/data/gui/scripts/MultiplayerMenu.lua	2010-03-19 13:39:55 UTC (rev 6570)
+++ code/branches/gamestate/data/gui/scripts/MultiplayerMenu.lua	2010-03-19 13:51:39 UTC (rev 6571)
@@ -26,7 +26,7 @@
     table.sort(levelList)
     for k,v in pairs(levelList) do
         item = CEGUI.createListboxTextItem(v)
-        item:setSelectionBrushImage("TaharezLook", "MultiListSelectionBrush")
+        item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
         CEGUI.toListbox(listbox):addItem(item)
         if v .. ".oxw" == preselect then
             listbox:setItemSelectState(item, true)

Modified: code/branches/gamestate/data/gui/scripts/SingleplayerMenu.lua
===================================================================
--- code/branches/gamestate/data/gui/scripts/SingleplayerMenu.lua	2010-03-19 13:39:55 UTC (rev 6570)
+++ code/branches/gamestate/data/gui/scripts/SingleplayerMenu.lua	2010-03-19 13:51:39 UTC (rev 6571)
@@ -26,7 +26,7 @@
     table.sort(levelList)
     for k,v in pairs(levelList) do
         item = CEGUI.createListboxTextItem(v)
-        item:setSelectionBrushImage("TaharezLook", "MultiListSelectionBrush")
+        item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
         CEGUI.toListbox(listbox):addItem(item)
         if v .. ".oxw" == preselect then
             listbox:setItemSelectState(item, true)