Changeset 7006
- Timestamp:
- May 29, 2010, 5:09:58 PM (15 years ago)
- Location:
- code/branches/presentation3/data/gui
- Files:
-
- 2 added
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentation3/data/gui/layouts/SettingsMenu.layout
r6746 r7006 2 2 3 3 <GUILayout > 4 <Window Type="MenuWidgets/StaticImage" Name="orxonox/Settings Background" >4 <Window Type="MenuWidgets/StaticImage" Name="orxonox/SettingsMenu/Background" > 5 5 <Property Name="InheritsAlpha" Value="False" /> 6 6 <Property Name="FrameEnabled" Value="False" /> … … 8 8 <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" /> 9 9 <Property Name="BackgroundEnabled" Value="False" /> 10 <Window Type="MenuWidgets/StaticText" Name="orxonox/Settings Window" >10 <Window Type="MenuWidgets/StaticText" Name="orxonox/SettingsMenu/SettingsWindow" > 11 11 <Property Name="Text" Value="Settings" /> 12 12 <Property Name="Alpha" Value="0.8" /> … … 16 16 <Property Name="VertFormatting" Value="TopAligned" /> 17 17 <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.3625,0},{0.75,0},{0.6375,0}}" /> 18 <Window Type="MenuWidgets/Button" Name="orxonox/ GameplayButton" >18 <Window Type="MenuWidgets/Button" Name="orxonox/SettingsMenu/GameplayButton" > 19 19 <Property Name="Text" Value="Gameplay" /> 20 20 <Property Name="Disabled" Value="True" /> … … 23 23 <Event Name="Clicked" Function="SettingsMenu.SettingsGameplayButton_clicked"/> 24 24 </Window> 25 <Window Type="MenuWidgets/Button" Name="orxonox/ MultiplayerOptionsButton" >25 <Window Type="MenuWidgets/Button" Name="orxonox/SettingsMenu/MultiplayerOptionsButton" > 26 26 <Property Name="Text" Value="Multiplayer options" /> 27 27 <Property Name="Disabled" Value="True" /> … … 30 30 <Event Name="Clicked" Function="SettingsMenu.SettingsMultiplayerOptionsButton_clicked"/> 31 31 </Window> 32 <Window Type="MenuWidgets/Button" Name="orxonox/ ControlsButton" >32 <Window Type="MenuWidgets/Button" Name="orxonox/SettingsMenu/ControlsButton" > 33 33 <Property Name="Text" Value="Controls" /> 34 34 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> … … 36 36 <Event Name="Clicked" Function="SettingsMenu.SettingsControlsButton_clicked"/> 37 37 </Window> 38 <Window Type="MenuWidgets/Button" Name="orxonox/ GraphicsButton" >38 <Window Type="MenuWidgets/Button" Name="orxonox/SettingsMenu/GraphicsButton" > 39 39 <Property Name="Text" Value="Graphics" /> 40 40 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> … … 42 42 <Event Name="Clicked" Function="SettingsMenu.SettingsGraphicsButton_clicked"/> 43 43 </Window> 44 <Window Type="MenuWidgets/Button" Name="orxonox/ AudioButton" >44 <Window Type="MenuWidgets/Button" Name="orxonox/SettingsMenu/AudioButton" > 45 45 <Property Name="Text" Value="Audio" /> 46 46 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> … … 48 48 <Event Name="Clicked" Function="SettingsMenu.SettingsAudioButton_clicked"/> 49 49 </Window> 50 <Window Type="MenuWidgets/Button" Name="orxonox/ ResetSettingsButton" >51 <Property Name="Text" Value=" Reset settings" />50 <Window Type="MenuWidgets/Button" Name="orxonox/SettingsMenu/MiscellaneousButton" > 51 <Property Name="Text" Value="Miscellaneous" /> 52 52 <Property Name="Disabled" Value="True" /> 53 53 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> 54 54 <Property Name="UnifiedAreaRect" Value="{{0.55,0},{0.727272,0},{0.95,0},{0.909090,0}}" /> 55 <Event Name="Clicked" Function="SettingsMenu.Settings ResetSettingsButton_clicked"/>55 <Event Name="Clicked" Function="SettingsMenu.SettingsMiscellaneousButton_clicked"/> 56 56 </Window> 57 57 </Window> 58 <Window Type="MenuWidgets/Button" Name="orxonox/Settings BackButton" >58 <Window Type="MenuWidgets/Button" Name="orxonox/SettingsMenu/SettingsBackButton" > 59 59 <Property Name="Text" Value="Back" /> 60 60 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> -
code/branches/presentation3/data/gui/scripts/SettingsMenu.lua
r6748 r7006 24 24 end 25 25 26 function P.SettingsResetSettingsButton_clicked(e) 27 -- reset settings 28 logMessage(0, "event: reset settings") 26 function P.SettingsMiscellaneousButton_clicked(e) 27 showMenuSheet("MiscConfigMenu", true) 29 28 end 30 29
Note: See TracChangeset
for help on using the changeset viewer.