Index: code/trunk/data/gui/layouts/GUILayout.xsd
===================================================================
--- code/trunk/data/gui/layouts/GUILayout.xsd	(revision 9016)
+++ code/trunk/data/gui/layouts/GUILayout.xsd	(revision 9348)
@@ -2,61 +2,61 @@
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
 
-	<xsd:element name="GUILayout" type="GUILayoutType"/>
-	
-	<xsd:complexType name="GUILayoutType">
-		<xsd:sequence>
-			<xsd:element name="Window" type="WindowType" />
-		</xsd:sequence>
-		<xsd:attribute name="Parent" type="xsd:string" use="optional" default=""/>
-	</xsd:complexType>
-	
-	<xsd:complexType name="WindowType">
-		<xsd:sequence>
-			<xsd:element name="LayoutImport" type="LayoutImportType"  minOccurs="0" maxOccurs="unbounded" />
-			<xsd:element name="Property" type="PropertyType"  minOccurs="0" maxOccurs="unbounded" />
-			<xsd:element name="Event" type="EventType"  minOccurs="0" maxOccurs="unbounded" />
-			<xsd:choice minOccurs="0" maxOccurs="unbounded">
-				<xsd:element name="Window" type="WindowType" />
-				<xsd:element name="AutoWindow" type="AutoWindowType" />
-			</xsd:choice>
-			<xsd:element name="Property" type="PropertyType"  minOccurs="0" maxOccurs="unbounded" />
-		</xsd:sequence>
-		<xsd:attribute name="Type" type="xsd:string" use="required"/>
-		<xsd:attribute name="Name" type="xsd:string" use="optional" default="" />
-	</xsd:complexType>
+    <xsd:element name="GUILayout" type="GUILayoutType"/>
 
-	<xsd:complexType name="AutoWindowType">
-		<xsd:sequence>
-			<xsd:element name="LayoutImport" type="LayoutImportType"  minOccurs="0" maxOccurs="unbounded" />
-			<xsd:element name="Property" type="PropertyType"  minOccurs="0" maxOccurs="unbounded" />
-			<xsd:element name="Event" type="EventType"  minOccurs="0" maxOccurs="unbounded" />
-			<xsd:choice minOccurs="0" maxOccurs="unbounded">
-				<xsd:element name="Window" type="WindowType" />
-				<xsd:element name="AutoWindow" type="AutoWindowType" />
-			</xsd:choice>
-			<xsd:element name="Property" type="PropertyType"  minOccurs="0" maxOccurs="unbounded" />
-		</xsd:sequence>
-		<xsd:attribute name="NameSuffix" type="xsd:string" use="required"/>
-	</xsd:complexType>
+    <xsd:complexType name="GUILayoutType">
+        <xsd:sequence>
+            <xsd:element name="Window" type="WindowType" />
+        </xsd:sequence>
+        <xsd:attribute name="Parent" type="xsd:string" use="optional" default=""/>
+    </xsd:complexType>
 
-	<xsd:complexType name="PropertyType">
-		<xsd:simpleContent>
-			<xsd:extension base="xsd:string">
-				<xsd:attribute name="Name" type="xsd:string" use="required"/>
-				<xsd:attribute name="Value" type="xsd:string" use="optional"/>
-			</xsd:extension>
-		</xsd:simpleContent> 
-	</xsd:complexType>
+    <xsd:complexType name="WindowType">
+        <xsd:sequence>
+            <xsd:element name="LayoutImport" type="LayoutImportType"  minOccurs="0" maxOccurs="unbounded" />
+            <xsd:element name="Property" type="PropertyType"  minOccurs="0" maxOccurs="unbounded" />
+            <xsd:element name="Event" type="EventType"  minOccurs="0" maxOccurs="unbounded" />
+            <xsd:choice minOccurs="0" maxOccurs="unbounded">
+                <xsd:element name="Window" type="WindowType" />
+                <xsd:element name="AutoWindow" type="AutoWindowType" />
+            </xsd:choice>
+            <xsd:element name="Property" type="PropertyType"  minOccurs="0" maxOccurs="unbounded" />
+        </xsd:sequence>
+        <xsd:attribute name="Type" type="xsd:string" use="required"/>
+        <xsd:attribute name="Name" type="xsd:string" use="optional" default="" />
+    </xsd:complexType>
 
-	<xsd:complexType name="LayoutImportType">
-		<xsd:attribute name="Filename" type="xsd:string" use="required"/>
-		<xsd:attribute name="Prefix" type="xsd:string" use="optional" default="" />
-		<xsd:attribute name="ResourceGroup" type="xsd:string" use="optional"  default="" />
-	</xsd:complexType>
+    <xsd:complexType name="AutoWindowType">
+        <xsd:sequence>
+            <xsd:element name="LayoutImport" type="LayoutImportType"  minOccurs="0" maxOccurs="unbounded" />
+            <xsd:element name="Property" type="PropertyType"  minOccurs="0" maxOccurs="unbounded" />
+            <xsd:element name="Event" type="EventType"  minOccurs="0" maxOccurs="unbounded" />
+            <xsd:choice minOccurs="0" maxOccurs="unbounded">
+                <xsd:element name="Window" type="WindowType" />
+                <xsd:element name="AutoWindow" type="AutoWindowType" />
+            </xsd:choice>
+            <xsd:element name="Property" type="PropertyType"  minOccurs="0" maxOccurs="unbounded" />
+        </xsd:sequence>
+        <xsd:attribute name="NameSuffix" type="xsd:string" use="required"/>
+    </xsd:complexType>
 
-	<xsd:complexType name="EventType">
-		<xsd:attribute name="Name" type="xsd:string" use="required"/>
-		<xsd:attribute name="Function" type="xsd:string" use="required"/>
-	</xsd:complexType>
+    <xsd:complexType name="PropertyType">
+        <xsd:simpleContent>
+            <xsd:extension base="xsd:string">
+                <xsd:attribute name="Name" type="xsd:string" use="required"/>
+                <xsd:attribute name="Value" type="xsd:string" use="optional"/>
+            </xsd:extension>
+        </xsd:simpleContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="LayoutImportType">
+        <xsd:attribute name="Filename" type="xsd:string" use="required"/>
+        <xsd:attribute name="Prefix" type="xsd:string" use="optional" default="" />
+        <xsd:attribute name="ResourceGroup" type="xsd:string" use="optional"  default="" />
+    </xsd:complexType>
+
+    <xsd:complexType name="EventType">
+        <xsd:attribute name="Name" type="xsd:string" use="required"/>
+        <xsd:attribute name="Function" type="xsd:string" use="required"/>
+    </xsd:complexType>
 
 </xsd:schema>
Index: code/trunk/data/gui/layouts/InGamePickupHUD.layout
===================================================================
--- code/trunk/data/gui/layouts/InGamePickupHUD.layout	(revision 9016)
+++ code/trunk/data/gui/layouts/InGamePickupHUD.layout	(revision 9348)
@@ -2,52 +2,48 @@
 
 <GUILayout>
-	<Window Type="DefaultWindow" Name="orxonox/InGamePickupHUD_RootWindow" >
-		<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}}" />
-		<Window Type="TaharezLook/StaticImage" Name="orxonox/InGamePickupHUD_Overview" >
-			<Property Name="Font" Value="BlueHighway-12" />
-			<Property Name="Text" Value="Pickup List" />
-			<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-			<Property Name="UnifiedAreaRect" Value="{{0,5},{0.15,0},{0.2,0},{0.45,0}}" />
-			<Property Name="Alpha" Value="0.3" />
-			<!--Event Name="Clicked" Function="InGameMenu.button_return_clicked"/-->
-			<Window Type="TaharezLook/StaticText" Name="orxonox/InGamePickupHUD_PickupTitle" >
-				<Property Name="Alpha" Value="0.8"/>
-				<Property Name="Text" Value="Pickup List" />
-				<Property Name="Font" Value="BlueHighway-10" />
-				<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-				<Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,-20},{0,20}}" />
-			</Window>
-			<Window Type="TaharezLook/Button" Name="orxonox/InGamePickupHUD_closeButton" >
-			        <Property Name="Alpha" Value="0.8" />
-				<Property Name="Font" Value="BlueHighway-12" />
-				<Property Name="Text" Value="X" />
-				<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-				<Property Name="UnifiedAreaRect" Value="{{1,-20},{0,0},{1,0},{0,20}}" />
-				<!-- alle Grössen / anordnungen angepasst - da überschneidungen von absoluten
-				und relativen Positionsangaben (problematisch bei kleinen auflösungen) -->
-				<Event Name="Clicked" Function="InGamePickupHUD.close_button_clicked"/>
-			</Window>
-			<Window Type="TaharezLook/Listbox" Name="orxonox/InGamePickupHUD_PickupListBox">
-			        <Property Name="Alpha" Value="0.8" />
-				<Property Name="Font" Value="BlueHighway-12" />
-				<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-				<Property Name="UnifiedAreaRect" Value="{{0,5},{0,25},{1,-5},{1,-5}}" />	
-				<!--
-				<Window Type="TaharezLook/ListboxItem" Name="orxonox/InGamePickupHUD_TestPickupOne">
-					<Property Name="Alpha" Value="0.8" />
-					<Property Name="Font" Value="BlueHighway-12" />
-					<Property Name="Text" Value="First Pickup" />
-					<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-					<Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{0,30},{1,0}}" />	
-				</Window>
-				-->
-			</Window>
-			
-		</Window>
-		
-	
-	</Window>
-	
+    <Window Type="DefaultWindow" Name="orxonox/InGamePickupHUD_RootWindow" >
+        <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}}" />
+        <Window Type="TaharezLook/StaticImage" Name="orxonox/InGamePickupHUD_Overview" >
+            <Property Name="Font" Value="BlueHighway-12" />
+            <Property Name="Text" Value="Pickup List" />
+            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+            <Property Name="UnifiedAreaRect" Value="{{0,5},{0.15,0},{0.2,0},{0.45,0}}" />
+            <Property Name="Alpha" Value="0.3" />
+            <!--Event Name="Clicked" Function="InGameMenu.button_return_clicked"/-->
+            <Window Type="TaharezLook/StaticText" Name="orxonox/InGamePickupHUD_PickupTitle" >
+                <Property Name="Alpha" Value="0.8"/>
+                <Property Name="Text" Value="Pickup List" />
+                <Property Name="Font" Value="BlueHighway-10" />
+                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+                <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,-20},{0,20}}" />
+            </Window>
+            <Window Type="TaharezLook/Button" Name="orxonox/InGamePickupHUD_closeButton" >
+                <Property Name="Alpha" Value="0.8" />
+                <Property Name="Font" Value="BlueHighway-12" />
+                <Property Name="Text" Value="X" />
+                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+                <Property Name="UnifiedAreaRect" Value="{{1,-20},{0,0},{1,0},{0,20}}" />
+                <!-- alle Grössen / anordnungen angepasst - da überschneidungen von absoluten
+                und relativen Positionsangaben (problematisch bei kleinen auflösungen) -->
+                <Event Name="Clicked" Function="InGamePickupHUD.close_button_clicked"/>
+            </Window>
+            <Window Type="TaharezLook/Listbox" Name="orxonox/InGamePickupHUD_PickupListBox">
+                <Property Name="Alpha" Value="0.8" />
+                <Property Name="Font" Value="BlueHighway-12" />
+                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+                <Property Name="UnifiedAreaRect" Value="{{0,5},{0,25},{1,-5},{1,-5}}" />
+                <!--
+                <Window Type="TaharezLook/ListboxItem" Name="orxonox/InGamePickupHUD_TestPickupOne">
+                    <Property Name="Alpha" Value="0.8" />
+                    <Property Name="Font" Value="BlueHighway-12" />
+                    <Property Name="Text" Value="First Pickup" />
+                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+                    <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{0,30},{1,0}}" />
+                </Window>
+                -->
+            </Window>
+        </Window>
+    </Window>
 </GUILayout>
Index: code/trunk/data/gui/layouts/ShipSelectionMenu.layout
===================================================================
--- code/trunk/data/gui/layouts/ShipSelectionMenu.layout	(revision 9348)
+++ code/trunk/data/gui/layouts/ShipSelectionMenu.layout	(revision 9348)
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<GUILayout >
+
+    <Window Type="MenuWidgets/StaticImage" Name="orxonox/ShipSelectionBackground" >
+        <Property Name="FrameEnabled" Value="False" />
+        <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/ShipSelectionWindow" >
+            <Property Name="Text" Value="ShipSelection" />
+            <Property Name="Alpha" Value="0.8" />
+            <Property Name="InheritsAlpha" Value="False" />
+            <Property Name="HorzFormatting" Value="HorzCentred" />
+            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+            <Property Name="VertFormatting" Value="TopAligned" />
+            <Property Name="UnifiedAreaRect" Value="{{0.2,0},{0.15,0},{0.8,0},{0.7,0}}" />
+            <Window Type="MenuWidgets/TabControl" Name="orxonox/ShipSelectionTabControl" >
+                <Property Name="TabHeight" Value="{0,26.4388}" />
+                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+                <Property Name="TabPanePosition" Value="Top" />
+                <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.1,0},{0.95,0},{0.925,0}}" />
+
+            </Window>
+
+            <!-- TODO: Ship Description and Image
+            <Window Type="MenuWidgets/StaticImage" Name="orxonox/ShipSelectionShipImage" >
+                <Property Name="AlwaysOnTop" Value="True" />
+                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+                <Property Name="UnifiedAreaRect" Value="{{0.55,0},{0.25,0},{0.9,0},{0.675,0}}" />
+            </Window>
+            <Window Type="MenuWidgets/StaticText" Name="orxonox/ShipSelectionLevelDescription" >
+                <Property Name="AlwaysOnTop" Value="True" />
+                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+                <Property Name="VertScrollbar" Value="True" />
+                <Property Name="HorzScrollbar" Value="True" />
+                <Property Name="UnifiedAreaRect" Value="{{0.1,0},{0.725,0},{0.9,0},{0.875,0}}" />
+            </Window>-->
+
+        </Window>
+        <Window Type="MenuWidgets/Button" Name="orxonox/ShipSelectionStartButton" >
+            <Property Name="Text" Value="Start" />
+            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+            <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.725,0},{0.4,0},{0.775,0}}" />
+            <Event Name="Clicked" Function="ShipSelectionMenu.ShipSelectionStartButton_clicked"/>
+        </Window>
+        <!-- TODO: set ship properties
+        <Window Type="MenuWidgets/Button" Name="orxonox/ShipSelectionConfigButton" >
+            <Property Name="Text" Value="Configure" />
+            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+            <Property Name="UnifiedAreaRect" Value="{{0.425,0},{0.725,0},{0.575,0},{0.775,0}}" />
+            <Property Name="Disabled" Value="True" />
+            <Event Name="Clicked" Function="ShipSelectionMenu.ShipSelectionConfigButton_clicked"/>
+        </Window> -->
+        <Window Type="MenuWidgets/Button" Name="orxonox/ShipSelectionBackButton" >
+            <Property Name="Text" Value="Back" />
+            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+            <Property Name="UnifiedAreaRect" Value="{{0.6,0},{0.725,0},{0.75,0},{0.775,0}}" />
+            <Event Name="Clicked" Function="ShipSelectionMenu.ShipSelectionBackButton_clicked"/>
+        </Window>
+    </Window>
+</GUILayout>
