Changeset 8927 for code

Timestamp:

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

Author:

baermatt

Message:

Changed some level tags.

Location:

code/branches/menue

Files:

• data/gui/layouts/SingleplayerConfigMenu.layout (added)
• data/gui/layouts/SingleplayerMenu.layout (modified) (2 diffs)
• data/gui/scripts/SingleplayerConfigMenu.lua (added)
• data/gui/scripts/SingleplayerMenu.lua (modified) (6 diffs)
• data/levels/asteroids.oxw (modified) (1 diff)
• data/levels/docking.oxw (modified) (1 diff)
• data/levels/dynamicMatch.oxw (modified) (1 diff)
• data/levels/fightInOurBack.oxw (modified) (1 diff)
• data/levels/lastManStanding.oxw (modified) (1 diff)
• data/levels/lastTeamStanding.oxw (modified) (1 diff)
• data/levels/lastTeamStandingII.oxw (modified) (1 diff)
• data/levels/pong.oxw (modified) (1 diff)
• data/levels/portals.oxw (modified) (1 diff)
• data/levels/presentationFS11.oxw (modified) (1 diff)
• data/levels/princessAeryn.oxw (modified) (1 diff)
• data/levels/screenshot.oxw (modified) (1 diff)
• data/levels/sound.oxw (modified) (1 diff)
• data/levels/teamBaseMatch.oxw (modified) (1 diff)
• data/levels/teamDeathMatch.oxw (modified) (1 diff)
• data/levels/tetris.oxw (modified) (1 diff)
• data/levels/theTimeMachine.oxw (modified) (1 diff)
• data/levels/underAttack.oxw (modified) (1 diff)
• src/orxonox/LevelInfo.cc (modified) (1 diff)

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
-

code/branches/menue/data/levels/asteroids.oxw

@@ -1 +1 @@
 <LevelInfo
  name = "Asteroids Race"
- description = "testmap for gametype asteroid race"
+ description = "Testmap for gametype asteroid race"
+ tags = "test"
  screenshot = "asteroids.png"
 />

code/branches/menue/data/levels/docking.oxw

@@ -2 +2 @@
  name = "Transporter"
  description = "Level with a Transporter. Demonstrates the docking system."
- tags = ""
+ tags = "showcase"
  screenshot = "transporter.png"
 />

code/branches/menue/data/levels/dynamicMatch.oxw

@@ -1 +1 @@
 <LevelInfo
  name = "Dynamic Match"
- description = "In progress -level for dynamicmatch"
+ description = "In progress - Level for dynamicmatch"
+ tags = "test"
  screenshot = "dynamicMatch.png"
 />

code/branches/menue/data/levels/fightInOurBack.oxw

@@ -2 +2 @@
   name = "Fight in our Back"
   description = "Our fleet is far ahead of us. We need to get rid of all the enemies in its back, because we do not want our enemies to attack from everywhere. So let us clear this Sector!"
-  tags = ""
+  tags = "mission"
   screenshot = "fightinourback.png"
 />

code/branches/menue/data/levels/lastManStanding.oxw

@@ -2 +2 @@
  name = "Last Man Standing"
  description = "Be the sole survivor."
- tags = ""
+ tags = "mission"
  screenshot = "lastmanstanding.png"
 />

code/branches/menue/data/levels/lastTeamStanding.oxw

@@ -2 +2 @@
  name = "Last Team Standing"
  description = "Survive as a team."
- tags = "singleplayer"
+ tags = "mission"
  screenshot = "lastteamstanding.png"
 />

code/branches/menue/data/levels/lastTeamStandingII.oxw

@@ -2 +2 @@
  name = "On the fly"
  description = "Survive as a team."
- tags = ""
+ tags = "mission"
  screenshot = "onthefly.png"
 />

code/branches/menue/data/levels/pong.oxw

@@ -2 +2 @@
  name = "Pong"
  description = "Pong in space!"
- tags = ""
+ tags = "showcase"
  screenshot = "pong.png"
 />

code/branches/menue/data/levels/portals.oxw

@@ -3 +3 @@
  name = "Portals"
  description = "Level for testing portals"
- tags = "tutorial"
+ tags = "test"
  screenshot = "portals.png"
 />

code/branches/menue/data/levels/presentationFS11.oxw

@@ -2 +2 @@
  name = "Presentation FS11"
  description = "Presentation level spring semester '11"
- tags = "test"
+ tags = "presentation"
  screenshot = "presentationfs11.png"
 />

code/branches/menue/data/levels/princessAeryn.oxw

@@ -2 +2 @@
  name = "The Tale of Princess Aeryn"
  description = "The Tale of the elusive but beautiful Princess Aeryn"
- tags = ""
+ tags = "mission"
  screenshot = "thetaleofprincessaeryn.png"
 />

code/branches/menue/data/levels/screenshot.oxw

@@ -2 +2 @@
  name = "Screenshot"
  description = "Level to make awesome screenshots in."
- tags = "test"
+ tags = "test, showcase"
  screenshot = "screenshot.png"
 />

code/branches/menue/data/levels/sound.oxw

@@ -2 +2 @@
  name = "Sound showcase"
  description = "Level to test and showcase sound."
- tags = "test"
+ tags = "test, showcase"
  screenshot = "soundshowcase.png"
 />

code/branches/menue/data/levels/teamBaseMatch.oxw

@@ -2 +2 @@
  name = "Teambase Match"
  description = "Fight for the bases."
- tags = ""
+ tags = "mission"
  screenshot = "teambasematch.png"
 />

code/branches/menue/data/levels/teamDeathMatch.oxw

@@ -2 +2 @@
  name = "Team Deathmatch"
  description = "Fight against each other in teams."
- tags = ""
+ tags = "mission"
  screenshot = "teamdeathmatch.png"
 />

code/branches/menue/data/levels/tetris.oxw

@@ -2 +2 @@
  name = "Tetris"
  description = "Tetris in space!"
- tags = ""
+ tags = "showcase"
  screenshot = "tetris.png"
 />

code/branches/menue/data/levels/theTimeMachine.oxw

@@ -2 +2 @@
  name = "The Time Machine"
  description = "A simple level. The only goal is to defeat as much enemies as you can."
- tags = "singleplayer"
+ tags = "mission"
  screenshot = "thetimemachine.png"
 />

code/branches/menue/data/levels/underAttack.oxw

@@ -2 +2 @@
  name = "UnderAttack testing"
  description = "A simple testlevel"
+ tags = "test"
  screenshot = "underattack.png"
 />

code/branches/menue/src/orxonox/LevelInfo.cc

@@ -87 +87 @@
         {
             LevelInfoItem::possibleTags_s.insert("test");
-            LevelInfoItem::possibleTags_s.insert("singleplayer");
-            LevelInfoItem::possibleTags_s.insert("multiplayer");
             LevelInfoItem::possibleTags_s.insert("showcase");
             LevelInfoItem::possibleTags_s.insert("tutorial");
             LevelInfoItem::possibleTags_s.insert("presentation");
+            LevelInfoItem::possibleTags_s.insert("mission");
         }
     }