Changeset 7732 for code/trunk/data/gui/layouts

Timestamp:

Dec 8, 2010, 3:29:28 PM (14 years ago)

Author:

konrad

Message:

Credits Menu is now scrollable

Location:

code/trunk/data/gui/layouts

Files:

• CreditsMenu.layout (modified) (3 diffs)
• MultiplayerMenu.layout (modified) (1 diff)

code/trunk/data/gui/layouts/CreditsMenu.layout

@@ -2 +2 @@
 
 <GUILayout >
-    <Window Type="MenuWidgets/StaticImage" Name="orxonox/CreditsBackground" >
-        <Property Name="FrameEnabled" Value="False" />
+    <Window Type="DefaultWindow" Name="orxonox/CreditsMenu/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}}" />
-        <Property Name="BackgroundEnabled" Value="False" />
         <Window Type="MenuWidgets/StaticText" Name="orxonox/CreditsWindow" >
-            <Property Name="Text" Value="Credits" />
+            <Property Name="Text" Value="Keybindings" />
             <Property Name="Alpha" Value="0.8" />
+            <Property Name="InheritsAlpha" Value="False" />
             <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.3625,0},{0.75,0},{0.6375,0}}" />
-            <Window Type="MenuWidgets/StaticText" Name="orxonox/CreditsText" >
-                <Property Name="Text">Orxonox version 0.0.3
+            <Property Name="UnifiedAreaRect" Value="{{0.15,0},{0.2125,0},{0.85,0},{0.6375,0}}" />
+            <Window Type="MenuWidgets/StaticText" Name="orxonox/CreditsMenuWrapper" >
+                <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.15,0},{0.95,0},{0.92,0}}" />
+                <Window Type="MenuWidgets/ScrollablePane" Name="orxonox/CreditsMenuPane" >
+                    <Property Name="ContentArea" Value="l:0 t:0 r:0 b:0" />
+                    <Property Name="HorzStepSize" Value="0.005" />
+                    <Property Name="VertStepSize" Value="0.005" />
+                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+                    <Property Name="HorzOverlapSize" Value="0.01" />
+                    <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 Type="MenuWidgets/StaticText" Name="orxonox/CreditsText" >
+                        <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,0},{0,0},{1,0},{1,0}}" />
+                        <Property Name="Text">Orxonox version 0.0.3
 
 Programming Language:  C++ - lua - tcl
@@ -23 +44 @@
 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}}" />
+http://www.orxonox.net
+n
+n
+n
+n
+n
+n
+n
+n
+n                       </Property>
+                    </Window>
+                </Window>
             </Window>
         </Window>
@@ -40 +66 @@
     </Window>
 </GUILayout>
+
+
+
+
+

code/trunk/data/gui/layouts/MultiplayerMenu.layout

@@ -20 +20 @@
                 <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.15,0},{0.95,0},{0.8,0}}" />
             </Window>
+            <Window Type="MenuWidgets/RadioButton" Name="orxonox/MultiplayerLanButton" >
+                <Property Name="Text" Value="LAN"/>
+                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+                <Property Name="UnifiedAreaRect" Value="{{0.2,0},{0.87,0},{0.4,0},{0.97,0}}" />
+                <Event Name="SelectStateChanged" Function="MultiplayerMenu.LanButton_clicked"/>
+            </Window>
+            <Window Type="MenuWidgets/RadioButton" Name="orxonox/MultiplayerInternetButton" >
+                <Property Name="Text" Value="Internet" />
+                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+                <Property Name="UnifiedAreaRect" Value="{{0.6,0},{0.87,0},{0.8,0},{0.97,0}}" />
+                <Event Name="SelectStateChanged" Function="MultiplayerMenu.InternetButton_clicked"/>
+            </Window>
+
+
         </Window>
          <Window Type="MenuWidgets/Button" Name="orxonox/MultiplayerBackButton" >