Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9051 for code/trunk/data


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • TabularUnified code/trunk/data/gui/scripts/GraphicsMenu.lua

    r8079 r9051  
    3434
    3535    -- resolution combobox
    36     local resolutionCombobox = winMgr:getWindow("orxonox/Display/Resolution/Combobox")
    37     CEGUI.toCombobox(resolutionCombobox):setReadOnly(true)
     36    local resolutionCombobox = CEGUI.toCombobox(winMgr:getWindow("orxonox/Display/Resolution/Combobox"))
     37    resolutionCombobox:setReadOnly(true)
    3838
    3939    for k,v in pairs(P.resolutionList) do
     
    4444
    4545    -- themes combobox
    46     local themeCombobox = winMgr:getWindow("orxonox/Display/Theme/Combobox")
    47     CEGUI.toCombobox(themeCombobox):setReadOnly(true)
     46    local themeCombobox = CEGUI.toCombobox(winMgr:getWindow("orxonox/Display/Theme/Combobox"))
     47    themeCombobox:setReadOnly(true)
    4848
    4949    for k,v in pairs(P.schemeList) do
     
    5454
    5555    -- fsaa combobox
    56     local fsaaCombobox = winMgr:getWindow("orxonox/Display/More/FSAA")
    57     CEGUI.toCombobox(fsaaCombobox):setReadOnly(true)
     56    local fsaaCombobox = CEGUI.toCombobox(winMgr:getWindow("orxonox/Display/More/FSAA"))
     57    fsaaCombobox:setReadOnly(true)
    5858
    5959    for k,v in pairs(P.fsaaList) do
     
    6464
    6565    -- particle lod combobox
    66     local particleLodCombobox = winMgr:getWindow("orxonox/Settings/ParticleLodCombobox")
    67     CEGUI.toCombobox(particleLodCombobox):setReadOnly(true)
     66    local particleLodCombobox = CEGUI.toCombobox(winMgr:getWindow("orxonox/Settings/ParticleLodCombobox"))
     67    particleLodCombobox:setReadOnly(true)
    6868
    6969    for k,v in pairs(P.particleLodList) do
     
    9191
    9292    -- themes combobox
    93     local themeCombobox = winMgr:getWindow("orxonox/Display/Theme/Combobox")
     93    local themeCombobox =  CEGUI.toCombobox(winMgr:getWindow("orxonox/Display/Theme/Combobox"))
    9494    local currentTheme = orxonox.CommandExecutor:query("getConfig GUIManager guiScheme_")
    9595
     
    105105
    106106    -- fsaa combobox
    107     local fsaaCombobox = winMgr:getWindow("orxonox/Display/More/FSAA")
     107    local fsaaCombobox = CEGUI.toCombobox(winMgr:getWindow("orxonox/Display/More/FSAA"))
    108108    local currentFSAAMode = orxonox.GraphicsManager:getInstance():getFSAAMode()
    109109
     
    131131
    132132    -- particle lod combobox
    133     local particleLodCombobox = winMgr:getWindow("orxonox/Settings/ParticleLodCombobox")
     133    local particleLodCombobox = CEGUI.toCombobox(winMgr:getWindow("orxonox/Settings/ParticleLodCombobox"))
    134134    local currentParticleLod = orxonox.CommandExecutor:query("getConfig GraphicsSettings particlesDetailLevel")
    135135
     
    173173
    174174    -- resolution combobox
    175     local resolutionCombobox = winMgr:getWindow("orxonox/Display/Resolution/Combobox")
     175    local resolutionCombobox = CEGUI.toCombobox(winMgr:getWindow("orxonox/Display/Resolution/Combobox"))
    176176
    177177    local currentWidth = orxonox.GraphicsManager:getInstance():getWindowWidth()
     
    202202function P.updateResolutionEditboxes()
    203203    -- resolution combobox
    204     local resolutionCombobox = winMgr:getWindow("orxonox/Display/Resolution/Combobox")
     204    local resolutionCombobox = CEGUI.toCombobox(winMgr:getWindow("orxonox/Display/Resolution/Combobox"))
    205205
    206206    local currentWidth = orxonox.GraphicsManager:getInstance():getWindowWidth()
     
    397397
    398398    -- particle lod
    399     local particleLodCombobox = winMgr:getWindow("orxonox/Settings/ParticleLodCombobox")
     399    local particleLodCombobox = CEGUI.toCombobox(winMgr:getWindow("orxonox/Settings/ParticleLodCombobox"))
    400400    local item = particleLodCombobox:getSelectedItem()
    401401    if item then
Note: See TracChangeset for help on using the changeset viewer.