[Orxonox-commit 1488] r6206 - in code/branches/presentation2/data/gui: layouts scripts
cmueri at orxonox.net
cmueri at orxonox.net
Wed Dec 2 17:25:43 CET 2009
Author: cmueri
Date: 2009-12-02 17:25:42 +0100 (Wed, 02 Dec 2009)
New Revision: 6206
Added:
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/GameplayMenu.layout
code/branches/presentation2/data/gui/layouts/GraphicsMenu.layout
code/branches/presentation2/data/gui/layouts/KeyboardControlsMenu.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/ControlsMenu.lua
code/branches/presentation2/data/gui/scripts/CreditsMenu.lua
code/branches/presentation2/data/gui/scripts/GameplayMenu.lua
code/branches/presentation2/data/gui/scripts/GraphicsMenu.lua
code/branches/presentation2/data/gui/scripts/KeyboardControlsMenu.lua
code/branches/presentation2/data/gui/scripts/MouseControlsMenu.lua
code/branches/presentation2/data/gui/scripts/MultiplayerMenu.lua
code/branches/presentation2/data/gui/scripts/MultiplayerOptionsMenu.lua
code/branches/presentation2/data/gui/scripts/SettingsMenu.lua
code/branches/presentation2/data/gui/scripts/SingleplayerMenu.lua
Modified:
code/branches/presentation2/data/gui/layouts/MainMenu.layout
code/branches/presentation2/data/gui/scripts/MainMenu.lua
Log:
The new menus (but not all functions of the menu) are now available.
Added: code/branches/presentation2/data/gui/layouts/AudioMenu.layout
===================================================================
--- code/branches/presentation2/data/gui/layouts/AudioMenu.layout (rev 0)
+++ code/branches/presentation2/data/gui/layouts/AudioMenu.layout 2009-12-02 16:25:42 UTC (rev 6206)
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<GUILayout >
+ <Window Type="TaharezLook/StaticImage" Name="orxonox/AudioBackground" >
+ <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/AudioWindow" >
+ <Property Name="Text" Value="Audio" />
+ <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.15,0},{0.325,0},{0.85,0},{0.6,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.03,0},{0.2,0},{0.34,0},{0.4,0}}" />
+ <Window Type="TaharezLook/HorizontalScrollbar" Name="orxonox/MasterScrollbar" >
+ <Property Name="PageSize" Value="0" />
+ <Property Name="StepSize" Value="1" />
+ <Property Name="OverlapSize" Value="0" />
+ <Property Name="DocumentSize" Value="1" />
+ <Property Name="ScrollPosition" Value="0" />
+ <Property Name="StepSize" Value="0.1" />
+ <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.6,0},{0.95,0},{0.8,0}}" />
+ <Event Name="ThumbTrackStarted" Function="AudioMenu.AudioMasterScrollbar_started" />
+ <Event Name="ThumbTrackEnded" Function="AudioMenu.AudioMasterScrollbar_ended" />
+ <Event Name="ScrollPosChanged" Function="AudioMenu.AudioMasterScrollbar_changed" />
+ </Window>
+ </Window>
+ <Window Type="TaharezLook/StaticText" Name="orxonox/MusicVolume" >
+ <Property Name="Text" Value="Music 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.03,0},{0.45,0},{0.34,0},{0.65,0}}" />
+ <Window Type="TaharezLook/HorizontalScrollbar" Name="orxonox/MusicScrollbar" >
+ <Property Name="PageSize" Value="0" />
+ <Property Name="StepSize" Value="1" />
+ <Property Name="OverlapSize" Value="0" />
+ <Property Name="DocumentSize" Value="1" />
+ <Property Name="ScrollPosition" Value="0" />
+ <Property Name="StepSize" Value="0.1" />
+ <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.6,0},{0.95,0},{0.8,0}}" />
+ <Event Name="ThumbTrackStarted" Function="AudioMenu.AudioMusicScrollbar_started" />
+ <Event Name="ThumbTrackEnded" Function="AudioMenu.AudioMusicScrollbar_ended" />
+ <Event Name="ScrollPosChanged" Function="AudioMenu.AudioMusicScrollbar_changed" />
+ </Window>
+ </Window>
+ <Window Type="TaharezLook/StaticText" Name="orxonox/EffectsVolume" >
+ <Property Name="Text" Value="Effects 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.03,0},{0.7,0},{0.34,0},{0.9,0}}" />
+ <Window Type="TaharezLook/HorizontalScrollbar" Name="orxonox/EffectsScrollbar" >
+ <Property Name="PageSize" Value="0" />
+ <Property Name="StepSize" Value="1" />
+ <Property Name="OverlapSize" Value="0" />
+ <Property Name="DocumentSize" Value="1" />
+ <Property Name="ScrollPosition" Value="0" />
+ <Property Name="StepSize" Value="0.1" />
+ <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.6,0},{0.95,0},{0.8,0}}" />
+ <Event Name="ThumbTrackStarted" Function="AudioMenu.AudioEffectsScrollbar_started" />
+ <Event Name="ThumbTrackEnded" Function="AudioMenu.AudioEffectsScrollbar_ended" />
+ <Event Name="ScrollPosChanged" Function="AudioMenu.AudioEffectsScrollbar_changed" />
+ </Window>
+ </Window>
+ <Window Type="TaharezLook/StaticText" Name="orxonox/AudioTheme" >
+ <Property Name="Text" Value="Theme" />
+ <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.66,0},{0.2,0},{0.97,0},{0.9,0}}" />
+ <Window Type="TaharezLook/Combobox" Name="orxonox/AudioThemeCombobox" >
+ <Property Name="AlwaysOnTop" Value="True" />
+ <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" />
+ </Window>
+ </Window>
+ <Window Type="TaharezLook/Checkbox" Name="orxonox/MasterCheckbox" >
+ <Property Name="Text" Value="Mute master" />
+ <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.375,0},{0.275,0},{0.625,0},{0.375,0}}" />
+ <Event Name="CheckStateChanged" Function="AudioMenu.AudioMuteMasterCheckbox_clicked"/>
+ </Window>
+ <Window Type="TaharezLook/Checkbox" Name="orxonox/MusicCheckbox" >
+ <Property Name="Text" Value="Mute music" />
+ <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.375,0},{0.525,0},{0.625,0},{0.625,0}}" />
+ <Event Name="CheckStateChanged" Function="AudioMenu.AudioMuteMusicCheckbox_clicked"/>
+ </Window>
+ <Window Type="TaharezLook/Checkbox" Name="orxonox/EffectsCheckbox" >
+ <Property Name="Text" Value="Mute effects" />
+ <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.375,0},{0.775,0},{0.625,0},{0.875,0}}" />
+ <Event Name="CheckStateChanged" Function="AudioMenu.AudioMuteEffectsCheckbox_clicked"/>
+ </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"/>
+ </Window>
+ <Window Type="TaharezLook/StaticText" Name="orxonox/AudioAvailable" >
+ <Property Name="Text" Value="Changes in audio 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>
Added: code/branches/presentation2/data/gui/layouts/ControlsMenu.layout
===================================================================
--- code/branches/presentation2/data/gui/layouts/ControlsMenu.layout (rev 0)
+++ code/branches/presentation2/data/gui/layouts/ControlsMenu.layout 2009-12-02 16:25:42 UTC (rev 6206)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<GUILayout >
+ <Window Type="TaharezLook/StaticImage" Name="orxonox/ControlsBackground" >
+ <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/ControlsWindow" >
+ <Property Name="Text" Value="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/Button" Name="orxonox/MouseControlsButton" >
+ <Property Name="Text" Value="Mouse controls" />
+ <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.3,0},{0.318181,0},{0.7,0},{0.5,0}}" />
+ <Event Name="Clicked" Function="ControlsMenu.ControlsMouseControlsButton_clicked"/>
+ </Window>
+ <Window Type="TaharezLook/Button" Name="orxonox/KeyboardControlsButton" >
+ <Property Name="Text" Value="Keyboard controls" />
+ <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.3,0},{0.590909,0},{0.7,0},{0.772727,0}}" />
+ <Event Name="Clicked" Function="ControlsMenu.ControlsKeyboardControlsButton_clicked"/>
+ </Window>
+ </Window>
+ <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}}" />
+ <Event Name="Clicked" Function="ControlsMenu.ControlsBackButton_clicked"/>
+ </Window>
+ </Window>
+</GUILayout>
Added: code/branches/presentation2/data/gui/layouts/CreditsMenu.layout
===================================================================
--- code/branches/presentation2/data/gui/layouts/CreditsMenu.layout (rev 0)
+++ code/branches/presentation2/data/gui/layouts/CreditsMenu.layout 2009-12-02 16:25:42 UTC (rev 6206)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<GUILayout >
+ <Window Type="TaharezLook/StaticImage" Name="orxonox/CreditsBackground" >
+ <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/CreditsWindow" >
+ <Property Name="Text" Value="Credits" />
+ <Property Name="Alpha" Value="0.8" />
+ <Property Name="HorzFormatting" Value="HorzCentred" />
+ <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}}" />
+ <Window Type="TaharezLook/StaticText" Name="orxonox/CreditsText" >
+ <Property Name="Text">Orxonox version 0.0.3
+
+Programming Language: C++ - lua - tcl
+Environment: OpenAL - Ogre - OIS - CEGUI - enet - ODE
+Licence: GNU General Public Licence - Creative Commons
+
+http://www.orxonox.net</Property>
+ <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.2,0},{0.95,0},{0.9,0}}" />
+ </Window>
+ </Window>
+ <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}}" />
+ <Event Name="Clicked" Function="CreditsMenu.CreditsBackButton_clicked"/>
+ </Window>
+ </Window>
+</GUILayout>
Added: code/branches/presentation2/data/gui/layouts/GameplayMenu.layout
===================================================================
--- code/branches/presentation2/data/gui/layouts/GameplayMenu.layout (rev 0)
+++ code/branches/presentation2/data/gui/layouts/GameplayMenu.layout 2009-12-02 16:25:42 UTC (rev 6206)
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<GUILayout >
+ <Window Type="TaharezLook/StaticImage" Name="orxonox/GameplayBackground" >
+ <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/GameplayWindow" >
+ <Property Name="Text" Value="Gameplay" />
+ <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/Difficulty" >
+ <Property Name="Text" Value="Difficulty" />
+ <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.05,0},{0.2,0},{0.475,0},{0.9,0}}" />
+ <Window Type="TaharezLook/RadioButton" Name="orxonox/DifficultyEasyButton" >
+ <Property Name="Text" Value="Easy" />
+ <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.325,0},{0.325,0},{0.675,0},{0.45,0}}" />
+ <Event Name="SelectStateChanged" Function="GameplayMenu.GameplayDifficultyEasyButton_clicked"/>
+ </Window>
+ <Window Type="TaharezLook/RadioButton" Name="orxonox/DifficultyNormalButton" >
+ <Property Name="Text" Value="Normal" />
+ <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.325,0},{0.525,0},{0.675,0},{0.65,0}}" />
+ <Event Name="SelectStateChanged" Function="GameplayMenu.GameplayDifficultyNormalButton_clicked"/>
+ </Window>
+ <Window Type="TaharezLook/RadioButton" Name="orxonox/DifficultyHardButton" >
+ <Property Name="Text" Value="Hard" />
+ <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.325,0},{0.725,0},{0.675,0},{0.85,0}}" />
+ <Event Name="SelectStateChanged" Function="GameplayMenu.GameplayDifficultyHardButton_clicked"/>
+ </Window>
+ </Window>
+ <Window Type="TaharezLook/StaticText" Name="orxonox/Theme" >
+ <Property Name="Text" Value="Theme" />
+ <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.525,0},{0.2,0},{0.95,0},{0.9,0}}" />
+ <Window Type="TaharezLook/Combobox" Name="orxonox/ThemeCombobox" >
+ <Property Name="AlwaysOnTop" Value="True" />
+ <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="GameplayMenu.GameplayThemeCombobox_changed" />
+ </Window>
+ </Window>
+ </Window>
+ <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}}" />
+ <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>
Added: code/branches/presentation2/data/gui/layouts/GraphicsMenu.layout
===================================================================
--- code/branches/presentation2/data/gui/layouts/GraphicsMenu.layout (rev 0)
+++ code/branches/presentation2/data/gui/layouts/GraphicsMenu.layout 2009-12-02 16:25:42 UTC (rev 6206)
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<GUILayout >
+ <Window Type="TaharezLook/StaticImage" Name="orxonox/GraphicsBackground" >
+ <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/GraphicsWindow" >
+ <Property Name="Text" Value="Graphics" />
+ <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/Resolution" >
+ <Property Name="Text" Value="Resolution" />
+ <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.05,0},{0.2,0},{0.475,0},{0.9,0}}" />
+ <Window Type="TaharezLook/Combobox" Name="orxonox/ResolutionCombobox" >
+ <Property Name="ReadOnly" Value="True" />
+ <Property Name="AlwaysOnTop" Value="True" />
+ <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" />
+ <Event Name="ListSelectionAccepted" Function="GraphicsMenu.GraphicsResolutionCombobox_changed"/>
+ </Window>
+ <Window Type="TaharezLook/Checkbox" Name="orxonox/FullscreenCheckbox" >
+ <Property Name="Text" Value="Fullscreen" />
+ <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.275,0},{0.725,0},{0.725,0},{0.85,0}}" />
+ <Event Name="CheckStateChanged" Function="GraphicsMenu.GraphicsFullscreenCheckbox_clicked"/>
+ </Window>
+ </Window>
+ <Window Type="TaharezLook/StaticText" Name="orxonox/Brightness" >
+ <Property Name="Text" Value="Brightness" />
+ <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.525,0},{0.2,0},{0.95,0},{0.45,0}}" />
+ <Window Type="TaharezLook/HorizontalScrollbar" Name="orxonox/BrightnessScrollbar" >
+ <Property Name="PageSize" Value="0" />
+ <Property Name="StepSize" Value="0.1" />
+ <Property Name="OverlapSize" Value="0" />
+ <Property Name="DocumentSize" Value="1" />
+ <Property Name="ScrollPosition" Value="0" />
+ <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.6,0},{0.95,0},{0.8,0}}" />
+ <Event Name="ThumbTrackStarted" Function="GraphicsMenu.GraphicsBrightnessScrollbar_started" />
+ <Event Name="ThumbTrackEnded" Function="GraphicsMenu.GraphicsBrightnessScrollbar_ended" />
+ <Event Name="ScrollPosChanged" Function="GraphicsMenu.GraphicsBrightnessScrollbar_changed" />
+ </Window>
+ </Window>
+ <Window Type="TaharezLook/StaticText" Name="orxonox/GraphicsInfo" >
+ <Property Name="Text" >Changes in graphics
+settings 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.525,0},{0.55,0},{0.95,0},{0.9,0}}" />
+ </Window>
+ </Window>
+ <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}}" />
+ <Event Name="Clicked" Function="GraphicsMenu.GraphicsBackButton_clicked"/>
+ </Window>
+ <Window Type="TaharezLook/StaticText" Name="orxonox/GraphicsAvailable" >
+ <Property Name="Text" Value="Changes in graphics 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>
Added: code/branches/presentation2/data/gui/layouts/KeyboardControlsMenu.layout
===================================================================
--- code/branches/presentation2/data/gui/layouts/KeyboardControlsMenu.layout (rev 0)
+++ code/branches/presentation2/data/gui/layouts/KeyboardControlsMenu.layout 2009-12-02 16:25:42 UTC (rev 6206)
@@ -0,0 +1,58 @@
+<?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-02 16:12:06 UTC (rev 6205)
+++ code/branches/presentation2/data/gui/layouts/MainMenu.layout 2009-12-02 16:25:42 UTC (rev 6206)
@@ -1,49 +1,47 @@
-<?xml version="1.0" ?>
-<GUILayout>
- <Window Type="DefaultWindow" Name="orxonox/MainMenuRootWindow">
- <Property Name="InheritsAlpha" Value="false"/>
- <Window Type="TaharezLook/Button" Name="orxonox/StandaloneButton">
- <Property Name="UnifiedPosition" Value="{{0.11,0},{0.3,0}}"/>
- <Property Name="UnifiedSize" Value="{{0.15,0},{0.05,0}}"/>
- <Property Name="Text" Value="Standalone"/>
- <Property Name="Disabled" Value="true"/>
- <Event Name="Clicked" Function="MainMenu.button_standalone_clicked"/>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<GUILayout >
+ <Window Type="TaharezLook/StaticImage" Name="orxonox/MainMenuBackground" >
+ <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.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="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"/>
</Window>
-
- <Window Type="TaharezLook/Listbox" Name="orxonox/LevelListbox">
- <Property Name="UnifiedPosition" Value="{{0.4,0},{0.3,0}}"/>
+ <Window Type="TaharezLook/Button" Name="orxonox/SingleplayerButton" >
+ <Property Name="Text" Value="Singleplayer" />
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
- <Property Name="UnifiedSize" Value="{{0.35,0},{0.33,0}}" />
- <Property Name="Tooltip" Value="Available Levels." />
- <Event Name="ItemSelectionChanged" Function="MainMenu.listbox_level_selectionchanged" />
+ <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.325,0},{0.6,0},{0.375,0}}" />
+ <Event Name="Clicked" Function="MainMenu.SingleplayerButton_clicked"/>
</Window>
-
- <Window Type="TaharezLook/Button" Name="orxonox/DedicatedButton">
- <Property Name="UnifiedPosition" Value="{{0.11,0},{0.376,0}}"/>
- <Property Name="UnifiedSize" Value="{{0.15,0},{0.05,0}}"/>
- <Property Name="Text" Value="Dedicated"/>
- <Event Name="Clicked" Function="MainMenu.button_dedicated_clicked"/>
+ <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}}" />
+ <Event Name="Clicked" Function="MainMenu.MultiplayerButton_clicked"/>
</Window>
-
- <Window Type="TaharezLook/Button" Name="orxonox/ServerButton">
- <Property Name="UnifiedPosition" Value="{{0.11,0},{0.452,0}}"/>
- <Property Name="UnifiedSize" Value="{{0.15,0},{0.05,0}}"/>
- <Property Name="Text" Value="Server"/>
- <Event Name="Clicked" Function="MainMenu.button_server_clicked"/>
+ <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}}" />
+ <Event Name="Clicked" Function="MainMenu.SettingsButton_clicked"/>
</Window>
-
- <Window Type="TaharezLook/Button" Name="orxonox/ClientButton">
- <Property Name="UnifiedPosition" Value="{{0.11,0},{0.528,0}}"/>
- <Property Name="UnifiedSize" Value="{{0.15,0},{0.05,0}}"/>
- <Property Name="Text" Value="Client"/>
- <Event Name="Clicked" Function="MainMenu.button_client_clicked"/>
+ <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}}" />
+ <Event Name="Clicked" Function="MainMenu.CreditsButton_clicked"/>
</Window>
-
- <Window Type="TaharezLook/Button" Name="orxonox/QuitButton">
- <Property Name="UnifiedPosition" Value="{{0.11,0},{0.604,0}}"/>
- <Property Name="UnifiedSize" Value="{{0.15,0},{0.05,0}}"/>
- <Property Name="Text" Value="Quit"/>
- <Event Name="Clicked" Function="MainMenu.button_quit_clicked"/>
+ <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}}" />
+ <Event Name="Clicked" Function="MainMenu.ExitButton_clicked"/>
</Window>
</Window>
</GUILayout>
Added: code/branches/presentation2/data/gui/layouts/MouseControlsMenu.layout
===================================================================
--- code/branches/presentation2/data/gui/layouts/MouseControlsMenu.layout (rev 0)
+++ code/branches/presentation2/data/gui/layouts/MouseControlsMenu.layout 2009-12-02 16:25:42 UTC (rev 6206)
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<GUILayout >
+ <Window Type="TaharezLook/StaticImage" Name="orxonox/MouseControlsBackground" >
+ <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/MouseControlsWindow" >
+ <Property Name="Text" Value="Mouse 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/MouseSensitivity" >
+ <Property Name="Text" Value="Mouse sensitivity" />
+ <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.05,0},{0.2,0},{0.95,0},{0.45,0}}" />
+ <Window Type="TaharezLook/HorizontalScrollbar" Name="orxonox/MouseScrollbar" >
+ <Property Name="PageSize" Value="0" />
+ <Property Name="StepSize" Value="1" />
+ <Property Name="OverlapSize" Value="0" />
+ <Property Name="DocumentSize" Value="1" />
+ <Property Name="ScrollPosition" Value="0" />
+ <Property Name="StepSize" Value="0.1" />
+ <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.02,0},{0.6,0},{0.98,0},{0.8,0}}" />
+ <Event Name="ThumbTrackStarted" Function="MouseControlsMenu.MouseControlsMouseScrollbar_started" />
+ <Event Name="ThumbTrackEnded" Function="MouseControlsMenu.MouseControlsMouseScrollbar_ended" />
+ <Event Name="ScrollPosChanged" Function="MouseControlsMenu.MouseControlsMouseScrollbar_changed" />
+ </Window>
+ </Window>
+ <Window Type="TaharezLook/StaticText" Name="orxonox/MouseControlMode" >
+ <Property Name="Text" Value="Mouse control mode" />
+ <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.05,0},{0.55,0},{0.95,0},{0.9,0}}" />
+ <Window Type="TaharezLook/RadioButton" Name="orxonox/MouseControlButton1" >
+ <Property Name="Text" Value="Default control mode" />
+ <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.03,0},{0.6,0},{0.47,0},{0.8,0}}" />
+ <Event Name="SelectStateChanged" Function="MouseControlsMenu.MouseControlsDefaultButton_clicked" />
+ </Window>
+ <Window Type="TaharezLook/RadioButton" Name="orxonox/MouseControlButton2" >
+ <Property Name="Text" Value=".............................................." />
+ <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.53,0},{0.6,0},{0.97,0},{0.8,0}}" />
+ <Event Name="SelectStateChanged" Function="MouseControlsMenu.MouseControls_______Button_clicked" />
+ </Window>
+ </Window>
+ </Window>
+ <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}}" />
+ <Event Name="Clicked" Function="MouseControlsMenu.MouseControlsBackButton_clicked"/>
+ </Window>
+ <Window Type="TaharezLook/StaticText" Name="orxonox/MouseControlsAvailable" >
+ <Property Name="Text" Value="Changes in mouse controls 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>
Added: code/branches/presentation2/data/gui/layouts/MultiplayerMenu.layout
===================================================================
--- code/branches/presentation2/data/gui/layouts/MultiplayerMenu.layout (rev 0)
+++ code/branches/presentation2/data/gui/layouts/MultiplayerMenu.layout 2009-12-02 16:25:42 UTC (rev 6206)
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<GUILayout >
+ <Window Type="TaharezLook/StaticImage" Name="orxonox/MultiplayerBackground" >
+ <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/MultiplayerWindow" >
+ <Property Name="Text" Value="Multiplayer" />
+ <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/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}}" />
+ </Window>
+ <Window Type="TaharezLook/RadioButton" Name="orxonox/MultiplayerJoinButton" >
+ <Property Name="Text" Value="Join" />
+ <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.1,0},{0.85,0},{0.3,0},{0.95,0}}" />
+ <Event Name="SelectStateChanged" Function="MultiplayerMenu.MultiplayerJoinButton_clicked"/>
+ </Window>
+ <Window Type="TaharezLook/RadioButton" Name="orxonox/MultiplayerHostButton" >
+ <Property Name="Text" Value="Host" />
+ <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.85,0},{0.6,0},{0.95,0}}" />
+ <Event Name="SelectStateChanged" Function="MultiplayerMenu.MultiplayerHostButton_clicked"/>
+ </Window>
+ <Window Type="TaharezLook/RadioButton" Name="orxonox/MultiplayerDedicatedButton" >
+ <Property Name="Text" Value="Dedicated" />
+ <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.7,0},{0.85,0},{0.9,0},{0.95,0}}" />
+ <Event Name="SelectStateChanged" Function="MultiplayerMenu.MultiplayerDedicatedButton_clicked"/>
+ </Window>
+ </Window>
+ <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}}" />
+ <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}}" />
+ <Event Name="Clicked" Function="MultiplayerMenu.MultiplayerBackButton_clicked"/>
+ </Window>
+ </Window>
+</GUILayout>
Added: code/branches/presentation2/data/gui/layouts/MultiplayerOptionsMenu.layout
===================================================================
--- code/branches/presentation2/data/gui/layouts/MultiplayerOptionsMenu.layout (rev 0)
+++ code/branches/presentation2/data/gui/layouts/MultiplayerOptionsMenu.layout 2009-12-02 16:25:42 UTC (rev 6206)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<GUILayout >
+ <Window Type="TaharezLook/StaticImage" Name="orxonox/MultiplayerOptionsBackground" >
+ <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/MultiplayerOptionsWindow" >
+ <Property Name="Text" Value="Multiplayer options" />
+ <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>
+ <Window Type="TaharezLook/Button" Name="orxonox/MultiplayerOptionsBackButton" >
+ <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="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>
Added: code/branches/presentation2/data/gui/layouts/SettingsMenu.layout
===================================================================
--- code/branches/presentation2/data/gui/layouts/SettingsMenu.layout (rev 0)
+++ code/branches/presentation2/data/gui/layouts/SettingsMenu.layout 2009-12-02 16:25:42 UTC (rev 6206)
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<GUILayout >
+ <Window Type="TaharezLook/StaticImage" Name="orxonox/SettingsBackground" >
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="FrameEnabled" 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/SettingsWindow" >
+ <Property Name="Text" Value="Settings" />
+ <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/Button" Name="orxonox/GameplayButton" >
+ <Property Name="Text" Value="Gameplay" />
+ <Property Name="Disabled" Value="True" />
+ <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.181818,0},{0.45,0},{0.363636,0}}" />
+ <Event Name="Clicked" Function="SettingsMenu.SettingsGameplayButton_clicked"/>
+ </Window>
+ <Window Type="TaharezLook/Button" Name="orxonox/MultiplayerOptionsButton" >
+ <Property Name="Text" Value="Multiplayer options" />
+ <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.454545,0},{0.45,0},{0.636363,0}}" />
+ <Event Name="Clicked" Function="SettingsMenu.SettingsMultiplayerOptionsButton_clicked"/>
+ </Window>
+ <Window Type="TaharezLook/Button" Name="orxonox/ControlsButton" >
+ <Property Name="Text" Value="Controls" />
+ <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.727272,0},{0.45,0},{0.909090,0}}" />
+ <Event Name="Clicked" Function="SettingsMenu.SettingsControlsButton_clicked"/>
+ </Window>
+ <Window Type="TaharezLook/Button" Name="orxonox/GraphicsButton" >
+ <Property Name="Text" Value="Graphics" />
+ <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.55,0},{0.181818,0},{0.95,0},{0.363636,0}}" />
+ <Event Name="Clicked" Function="SettingsMenu.SettingsGraphicsButton_clicked"/>
+ </Window>
+ <Window Type="TaharezLook/Button" Name="orxonox/AudioButton" >
+ <Property Name="Text" Value="Audio" />
+ <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.55,0},{0.454545,0},{0.95,0},{0.636363,0}}" />
+ <Event Name="Clicked" Function="SettingsMenu.SettingsAudioButton_clicked"/>
+ </Window>
+ <Window Type="TaharezLook/Button" Name="orxonox/ResetSettingsButton" >
+ <Property Name="Text" Value="Reset settings" />
+ <Property Name="Disabled" Value="True" />
+ <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.55,0},{0.727272,0},{0.95,0},{0.909090,0}}" />
+ <Event Name="Clicked" Function="SettingsMenu.SettingsResetSettingsButton_clicked"/>
+ </Window>
+ </Window>
+ <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}}" />
+ <Event Name="Clicked" Function="SettingsMenu.SettingsBackButton_clicked"/>
+ </Window>
+ </Window>
+</GUILayout>
Added: code/branches/presentation2/data/gui/layouts/SingleplayerMenu.layout
===================================================================
--- code/branches/presentation2/data/gui/layouts/SingleplayerMenu.layout (rev 0)
+++ code/branches/presentation2/data/gui/layouts/SingleplayerMenu.layout 2009-12-02 16:25:42 UTC (rev 6206)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<GUILayout >
+ <Window Type="TaharezLook/StaticImage" Name="orxonox/SingleplayerBackground" >
+ <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/SingleplayerWindow" >
+ <Property Name="Text" Value="Singleplayer" />
+ <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/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}}" />
+ </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}}" />
+ <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}}" />
+ <Event Name="Clicked" Function="SingleplayerMenu.SingleplayerBackButton_clicked"/>
+ </Window>
+ </Window>
+</GUILayout>
Added: code/branches/presentation2/data/gui/scripts/AudioMenu.lua
===================================================================
--- code/branches/presentation2/data/gui/scripts/AudioMenu.lua (rev 0)
+++ code/branches/presentation2/data/gui/scripts/AudioMenu.lua 2009-12-02 16:25:42 UTC (rev 6206)
@@ -0,0 +1,130 @@
+-- AudioMenu.lua
+
+BasicGUI = require("BasicGUI")
+local P = BasicGUI:new() --inherit everything from the gui package
+if _REQUIREDNAME == nil then
+ AudioMenu = P
+else
+ _G[_REQUIREDNAME] = P
+end
+
+P.filename = "AudioMenu"
+P.layoutString = "AudioMenu.layout"
+
+function P:init()
+ soundMgr = orxonox.SoundManager:getInstance()
+ masterscrollbar_active = false
+ musicscrollbar_active = false
+ effectsscrollbar_active = false
+ mastervolume = soundMgr:getVolume(orxonox.SoundType.none)
+ musicvolume = soundMgr:getVolume(orxonox.SoundType.ambient)
+ effectsvolume = soundMgr:getVolume(orxonox.SoundType.effects)
+ window = tolua.cast(winMgr:getWindow("orxonox/MasterScrollbar"),"CEGUI::Scrollbar")
+ window:setScrollPosition(mastervolume)
+ window = tolua.cast(winMgr:getWindow("orxonox/MusicScrollbar"),"CEGUI::Scrollbar")
+ window:setScrollPosition(musicvolume)
+ window = tolua.cast(winMgr:getWindow("orxonox/EffectsScrollbar"),"CEGUI::Scrollbar")
+ window:setScrollPosition(effectsvolume)
+ dropdown = winMgr:getWindow("orxonox/AudioThemeCombobox")
+ 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(dropdown):addItem(item)
+ end
+end
+
+function P.AudioMasterScrollbar_changed(e)
+ if masterscrollbar_active == false then
+ window = tolua.cast(winMgr:getWindow("orxonox/MasterScrollbar"),"CEGUI::Scrollbar")
+ volume = window:getScrollPosition()
+ orxonox.CommandExecutor:execute("config SoundManager soundVolume_ " .. volume)
+ end
+end
+
+function P.AudioMasterScrollbar_started(e)
+ masterscrollbar_active = true
+end
+
+function P.AudioMasterScrollbar_ended(e)
+ window = tolua.cast(winMgr:getWindow("orxonox/MasterScrollbar"),"CEGUI::Scrollbar")
+ volume = window:getScrollPosition()
+ orxonox.CommandExecutor:execute("config SoundManager soundVolume_ " .. volume)
+ masterscrollbar_active = false
+end
+
+function P.AudioMusicScrollbar_changed(e)
+ if musicscrollbar_active == false then
+ window = tolua.cast(winMgr:getWindow("orxonox/MusicScrollbar"),"CEGUI::Scrollbar")
+ volume = window:getScrollPosition()
+ orxonox.CommandExecutor:execute("config SoundManager ambientVolume_ " .. volume)
+ end
+end
+
+function P.AudioMusicScrollbar_started(e)
+ musicscrollbar_active = true
+end
+
+function P.AudioMusicScrollbar_ended(e)
+ window = tolua.cast(winMgr:getWindow("orxonox/MusicScrollbar"),"CEGUI::Scrollbar")
+ volume = window:getScrollPosition()
+ orxonox.CommandExecutor:execute("config SoundManager ambientVolume_ " .. volume)
+ musicscrollbar_active = false
+end
+
+function P.AudioEffectsScrollbar_changed(e)
+ if effectsscrollbar_active == false then
+ window = tolua.cast(winMgr:getWindow("orxonox/EffectsScrollbar"),"CEGUI::Scrollbar")
+ volume = window:getScrollPosition()
+ orxonox.CommandExecutor:execute("config SoundManager effectsVolume_ " .. volume)
+ end
+end
+
+function P.AudioEffectsScrollbar_started(e)
+ effectsscrollbar_active = true
+end
+
+function P.AudioEffectsScrollbar_ended(e)
+ window = tolua.cast(winMgr:getWindow("orxonox/EffectsScrollbar"),"CEGUI::Scrollbar")
+ volume = window:getScrollPosition()
+ orxonox.CommandExecutor:execute("config SoundManager effectsVolume_ " .. volume)
+ effectsscrollbar_active = false
+end
+
+function P.AudioMuteMasterCheckbox_clicked(e)
+-- if
+-- mastervolume = soundMgr:getVolume(orxonox.SoundType.none)
+-- window = tolua.cast(winMgr:getWindow("orxonox/MasterScrollbar"),"CEGUI::Scrollbar")
+-- window:setScrollPosition(0)
+-- end
+ soundMgr:toggleMute(orxonox.SoundType.none)
+end
+
+function P.AudioMuteMusicCheckbox_clicked(e)
+ soundMgr:toggleMute(orxonox.SoundType.ambient)
+end
+
+function P.AudioMuteEffectsCheckbox_clicked(e)
+ soundMgr:toggleMute(orxonox.SoundType.effects)
+end
+
+function P.AudioThemeCombobox_changed(e)
+-- local choice = winMgr:getWindow("orxonox/AudioThemeCombobox"):getFirstSelectedItem()
+-- if choice == "Default" then
+-- orxonox.CommandExecutor:execute("setMood default")
+-- debug("default selected")
+-- end
+-- if choice == "Drum 'n Bass" then
+-- orxonox.CommandExecutor:execute("setMood dnb")
+-- debug("dnb selected")
+-- end
+end
+
+function P.AudioBackButton_clicked(e)
+ hideGUI(P.filename)
+end
+
+return P
+
Added: code/branches/presentation2/data/gui/scripts/ControlsMenu.lua
===================================================================
--- code/branches/presentation2/data/gui/scripts/ControlsMenu.lua (rev 0)
+++ code/branches/presentation2/data/gui/scripts/ControlsMenu.lua 2009-12-02 16:25:42 UTC (rev 6206)
@@ -0,0 +1,27 @@
+-- ControlsMenu.lua
+
+BasicGUI = require("BasicGUI")
+local P = BasicGUI:new() --inherit everything from the gui package
+if _REQUIREDNAME == nil then
+ ControlsMenu = P
+else
+ _G[_REQUIREDNAME] = P
+end
+
+P.filename = "ControlsMenu"
+P.layoutString = "ControlsMenu.layout"
+
+function P.ControlsMouseControlsButton_clicked(e)
+ showGUI("MouseControlsMenu", true)
+end
+
+function P.ControlsKeyboardControlsButton_clicked(e)
+ showGUI("KeyboardControlsMenu", true)
+end
+
+function P.ControlsBackButton_clicked(e)
+ hideGUI(P.filename)
+end
+
+return P
+
Added: code/branches/presentation2/data/gui/scripts/CreditsMenu.lua
===================================================================
--- code/branches/presentation2/data/gui/scripts/CreditsMenu.lua (rev 0)
+++ code/branches/presentation2/data/gui/scripts/CreditsMenu.lua 2009-12-02 16:25:42 UTC (rev 6206)
@@ -0,0 +1,19 @@
+-- CreditsMenu.lua
+
+BasicGUI = require("BasicGUI")
+local P = BasicGUI:new() --inherit everything from the gui package
+if _REQUIREDNAME == nil then
+ CreditsMenu = P
+else
+ _G[_REQUIREDNAME] = P
+end
+
+P.filename = "CreditsMenu"
+P.layoutString = "CreditsMenu.layout"
+
+function P.CreditsBackButton_clicked(e)
+ hideGUI(P.filename)
+end
+
+return P
+
Added: code/branches/presentation2/data/gui/scripts/GameplayMenu.lua
===================================================================
--- code/branches/presentation2/data/gui/scripts/GameplayMenu.lua (rev 0)
+++ code/branches/presentation2/data/gui/scripts/GameplayMenu.lua 2009-12-02 16:25:42 UTC (rev 6206)
@@ -0,0 +1,52 @@
+-- GameplayMenu.lua
+
+BasicGUI = require("BasicGUI")
+local P = BasicGUI:new() --inherit everything from the gui package
+if _REQUIREDNAME == nil then
+ GameplayMenu = P
+else
+ _G[_REQUIREDNAME] = P
+end
+
+P.filename = "GameplayMenu"
+P.layoutString = "GameplayMenu.layout"
+
+function P:init()
+ dropdown = winMgr:getWindow("orxonox/ThemeCombobox")
+ local themeList = {}
+ table.insert(themeList, "Theme 1")
+ table.insert(themeList, "Theme 2")
+ table.insert(themeList, "Theme 3")
+ for k,v in pairs(themeList) do
+ item = CEGUI.createListboxTextItem(v)
+ item:setSelectionBrushImage("TaharezLook", "MultiListSelectionBrush")
+ CEGUI.toCombobox(dropdown):addItem(item)
+ end
+end
+
+function P.GameplayThemeCombobox_changed(e)
+ -- theme
+ debug("event: theme")
+end
+
+function P.GameplayDifficultyEasyButton_clicked(e)
+ -- difficulty easy
+ debug("event: easy")
+end
+
+function P.GameplayDifficultyNormalButton_clicked(e)
+ -- difficulty normal
+ debug("event: normal")
+end
+
+function P.GameplayDifficultyHardButton_clicked(e)
+ -- difficulty hard
+ debug("event: hard")
+end
+
+function P.GameplayBackButton_clicked(e)
+ hideGUI(P.filename)
+end
+
+return P
+
Added: code/branches/presentation2/data/gui/scripts/GraphicsMenu.lua
===================================================================
--- code/branches/presentation2/data/gui/scripts/GraphicsMenu.lua (rev 0)
+++ code/branches/presentation2/data/gui/scripts/GraphicsMenu.lua 2009-12-02 16:25:42 UTC (rev 6206)
@@ -0,0 +1,65 @@
+-- GraphicsMenu.lua
+
+BasicGUI = require("BasicGUI")
+local P = BasicGUI:new() --inherit everything from the gui package
+if _REQUIREDNAME == nil then
+ GraphicsMenu = P
+else
+ _G[_REQUIREDNAME] = P
+end
+
+P.filename = "GraphicsMenu"
+P.layoutString = "GraphicsMenu.layout"
+
+function P:init()
+ dropdown = winMgr:getWindow("orxonox/ResolutionCombobox")
+ local resolutionList = {}
+ table.insert(resolutionList, "800 x 600 (4:3)")
+ table.insert(resolutionList, "1024 x 640 (16:10)")
+ table.insert(resolutionList, "1024 x 768 (4:3)")
+ table.insert(resolutionList, "1280 x 800 (16:10)")
+ table.insert(resolutionList, "1280 x 960 (4:3)")
+ table.insert(resolutionList, "1440 x 900 (16:10)")
+ table.insert(resolutionList, "1600 x 1200 (4:3)")
+ table.insert(resolutionList, "1680 x 1050 (16:10)")
+ for k,v in pairs(resolutionList) do
+ item = CEGUI.createListboxTextItem(v)
+ item:setSelectionBrushImage("TaharezLook", "MultiListSelectionBrush")
+ CEGUI.toCombobox(dropdown):addItem(item)
+ end
+ local scrollbar_active = false
+end
+
+function P.GraphicsResolutionCombobox_changed(e)
+ -- resolution
+ debug("event: resolution")
+end
+
+function P.GraphicsBrightnessScrollbar_changed(e)
+ if scrollbar_active == false then
+ -- brightness
+ debug("event: brightness")
+ end
+end
+
+function P.GraphicsBrightnessScrollbar_started(e)
+ scrollbar_active = true
+end
+
+function P.GraphicsBrightnessScrollbar_ended(e)
+ -- brightness
+ debug("event: brightness")
+ scrollbar_active = false
+end
+
+function P.GraphicsFullscreenCheckbox_clicked(e)
+ -- fullscreen
+ debug("event: fullscreen")
+end
+
+function P.GraphicsBackButton_clicked(e)
+ hideGUI(P.filename)
+end
+
+return P
+
Added: code/branches/presentation2/data/gui/scripts/KeyboardControlsMenu.lua
===================================================================
--- code/branches/presentation2/data/gui/scripts/KeyboardControlsMenu.lua (rev 0)
+++ code/branches/presentation2/data/gui/scripts/KeyboardControlsMenu.lua 2009-12-02 16:25:42 UTC (rev 6206)
@@ -0,0 +1,18 @@
+-- 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
Modified: code/branches/presentation2/data/gui/scripts/MainMenu.lua
===================================================================
--- code/branches/presentation2/data/gui/scripts/MainMenu.lua 2009-12-02 16:12:06 UTC (rev 6205)
+++ code/branches/presentation2/data/gui/scripts/MainMenu.lua 2009-12-02 16:25:42 UTC (rev 6206)
@@ -11,83 +11,30 @@
P.filename = "MainMenu"
P.layoutString = "MainMenu.layout"
-function P:init()
- listbox = winMgr:getWindow("orxonox/LevelListbox")
- preselect = orxonox.LevelManager:getInstance():getDefaultLevel()
- orxonox.LevelManager:getInstance():compileAvailableLevelList()
- local levelList = {}
- local index = 0
- local level = ""
- while true do
- level = orxonox.LevelManager:getInstance():getAvailableLevelListItem(index)
- if level == "" then
- break
- end
- table.insert(levelList, level)
- index = index + 1
- end
- table.sort(levelList)
- for k,v in pairs(levelList) do
- item = CEGUI.createListboxTextItem(v)
- item:setSelectionBrushImage("TaharezLook", "MultiListSelectionBrush")
- CEGUI.toListbox(listbox):addItem(item)
- if v .. ".oxw" == preselect then
- listbox:setItemSelectState(item, true)
- end
- end
+-- events for MainMenu
+function P.QuickGameTestButton_clicked(e)
+ orxonox.CommandExecutor:execute("startGame")
end
-
--- events for mainmenu
-function P.button_quit_clicked(e)
- hideGUI()
- orxonox.CommandExecutor:execute("exit")
+function P.SingleplayerButton_clicked(e)
+ showGUI("SingleplayerMenu", true)
end
-function P.button_standalone_clicked(e)
- choice = winMgr:getWindow("orxonox/LevelListbox"):getFirstSelectedItem()
- if choice then
- orxonox.LevelManager:getInstance():setDefaultLevel(choice:getText() .. ".oxw")
- orxonox.CommandExecutor:execute("startGame")
- hideGUI(P.filename)
- end
+function P.MultiplayerButton_clicked(e)
+ showGUI("MultiplayerMenu", true)
end
-function P.button_server_clicked(e)
- choice = winMgr:getWindow("orxonox/LevelListbox"):getFirstSelectedItem()
- if choice then
- orxonox.LevelManager:getInstance():setDefaultLevel(choice:getText() .. ".oxw")
- orxonox.CommandExecutor:execute("startServer")
- hideGUI(P.filename)
- end
+function P.SettingsButton_clicked(e)
+ showGUI("SettingsMenu", true)
end
-function P.button_dedicated_clicked(e)
- choice = winMgr:getWindow("orxonox/LevelListbox"):getFirstSelectedItem()
- if choice then
- orxonox.LevelManager:getInstance():setDefaultLevel(choice:getText() .. ".oxw")
- orxonox.CommandExecutor:execute("startDedicated")
- hideGUI(P.filename)
- end
+function P.CreditsButton_clicked(e)
+ showGUI("CreditsMenu", true)
end
-function P.button_client_clicked(e)
- choice = winMgr:getWindow("orxonox/LevelListbox"):getFirstSelectedItem()
- if choice then
- orxonox.LevelManager:getInstance():setDefaultLevel(choice:getText() .. ".oxw")
- orxonox.CommandExecutor:execute("startClient")
- hideGUI(P.filename)
-
- end
+function P.ExitButton_clicked(e)
+ orxonox.CommandExecutor:execute("exit")
end
-function P.listbox_level_selectionchanged(e)
- if winMgr:getWindow("orxonox/LevelListbox"):getFirstSelectedItem() then
- winMgr:getWindow("orxonox/StandaloneButton"):enable()
- else
- winMgr:getWindow("orxonox/StandaloneButton"):disable()
- end
-end
-
return P
Added: code/branches/presentation2/data/gui/scripts/MouseControlsMenu.lua
===================================================================
--- code/branches/presentation2/data/gui/scripts/MouseControlsMenu.lua (rev 0)
+++ code/branches/presentation2/data/gui/scripts/MouseControlsMenu.lua 2009-12-02 16:25:42 UTC (rev 6206)
@@ -0,0 +1,48 @@
+-- MouseControlsMenu.lua
+
+BasicGUI = require("BasicGUI")
+local P = BasicGUI:new() --inherit everything from the gui package
+if _REQUIREDNAME == nil then
+ MouseControlsMenu = P
+else
+ _G[_REQUIREDNAME] = P
+end
+
+P.filename = "MouseControlsMenu"
+P.layoutString = "MouseControlsMenu.layout"
+
+local scrollbar_active = false
+
+function P.MouseControlsMouseScrollbar_changed(e)
+ if scrollbar_active == false then
+ -- mouse sensitivity
+ debug("event: mouse sensitivity")
+ end
+end
+
+function P.MouseControlsMouseScrollbar_started(e)
+ scrollbar_active = true
+end
+
+function P.MouseControlsMouseScrollbar_ended(e)
+ -- mouse sensitivity
+ debug("event: mouse sensitivity")
+ scrollbar_active = false
+end
+
+function P.MouseControlsDefaultButton_clicked(e)
+ -- default control mode
+ debug("event: default control mode")
+end
+
+function P.MouseControls_______Button_clicked(e)
+ -- .......
+ debug("event: .......")
+end
+
+function P.MouseControlsBackButton_clicked(e)
+ hideGUI(P.filename)
+end
+
+return P
+
Added: code/branches/presentation2/data/gui/scripts/MultiplayerMenu.lua
===================================================================
--- code/branches/presentation2/data/gui/scripts/MultiplayerMenu.lua (rev 0)
+++ code/branches/presentation2/data/gui/scripts/MultiplayerMenu.lua 2009-12-02 16:25:42 UTC (rev 6206)
@@ -0,0 +1,82 @@
+-- MultiplayerMenu.lua
+
+BasicGUI = require("BasicGUI")
+local P = BasicGUI:new() --inherit everything from the gui package
+if _REQUIREDNAME == nil then
+ MultiplayerMenu = P
+else
+ _G[_REQUIREDNAME] = P
+end
+
+P.filename = "MultiplayerMenu"
+P.layoutString = "MultiplayerMenu.layout"
+
+function P:init()
+ listbox = winMgr:getWindow("orxonox/MultiplayerLevelListbox")
+ preselect = orxonox.LevelManager:getInstance():getDefaultLevel()
+ orxonox.LevelManager:getInstance():compileAvailableLevelList()
+ local levelList = {}
+ local index = 0
+ local level = ""
+ while true do
+ level = orxonox.LevelManager:getInstance():getAvailableLevelListItem(index)
+ if level == "" then
+ break
+ end
+ table.insert(levelList, level)
+ index = index + 1
+ end
+ table.sort(levelList)
+ for k,v in pairs(levelList) do
+ item = CEGUI.createListboxTextItem(v)
+ item:setSelectionBrushImage("TaharezLook", "MultiListSelectionBrush")
+ CEGUI.toListbox(listbox):addItem(item)
+ if v .. ".oxw" == preselect then
+ listbox:setItemSelectState(item, true)
+ end
+ end
+ local multiplayerMode = "startClient"
+ if multiplayerMode == "startClient" then
+ window = winMgr:getWindow("orxonox/MultiplayerJoinButton")
+ button = tolua.cast(window,"CEGUI::RadioButton")
+ button:setSelected(true)
+ end
+ if multiplayerMode == "startServer" then
+ window = winMgr:getWindow("orxonox/MultiplayerHostButton")
+ button = tolua.cast(window,"CEGUI::RadioButton")
+ button:setSelected(true)
+ end
+ if multiplayerMode == "startDedicated" then
+ window = winMgr:getWindow("orxonox/MultiplayerDedicatedButton")
+ button = tolua.cast(window,"CEGUI::RadioButton")
+ button:setSelected(true)
+ end
+end
+
+function P.MultiplayerJoinButton_clicked(e)
+ multiplayerMode = "startClient"
+end
+
+function P.MultiplayerHostButton_clicked(e)
+ multiplayerMode = "startServer"
+end
+
+function P.MultiplayerDedicatedButton_clicked(e)
+ multiplayerMode = "startDedicated"
+end
+
+function P.MultiplayerStartButton_clicked(e)
+ local choice = winMgr:getWindow("orxonox/MultiplayerLevelListbox"):getFirstSelectedItem()
+ if choice then
+ orxonox.LevelManager:getInstance():setDefaultLevel(choice:getText() .. ".oxw")
+ orxonox.CommandExecutor:execute(multiplayerMode)
+ hideAllGUIs()
+ end
+end
+
+function P.MultiplayerBackButton_clicked(e)
+ hideGUI(P.filename)
+end
+
+return P
+
Added: code/branches/presentation2/data/gui/scripts/MultiplayerOptionsMenu.lua
===================================================================
--- code/branches/presentation2/data/gui/scripts/MultiplayerOptionsMenu.lua (rev 0)
+++ code/branches/presentation2/data/gui/scripts/MultiplayerOptionsMenu.lua 2009-12-02 16:25:42 UTC (rev 6206)
@@ -0,0 +1,18 @@
+-- MultiplayerOptionsMenu.lua
+
+BasicGUI = require("BasicGUI")
+local P = BasicGUI:new() --inherit everything from the gui package
+if _REQUIREDNAME == nil then
+ MultiplayerOptionsMenu = P
+else
+ _G[_REQUIREDNAME] = P
+end
+
+P.filename = "MultiplayerOptionsMenu"
+P.layoutString = "MultiplayerOptionsMenu.layout"
+
+function P.MultiplayerOptionsBackButton_clicked(e)
+ hideGUI(P.filename)
+end
+
+return P
Added: code/branches/presentation2/data/gui/scripts/SettingsMenu.lua
===================================================================
--- code/branches/presentation2/data/gui/scripts/SettingsMenu.lua (rev 0)
+++ code/branches/presentation2/data/gui/scripts/SettingsMenu.lua 2009-12-02 16:25:42 UTC (rev 6206)
@@ -0,0 +1,44 @@
+-- SettingsMenu.lua
+
+BasicGUI = require("BasicGUI")
+local P = BasicGUI:new() --inherit everything from the gui package
+if _REQUIREDNAME == nil then
+ SettingsMenu = P
+else
+ _G[_REQUIREDNAME] = P
+end
+
+P.filename = "SettingsMenu"
+P.layoutString = "SettingsMenu.layout"
+
+function P.SettingsGameplayButton_clicked(e)
+ showGUI("GameplayMenu", true)
+end
+
+function P.SettingsMultiplayerOptionsButton_clicked(e)
+ showGUI("MultiplayerOptionsMenu", true)
+end
+
+function P.SettingsControlsButton_clicked(e)
+ showGUI("ControlsMenu", true)
+end
+
+function P.SettingsGraphicsButton_clicked(e)
+ showGUI("GraphicsMenu", true)
+end
+
+function P.SettingsAudioButton_clicked(e)
+ showGUI("AudioMenu", true)
+end
+
+function P.SettingsResetSettingsButton_clicked(e)
+ -- reset settings
+ debug("event: reset settings")
+end
+
+function P.SettingsBackButton_clicked(e)
+ hideGUI(P.filename)
+end
+
+return P
+
Added: code/branches/presentation2/data/gui/scripts/SingleplayerMenu.lua
===================================================================
--- code/branches/presentation2/data/gui/scripts/SingleplayerMenu.lua (rev 0)
+++ code/branches/presentation2/data/gui/scripts/SingleplayerMenu.lua 2009-12-02 16:25:42 UTC (rev 6206)
@@ -0,0 +1,54 @@
+-- SingleplayerMenu.lua
+
+BasicGUI = require("BasicGUI")
+local P = BasicGUI:new() --inherit everything from the gui package
+if _REQUIREDNAME == nil then
+ SingleplayerMenu = P
+else
+ _G[_REQUIREDNAME] = P
+end
+
+P.filename = "SingleplayerMenu"
+P.layoutString = "SingleplayerMenu.layout"
+
+function P:init()
+ listbox = winMgr:getWindow("orxonox/SingleplayerLevelListbox")
+ preselect = orxonox.LevelManager:getInstance():getDefaultLevel()
+ orxonox.LevelManager:getInstance():compileAvailableLevelList()
+ local levelList = {}
+ local index = 0
+ local level = ""
+ while true do
+ level = orxonox.LevelManager:getInstance():getAvailableLevelListItem(index)
+ if level == "" then
+ break
+ end
+ table.insert(levelList, level)
+ index = index + 1
+ end
+ table.sort(levelList)
+ for k,v in pairs(levelList) do
+ item = CEGUI.createListboxTextItem(v)
+ item:setSelectionBrushImage("TaharezLook", "MultiListSelectionBrush")
+ CEGUI.toListbox(listbox):addItem(item)
+ if v .. ".oxw" == preselect then
+ listbox:setItemSelectState(item, true)
+ end
+ end
+end
+
+function P.SingleplayerStartButton_clicked(e)
+ choice = winMgr:getWindow("orxonox/SingleplayerLevelListbox"):getFirstSelectedItem()
+ if choice then
+ orxonox.LevelManager:getInstance():setDefaultLevel(choice:getText() .. ".oxw")
+ orxonox.CommandExecutor:execute("startGame")
+ hideAllGUIs()
+ end
+end
+
+function P.SingleplayerBackButton_clicked(e)
+ hideGUI(P.filename)
+end
+
+return P
+
More information about the Orxonox-commit
mailing list