[Orxonox-commit 1499] r6217 - in code/branches/presentation2/data/gui: layouts scripts

[dafrick at orxonox.net]

Author: dafrick
Date: 2009-12-02 22:13:13 +0100 (Wed, 02 Dec 2009)
New Revision: 6217

Modified:
   code/branches/presentation2/data/gui/layouts/DecisionPopup.layout
   code/branches/presentation2/data/gui/layouts/InGameMenu.layout
   code/branches/presentation2/data/gui/layouts/MainMenu.layout
   code/branches/presentation2/data/gui/scripts/InGameMenu.lua
Log:
Improved GUI. (Especially IngameMenu)

Modified: code/branches/presentation2/data/gui/layouts/DecisionPopup.layout
===================================================================
--- code/branches/presentation2/data/gui/layouts/DecisionPopup.layout	2009-12-02 21:08:08 UTC (rev 6216)
+++ code/branches/presentation2/data/gui/layouts/DecisionPopup.layout	2009-12-02 21:13:13 UTC (rev 6217)
@@ -8,7 +8,7 @@
         <Window Type="TaharezLook/StaticImage" Name="orxonox/DecisionPopup_Background" >
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
             <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
-            <Property Name="Alpha" Value="0.5" />
+            <Property Name="Alpha" Value="0.6" />
             <Window Type="TaharezLook/Button" Name="orxonox/DecisionPopup_button_yes" >
                 <Property Name="Font" Value="BlueHighway-12" />
                 <Property Name="Text" Value="Yes" />

Modified: code/branches/presentation2/data/gui/layouts/InGameMenu.layout
===================================================================
--- code/branches/presentation2/data/gui/layouts/InGameMenu.layout	2009-12-02 21:08:08 UTC (rev 6216)
+++ code/branches/presentation2/data/gui/layouts/InGameMenu.layout	2009-12-02 21:13:13 UTC (rev 6217)
@@ -5,29 +5,37 @@
         <Property Name="InheritsAlpha" Value="False" />
         <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
         <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
+        <Window Type="TaharezLook/Button" Name="orxonox/InGameMenu_ReturnButton" >
+            <Property Name="Font" Value="BlueHighway-12" />
+            <Property Name="Text" Value="Return to Game" />
+            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.3,0},{0.6,0},{0.36,0}}" />
+            <Property Name="Alpha" Value="0.7" />
+            <Event Name="Clicked" Function="InGameMenu.button_return_clicked"/>
+        </Window>
         <Window Type="TaharezLook/Button" Name="orxonox/InGameMenu_MainMenuButton" >
             <Property Name="Font" Value="BlueHighway-12" />
-            <Property Name="Text" Value="MainMenu" />
+            <Property Name="Text" Value="Main Menu" />
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.2,0},{0.6,0},{0.3,0}}" />
+            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.4,0},{0.6,0},{0.46,0}}" />
             <Property Name="Alpha" Value="0.7" />
             <Event Name="Clicked" Function="InGameMenu.button_mainmenu_clicked"/>
         </Window>
-        <Window Type="TaharezLook/Button" Name="orxonox/InGameMenu_QuitButton" >
+        <Window Type="TaharezLook/Button" Name="orxonox/InGameMenu_SettingsButton" >
             <Property Name="Font" Value="BlueHighway-12" />
-            <Property Name="Text" Value="Quit" />
+            <Property Name="Text" Value="Settings" />
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.4,0},{0.6,0},{0.5,0}}" />
+            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.5,0},{0.6,0},{0.56,0}}" />
             <Property Name="Alpha" Value="0.7" />
-            <Event Name="Clicked" Function="InGameMenu.button_quit_clicked"/>
+            <Event Name="Clicked" Function="InGameMenu.button_settings_clicked"/>
         </Window>
-        <Window Type="TaharezLook/Button" Name="orxonox/InGameMenu_ReturnButton" >
+        <Window Type="TaharezLook/Button" Name="orxonox/InGameMenu_QuitButton" >
             <Property Name="Font" Value="BlueHighway-12" />
-            <Property Name="Text" Value="return to Game" />
+            <Property Name="Text" Value="Quit" />
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.6,0},{0.6,0},{0.7,0}}" />
+            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.6,0},{0.6,0},{0.66,0}}" />
             <Property Name="Alpha" Value="0.7" />
-            <Event Name="Clicked" Function="InGameMenu.button_return_clicked"/>
+            <Event Name="Clicked" Function="InGameMenu.button_quit_clicked"/>
         </Window>
     </Window>
 </GUILayout>

Modified: code/branches/presentation2/data/gui/layouts/MainMenu.layout
===================================================================
--- code/branches/presentation2/data/gui/layouts/MainMenu.layout	2009-12-02 21:08:08 UTC (rev 6216)
+++ code/branches/presentation2/data/gui/layouts/MainMenu.layout	2009-12-02 21:13:13 UTC (rev 6217)
@@ -8,7 +8,7 @@
         <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1.02125,0},{1.02167,0}}" />
         <Property Name="BackgroundEnabled" Value="False" />
         <Window Type="TaharezLook/Button" Name="orxonox/QuickGameTestButton" >
-            <Property Name="Text" Value="QUICK GAME TEST" />
+            <Property Name="Text" Value="Quickstart" />
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
             <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.25,0},{0.6,0},{0.3,0}}" />
             <Event Name="Clicked" Function="MainMenu.QuickGameTestButton_clicked"/>

Modified: code/branches/presentation2/data/gui/scripts/InGameMenu.lua
===================================================================
--- code/branches/presentation2/data/gui/scripts/InGameMenu.lua	2009-12-02 21:08:08 UTC (rev 6216)
+++ code/branches/presentation2/data/gui/scripts/InGameMenu.lua	2009-12-02 21:13:13 UTC (rev 6217)
@@ -24,16 +24,20 @@
     orxonox.Game:getInstance():popState()
     orxonox.Game:getInstance():popState()
     orxonox.Game:getInstance():requestState("mainmenu")
-    orxonox.CommandExecutor:execute("hideGUI InGameMenu")
+    hideGUI("InGameMenu")
 end
 
+function P.button_settings_clicked(e)
+    showGUI("SettingsMenu", true)
+end
+
 function P.button_return_clicked(e)
-    orxonox.CommandExecutor:execute("hideGUI InGameMenu")
+    hideGUI("InGameMenu")
 end
 
 function P.callback(doExit)
     if doExit then
-        orxonox.CommandExecutor:execute("hideGUI InGameMenu")
+        hideGUI("InGameMenu")
         orxonox.CommandExecutor:execute("exit")
     end
 end