Changeset 6595 for code/branches/gamestates2/data/gui/layouts/PickupInventory.layout

Timestamp:

Mar 22, 2010, 2:47:10 PM (15 years ago)

Author:

rgrieder

Message:

Merged remaining revisions from gamestate to gamestates2.

Location:

code/branches/gamestates2

Files:

• . (modified) (1 prop)
• data/gui/layouts/PickupInventory.layout (modified) (3 diffs)

code/branches/gamestates2/data/gui/layouts/PickupInventory.layout

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <GUILayout>
-    <Window Type="TaharezLook/FrameWindow" Name="orxonox/Inventory">
+    <Window Type="MenuWidgets/FrameWindow" Name="orxonox/Inventory">
         <Property Name="UnifiedMinSize" Value="{{0.0,385},{0.0,200}}" />
         <Property Name="UnifiedMaxSize" Value="{{0.0,385},{0.0,200}}" />
@@ -9 +9 @@
         <Property Name="CloseButtonEnabled" Value="False" />
 
-        <Window Type="TaharezLook/TabControl" Name="orxonox/Inventory/TabControl" >
+        <Window Type="MenuWidgets/TabControl" Name="orxonox/Inventory/TabControl" >
             <Property Name="Tooltip" Value="Inventory" />
             <Property Name="TabHeight" Value="{0,-1}" />
@@ -16 +16 @@
             <Property Name="UnifiedAreaRect" Value="{{0,10},{0,30},{1,-10},{1,-10}}" />
 
-            <Window Type="TaharezLook/ScrollablePane" Name="orxonox/Inventory/TabControl/TabEquipment">
+            <Window Type="MenuWidgets/ScrollablePane" Name="orxonox/Inventory/TabControl/TabEquipment">
                 <Property Name="Text" Value="Equipment" />
                 <Property Name="UnifiedPosition" Value="{{0.0,3},{0.0,3}}"/>
                 <Property Name="UnifiedSize" Value="{{1.0,-6},{1.0,-6}}"/>
             </Window>
-            <Window Type="TaharezLook/ScrollablePane" Name="orxonox/Inventory/TabControl/TabUsable">
+            <Window Type="MenuWidgets/ScrollablePane" Name="orxonox/Inventory/TabControl/TabUsable">
                 <Property Name="Text" Value="Usable" />
                 <Property Name="UnifiedPosition" Value="{{0.0,3},{0.0,3}}"/>