Changeset 6571 for code

Timestamp:

Mar 19, 2010, 2:51:39 PM (15 years ago)

Author:

rgrieder

Message:

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…)

Location:

code/branches/gamestate/data/gui/scripts

Files:

• AudioMenu.lua (modified) (1 diff)
• GameplayMenu.lua (modified) (1 diff)
• GraphicsMenu.lua (modified) (1 diff)
• InitialiseGUI.lua (modified) (1 diff)
• MultiplayerMenu.lua (modified) (1 diff)
• SingleplayerMenu.lua (modified) (1 diff)

code/branches/gamestate/data/gui/scripts/AudioMenu.lua

@@ -40 +40 @@
     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

code/branches/gamestate/data/gui/scripts/GameplayMenu.lua

@@ -17 +17 @@
     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

code/branches/gamestate/data/gui/scripts/GraphicsMenu.lua

@@ -59 +59 @@
     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

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

@@ -17 +17 @@
 -- 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")

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

@@ -27 +27 @@
     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

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

@@ -27 +27 @@
     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