Changeset 11805 for code

Timestamp:

Feb 24, 2018, 2:50:16 AM (7 years ago)

Author:

landauf

Message:

migrated HighscoreMenu.lua and CampaignMenu.lua to cegui 0.8

Location:

code/branches/cegui0.8_ogre1.9/data/gui

Files:

• layouts/HighscoreMenu.layout (modified) (2 diffs)
• scripts/CampaignMenu.lua (modified) (1 diff)
• scripts/HighscoreMenu.lua (modified) (7 diffs)

code/branches/cegui0.8_ogre1.9/data/gui/layouts/HighscoreMenu.layout

@@ -1 +1 @@
 <?xml version='1.0' encoding='utf-8'?>
 <GUILayout version="4">
-    <Window name="Background" type="DefaultWindow">
+    <Window name="HighscoreBackground" type="DefaultWindow">
         <Property name="InheritsAlpha" value="False" />
         <Property name="MaxSize" value="{{1,0},{1,0}}" />
@@ -9 +9 @@
             <Property name="Alpha" value="0.8" />
             <Property name="InheritsAlpha" value="False" />
-            <Property name="HorzFormatting" value="HorzCentred" />
+            <Property name="HorzFormatting" value="CentreAligned" />
             <Property name="MaxSize" value="{{1,0},{1,0}}" />
             <Property name="VertFormatting" value="TopAligned" />

code/branches/cegui0.8_ogre1.9/data/gui/scripts/CampaignMenu.lua

@@ -8 +8 @@
 
 function P.updateButtons()
-    P.updateButton(0, winMgr:getWindow("orxonox/Mission1Button"))
-    P.updateButton(0, winMgr:getWindow("orxonox/Mission1Text"))
-    P.updateButton(1, winMgr:getWindow("orxonox/Mission2Button"))
-    P.updateButton(1, winMgr:getWindow("orxonox/Mission2Text"))
-    P.updateButton(2, winMgr:getWindow("orxonox/Mission3Button"))
-    P.updateButton(2, winMgr:getWindow("orxonox/Mission3Text"))
-    P.updateButton(3, winMgr:getWindow("orxonox/Mission4Button"))
-    P.updateButton(3, winMgr:getWindow("orxonox/Mission4Text"))
-    P.updateButton(4, winMgr:getWindow("orxonox/Mission5Button"))
-    P.updateButton(4, winMgr:getWindow("orxonox/Mission5Text"))
-    P.updateButton(5, winMgr:getWindow("orxonox/Mission6Button"))
-    P.updateButton(5, winMgr:getWindow("orxonox/Mission6Text"))
-    P.updateButton(6, winMgr:getWindow("orxonox/Mission7Button"))
-    P.updateButton(6, winMgr:getWindow("orxonox/Mission7Text"))
-    P.updateButton(7, winMgr:getWindow("orxonox/Mission8Button"))
-    P.updateButton(7, winMgr:getWindow("orxonox/Mission8Text"))
-    P.updateButton(8, winMgr:getWindow("orxonox/Mission9Button"))
-    P.updateButton(8, winMgr:getWindow("orxonox/Mission9Text"))
+    P.updateButton(0, P.window:getChild("Mission1Button"))
+    P.updateButton(0, P.window:getChild("Mission1Text"))
+    P.updateButton(1, P.window:getChild("Mission2Button"))
+    P.updateButton(1, P.window:getChild("Mission2Text"))
+    P.updateButton(2, P.window:getChild("Mission3Button"))
+    P.updateButton(2, P.window:getChild("Mission3Text"))
+    P.updateButton(3, P.window:getChild("Mission4Button"))
+    P.updateButton(3, P.window:getChild("Mission4Text"))
+    P.updateButton(4, P.window:getChild("Mission5Button"))
+    P.updateButton(4, P.window:getChild("Mission5Text"))
+    P.updateButton(5, P.window:getChild("Mission6Button"))
+    P.updateButton(5, P.window:getChild("Mission6Text"))
+    P.updateButton(6, P.window:getChild("Mission7Button"))
+    P.updateButton(6, P.window:getChild("Mission7Text"))
+    P.updateButton(7, P.window:getChild("Mission8Button"))
+    P.updateButton(7, P.window:getChild("Mission8Text"))
+    P.updateButton(8, P.window:getChild("Mission9Button"))
+    P.updateButton(8, P.window:getChild("Mission9Text"))
 
 
     if (P.getIndexOfLastFinishedMission() == orxonox.LevelManager:getInstance():getNumberOfCampaignMissions() - 1) then
-        local label = winMgr:getWindow("orxonox/CampaignMenuCongratulation")
+        local label = P.window:getChild("CampaignMenuCongratulation")
         label:setProperty("Visible","True")
     end

code/branches/cegui0.8_ogre1.9/data/gui/scripts/HighscoreMenu.lua

@@ -39 +39 @@
 
     -- delete old windows to reload them on show
-    local tabControl = winMgr:getWindow("orxonox/HighscoreTabControl")
+    local tabControl = P.window:getChild("HighscoreWindow/HighscoreTabControl")
     for k,v in pairs(P.tabList) do
-            local default = winMgr:getWindow(v)
-            tabControl:removeChildWindow(default)
+            local default = tabControl:getChild(v)
+            tabControl:removeChild(default)
             winMgr:destroyWindow(default)
     end
@@ -61 +61 @@
 function P.createFilterTab(name, tag)
     -- create unique tab window name
-    local tabName = "orxonox/HighscoreLevelTab"
+    local tabName = "HighscoreLevelTab"
     if tag ~= nil then
         tabName = tabName..tag
@@ -70 +70 @@
     local default = (winMgr:createWindow("DefaultWindow", tabName))
     default:setText(name)
-    default:setProperty("UnifiedMaxSize", "{{1,0},{1,0}}")
-    default:setProperty("UnifiedAreaRect", "{{0,0},{0,0},{1,0},{1,0}}")
+    default:setProperty("MaxSize", "{{1,0},{1,0}}")
+    default:setProperty("Area", "{{0,0},{0,0},{1,0},{1,0}}")
     local pane = winMgr:createWindow("MenuWidgets/ScrollablePane", tabName .. "pane") 
-    pane:setSize(CEGUI.UVector2(CEGUI.UDim(1,0),CEGUI.UDim(1,0)))
-    default:addChildWindow(pane)
+    pane:setSize(CEGUI.USize(CEGUI.UDim(1,0),CEGUI.UDim(1,0)))
+    default:addChild(pane)
 
    
@@ -85 +85 @@
             table.insert(P.linesList, line)
             line:setYPosition(CEGUI.UDim(0,offset))
-            offset = offset + line:getHeight():asAbsolute(1)+2
-            pane:addChildWindow(line)
+            offset = offset + P.imageHeight +2
+            pane:addChild(line)
         end
         
     end
 
-    local tabControl = winMgr:getWindow("orxonox/HighscoreTabControl")
-    tabControl:addChildWindow(default)
+    local tabControl = P.window:getChild("HighscoreWindow/HighscoreTabControl")
+    tabControl:addChild(default)
  
 
@@ -99 +99 @@
 function P.createPickupEntry(parent,k,tag)
    
-    local name = "orxonox/HiscoreEntry" .. parent
+    local name = "HiscoreEntry" .. parent
     local splitlist = P.Split(P.highscoreList[k],"./.")
     local item = winMgr:createWindow("DefaultWindow", name)
-    item:setSize(CEGUI.UVector2(CEGUI.UDim(1, 0), CEGUI.UDim(0, P.imageHeight)))
+    item:setSize(CEGUI.USize(CEGUI.UDim(1, 0), CEGUI.UDim(0, P.imageHeight)))
     item:setPosition(CEGUI.UVector2(CEGUI.UDim(0, 0), CEGUI.UDim(0, 0)))
 
@@ -108 +108 @@
     player:setText(splitlist[1])
     player:setPosition(CEGUI.UVector2(CEGUI.UDim(0.005,0), CEGUI.UDim(0,0)))
-    player:setSize(CEGUI.UVector2(CEGUI.UDim(0.49, 0), CEGUI.UDim(0, P.imageHeight)))
+    player:setSize(CEGUI.USize(CEGUI.UDim(0.49, 0), CEGUI.UDim(0, P.imageHeight)))
     
-    item:addChildWindow(player)
+    item:addChild(player)
         
     local score = winMgr:createWindow("MenuWidgets/StaticText", name .. "/Score")
     score:setText(splitlist[3])
     score:setPosition(CEGUI.UVector2(CEGUI.UDim(0.5,0), CEGUI.UDim(0,0)))
-    score:setSize(CEGUI.UVector2(CEGUI.UDim(0.495, 0), CEGUI.UDim(0, P.imageHeight)))
+    score:setSize(CEGUI.USize(CEGUI.UDim(0.495, 0), CEGUI.UDim(0, P.imageHeight)))
     
-    item:addChildWindow(score)
+    item:addChild(score)
 
     return item
@@ -123 +123 @@
 function P.HighscoreGetSelectedLevel()
     -- choose the active listbox
-    local tabControl = CEGUI.toTabControl(winMgr:getWindow("orxonox/HighscoreTabControl"))
+    local tabControl = CEGUI.toTabControl(P.window:getChild("HighscoreWindow/HighscoreTabControl"))
     local listbox = CEGUI.toListbox(tabControl:getTabContentsAtIndex(tabControl:getSelectedTabIndex()))
     local choice = listbox:getFirstSelectedItem()