[Orxonox-commit 1616] r6334 - in code/branches/presentation2/data/gui: layouts scripts
cmueri at orxonox.net
cmueri at orxonox.net
Sun Dec 13 13:12:13 CET 2009
Author: cmueri
Date: 2009-12-13 13:12:13 +0100 (Sun, 13 Dec 2009)
New Revision: 6334
Removed:
code/branches/presentation2/data/gui/layouts/KeyboardControlsMenu.layout
code/branches/presentation2/data/gui/scripts/KeyboardControlsMenu.lua
Modified:
code/branches/presentation2/data/gui/layouts/AudioMenu.layout
code/branches/presentation2/data/gui/layouts/ControlsMenu.layout
code/branches/presentation2/data/gui/layouts/CreditsMenu.layout
code/branches/presentation2/data/gui/layouts/DecisionPopup.layout
code/branches/presentation2/data/gui/layouts/GameplayMenu.layout
code/branches/presentation2/data/gui/layouts/GraphicsMenu.layout
code/branches/presentation2/data/gui/layouts/InGameMenu.layout
code/branches/presentation2/data/gui/layouts/InfoPopup.layout
code/branches/presentation2/data/gui/layouts/KeyBindMenu.layout
code/branches/presentation2/data/gui/layouts/MainMenu.layout
code/branches/presentation2/data/gui/layouts/MouseControlsMenu.layout
code/branches/presentation2/data/gui/layouts/MultiplayerMenu.layout
code/branches/presentation2/data/gui/layouts/MultiplayerOptionsMenu.layout
code/branches/presentation2/data/gui/layouts/SettingsMenu.layout
code/branches/presentation2/data/gui/layouts/SingleplayerMenu.layout
code/branches/presentation2/data/gui/scripts/AudioMenu.lua
code/branches/presentation2/data/gui/scripts/InfoPopup.lua
code/branches/presentation2/data/gui/scripts/KeyBindMenu.lua
Log:
All the menus (inclusive InGameMenus) have an equal design, some menus have a larger window. They should be ready to presentate now.
BUG REPORT in KeyBindMenu: If there are >4 buttons in a row, the GUI doesn't show those correctly.
Modified: code/branches/presentation2/data/gui/layouts/AudioMenu.layout
===================================================================
--- code/branches/presentation2/data/gui/layouts/AudioMenu.layout 2009-12-12 23:46:54 UTC (rev 6333)
+++ code/branches/presentation2/data/gui/layouts/AudioMenu.layout 2009-12-13 12:12:13 UTC (rev 6334)
@@ -14,14 +14,14 @@
<Property Name="HorzFormatting" Value="HorzCentred" />
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
<Property Name="VertFormatting" Value="TopAligned" />
- <Property Name="UnifiedAreaRect" Value="{{0.2,0},{0.325,0},{0.8,0},{0.6,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.2,0},{0.2875,0},{0.8,0},{0.6375,0}}" />
<Window Type="TaharezLook/StaticText" Name="orxonox/MasterVolume" >
<Property Name="Text" Value="Master volume " />
<Property Name="InheritsAlpha" Value="False" />
<Property Name="HorzFormatting" Value="HorzCentred" />
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
<Property Name="VertFormatting" Value="TopAligned" />
- <Property Name="UnifiedAreaRect" Value="{{0.041666,0},{0.2,0},{0.5625,0},{0.4,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.041666,0},{0.15,0},{0.5625,0},{0.3525,0}}" />
<Window Type="TaharezLook/HorizontalScrollbar" Name="orxonox/MasterScrollbar" >
<Property Name="PageSize" Value="0" />
<Property Name="StepSize" Value="1" />
@@ -48,7 +48,7 @@
<Property Name="HorzFormatting" Value="HorzCentred" />
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
<Property Name="VertFormatting" Value="TopAligned" />
- <Property Name="UnifiedAreaRect" Value="{{0.041666,0},{0.45,0},{0.5625,0},{0.65,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.041666,0},{0.4335,0},{0.5625,0},{0.636,0}}" />
<Window Type="TaharezLook/HorizontalScrollbar" Name="orxonox/MusicScrollbar" >
<Property Name="PageSize" Value="0" />
<Property Name="StepSize" Value="1" />
@@ -75,7 +75,7 @@
<Property Name="HorzFormatting" Value="HorzCentred" />
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
<Property Name="VertFormatting" Value="TopAligned" />
- <Property Name="UnifiedAreaRect" Value="{{0.041666,0},{0.7,0},{0.5625,0},{0.9,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.041666,0},{0.717,0},{0.5625,0},{0.9195,0}}" />
<Window Type="TaharezLook/HorizontalScrollbar" Name="orxonox/EffectsScrollbar" >
<Property Name="PageSize" Value="0" />
<Property Name="StepSize" Value="1" />
@@ -102,22 +102,29 @@
<Property Name="HorzFormatting" Value="HorzCentred" />
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
<Property Name="VertFormatting" Value="TopAligned" />
- <Property Name="UnifiedAreaRect" Value="{{0.604166,0},{0.2,0},{0.958333,0},{0.9,0}}" />
- <Window Type="TaharezLook/Combobox" Name="orxonox/AudioThemeCombobox" >
- <Property Name="AlwaysOnTop" Value="True" />
+ <Property Name="UnifiedAreaRect" Value="{{0.604166,0},{0.15,0},{0.958333,0},{0.636,0}}" />
+ <Window Type="TaharezLook/Listbox" Name="orxonox/AudioThemeListbox" >
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
- <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.21,0},{0.95,0},{0.9,0}}" />
- <Property Name="MaxEditTextLength" Value="1073741823" />
- <Property Name="ReadOnly" Value="True" />
- <Event Name="ListSelectionAccepted" Function="AudioMenu.AudioThemeCombobox_changed" />
+ <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.225,0},{0.95,0},{0.92,0}}" />
+ <Event Name="ItemSelectionChanged" Function="AudioMenu.AudioThemeListbox_changed" />
</Window>
</Window>
+ <Window Type="TaharezLook/StaticText" Name="orxonox/AudioInfo" >
+ <Property Name="Text" >Theme changes require
+a game restart.</Property>
+ <Property Name="TextColours" Value="FF4444FF" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="HorzFormatting" Value="HorzCentred" />
+ <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+ <Property Name="VertFormatting" Value="TopAligned" />
+ <Property Name="UnifiedAreaRect" Value="{{0.604166,0},{0.717,0},{0.958333,0},{0.9195,0}}" />
+ </Window>
</Window>
<Window Type="TaharezLook/Button" Name="orxonox/AudioBackButton" >
<Property Name="Text" Value="Back" />
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
- <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.625,0},{0.6,0},{0.675,0}}" />
- <Event Name="Clicked" Function="AudioMenu.AudioBackButton_clicked"/>
+ <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.6625,0},{0.6,0},{0.7125,0}}" />
+ <Event Name="Clicked" Function="AudioMenu.AudioBackButton_clicked" />
</Window>
</Window>
</GUILayout>
Modified: code/branches/presentation2/data/gui/layouts/ControlsMenu.layout
===================================================================
--- code/branches/presentation2/data/gui/layouts/ControlsMenu.layout 2009-12-12 23:46:54 UTC (rev 6333)
+++ code/branches/presentation2/data/gui/layouts/ControlsMenu.layout 2009-12-13 12:12:13 UTC (rev 6334)
@@ -14,7 +14,7 @@
<Property Name="HorzFormatting" Value="HorzCentred" />
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
<Property Name="VertFormatting" Value="TopAligned" />
- <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.325,0},{0.75,0},{0.6,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.3625,0},{0.75,0},{0.6375,0}}" />
<Window Type="TaharezLook/Button" Name="orxonox/MouseControlsButton" >
<Property Name="Text" Value="Mouse controls" />
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -31,7 +31,7 @@
<Window Type="TaharezLook/Button" Name="orxonox/ControlsBackButton" >
<Property Name="Text" Value="Back" />
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
- <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.625,0},{0.6,0},{0.675,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.6625,0},{0.6,0},{0.7125,0}}" />
<Event Name="Clicked" Function="ControlsMenu.ControlsBackButton_clicked"/>
</Window>
</Window>
Modified: code/branches/presentation2/data/gui/layouts/CreditsMenu.layout
===================================================================
--- code/branches/presentation2/data/gui/layouts/CreditsMenu.layout 2009-12-12 23:46:54 UTC (rev 6333)
+++ code/branches/presentation2/data/gui/layouts/CreditsMenu.layout 2009-12-13 12:12:13 UTC (rev 6334)
@@ -14,7 +14,7 @@
<Property Name="InheritsAlpha" Value="False" />
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
<Property Name="VertFormatting" Value="TopAligned" />
- <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.325,0},{0.75,0},{0.6,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.3625,0},{0.75,0},{0.6375,0}}" />
<Window Type="TaharezLook/StaticText" Name="orxonox/CreditsText" >
<Property Name="Text">Orxonox version 0.0.3
@@ -34,7 +34,7 @@
<Window Type="TaharezLook/Button" Name="orxonox/CreditsBackButton" >
<Property Name="Text" Value="Back" />
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
- <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.625,0},{0.6,0},{0.675,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.6625,0},{0.6,0},{0.7125,0}}" />
<Event Name="Clicked" Function="CreditsMenu.CreditsBackButton_clicked"/>
</Window>
</Window>
Modified: code/branches/presentation2/data/gui/layouts/DecisionPopup.layout
===================================================================
--- code/branches/presentation2/data/gui/layouts/DecisionPopup.layout 2009-12-12 23:46:54 UTC (rev 6333)
+++ code/branches/presentation2/data/gui/layouts/DecisionPopup.layout 2009-12-13 12:12:13 UTC (rev 6334)
@@ -1,40 +1,79 @@
<?xml version="1.0" encoding="UTF-8"?>
-<GUILayout >
- <Window Type="DefaultWindow" Name="orxonox/DecisionPopup_RootWindow" >
- <Property Name="InheritsAlpha" Value="False" />
- <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+
+
+<GUILayout >
+
+ <Window Type="DefaultWindow" Name="orxonox/DecisionPopup_RootWindow" >
+
+ <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/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.6" />
- <Window Type="TaharezLook/Button" Name="orxonox/DecisionPopup_button_yes" >
- <Property Name="Font" Value="BlueHighway-12" />
- <Property Name="Text" Value="Yes" />
- <Property Name="Alpha" Value="0.7" />
- <Property Name="InheritsAlpha" Value="False" />
- <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
- <Property Name="UnifiedAreaRect" Value="{{0.3,0},{0.55,0},{0.45,0},{0.6,0}}" />
- <Event Name="Clicked" Function="DecisionPopup.button_yes"/>
- </Window>
+
+ <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.6" />
+
+ <Window Type="TaharezLook/Button" Name="orxonox/DecisionPopup_button_yes" >
+
+ <Property Name="Font" Value="BlueHighway-12" />
+
+ <Property Name="Text" Value="Yes" />
+
+ <Property Name="Alpha" Value="0.7" />
+
+ <Property Name="InheritsAlpha" Value="False" />
+
+ <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+
+ <Property Name="UnifiedAreaRect" Value="{{0.2875,0},{0.5625,0},{0.4875,0},{0.6125,0}}" />
+
+ <Event Name="Clicked" Function="DecisionPopup.button_yes"/>
+
+ </Window>
+
<Window Type="TaharezLook/Button" Name="orxonox/DecisionPopup_button_no" >
+
<Property Name="Font" Value="BlueHighway-12" />
+
<Property Name="Text" Value="No" />
- <Property Name="Alpha" Value="0.8" />
- <Property Name="InheritsAlpha" Value="False" />
+
+ <Property Name="Alpha" Value="0.8" />
+
+ <Property Name="InheritsAlpha" Value="False" />
+
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
- <Property Name="UnifiedAreaRect" Value="{{0.55,0},{0.55,0},{0.7,0},{0.6,0}}" />
- <Event Name="Clicked" Function="DecisionPopup.button_no"/>
+
+ <Property Name="UnifiedAreaRect" Value="{{0.5125,0},{0.5625,0},{0.7125,0},{0.6125,0}}" />
+
+ <Event Name="Clicked" Function="DecisionPopup.button_no"/>
+
</Window>
- <Window Type="TaharezLook/StaticText" Name="orxonox/DecisionPopup_text" >
- <Property Name="Text" Value="Template text" />
- <Property Name="HorzFormatting" Value="WordWrapCentred" />
+
+ <Window Type="TaharezLook/StaticText" Name="orxonox/DecisionPopup_text" >
+
+ <Property Name="Text" Value="Template text" />
+
+ <Property Name="HorzFormatting" Value="WordWrapCentred" />
+
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
- <Property Name="UnifiedAreaRect" Value="{{0.2,0},{0.4,0},{0.8,0},{0.5,0}}" />
- <Property Name="InheritsAlpha" Value="False" />
- <Property Name="Alpha" Value="0.8" />
- </Window>
- </Window>
- </Window>
+
+ <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.4375,0},{0.75,0},{0.5375,0}}" />
+
+ <Property Name="InheritsAlpha" Value="False" />
+
+ <Property Name="Alpha" Value="0.8" />
+
+ </Window>
+
+ </Window>
+
+ </Window>
+
</GUILayout>
Modified: code/branches/presentation2/data/gui/layouts/GameplayMenu.layout
===================================================================
--- code/branches/presentation2/data/gui/layouts/GameplayMenu.layout 2009-12-12 23:46:54 UTC (rev 6333)
+++ code/branches/presentation2/data/gui/layouts/GameplayMenu.layout 2009-12-13 12:12:13 UTC (rev 6334)
@@ -14,7 +14,7 @@
<Property Name="HorzFormatting" Value="HorzCentred" />
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
<Property Name="VertFormatting" Value="TopAligned" />
- <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.325,0},{0.75,0},{0.6,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.3625,0},{0.75,0},{0.6375,0}}" />
<Window Type="TaharezLook/StaticText" Name="orxonox/Difficulty" >
<Property Name="Text" Value="Difficulty" />
<Property Name="InheritsAlpha" Value="False" />
@@ -61,17 +61,8 @@
<Window Type="TaharezLook/Button" Name="orxonox/GameplayBackButton" >
<Property Name="Text" Value="Back" />
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
- <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.625,0},{0.6,0},{0.675,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.6625,0},{0.6,0},{0.7125,0}}" />
<Event Name="Clicked" Function="GameplayMenu.GameplayBackButton_clicked"/>
</Window>
- <Window Type="TaharezLook/StaticText" Name="orxonox/GameplayAvailable" >
- <Property Name="Text" Value="Changes in gameplay settings are not yet available." />
- <Property Name="TextColours" Value="FFFF0000" />
- <Property Name="InheritsAlpha" Value="False" />
- <Property Name="HorzFormatting" Value="HorzCentred" />
- <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
- <Property Name="VertFormatting" Value="TopAligned" />
- <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.75,0},{0.75,0},{0.8,0}}" />
- </Window>
</Window>
</GUILayout>
Modified: code/branches/presentation2/data/gui/layouts/GraphicsMenu.layout
===================================================================
--- code/branches/presentation2/data/gui/layouts/GraphicsMenu.layout 2009-12-12 23:46:54 UTC (rev 6333)
+++ code/branches/presentation2/data/gui/layouts/GraphicsMenu.layout 2009-12-13 12:12:13 UTC (rev 6334)
@@ -14,7 +14,7 @@
<Property Name="HorzFormatting" Value="HorzCentred" />
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
<Property Name="VertFormatting" Value="TopAligned" />
- <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.25,0},{0.75,0},{0.6,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.2875,0},{0.75,0},{0.6375,0}}" />
<Window Type="TaharezLook/StaticText" Name="orxonox/Resolution" >
<Property Name="Text" Value="Resolution" />
<Property Name="InheritsAlpha" Value="False" />
@@ -24,7 +24,7 @@
<Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.15,0},{0.475,0},{0.92,0}}" />
<Window Type="TaharezLook/Listbox" Name="orxonox/ResolutionListbox" >
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
- <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.15,0},{0.95,0},{0.92,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.15,0},{0.95,0},{0.95,0}}" />
<Event Name="ItemSelectionChanged" Function="GraphicsMenu.GraphicsResolutionListbox_changed"/>
</Window>
</Window>
@@ -71,17 +71,8 @@
<Window Type="TaharezLook/Button" Name="orxonox/GraphicsBackButton" >
<Property Name="Text" Value="Back" />
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
- <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.625,0},{0.6,0},{0.675,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.6625,0},{0.6,0},{0.7125,0}}" />
<Event Name="Clicked" Function="GraphicsMenu.GraphicsBackButton_clicked"/>
</Window>
- <Window Type="TaharezLook/StaticText" Name="orxonox/GraphicsAvailable" >
- <Property Name="Text" Value="The brightness scrollbar is not yet available." />
- <Property Name="TextColours" Value="FFFF0000" />
- <Property Name="InheritsAlpha" Value="False" />
- <Property Name="HorzFormatting" Value="HorzCentred" />
- <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
- <Property Name="VertFormatting" Value="TopAligned" />
- <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.75,0},{0.75,0},{0.8,0}}" />
- </Window>
</Window>
</GUILayout>
Modified: code/branches/presentation2/data/gui/layouts/InGameMenu.layout
===================================================================
--- code/branches/presentation2/data/gui/layouts/InGameMenu.layout 2009-12-12 23:46:54 UTC (rev 6333)
+++ code/branches/presentation2/data/gui/layouts/InGameMenu.layout 2009-12-13 12:12:13 UTC (rev 6334)
@@ -1,41 +1,81 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
+
-<GUILayout >
- <Window Type="DefaultWindow" Name="orxonox/InGameMenu_RootWindow" >
- <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" >
+
+<GUILayout >
+
+ <Window Type="DefaultWindow" Name="orxonox/InGameMenu_RootWindow" >
+
+ <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="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="UnifiedAreaRect" Value="{{0.4,0},{0.3625,0},{0.6,0},{0.4125,0}}" />
+
<Property Name="Alpha" Value="0.7" />
- <Event Name="Clicked" Function="InGameMenu.button_return_clicked"/>
- </Window>
+
+ <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="Main Menu" />
- <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
- <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.4,0},{0.6,0},{0.46,0}}" />
- <Property Name="Alpha" Value="0.7" />
+
+ <Property Name="Font" Value="BlueHighway-12" />
+
+ <Property Name="Text" Value="Main Menu" />
+
+ <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+
+ <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.4625,0},{0.6,0},{0.5125,0}}" />
+
+ <Property Name="Alpha" Value="0.7" />
+
<Event Name="Clicked" Function="InGameMenu.button_mainmenu_clicked"/>
- </Window>
+
+ </Window>
+
<Window Type="TaharezLook/Button" Name="orxonox/InGameMenu_SettingsButton" >
- <Property Name="Font" Value="BlueHighway-12" />
- <Property Name="Text" Value="Settings" />
+
+ <Property Name="Font" Value="BlueHighway-12" />
+
+ <Property Name="Text" Value="Settings" />
+
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
- <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.5,0},{0.6,0},{0.56,0}}" />
+
+ <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.5625,0},{0.6,0},{0.6125,0}}" />
+
<Property Name="Alpha" Value="0.7" />
- <Event Name="Clicked" Function="InGameMenu.button_settings_clicked"/>
- </Window>
+
+ <Event Name="Clicked" Function="InGameMenu.button_settings_clicked"/>
+
+ </Window>
+
<Window Type="TaharezLook/Button" Name="orxonox/InGameMenu_QuitButton" >
- <Property Name="Font" Value="BlueHighway-12" />
+
+ <Property Name="Font" Value="BlueHighway-12" />
+
<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.66,0}}" />
- <Property Name="Alpha" Value="0.7" />
- <Event Name="Clicked" Function="InGameMenu.button_quit_clicked"/>
- </Window>
- </Window>
+
+ <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+
+ <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.6625,0},{0.6,0},{0.7125,0}}" />
+
+ <Property Name="Alpha" Value="0.7" />
+
+ <Event Name="Clicked" Function="InGameMenu.button_quit_clicked"/>
+
+ </Window>
+
+ </Window>
+
</GUILayout>
Modified: code/branches/presentation2/data/gui/layouts/InfoPopup.layout
===================================================================
--- code/branches/presentation2/data/gui/layouts/InfoPopup.layout 2009-12-12 23:46:54 UTC (rev 6333)
+++ code/branches/presentation2/data/gui/layouts/InfoPopup.layout 2009-12-13 12:12:13 UTC (rev 6334)
@@ -1,31 +1,62 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
+
-<GUILayout >
+
+<GUILayout >
+
<Window Type="DefaultWindow" Name="orxonox/InfoPopup_RootWindow" >
- <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/StaticImage" Name="orxonox/InfoPopup_Background" >
- <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
- <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
+
+ <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/StaticImage" Name="orxonox/InfoPopup_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.7" />
- <Window Type="TaharezLook/Button" Name="orxonox/InfoPopup_close" >
- <Property Name="Font" Value="BlueHighway-12" />
+
+ <Window Type="TaharezLook/Button" Name="orxonox/InfoPopup_close" >
+
+ <Property Name="Font" Value="BlueHighway-12" />
+
<Property Name="Text" Value="Close" />
- <Property Name="Alpha" Value="0.7" />
- <Property Name="InheritsAlpha" Value="False" />
- <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
- <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.55,0},{0.6,0},{0.6,0}}" />
- <Event Name="Clicked" Function="InfoPopup.close"/>
+
+ <Property Name="Alpha" Value="0.7" />
+
+ <Property Name="InheritsAlpha" Value="False" />
+
+ <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+
+ <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.5,0},{0.6,0},{0.55,0}}" />
+
+ <Event Name="Clicked" Function="InfoPopup.close"/>
+
</Window>
- <Window Type="TaharezLook/StaticText" Name="orxonox/InfoPopup_text" >
+
+ <Window Type="TaharezLook/StaticText" Name="orxonox/InfoPopup_text" >
+
<Property Name="Text" Value="Template text" />
- <Property Name="HorzFormatting" Value="WordWrapCentred" />
- <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
- <Property Name="UnifiedAreaRect" Value="{{0.2,0},{0.4,0},{0.8,0},{0.5,0}}" />
- <Property Name="InheritsAlpha" Value="False" />
- <Property Name="Alpha" Value="0.8" />
- </Window>
- </Window>
+
+ <Property Name="TextColours" Value="FF4444FF" />
+ <Property Name="HorzFormatting" Value="WordWrapCentred" />
+
+ <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+
+ <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.375,0},{0.75,0},{0.475,0}}" />
+
+ <Property Name="InheritsAlpha" Value="False" />
+
+ <Property Name="Alpha" Value="0.8" />
+
+ </Window>
+
+ </Window>
+
</Window>
+
</GUILayout>
Modified: code/branches/presentation2/data/gui/layouts/KeyBindMenu.layout
===================================================================
--- code/branches/presentation2/data/gui/layouts/KeyBindMenu.layout 2009-12-12 23:46:54 UTC (rev 6333)
+++ code/branches/presentation2/data/gui/layouts/KeyBindMenu.layout 2009-12-13 12:12:13 UTC (rev 6334)
@@ -1,43 +1,84 @@
<?xml version="1.0" encoding="UTF-8"?>
-<GUILayout >
- <Window Type="DefaultWindow" Name="orxonox/KeyBindMenu/Background" >
- <Property Name="InheritsAlpha" Value="False" />
- <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+
+
+<GUILayout >
+
+ <Window Type="DefaultWindow" Name="orxonox/KeyBindMenu/Background" >
+
+ <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/StaticText" Name="orxonox/KeyBindWindow" >
+
<Property Name="Text" Value="Keybindings" />
+
<Property Name="Alpha" Value="0.8" />
+
<Property Name="InheritsAlpha" Value="False" />
+
<Property Name="HorzFormatting" Value="HorzCentred" />
- <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
- <Property Name="VertFormatting" Value="TopAligned" />
- <Property Name="UnifiedAreaRect" Value="{{0.1,0},{0.1,0},{0.9,0},{0.8,0}}" />
- <Window Type="TaharezLook/StaticText" Name="orxonox/KeyBindWrapper" >
- <Property Name="TextColours" Value="FF4444FF" />
- <Property Name="InheritsAlpha" Value="False" />
- <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
- <Property Name="HorzFormatting" Value="HorzCentred" />
+
+ <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+
+ <Property Name="VertFormatting" Value="TopAligned" />
+
+ <Property Name="UnifiedAreaRect" Value="{{0.15,0},{0.2125,0},{0.85,0},{0.6375,0}}" />
+
+ <Window Type="TaharezLook/StaticText" Name="orxonox/KeyBindWrapper" >
+
+ <Property Name="TextColours" Value="FF4444FF" />
+
+ <Property Name="InheritsAlpha" Value="False" />
+
+ <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+
+ <Property Name="HorzFormatting" Value="HorzCentred" />
+
<Property Name="VertFormatting" Value="TopAligned" />
- <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.1,0},{0.95,0},{0.95,0}}" />
- <Window Type="TaharezLook/ScrollablePane" Name="orxonox/KeyBindPane" >
- <Property Name="ContentArea" Value="l:0 t:0 r:0 b:0" />
- <Property Name="HorzStepSize" Value="0.1" />
- <Property Name="VertStepSize" Value="0.1" />
+
+ <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.15,0},{0.95,0},{0.92,0}}" />
+
+ <Window Type="TaharezLook/ScrollablePane" Name="orxonox/KeyBindPane" >
+
+ <Property Name="ContentArea" Value="l:0 t:0 r:0 b:0" />
+
+ <Property Name="HorzStepSize" Value="0.1" />
+
+ <Property Name="VertStepSize" Value="0.1" />
+
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+
<Property Name="HorzOverlapSize" Value="0.01" />
- <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
- <Property Name="VertOverlapSize" Value="0.01" />
- <Property Name="HorzScrollPosition" Value="0" />
+
+ <Property Name="UnifiedAreaRect" Value="{{0.005,0},{0.01,0},{0.995,0},{0.99,0}}" />
+
+ <Property Name="VertOverlapSize" Value="0.01" />
+
+ <Property Name="HorzScrollPosition" Value="0" />
+
<Property Name="VertScrollPosition" Value="0" />
- </Window>
+
+ </Window>
+
</Window>
- </Window>
- <Window Type="TaharezLook/Button" Name="orxonox/KeyBindBackButton" >
- <Property Name="Text" Value="Back" />
+
+ </Window>
+
+ <Window Type="TaharezLook/Button" Name="orxonox/KeyBindBackButton" >
+ <Property Name="Text" Value="Back" />
+
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
- <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.825,0},{0.6,0},{0.875,0}}" />
- <Event Name="Clicked" Function="KeyBindMenu.KeyBindBackButton_clicked"/>
- </Window>
- </Window>
+
+ <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.6625,0},{0.6,0},{0.7125,0}}" />
+
+ <Event Name="Clicked" Function="KeyBindMenu.KeyBindBackButton_clicked"/>
+
+ </Window>
+
+ </Window>
+
</GUILayout>
Deleted: code/branches/presentation2/data/gui/layouts/KeyboardControlsMenu.layout
===================================================================
--- code/branches/presentation2/data/gui/layouts/KeyboardControlsMenu.layout 2009-12-12 23:46:54 UTC (rev 6333)
+++ code/branches/presentation2/data/gui/layouts/KeyboardControlsMenu.layout 2009-12-13 12:12:13 UTC (rev 6334)
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<GUILayout >
- <Window Type="TaharezLook/StaticImage" Name="orxonox/KeyboardControlsBackground" >
- <Property Name="FrameEnabled" Value="False" />
- <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}}" />
- <Property Name="BackgroundEnabled" Value="False" />
- <Window Type="TaharezLook/StaticText" Name="orxonox/KeyboardControlsWindow" >
- <Property Name="Text" Value="Keyboard controls" />
- <Property Name="Alpha" Value="0.8" />
- <Property Name="InheritsAlpha" Value="False" />
- <Property Name="HorzFormatting" Value="HorzCentred" />
- <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
- <Property Name="VertFormatting" Value="TopAligned" />
- <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.325,0},{0.75,0},{0.6,0}}" />
- <Window Type="TaharezLook/StaticText" Name="orxonox/KeyboardLeftWindow" >
- <Property Name="Text" >Move forward
-Move backward
-Move left
-Move right
-Move up
-Move down</Property>
- <Property Name="InheritsAlpha" Value="False" />
- <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
- <Property Name="VertFormatting" Value="TopAligned" />
- <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.2,0},{0.475,0},{0.9,0}}" />
- </Window>
- <Window Type="TaharezLook/StaticText" Name="orxonox/KeyboardRightWindow" >
- <Property Name="Text" >Rotate left
-Rotate right
-Shoot mode 1
-Shoot mode 2
-Zoom in/out</Property>
- <Property Name="InheritsAlpha" Value="False" />
- <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
- <Property Name="VertFormatting" Value="TopAligned" />
- <Property Name="UnifiedAreaRect" Value="{{0.525,0},{0.2,0},{0.95,0},{0.9,0}}" />
- </Window>
- </Window>
- <Window Type="TaharezLook/Button" Name="orxonox/KeyboardControlsBackButton" >
- <Property Name="Text" Value="Back" />
- <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
- <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.625,0},{0.6,0},{0.675,0}}" />
- <Event Name="Clicked" Function="KeyboardControlsMenu.KeyboardControlsBackButton_clicked"/>
- </Window>
- <Window Type="TaharezLook/StaticText" Name="orxonox/KeyboardControlsAvailable" >
- <Property Name="Text" Value="The keyboard menu is not yet available." />
- <Property Name="TextColours" Value="FFFF0000" />
- <Property Name="InheritsAlpha" Value="False" />
- <Property Name="HorzFormatting" Value="HorzCentred" />
- <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
- <Property Name="VertFormatting" Value="TopAligned" />
- <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.75,0},{0.75,0},{0.8,0}}" />
- </Window>
- </Window>
-</GUILayout>
Modified: code/branches/presentation2/data/gui/layouts/MainMenu.layout
===================================================================
--- code/branches/presentation2/data/gui/layouts/MainMenu.layout 2009-12-12 23:46:54 UTC (rev 6333)
+++ code/branches/presentation2/data/gui/layouts/MainMenu.layout 2009-12-13 12:12:13 UTC (rev 6334)
@@ -10,37 +10,37 @@
<Window Type="TaharezLook/Button" Name="orxonox/QuickGameTestButton" >
<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}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.2875,0},{0.6,0},{0.3375,0}}" />
<Event Name="Clicked" Function="MainMenu.QuickGameTestButton_clicked"/>
</Window>
<Window Type="TaharezLook/Button" Name="orxonox/SingleplayerButton" >
<Property Name="Text" Value="Singleplayer" />
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
- <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.325,0},{0.6,0},{0.375,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.3625,0},{0.6,0},{0.4125,0}}" />
<Event Name="Clicked" Function="MainMenu.SingleplayerButton_clicked"/>
</Window>
<Window Type="TaharezLook/Button" Name="orxonox/MultiplayerButton" >
<Property Name="Text" Value="Multiplayer" />
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
- <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.4,0},{0.6,0},{0.45,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.4375,0},{0.6,0},{0.4875,0}}" />
<Event Name="Clicked" Function="MainMenu.MultiplayerButton_clicked"/>
</Window>
<Window Type="TaharezLook/Button" Name="orxonox/SettingsButton" >
<Property Name="Text" Value="Settings" />
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
- <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.475,0},{0.6,0},{0.525,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.5125,0},{0.6,0},{0.5625,0}}" />
<Event Name="Clicked" Function="MainMenu.SettingsButton_clicked"/>
</Window>
<Window Type="TaharezLook/Button" Name="orxonox/CreditsButton" >
<Property Name="Text" Value="Credits" />
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
- <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.55,0},{0.6,0},{0.6,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.5875,0},{0.6,0},{0.6375,0}}" />
<Event Name="Clicked" Function="MainMenu.CreditsButton_clicked"/>
</Window>
<Window Type="TaharezLook/Button" Name="orxonox/ExitButton" >
<Property Name="Text" Value="Exit" />
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
- <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.625,0},{0.6,0},{0.675,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.6625,0},{0.6,0},{0.7125,0}}" />
<Event Name="Clicked" Function="MainMenu.ExitButton_clicked"/>
</Window>
</Window>
Modified: code/branches/presentation2/data/gui/layouts/MouseControlsMenu.layout
===================================================================
--- code/branches/presentation2/data/gui/layouts/MouseControlsMenu.layout 2009-12-12 23:46:54 UTC (rev 6333)
+++ code/branches/presentation2/data/gui/layouts/MouseControlsMenu.layout 2009-12-13 12:12:13 UTC (rev 6334)
@@ -14,7 +14,7 @@
<Property Name="HorzFormatting" Value="HorzCentred" />
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
<Property Name="VertFormatting" Value="TopAligned" />
- <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.325,0},{0.75,0},{0.6,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.3625,0},{0.75,0},{0.6375,0}}" />
<Window Type="TaharezLook/StaticText" Name="orxonox/MouseNormalSensitivity" >
<Property Name="Text" Value="Sensitivity (normal mode) " />
<Property Name="InheritsAlpha" Value="False" />
@@ -80,17 +80,8 @@
<Window Type="TaharezLook/Button" Name="orxonox/MouseControlsBackButton" >
<Property Name="Text" Value="Back" />
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
- <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.625,0},{0.6,0},{0.675,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.6625,0},{0.6,0},{0.7125,0}}" />
<Event Name="Clicked" Function="MouseControlsMenu.MouseControlsBackButton_clicked"/>
</Window>
- <Window Type="TaharezLook/StaticText" Name="orxonox/MouseControlsAvailable" >
- <Property Name="Text" Value="The invert mouse button is not yet available." />
- <Property Name="TextColours" Value="FFFF0000" />
- <Property Name="InheritsAlpha" Value="False" />
- <Property Name="HorzFormatting" Value="HorzCentred" />
- <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
- <Property Name="VertFormatting" Value="TopAligned" />
- <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.75,0},{0.75,0},{0.8,0}}" />
- </Window>
</Window>
</GUILayout>
Modified: code/branches/presentation2/data/gui/layouts/MultiplayerMenu.layout
===================================================================
--- code/branches/presentation2/data/gui/layouts/MultiplayerMenu.layout 2009-12-12 23:46:54 UTC (rev 6333)
+++ code/branches/presentation2/data/gui/layouts/MultiplayerMenu.layout 2009-12-13 12:12:13 UTC (rev 6334)
@@ -14,10 +14,10 @@
<Property Name="HorzFormatting" Value="HorzCentred" />
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
<Property Name="VertFormatting" Value="TopAligned" />
- <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.325,0},{0.75,0},{0.6,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.2875,0},{0.75,0},{0.6375,0}}" />
<Window Type="TaharezLook/Listbox" Name="orxonox/MultiplayerLevelListbox" >
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
- <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.2,0},{0.95,0},{0.8,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.15,0},{0.95,0},{0.8,0}}" />
</Window>
<Window Type="TaharezLook/RadioButton" Name="orxonox/MultiplayerJoinButton" >
<Property Name="Text" Value="Join" />
@@ -41,13 +41,13 @@
<Window Type="TaharezLook/Button" Name="orxonox/MultiplayerStartButton" >
<Property Name="Text" Value="Start" />
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
- <Property Name="UnifiedAreaRect" Value="{{0.2875,0},{0.625,0},{0.4875,0},{0.675,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.2875,0},{0.6625,0},{0.4875,0},{0.7125,0}}" />
<Event Name="Clicked" Function="MultiplayerMenu.MultiplayerStartButton_clicked"/>
</Window>
<Window Type="TaharezLook/Button" Name="orxonox/MultiplayerBackButton" >
<Property Name="Text" Value="Back" />
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
- <Property Name="UnifiedAreaRect" Value="{{0.5125,0},{0.625,0},{0.7125,0},{0.675,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.5125,0},{0.6625,0},{0.7125,0},{0.7125,0}}" />
<Event Name="Clicked" Function="MultiplayerMenu.MultiplayerBackButton_clicked"/>
</Window>
</Window>
Modified: code/branches/presentation2/data/gui/layouts/MultiplayerOptionsMenu.layout
===================================================================
--- code/branches/presentation2/data/gui/layouts/MultiplayerOptionsMenu.layout 2009-12-12 23:46:54 UTC (rev 6333)
+++ code/branches/presentation2/data/gui/layouts/MultiplayerOptionsMenu.layout 2009-12-13 12:12:13 UTC (rev 6334)
@@ -14,7 +14,7 @@
<Property Name="HorzFormatting" Value="HorzCentred" />
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
<Property Name="VertFormatting" Value="TopAligned" />
- <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.325,0},{0.75,0},{0.6,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.3625,0},{0.75,0},{0.6375,0}}" />
</Window>
<Window Type="TaharezLook/Button" Name="orxonox/MultiplayerOptionsBackButton" >
<Property Name="Text" Value="Back" />
@@ -22,14 +22,5 @@
<Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.625,0},{0.6,0},{0.675,0}}" />
<Event Name="Clicked" Function="MultiplayerOptionsMenu.MultiplayerOptionsBackButton_clicked"/>
</Window>
- <Window Type="TaharezLook/StaticText" Name="orxonox/MultiplayerOptionsAvailable" >
- <Property Name="Text" Value="The multiplayer options menu is not yet available." />
- <Property Name="TextColours" Value="FFFF0000" />
- <Property Name="InheritsAlpha" Value="False" />
- <Property Name="HorzFormatting" Value="HorzCentred" />
- <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
- <Property Name="VertFormatting" Value="TopAligned" />
- <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.75,0},{0.75,0},{0.8,0}}" />
- </Window>
</Window>
</GUILayout>
Modified: code/branches/presentation2/data/gui/layouts/SettingsMenu.layout
===================================================================
--- code/branches/presentation2/data/gui/layouts/SettingsMenu.layout 2009-12-12 23:46:54 UTC (rev 6333)
+++ code/branches/presentation2/data/gui/layouts/SettingsMenu.layout 2009-12-13 12:12:13 UTC (rev 6334)
@@ -7,7 +7,6 @@
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
<Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
<Property Name="BackgroundEnabled" Value="False" />
-
<Window Type="TaharezLook/StaticText" Name="orxonox/SettingsWindow" >
<Property Name="Text" Value="Settings" />
<Property Name="Alpha" Value="0.8" />
@@ -15,7 +14,7 @@
<Property Name="HorzFormatting" Value="HorzCentred" />
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
<Property Name="VertFormatting" Value="TopAligned" />
- <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.325,0},{0.75,0},{0.6,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.3625,0},{0.75,0},{0.6375,0}}" />
<Window Type="TaharezLook/Button" Name="orxonox/GameplayButton" >
<Property Name="Text" Value="Gameplay" />
<Property Name="Disabled" Value="True" />
@@ -59,7 +58,7 @@
<Window Type="TaharezLook/Button" Name="orxonox/SettingsBackButton" >
<Property Name="Text" Value="Back" />
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
- <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.625,0},{0.6,0},{0.675,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.6625,0},{0.6,0},{0.7125,0}}" />
<Event Name="Clicked" Function="SettingsMenu.SettingsBackButton_clicked"/>
</Window>
</Window>
Modified: code/branches/presentation2/data/gui/layouts/SingleplayerMenu.layout
===================================================================
--- code/branches/presentation2/data/gui/layouts/SingleplayerMenu.layout 2009-12-12 23:46:54 UTC (rev 6333)
+++ code/branches/presentation2/data/gui/layouts/SingleplayerMenu.layout 2009-12-13 12:12:13 UTC (rev 6334)
@@ -14,22 +14,22 @@
<Property Name="HorzFormatting" Value="HorzCentred" />
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
<Property Name="VertFormatting" Value="TopAligned" />
- <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.325,0},{0.75,0},{0.6,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.2875,0},{0.75,0},{0.6375,0}}" />
<Window Type="TaharezLook/Listbox" Name="orxonox/SingleplayerLevelListbox" >
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
- <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.2,0},{0.95,0},{0.9,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.15,0},{0.95,0},{0.92,0}}" />
</Window>
</Window>
<Window Type="TaharezLook/Button" Name="orxonox/SingleplayerStartButton" >
<Property Name="Text" Value="Start" />
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
- <Property Name="UnifiedAreaRect" Value="{{0.2875,0},{0.625,0},{0.4875,0},{0.675,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.2875,0},{0.6625,0},{0.4875,0},{0.7125,0}}" />
<Event Name="Clicked" Function="SingleplayerMenu.SingleplayerStartButton_clicked"/>
</Window>
<Window Type="TaharezLook/Button" Name="orxonox/SingleplayerBackButton" >
<Property Name="Text" Value="Back" />
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
- <Property Name="UnifiedAreaRect" Value="{{0.5125,0},{0.625,0},{0.7125,0},{0.675,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.5125,0},{0.6625,0},{0.7125,0},{0.7125,0}}" />
<Event Name="Clicked" Function="SingleplayerMenu.SingleplayerBackButton_clicked"/>
</Window>
</Window>
Modified: code/branches/presentation2/data/gui/scripts/AudioMenu.lua
===================================================================
--- code/branches/presentation2/data/gui/scripts/AudioMenu.lua 2009-12-12 23:46:54 UTC (rev 6333)
+++ code/branches/presentation2/data/gui/scripts/AudioMenu.lua 2009-12-13 12:12:13 UTC (rev 6334)
@@ -36,16 +36,15 @@
musicmutewindow:setSelected(musicmute)
effectsmutewindow:setSelected(effectsmute)
choice = "Default"
- dropdownwindow = winMgr:getWindow("orxonox/AudioThemeCombobox")
+ listboxwindow = winMgr:getWindow("orxonox/AudioThemeListbox")
local themeList = {}
table.insert(themeList, "Default")
table.insert(themeList, "Drum n' Bass")
for k,v in pairs(themeList) do
item = CEGUI.createListboxTextItem(v)
item:setSelectionBrushImage("TaharezLook", "MultiListSelectionBrush")
- CEGUI.toCombobox(dropdownwindow):addItem(item)
+ CEGUI.toListbox(listboxwindow):addItem(item)
end
- dropdownwindow:setItemSelectState(0,true)
end
function P.AudioMasterScrollbar_changed(e)
@@ -164,8 +163,8 @@
soundMgr:toggleMute(orxonox.SoundType.effects)
end
-function P.AudioThemeCombobox_changed(e)
- if dropdownwindow:isItemSelected(1) then
+function P.AudioThemeListbox_changed(e)
+ if listboxwindow:isItemSelected(1) then
orxonox.CommandExecutor:execute("setMood dnb")
else
orxonox.CommandExecutor:execute("setMood default")
Modified: code/branches/presentation2/data/gui/scripts/InfoPopup.lua
===================================================================
--- code/branches/presentation2/data/gui/scripts/InfoPopup.lua 2009-12-12 23:46:54 UTC (rev 6333)
+++ code/branches/presentation2/data/gui/scripts/InfoPopup.lua 2009-12-13 12:12:13 UTC (rev 6334)
@@ -1,47 +1,93 @@
--- InfoPopup.lua
+-- InfoPopup.lua
+
-BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
-if _REQUIREDNAME == nil then
- InfoPopup = P
-else
- _G[_REQUIREDNAME] = P
-end
-P.filename = "InfoPopup"
-P.layoutString = "InfoPopup.layout"
+BasicGUI = require("BasicGUI")
+local P = BasicGUI:new() --inherit everything from the gui package
-function P:init()
-end
+
+if _REQUIREDNAME == nil then
+ InfoPopup = P
+
+else
+
+ _G[_REQUIREDNAME] = P
+
+end
+
+
+
+P.filename = "InfoPopup"
+
+P.layoutString = "InfoPopup.layout"
+
+
+
+function P:init()
+
+end
+
+
+
function P.execute(functionPtr, arguments)
+
if functionPtr ~= nil then
- if arguments ~= nil then
- functionPtr(arguments)
- else
+
+ if arguments ~= nil then
+
+ functionPtr(arguments)
+
+ else
+
functionPtr()
- end
+
+ end
+
end
-end
+
+end
-function P.setText( text )
- winMgr:getWindow("orxonox/InfoPopup_text"):setText( text )
+
+
+function P.setText( text )
+
+ winMgr:getWindow("orxonox/InfoPopup_text"):setText( text )
+
end
-function P.setCloseButton(closeButton)
+
+
+function P.setCloseButton(closeButton)
+
close = winMgr:getWindow("orxonox/InfoPopup_close")
- close:setVisible(closeButton)
- if(not closeButton) then
- close:deactivate();
+
+ close:setVisible(closeButton)
+
+ if(not closeButton) then
+
+ close:deactivate();
+
else
+
close:activate();
+
end
-end
+
+end
+
+
-- events for ingamemenu
-function P.close(e)
+
+
+function P.close(e)
+
hideGUI("InfoPopup")
-end
+
+end
+
+
return P
Modified: code/branches/presentation2/data/gui/scripts/KeyBindMenu.lua
===================================================================
--- code/branches/presentation2/data/gui/scripts/KeyBindMenu.lua 2009-12-12 23:46:54 UTC (rev 6333)
+++ code/branches/presentation2/data/gui/scripts/KeyBindMenu.lua 2009-12-13 12:12:13 UTC (rev 6334)
@@ -1,212 +1,401 @@
--- KeyBindMenu.lua
+-- KeyBindMenu.lua
+
-BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
-if _REQUIREDNAME == nil then
- KeyBindMenu = P
+
+BasicGUI = require("BasicGUI")
+
+local P = BasicGUI:new() --inherit everything from the gui package
+
+
+if _REQUIREDNAME == nil then
+
+ KeyBindMenu = P
+
else
- _G[_REQUIREDNAME] = P
-end
+ _G[_REQUIREDNAME] = P
-P.filename = "KeyBindMenu"
-P.layoutString = "KeyBindMenu.layout"
+end
+
-function P:init()
- commandList = {}
- table.insert(commandList, "fire 0")
- table.insert(commandList, "fire 1 | unfire")
- table.insert(commandList, "onpress fire 2")
- table.insert(commandList, "scale 1 moveFrontBack")
- table.insert(commandList, "scale -1 moveFrontBack")
- table.insert(commandList, "boost")
- table.insert(commandList, "scale 1 moveRightLeft")
- table.insert(commandList, "scale -1 moveRightLeft")
- table.insert(commandList, "scale 1 moveUpDown")
- table.insert(commandList, "scale -1 moveUpDown")
+
+P.filename = "KeyBindMenu"
+
+P.layoutString = "KeyBindMenu.layout"
+
+
+
+function P:init()
+
+ commandList = {}
+
+ table.insert(commandList, "fire 0")
+
+ table.insert(commandList, "fire 1 | unfire")
+
+ table.insert(commandList, "onpress fire 2")
+
+ table.insert(commandList, "scale 1 moveFrontBack")
+
+ table.insert(commandList, "scale -1 moveFrontBack")
+
+ table.insert(commandList, "boost")
+
+ table.insert(commandList, "scale 1 moveRightLeft")
+
+ table.insert(commandList, "scale -1 moveRightLeft")
+
+ table.insert(commandList, "scale 1 moveUpDown")
+
+ table.insert(commandList, "scale -1 moveUpDown")
+
table.insert(commandList, "scale 1 rotateRoll")
- table.insert(commandList, "scale -1 rotateRoll")
- table.insert(commandList, "switchCamera")
+
+ table.insert(commandList, "scale -1 rotateRoll")
+
+ table.insert(commandList, "switchCamera")
+
table.insert(commandList, "openConsole")
- table.insert(commandList, "OverlayGroup toggleVisibility Debug")
- table.insert(commandList, "OverlayGroup toggleVisibility Stats")
- table.insert(commandList, "mouseLook")
- table.insert(commandList, "pause")
-
- nameList = {}
- table.insert(nameList, "Primary Fire")
+
+ table.insert(commandList, "OverlayGroup toggleVisibility Debug")
+
+ table.insert(commandList, "OverlayGroup toggleVisibility Stats")
+
+ table.insert(commandList, "mouseLook")
+
+ table.insert(commandList, "pause")
+
+
+
+ nameList = {}
+
+ table.insert(nameList, "Primary Fire")
+
table.insert(nameList, "Secondary Fire")
- table.insert(nameList, "Fire Rocket")
- table.insert(nameList, "Accelerate")
- table.insert(nameList, "Break")
+
+ table.insert(nameList, "Fire Rocket")
+
+ table.insert(nameList, "Accelerate")
+
+ table.insert(nameList, "Break")
table.insert(nameList, "Boost")
- table.insert(nameList, "Move Right")
+
+ table.insert(nameList, "Move Right")
+
table.insert(nameList, "Move Left")
+
table.insert(nameList, "Move Up")
- table.insert(nameList, "Move Down")
+
+ table.insert(nameList, "Move Down")
+
table.insert(nameList, "Roll Right")
+
table.insert(nameList, "Roll Left")
+
table.insert(nameList, "Switch Camera")
- table.insert(nameList, "Open Console")
- table.insert(nameList, "Show Debug")
- table.insert(nameList, "Show Stats")
- table.insert(nameList, "Look Around")
- table.insert(nameList, "Pause")
-
- linesList = {}
+
+ table.insert(nameList, "Open Console")
- lineHeight = 35
- commandWidth = 200
- buttonWidth = 170
- clearWidth = 20
- spaceWidth = 10
-
- P.createLines()
-
- local funct = luaState:createLuaFunctor("KeyBindMenu.callback()")
+ table.insert(nameList, "Show Debug")
+
+ table.insert(nameList, "Show Stats")
+
+ table.insert(nameList, "Look Around")
+
+ table.insert(nameList, "Pause")
+
+
+
+ linesList = {}
+
+
+ lineHeight = 25
+ commandWidth = 125
+ buttonWidth = 125
+ clearWidth = 20
+ addWidth = 25
+
+ spaceWidth = 10
+
+
+
+ P.createLines()
+
+
+
+ local funct = luaState:createLuaFunctor("KeyBindMenu.callback()")
+
orxonox.KeyBinderManager:getInstance():registerKeybindCallback(funct)
-end
+
+end
+
-function P.KeyNameNiceifier(key)
- local name = string.sub(key, string.find(key, '%.(.*)')+1)
+
+function P.KeyNameNiceifier(key)
+
+ local name = string.sub(key, string.find(key, '%.(.*)')+1)
local group = string.sub(key, string.find(key, '(.*)%.'))
- group = string.sub(group,1,string.len(group)-1)
+
+ group = string.sub(group,1,string.len(group)-1)
+
if( group == "Keys") then
- return "Key " .. string.sub(name, string.find(name, 'Key(.*)')+3)
+
+ return "Key " .. string.sub(name, string.find(name, 'Key(.*)')+3)
+
elseif( group == "MouseButtons") then
- return "Mouse " .. name
- end
+
+ return "Mouse " .. name
+
+ end
+
return key
-end
+
+end
+
-function P.createLine(k)
- local offset = 0
- local line = winMgr:createWindow("DefaultWindow", "orxonox/KeyBindPane/Binding" .. k)
- line:setHeight(CEGUI.UDim(0, lineHeight))
+
+function P.createLine(k)
+
+ local offset = 0
+
+ local line = winMgr:createWindow("DefaultWindow", "orxonox/KeyBindPane/Binding" .. k)
+
+ line:setHeight(CEGUI.UDim(0, lineHeight))
+
line:setPosition(CEGUI.UVector2(CEGUI.UDim(0, 0), CEGUI.UDim(0, lineHeight*(k-1))))
-
+
+
+
local command = winMgr:createWindow("TaharezLook/StaticText", "orxonox/KeyBindPane/Binding" .. k .. "/Command")
- command:setSize(CEGUI.UVector2(CEGUI.UDim(0, commandWidth), CEGUI.UDim(0.9, 0)))
- command:setPosition(CEGUI.UVector2(CEGUI.UDim(0, offset), CEGUI.UDim(0.05, 0)))
- command:setText(nameList[k])
- line:addChildWindow(command)
- offset = offset + commandWidth + spaceWidth
-
- local plus = winMgr:createWindow("TaharezLook/TabButton", "orxonox/KeyBindPane/Binding" .. k .. "/Plus")
- plus:setSize(CEGUI.UVector2(CEGUI.UDim(0, clearWidth), CEGUI.UDim(0.7, 0)))
- plus:setPosition(CEGUI.UVector2(CEGUI.UDim(0, offset), CEGUI.UDim(0.15, 0)))
- plus:setText("+")
- orxonox.KeyBinderManager:getInstance():subscribeEventHelper(plus, "Clicked", P.filename .. ".KeyBindPlus_clicked")
- line:addChildWindow(plus)
- offset = offset + clearWidth + spaceWidth
-
- local numButtons = orxonox.KeyBinderManager:getInstance():getCurrent():getNumberOfBindings(commandList[k]);
- for i=0,(numButtons-1) do
+
+ command:setSize(CEGUI.UVector2(CEGUI.UDim(0, commandWidth), CEGUI.UDim(1, 0)))
+
+ command:setPosition(CEGUI.UVector2(CEGUI.UDim(0, offset), CEGUI.UDim(0, 0)))
+
+ command:setText(nameList[k])
+ line:addChildWindow(command)
+
+ offset = offset + commandWidth + spaceWidth
+
+
+
+ local plus = winMgr:createWindow("TaharezLook/TabButton", "orxonox/KeyBindPane/Binding" .. k .. "/Plus")
+
+ plus:setSize(CEGUI.UVector2(CEGUI.UDim(0, addWidth), CEGUI.UDim(0.7, 0)))
+
+ plus:setPosition(CEGUI.UVector2(CEGUI.UDim(0, offset), CEGUI.UDim(0.15, 0)))
+
+ plus:setText("add")
+
+ orxonox.KeyBinderManager:getInstance():subscribeEventHelper(plus, "Clicked", P.filename .. ".KeyBindPlus_clicked")
+
+ line:addChildWindow(plus)
+
+ offset = offset + addWidth + spaceWidth
+
+
+
+ local numButtons = orxonox.KeyBinderManager:getInstance():getCurrent():getNumberOfBindings(commandList[k]);
+
+ for i=0,(numButtons-1) do
+
local button = winMgr:createWindow("TaharezLook/TabButton", "orxonox/KeyBindPane/Binding" .. k .. "/Button" .. i)
- button:setSize(CEGUI.UVector2(CEGUI.UDim(0, buttonWidth), CEGUI.UDim(0.7, 0)))
+
+ button:setSize(CEGUI.UVector2(CEGUI.UDim(0, buttonWidth), CEGUI.UDim(0.7, 0)))
+
button:setPosition(CEGUI.UVector2(CEGUI.UDim(0, offset), CEGUI.UDim(0.15, 0)))
- local name = orxonox.KeyBinderManager:getInstance():getCurrent():getBinding(commandList[k],i)
- name = P.KeyNameNiceifier(name)
+
+ local name = orxonox.KeyBinderManager:getInstance():getCurrent():getBinding(commandList[k],i)
+
+ name = P.KeyNameNiceifier(name)
+
button:setText(name)
+
orxonox.KeyBinderManager:getInstance():subscribeEventHelper(button, "Clicked", P.filename .. ".KeyBindButton_clicked")
+
--button:subscribeScriptedEvent("EventClicked", P.filename .. ".KeyBindButton_clicked")
+
line:addChildWindow(button)
+
offset = offset + buttonWidth
+
- local clear = winMgr:createWindow("TaharezLook/TabButton", "orxonox/KeyBindPane/Binding" .. k .. "/Clear" .. i)
- clear:setSize(CEGUI.UVector2(CEGUI.UDim(0, clearWidth), CEGUI.UDim(0.7, 0)))
+
+ local clear = winMgr:createWindow("TaharezLook/TabButton", "orxonox/KeyBindPane/Binding" .. k .. "/Clear" .. i)
+
+ clear:setSize(CEGUI.UVector2(CEGUI.UDim(0, clearWidth), CEGUI.UDim(0.7, 0)))
+
clear:setPosition(CEGUI.UVector2(CEGUI.UDim(0, (i*(buttonWidth+clearWidth+spaceWidth)+buttonWidth)+commandWidth+clearWidth+2*spaceWidth), CEGUI.UDim(0.15, 0)))
- clear:setText("X")
- orxonox.KeyBinderManager:getInstance():subscribeEventHelper(clear, "Clicked", P.filename .. ".KeyBindClear_clicked")
- line:addChildWindow(clear)
- offset = offset + clearWidth + spaceWidth
+
+ clear:setText("X")
+
+ orxonox.KeyBinderManager:getInstance():subscribeEventHelper(clear, "Clicked", P.filename .. ".KeyBindClear_clicked")
+
+ line:addChildWindow(clear)
+
+ offset = offset + clearWidth + spaceWidth
+
end
-
+
+
+
line:setWidth(CEGUI.UDim(0, offset+clearWidth))
-
+
+
+
return line
-end
+
+end
+
-function P.createLines()
- local window = winMgr:getWindow("orxonox/KeyBindPane")
+function P.createLines()
+
+ local window = winMgr:getWindow("orxonox/KeyBindPane")
+
+
for k,v in pairs(commandList) do
- local line = P.createLine(k)
+
+ local line = P.createLine(k)
+
table.insert(linesList, line)
- window:addChildWindow(line)
- end
+
+ window:addChildWindow(line)
-end
+ end
-function P.KeyBindButton_clicked(e)
- local we = CEGUI.toWindowEventArgs(e)
- local name = we.window:getName()
+end
+
+
+
+function P.KeyBindButton_clicked(e)
+
+ local we = CEGUI.toWindowEventArgs(e)
+
+ local name = we.window:getName()
+
+
local match = string.gmatch(name, "%d+")
- local commandNr = tonumber(match())
+
+ local commandNr = tonumber(match())
+
local buttonNr = tonumber(match())
+
- local arguments = {}
- arguments[1] = commandNr
- arguments[2] = buttonNr
+
+ local arguments = {}
+
+ arguments[1] = commandNr
+
+ arguments[2] = buttonNr
+
openInfoPopup("Press any button/key or move a mouse/joystick axis.", KeyBindMenu.keybind, false, arguments)
end
function P.KeyBindPlus_clicked(e)
- local we = CEGUI.toWindowEventArgs(e)
- local name = we.window:getName()
-
- local match = string.gmatch(name, "%d+")
- local commandNr = tonumber(match())
-
- local arguments = {}
- arguments[1] = commandNr
+
+ local we = CEGUI.toWindowEventArgs(e)
+
+ local name = we.window:getName()
+
+
+
+ local match = string.gmatch(name, "%d+")
+
+ local commandNr = tonumber(match())
+
+
+ local arguments = {}
+
+ arguments[1] = commandNr
+
openInfoPopup("Press any button/key or move a mouse/joystick axis.", KeyBindMenu.keybind, false, arguments)
end
-function P.KeyBindClear_clicked(e)
- local we = CEGUI.toWindowEventArgs(e)
- local name = we.window:getName()
-
- local match = string.gmatch(name, "%d+")
- local commandNr = tonumber(match())
- local buttonNr = tonumber(match())
+function P.KeyBindClear_clicked(e)
+
+ local we = CEGUI.toWindowEventArgs(e)
+
+ local name = we.window:getName()
+
+
+
+ local match = string.gmatch(name, "%d+")
+
+ local commandNr = tonumber(match())
+
+ local buttonNr = tonumber(match())
- orxonox.KeyBinderManager:getInstance():unbind(orxonox.KeyBinderManager:getInstance():getCurrent():getBinding(commandList[commandNr], buttonNr))
-
- P.callback()
-end
+
+ orxonox.KeyBinderManager:getInstance():unbind(orxonox.KeyBinderManager:getInstance():getCurrent():getBinding(commandList[commandNr], buttonNr))
-function P.keybind(arguments)
- local commandNr = arguments[1]
- local buttonNr = arguments[2]
- if buttonNr ~= nil then
- orxonox.KeyBinderManager:getInstance():unbind(orxonox.KeyBinderManager:getInstance():getCurrent():getBinding(commandList[commandNr], buttonNr))
- end
- orxonox.KeyBinderManager:getInstance():keybind(commandList[commandNr])
-end
+
-function P.callback()
+ P.callback()
+
+end
+
+
+
+function P.keybind(arguments)
+
+ local commandNr = arguments[1]
+
+ local buttonNr = arguments[2]
+
+ if buttonNr ~= nil then
+
+ orxonox.KeyBinderManager:getInstance():unbind(orxonox.KeyBinderManager:getInstance():getCurrent():getBinding(commandList[commandNr], buttonNr))
+
+ end
+
+
+ orxonox.KeyBinderManager:getInstance():keybind(commandList[commandNr])
+
+end
+
+
+
+function P.callback()
+
while table.getn(linesList) ~= 0 do
+
if linesList[1] ~= nil then
- winMgr:destroyWindow(linesList[1]:getName())
- end
- table.remove(linesList, 1)
- end
-
+
+ winMgr:destroyWindow(linesList[1]:getName())
+
+ end
+
+ table.remove(linesList, 1)
+
+ end
+
+
+
linesList = {}
- P.createLines()
-
- if(InfoPopup ~= nil) then
- InfoPopup.close()
+
+ P.createLines()
+
+ if(InfoPopup ~= nil) then
+
+ InfoPopup.close()
+
end
+
end
+
+
function P.KeyBindBackButton_clicked(e)
+
hideGUI("KeyBindMenu")
+
end
+
+
return P
Deleted: code/branches/presentation2/data/gui/scripts/KeyboardControlsMenu.lua
===================================================================
--- code/branches/presentation2/data/gui/scripts/KeyboardControlsMenu.lua 2009-12-12 23:46:54 UTC (rev 6333)
+++ code/branches/presentation2/data/gui/scripts/KeyboardControlsMenu.lua 2009-12-13 12:12:13 UTC (rev 6334)
@@ -1,18 +0,0 @@
--- KeyboardControlsMenu.lua
-
-BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
-if _REQUIREDNAME == nil then
- KeyboardControlsMenu = P
-else
- _G[_REQUIREDNAME] = P
-end
-
-P.filename = "KeyboardControlsMenu"
-P.layoutString = "KeyboardControlsMenu.layout"
-
-function P.KeyboardControlsBackButton_clicked(e)
- hideGUI(P.filename)
-end
-
-return P
More information about the Orxonox-commit
mailing list