Changeset 9051 for code/trunk/data

Timestamp:

Mar 21, 2012, 9:32:23 PM (13 years ago)

Author:

dafrick

Message:

Resolving some issues with typecasts and comboboxes in graphics menu.

File:

• code/trunk/data/gui/scripts/GraphicsMenu.lua (modified) (10 diffs)

code/trunk/data/gui/scripts/GraphicsMenu.lua

@@ -34 +34 @@
 
     -- resolution combobox
-    local resolutionCombobox = winMgr:getWindow("orxonox/Display/Resolution/Combobox")
-    CEGUI.toCombobox(resolutionCombobox):setReadOnly(true)
+    local resolutionCombobox = CEGUI.toCombobox(winMgr:getWindow("orxonox/Display/Resolution/Combobox"))
+    resolutionCombobox:setReadOnly(true)
 
     for k,v in pairs(P.resolutionList) do
@@ -44 +44 @@
 
     -- themes combobox
-    local themeCombobox = winMgr:getWindow("orxonox/Display/Theme/Combobox")
-    CEGUI.toCombobox(themeCombobox):setReadOnly(true)
+    local themeCombobox = CEGUI.toCombobox(winMgr:getWindow("orxonox/Display/Theme/Combobox"))
+    themeCombobox:setReadOnly(true)
 
     for k,v in pairs(P.schemeList) do
@@ -54 +54 @@
 
     -- fsaa combobox
-    local fsaaCombobox = winMgr:getWindow("orxonox/Display/More/FSAA")
-    CEGUI.toCombobox(fsaaCombobox):setReadOnly(true)
+    local fsaaCombobox = CEGUI.toCombobox(winMgr:getWindow("orxonox/Display/More/FSAA"))
+    fsaaCombobox:setReadOnly(true)
 
     for k,v in pairs(P.fsaaList) do
@@ -64 +64 @@
 
     -- particle lod combobox
-    local particleLodCombobox = winMgr:getWindow("orxonox/Settings/ParticleLodCombobox")
-    CEGUI.toCombobox(particleLodCombobox):setReadOnly(true)
+    local particleLodCombobox = CEGUI.toCombobox(winMgr:getWindow("orxonox/Settings/ParticleLodCombobox"))
+    particleLodCombobox:setReadOnly(true)
 
     for k,v in pairs(P.particleLodList) do
@@ -91 +91 @@
 
     -- themes combobox
-    local themeCombobox = winMgr:getWindow("orxonox/Display/Theme/Combobox")
+    local themeCombobox =  CEGUI.toCombobox(winMgr:getWindow("orxonox/Display/Theme/Combobox"))
     local currentTheme = orxonox.CommandExecutor:query("getConfig GUIManager guiScheme_")
 
@@ -105 +105 @@
 
     -- fsaa combobox
-    local fsaaCombobox = winMgr:getWindow("orxonox/Display/More/FSAA")
+    local fsaaCombobox = CEGUI.toCombobox(winMgr:getWindow("orxonox/Display/More/FSAA"))
     local currentFSAAMode = orxonox.GraphicsManager:getInstance():getFSAAMode()
 
@@ -131 +131 @@
 
     -- particle lod combobox
-    local particleLodCombobox = winMgr:getWindow("orxonox/Settings/ParticleLodCombobox")
+    local particleLodCombobox = CEGUI.toCombobox(winMgr:getWindow("orxonox/Settings/ParticleLodCombobox"))
     local currentParticleLod = orxonox.CommandExecutor:query("getConfig GraphicsSettings particlesDetailLevel")
 
@@ -173 +173 @@
 
     -- resolution combobox
-    local resolutionCombobox = winMgr:getWindow("orxonox/Display/Resolution/Combobox")
+    local resolutionCombobox = CEGUI.toCombobox(winMgr:getWindow("orxonox/Display/Resolution/Combobox"))
 
     local currentWidth = orxonox.GraphicsManager:getInstance():getWindowWidth()
@@ -202 +202 @@
 function P.updateResolutionEditboxes()
     -- resolution combobox
-    local resolutionCombobox = winMgr:getWindow("orxonox/Display/Resolution/Combobox")
+    local resolutionCombobox = CEGUI.toCombobox(winMgr:getWindow("orxonox/Display/Resolution/Combobox"))
 
     local currentWidth = orxonox.GraphicsManager:getInstance():getWindowWidth()
@@ -397 +397 @@
 
     -- particle lod
-    local particleLodCombobox = winMgr:getWindow("orxonox/Settings/ParticleLodCombobox")
+    local particleLodCombobox = CEGUI.toCombobox(winMgr:getWindow("orxonox/Settings/ParticleLodCombobox"))
     local item = particleLodCombobox:getSelectedItem()
     if item then