Changeset 7689 for code/trunk/data/gui/layouts
- Timestamp:
- Dec 1, 2010, 3:00:19 PM (13 years ago)
- Location:
- code/trunk
- Files:
-
- 3 edited
- 1 copied
-
. (modified) (1 prop)
-
data/gui/layouts/HostMenu.layout (copied) (copied from code/branches/menu/data/gui/layouts/HostMenu.layout) (3 diffs)
-
data/gui/layouts/MainMenuBackground.layout (modified) (1 diff)
-
data/gui/layouts/MultiplayerMenu.layout (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/menu merged: 7587-7588,7594,7607-7608,7649,7663,7670-7671,7687
- Property svn:mergeinfo changed
-
code/trunk/data/gui/layouts/HostMenu.layout
r7687 r7689 8 8 <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" /> 9 9 <Property Name="BackgroundEnabled" Value="False" /> 10 11 12 10 <Window Type="MenuWidgets/StaticText" Name="orxonox/HostMenuWindow" > 13 11 <Property Name="Text" Value="Multiplayer" /> … … 17 15 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> 18 16 <Property Name="VertFormatting" Value="TopAligned" /> 19 <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.2875,0},{0.75,0},{0. 6375,0}}" />17 <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.2875,0},{0.75,0},{0.7,0}}" /> 20 18 <Window Type="MenuWidgets/Listbox" Name="orxonox/HostMenuListbox" > 21 19 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> 22 <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.15,0},{0.95,0},{0.8 ,0}}" />20 <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.15,0},{0.95,0},{0.85,0}}" /> 23 21 </Window> 24 25 26 22 <Window Type="MenuWidgets/RadioButton" Name="orxonox/HostMenuHostButton" > 27 23 <Property Name="Text" Value="Build Server"/> 28 24 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> 29 <Property Name="UnifiedAreaRect" Value="{{0. 2,0},{0.85,0},{0.4,0},{0.95,0}}" />25 <Property Name="UnifiedAreaRect" Value="{{0.1,0},{0.87,0},{0.3,0},{0.97,0}}" /> 30 26 <Event Name="SelectStateChanged" Function="HostMenu.HostMenuBuildServerButton_clicked"/> 31 27 </Window> … … 33 29 <Property Name="Text" Value="Dedicated" /> 34 30 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> 35 <Property Name="UnifiedAreaRect" Value="{{0. 7,0},{0.85,0},{0.9,0},{0.95,0}}" />31 <Property Name="UnifiedAreaRect" Value="{{0.5,0},{0.87,0},{0.7,0},{0.97,0}}" /> 36 32 <Event Name="SelectStateChanged" Function="HostMenu.HostMenuDedicatedButton_clicked"/> 37 33 </Window> 38 34 <Window Type="MenuWidgets/Checkbox" Name="orxonox/MultiplayerShowAllCheckbox" > 35 <Property Name="Text" Value="show all" /> 36 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> 37 <Property Name="UnifiedAreaRect" Value="{{0.8,0},{0.87,0},{1,0},{.97,0}}" /> 38 <Event Name="CheckStateChanged" Function="HostMenu.MultiplayerShowAll_clicked"/> 39 </Window> 39 40 </Window> 40 41 41 <Window Type="MenuWidgets/Button" Name="orxonox/HostMenuStartButton" > 42 42 <Property Name="Text" Value="Start" /> 43 43 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> 44 <Property Name="UnifiedAreaRect" Value="{{0.2875,0},{0. 6625,0},{0.4875,0},{0.7125,0}}" />44 <Property Name="UnifiedAreaRect" Value="{{0.2875,0},{0.725,0},{0.4875,0},{0.775,0}}" /> 45 45 <Event Name="Clicked" Function="HostMenu.HostMenuStartButton_clicked"/> 46 46 </Window> 47 47 <Window Type="MenuWidgets/Button" Name="orxonox/HostMenuBackButton" > 48 <Property Name="Text" Value="Back" /> 49 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> 50 <Property Name="UnifiedAreaRect" Value="{{0.5125,0},{0.6625,0},{0.7125,0},{0.7125,0}}" /> 51 <Event Name="Clicked" Function="HostMenu.HostMenuBackButton_clicked"/> 52 </Window> 53 48 <Property Name="Text" Value="Back" /> 49 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> 50 <Property Name="UnifiedAreaRect" Value="{{0.5125,0},{0.725,0},{0.7125,0},{0.775,0}}" /> 51 <Event Name="Clicked" Function="HostMenu.HostMenuBackButton_clicked"/> 52 </Window> 54 53 </Window> 55 54 </GUILayout> -
code/trunk/data/gui/layouts/MainMenuBackground.layout
r6746 r7689 2 2 <GUILayout> 3 3 <Window Type="MenuWidgets/StaticImage" Name="orxonox/Background"> 4 <Property Name="UnifiedSize" Value="{{1.0,0},{1.0,0}}"/>5 <Property Name="Image" Value="set:MainMenuBackground image:Background"/>6 <Property Name="FrameEnabled" Value="set:true"/>7 <Property Name="BackgroundEnabled" Value="set:false"/>8 <Property Name="InheritsAlpha" Value="False" />4 <Property Name="UnifiedSize" Value="{{1.0,0},{1.0,0}}"/> 5 <Property Name="Image" Value="set:MainMenuBackground image:Background"/> 6 <Property Name="FrameEnabled" Value="set:true"/> 7 <Property Name="BackgroundEnabled" Value="set:false"/> 8 <Property Name="InheritsAlpha" Value="False" /> 9 9 </Window> 10 10 </GUILayout> -
code/trunk/data/gui/layouts/MultiplayerMenu.layout
r7648 r7689 15 15 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> 16 16 <Property Name="VertFormatting" Value="TopAligned" /> 17 <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.2875,0},{0.75,0},{0. 7,0}}" />17 <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.2875,0},{0.75,0},{0.6375,0}}" /> 18 18 <Window Type="MenuWidgets/Listbox" Name="orxonox/MultiplayerListbox" > 19 19 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> 20 20 <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.15,0},{0.95,0},{0.8,0}}" /> 21 21 </Window> 22 <Window Type="MenuWidgets/RadioButton" Name="orxonox/MultiplayerJoinButton" >23 <Property Name="Text" Value="Join" />24 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />25 <Property Name="UnifiedAreaRect" Value="{{0.1,0},{0.81,0},{0.3,0},{0.89,0}}" />26 <Event Name="SelectStateChanged" Function="MultiplayerMenu.MultiplayerJoinButton_clicked"/>27 </Window>28 <Window Type="MenuWidgets/RadioButton" Name="orxonox/MultiplayerHostButton" >29 <Property Name="Text" Value="Host" />30 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />31 <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.81,0},{0.6,0},{0.89,0}}" />32 <Event Name="SelectStateChanged" Function="MultiplayerMenu.MultiplayerHostButton_clicked"/>33 </Window>34 <Window Type="MenuWidgets/RadioButton" Name="orxonox/MultiplayerDedicatedButton" >35 <Property Name="Text" Value="Dedicated" />36 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />37 <Property Name="UnifiedAreaRect" Value="{{0.7,0},{0.81,0},{0.9,0},{0.89,0}}" />38 <Event Name="SelectStateChanged" Function="MultiplayerMenu.MultiplayerDedicatedButton_clicked"/>39 </Window>40 <Window Type="MenuWidgets/Checkbox" Name="orxonox/MultiplayerShowAllCheckbox" >41 <Property Name="Text" Value="show all" />42 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />43 <Property Name="UnifiedAreaRect" Value="{{0.65,0},{0.89,0},{0.8,0},{0.99,0}}" />44 <Property Name="Disabled" Value="True" />45 <Event Name="CheckStateChanged" Function="MultiplayerMenu.MultiplayerShowAll_clicked"/>46 </Window>47 22 </Window> 48 <Window Type="MenuWidgets/Button" Name="orxonox/MultiplayerStartButton" > 49 <Property Name="Text" Value="Start" /> 50 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> 51 <Property Name="UnifiedAreaRect" Value="{{0.2875,0},{0.725,0},{0.4875,0},{0.775,0}}" /> 52 <Event Name="Clicked" Function="MultiplayerMenu.MultiplayerStartButton_clicked"/> 53 </Window> 54 <Window Type="MenuWidgets/Button" Name="orxonox/MultiplayerBackButton" > 23 <Window Type="MenuWidgets/Button" Name="orxonox/MultiplayerBackButton" > 55 24 <Property Name="Text" Value="Back" /> 56 25 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> 57 <Property Name="UnifiedAreaRect" Value="{{0. 5125,0},{0.725,0},{0.7125,0},{0.775,0}}" />26 <Property Name="UnifiedAreaRect" Value="{{0.7125,0},{0.8625,0},{0.9125,0},{0.9125,0}}" /> 58 27 <Event Name="Clicked" Function="MultiplayerMenu.MultiplayerBackButton_clicked"/> 28 </Window> 29 <Window Type="MenuWidgets/Button" Name="orxonox/MultiplayerJoinButton" > 30 <Property Name="Text" Value="Join" /> 31 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> 32 <Property Name="UnifiedAreaRect" Value="{{0.2875,0},{0.6625,0},{0.4875,0},{0.7125,0}}" /> 33 <Event Name="Clicked" Function="MultiplayerMenu.MultiplayerJoinButton_clicked"/> 34 </Window> 35 <Window Type="MenuWidgets/Button" Name="orxonox/MultiplayerHostButton" > 36 <Property Name="Text" Value="Host" /> 37 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> 38 <Property Name="UnifiedAreaRect" Value="{{0.5125,0},{0.6625,0},{0.7125,0},{0.7125,0}}" /> 39 <Event Name="Clicked" Function="MultiplayerMenu.MultiplayerHostButton_clicked"/> 59 40 </Window> 60 41 </Window> 61 42 </GUILayout> 43
Note: See TracChangeset
for help on using the changeset viewer.
