Changeset 8927 for code/branches/menue/data/gui

Timestamp:

Nov 9, 2011, 2:42:04 PM (13 years ago)

Author:

baermatt

Message:

Changed some level tags.

Location:

code/branches/menue/data/gui

Files:

• layouts/SingleplayerConfigMenu.layout (added)
• layouts/SingleplayerMenu.layout (modified) (2 diffs)
• scripts/SingleplayerConfigMenu.lua (added)
• scripts/SingleplayerMenu.lua (modified) (6 diffs)

code/branches/menue/data/gui/layouts/SingleplayerMenu.layout

@@ -15 +15 @@
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
             <Property Name="VertFormatting" Value="TopAligned" />
-            <Property Name="UnifiedAreaRect" Value="{{0.2,0},{0.2,0},{0.8,0},{0.7,0}}" />
+            <Property Name="UnifiedAreaRect" Value="{{0.2,0},{0.15,0},{0.8,0},{0.7,0}}" />
             <Window Type="MenuWidgets/TabControl" Name="orxonox/SingleplayerTabControl" >
                 <Property Name="TabHeight" Value="{0,26.4388}" />
@@ -25 +25 @@
                 <Property Name="AlwaysOnTop" Value="True" />
                 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="UnifiedAreaRect" Value="{{0.55,0},{0.25,0},{0.9,0},{0.7,0}}" />
+                <Property Name="UnifiedAreaRect" Value="{{0.55,0},{0.25,0},{0.9,0},{0.675,0}}" />
             </Window>
-            <Window Type="MenuWidgets/StaticText" Name="orxonox/SingleplayerLevelDescriptionWrapper" >
+            <Window Type="MenuWidgets/StaticText" Name="orxonox/SingleplayerLevelDescription" >
                 <Property Name="AlwaysOnTop" Value="True" />
                 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="HorzFormatting" Value="HorzCentred" />
-                <Property Name="VertFormatting" Value="TopAligned" />
-                <Property Name="UnifiedAreaRect" Value="{{0.1,0},{0.75,0},{0.9,0},{0.85,0}}" />
-                <Window Type="MenuWidgets/ScrollablePane" Name="orxonox/SingleplayerLevelDescriptionPane" >
-                    <Property Name="ContentArea" Value="l:0 t:0 r:0 b:0" />
-                    <Property Name="HorzStepSize" Value="0.005" />
-                    <Property Name="VertStepSize" Value="0.005" />
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="HorzOverlapSize" Value="0.01" />
-                    <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{0.997,0},{0.997,0}}" />
-                    <Property Name="VertOverlapSize" Value="0.01" />
-                    <Property Name="HorzScrollPosition" Value="0" />
-                    <Property Name="VertScrollPosition" Value="0" />
-                    <Window Type="MenuWidgets/StaticText" Name="orxonox/SingleplayerLevelDescription" >
-                        <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                        <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
-                    </Window>
-                </Window>
+                <Property Name="VertScrollbar" Value="True" />
+                <Property Name="HorzScrollbar" Value="True" />
+                <Property Name="UnifiedAreaRect" Value="{{0.1,0},{0.725,0},{0.9,0},{0.875,0}}" />
             </Window>
         </Window>

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

@@ -11 +11 @@
     
     -- create tabs with desired tab as argument (nil for all)
-    P.createFilterTab("Tests", "test")
+    P.createFilterTab("Missions", "mission")
     P.createFilterTab("Tutorials", "tutorial")
     P.createFilterTab("Showcases", "showcase")
-    P.createFilterTab("SP?", "singleplayer")
     P.createFilterTab("Presentations", "presentation")
+    P.createFilterTab("Tests", "test")
     P.createFilterTab("Show All", nil)
-
+    
+    SingleplayerSelectionChanged()
+    
     --buttons are arranged in a 1x3 matrix
     P:setButton(1, 1, {
@@ -62 +64 @@
         tabName = tabName..tag
     end
-    -- add new tab window with desired name
-    local tabControl = winMgr:getWindow("orxonox/SingleplayerTabControl")
+    -- create new tab window with desired name
     local listbox = CEGUI.toListbox(winMgr:createWindow("MenuWidgets/Listbox", tabName))
     listbox:setText(name)
     listbox:setProperty("UnifiedMaxSize", "{{1,0},{1,0}}")
-    listbox:setProperty("UnifiedAreaRect", "{{0.05,0},{0.1,0},{0.5,0},{0.7,0}}")
-    tabControl:addChildWindow(tabName)
+    listbox:setProperty("UnifiedAreaRect", "{{0.05,0},{0.1,0},{0.5,0},{0.675,0}}")
     -- fill listbox with items
     listbox:resetList()
@@ -89 +89 @@
     table.insert(P.activeTabIndexes, tabIndexes)
     listbox:subscribeEvent("ItemSelectionChanged", "SingleplayerSelectionChanged")
+    local tabControl = winMgr:getWindow("orxonox/SingleplayerTabControl")
     tabControl:subscribeEvent("TabSelectionChanged", "SingleplayerSelectionChanged")
-    SingleplayerSelectionChanged()
+    if listbox:getItemCount() > 0 then
+        tabControl:addChildWindow(tabName)
+    end
 end
 
@@ -108 +111 @@
 
 function SingleplayerSelectionChanged(e)
+    local levelImage = winMgr:getWindow("orxonox/SingleplayerLevelImage")
+    local levelDescription = winMgr:getWindow("orxonox/SingleplayerLevelDescription")
     local level = P.SingleplayerGetSelectedLevel()
     if level ~= nil then
         local levelXMLFilename = level:getXMLFilename()
         local imageName = level:getScreenshot()
-        local levelImage = winMgr:getWindow("orxonox/SingleplayerLevelImage")
         levelImage:setProperty("Image", "set:"..levelXMLFilename..imageName.." image:full_image")
-        local levelDescription = winMgr:getWindow("orxonox/SingleplayerLevelDescription")
-        local height = getStaticTextWindowHeight(levelDescription)
---        local width = getStaticTextWindowWidth(levelDescription)
-        levelDescription:setSize(CEGUI.UVector2(CEGUI.UDim(1.0, -P.scrollbarWidth), CEGUI.UDim(0.0, height)))
         levelDescription:setText(level:getDescription())
+    else
+        levelImage:setProperty("Image", nil)
+        levelDescription:setText("")
     end
 end
@@ -131 +134 @@
 
 function P.SingleplayerConfigButton_clicked(e)
-    hideMenuSheet(P.name)
+    showMenuSheet("SingleplayerConfigMenu", true)
 end
 
@@ -139 +142 @@
 
 return P
-