Changeset 6746 for code/trunk/data/gui/layouts/GraphicsMenu.layout

Timestamp:

Apr 16, 2010, 2:50:16 PM (14 years ago)

Author:

rgrieder

Message:

Merged gamestates2 branch back to trunk.
This brings in some heavy changes in the GUI framework.
It should also fix problems with triggered asserts in the InputManager.

Note: PickupInventory does not seem to work —> Segfault when showing because before, the owner in GUIOverlay::setGUIName is already NULL.
I haven't tested it before, so I can't tell whether it's my changes.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• data/gui/layouts/GraphicsMenu.layout (modified) (9 diffs)

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

@@ -2 +2 @@
 
 <GUILayout >
-    <Window Type="TaharezLook/StaticImage" Name="orxonox/GraphicsBackground" >
+    <Window Type="MenuWidgets/StaticImage" Name="orxonox/GraphicsBackground" >
         <Property Name="FrameEnabled" Value="False" />
         <Property Name="InheritsAlpha" Value="False" />
@@ -8 +8 @@
         <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
         <Property Name="BackgroundEnabled" Value="False" />
-        <Window Type="TaharezLook/StaticText" Name="orxonox/GraphicsWindow" >
+        <Window Type="MenuWidgets/StaticText" Name="orxonox/GraphicsWindow" >
             <Property Name="Text" Value="Graphics" />
             <Property Name="Alpha" Value="0.8" />
@@ -16 +16 @@
             <Property Name="VertFormatting" Value="TopAligned" />
             <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.2875,0},{0.75,0},{0.6375,0}}" />
-            <Window Type="TaharezLook/StaticText" Name="orxonox/Resolution" >
+            <Window Type="MenuWidgets/StaticText" Name="orxonox/Resolution" >
                 <Property Name="Text" Value="Resolution" />
                 <Property Name="InheritsAlpha" Value="False" />
@@ -23 +23 @@
                 <Property Name="VertFormatting" Value="TopAligned" />
                 <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.15,0},{0.475,0},{0.92,0}}" />
-                <Window Type="TaharezLook/Listbox" Name="orxonox/ResolutionListbox" >
+                <Window Type="MenuWidgets/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.95,0}}" />
@@ -29 +29 @@
                 </Window>
             </Window>
-            <Window Type="TaharezLook/StaticText" Name="orxonox/Brightness" >
+            <Window Type="MenuWidgets/StaticText" Name="orxonox/Brightness" >
                 <Property Name="Text" Value="Brightness" />
                 <Property Name="InheritsAlpha" Value="False" />
@@ -36 +36 @@
                 <Property Name="VertFormatting" Value="TopAligned" />
                 <Property Name="UnifiedAreaRect" Value="{{0.525,0},{0.15,0},{0.95,0},{0.35,0}}" />
-                <Window Type="TaharezLook/HorizontalScrollbar" Name="orxonox/BrightnessScrollbar" >
+                <Window Type="MenuWidgets/HorizontalScrollbar" Name="orxonox/BrightnessScrollbar" >
                     <Property Name="Disabled" Value="true" />
                     <Property Name="PageSize" Value="0" />
@@ -50 +50 @@
                 </Window>
             </Window>
-            <Window Type="TaharezLook/Checkbox" Name="orxonox/FullscreenCheckbox" >
+            <Window Type="MenuWidgets/Checkbox" Name="orxonox/FullscreenCheckbox" >
                 <Property Name="Text" Value="Fullscreen" />
                 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -56 +56 @@
                 <Event Name="CheckStateChanged" Function="GraphicsMenu.GraphicsFullscreenCheckbox_clicked"/>
             </Window>
-            <Window Type="TaharezLook/StaticText" Name="orxonox/GraphicsInfo" >
+            <Window Type="MenuWidgets/StaticText" Name="orxonox/GraphicsInfo" >
                 <Property Name="Text" >
 Changes in graphics
@@ -69 +69 @@
             </Window>
         </Window>
-        <Window Type="TaharezLook/Button" Name="orxonox/GraphicsBackButton" >
+        <Window Type="MenuWidgets/Button" Name="orxonox/GraphicsBackButton" >
             <Property Name="Text" Value="Back" />
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />