Changeset 6595

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/configs/Falagard.xsd (deleted)
• data/gui/configs/Font.xsd (deleted)
• data/gui/configs/GUILayout.xsd (deleted)
• data/gui/configs/GUIScheme.xsd (deleted)
• data/gui/configs/Imageset.xsd (deleted)
• data/gui/layouts/AudioMenu.layout (modified) (15 diffs)
• data/gui/layouts/CompositorDemo.layout (deleted)
• data/gui/layouts/Console.wnd (deleted)
• data/gui/layouts/ControlsMenu.layout (modified) (5 diffs)
• data/gui/layouts/CreditsMenu.layout (modified) (4 diffs)
• data/gui/layouts/CrowdDemo.layout (deleted)
• data/gui/layouts/DecisionPopup.layout (modified) (3 diffs)
• data/gui/layouts/Demo7Windows.layout (deleted)
• data/gui/layouts/Demo8.layout (deleted)
• data/gui/layouts/DragDropDemo.layout (deleted)
• data/gui/layouts/FontDemo.layout (deleted)
• data/gui/layouts/GameplayMenu.layout (modified) (9 diffs)
• data/gui/layouts/GraphicsMenu.layout (modified) (9 diffs)
• data/gui/layouts/InGameMenu.layout (modified) (4 diffs)
• data/gui/layouts/InGameTest.layout (modified) (1 diff)
• data/gui/layouts/InfoPopup.layout (modified) (2 diffs)
• data/gui/layouts/InstancingDemo.layout (deleted)
• data/gui/layouts/KeyBindMenu.layout (modified) (4 diffs)
• data/gui/layouts/MainMenu.layout (modified) (6 diffs)
• data/gui/layouts/MainMenuBackground.layout (modified) (1 diff)
• data/gui/layouts/MouseControlsMenu.layout (modified) (10 diffs)
• data/gui/layouts/MultiplayerMenu.layout (modified) (7 diffs)
• data/gui/layouts/MultiplayerOptionsMenu.layout (modified) (3 diffs)
• data/gui/layouts/PickupInventory.layout (modified) (3 diffs)
• data/gui/layouts/QuestGUI.layout (modified) (3 diffs)
• data/gui/layouts/SettingsMenu.layout (modified) (9 diffs)
• data/gui/layouts/SingleplayerMenu.layout (modified) (4 diffs)
• data/gui/layouts/TabControlDemo.layout (deleted)
• data/gui/layouts/TabPage.layout (deleted)
• data/gui/layouts/TabPage1.layout (deleted)
• data/gui/layouts/TabPage2.layout (deleted)
• data/gui/layouts/TextDemo.layout (deleted)
• data/gui/layouts/TreeDemoTaharez.layout (deleted)
• data/gui/layouts/VanillaConsole.layout (deleted)
• data/gui/layouts/VanillaWindows.layout (deleted)
• data/gui/layouts/cegui8.layout (deleted)
• data/gui/layouts/facial.layout (deleted)
• data/gui/layouts/ogregui.layout (deleted)
• data/gui/layouts/shadows.layout (deleted)
• data/gui/schemes/Demo8.scheme (deleted)
• data/gui/schemes/Looks.txt (copied) (copied from code/branches/gamestate/data/gui/schemes/Looks.txt)
• data/gui/schemes/OrxonoxGUIScheme.scheme (modified) (1 diff)
• data/gui/schemes/SleekSpaceHUDWidgets.scheme (copied) (copied from code/branches/gamestate/data/gui/schemes/SleekSpaceHUDWidgets.scheme)
• data/gui/schemes/SleekSpaceLook.scheme (copied) (copied from code/branches/gamestate/data/gui/schemes/SleekSpaceLook.scheme)
• data/gui/schemes/SleekSpaceMenuWidgets.scheme (copied) (copied from code/branches/gamestate/data/gui/schemes/SleekSpaceMenuWidgets.scheme)
• data/gui/schemes/TaharezGreenHUDWidgets.scheme (copied) (copied from code/branches/gamestate/data/gui/schemes/TaharezGreenHUDWidgets.scheme)
• data/gui/schemes/TaharezGreenLook.scheme (copied) (copied from code/branches/gamestate/data/gui/schemes/TaharezGreenLook.scheme)
• data/gui/schemes/TaharezGreenMenuWidgets.scheme (copied) (copied from code/branches/gamestate/data/gui/schemes/TaharezGreenMenuWidgets.scheme)
• data/gui/schemes/TaharezHUDWidgets.scheme (copied) (copied from code/branches/gamestate/data/gui/schemes/TaharezHUDWidgets.scheme)
• data/gui/schemes/TaharezLook.scheme (modified) (1 diff)
• data/gui/schemes/TaharezLookSkin.scheme (deleted)
• data/gui/schemes/TaharezLookWidgetAliases.scheme (deleted)
• data/gui/schemes/TaharezLookWidgets.scheme (deleted)
• data/gui/schemes/TaharezMenuWidgets.scheme (copied) (copied from code/branches/gamestate/data/gui/schemes/TaharezMenuWidgets.scheme)
• data/gui/schemes/VanillaHUDWidgets.scheme (copied) (copied from code/branches/gamestate/data/gui/schemes/VanillaHUDWidgets.scheme)
• data/gui/schemes/VanillaLook.scheme (copied) (copied from code/branches/gamestate/data/gui/schemes/VanillaLook.scheme)
• data/gui/schemes/VanillaMenuWidgets.scheme (copied) (copied from code/branches/gamestate/data/gui/schemes/VanillaMenuWidgets.scheme)
• data/gui/schemes/VanillaSkin.scheme (deleted)
• data/gui/schemes/WindowsHUDWidgets.scheme (copied) (copied from code/branches/gamestate/data/gui/schemes/WindowsHUDWidgets.scheme)
• data/gui/schemes/WindowsLook.scheme (modified) (1 diff)
• data/gui/schemes/WindowsLookWidgets.scheme (deleted)
• data/gui/schemes/WindowsMenuWidgets.scheme (copied) (copied from code/branches/gamestate/data/gui/schemes/WindowsMenuWidgets.scheme)
• data/gui/scripts/AudioMenu.lua (modified) (3 diffs)
• data/gui/scripts/BasicGUI.lua (modified) (3 diffs)
• data/gui/scripts/ControlsMenu.lua (modified) (2 diffs)
• data/gui/scripts/CreditsMenu.lua (modified) (2 diffs)
• data/gui/scripts/DecisionPopup.lua (modified) (1 diff)
• data/gui/scripts/GameplayMenu.lua (modified) (3 diffs)
• data/gui/scripts/GraphicsMenu.lua (modified) (3 diffs)
• data/gui/scripts/InGameMenu.lua (modified) (2 diffs)
• data/gui/scripts/InfoPopup.lua (modified) (4 diffs)
• data/gui/scripts/InitialiseGUI.lua (modified) (4 diffs)
• data/gui/scripts/KeyBindMenu.lua (modified) (7 diffs)
• data/gui/scripts/MainMenu.lua (modified) (2 diffs)
• data/gui/scripts/MouseControlsMenu.lua (modified) (2 diffs)
• data/gui/scripts/MultiplayerMenu.lua (modified) (3 diffs)
• data/gui/scripts/MultiplayerOptionsMenu.lua (modified) (2 diffs)
• data/gui/scripts/PickupInventory.lua (modified) (2 diffs)
• data/gui/scripts/QuestGUI.lua (modified) (2 diffs)
• data/gui/scripts/SettingsMenu.lua (modified) (2 diffs)
• data/gui/scripts/SingleplayerMenu.lua (modified) (3 diffs)
• src/libraries/core/Core.cc (modified) (1 diff)
• src/libraries/core/Core.h (modified) (1 diff)
• src/libraries/core/GUIManager.cc (modified) (6 diffs)
• src/libraries/core/GUIManager.h (modified) (7 diffs)
• src/libraries/core/Game.h (modified) (1 diff)
• src/libraries/core/IOConsole.cc (modified) (1 diff)
• src/libraries/core/IOConsole.h (modified) (1 diff)
• src/libraries/core/LuaState.h (modified) (1 diff)
• src/libraries/core/Template.cc (modified) (1 diff)
• src/libraries/core/input/InputManager.cc (modified) (5 diffs)
• src/libraries/core/input/InputManager.h (modified) (3 diffs)
• src/libraries/core/input/InputState.cc (modified) (1 diff)
• src/libraries/core/input/InputState.h (modified) (7 diffs)
• src/libraries/network/TrafficControl.h (modified) (1 diff)
• src/libraries/util/Serialise.h (modified) (1 diff)
• src/libraries/util/TriBool.h (copied) (copied from code/branches/gamestate/src/libraries/util/TriBool.h)
• src/modules/questsystem/QuestGUI.cc (modified) (3 diffs)
• src/modules/questsystem/QuestGUINode.cc (modified) (6 diffs)
• src/orxonox/gamestates/GSLevel.cc (modified) (1 diff)
• src/orxonox/gamestates/GSMainMenu.cc (modified) (3 diffs)
• src/orxonox/overlays/CMakeLists.txt (modified) (1 diff)
• src/orxonox/overlays/GUISheet.cc (copied) (copied from code/branches/gamestate/src/orxonox/overlays/GUISheet.cc)
• src/orxonox/overlays/GUISheet.h (copied) (copied from code/branches/gamestate/src/orxonox/overlays/GUISheet.h)

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

@@ -2 +2 @@
 
 <GUILayout >
-    <Window Type="TaharezLook/StaticImage" Name="orxonox/AudioBackground" >
+    <Window Type="MenuWidgets/StaticImage" Name="orxonox/AudioBackground" >
         <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/AudioWindow" >
+        <Window Type="MenuWidgets/StaticText" Name="orxonox/AudioWindow" >
             <Property Name="Text" Value="Audio" />
             <Property Name="Alpha" Value="0.8" />
@@ -16 +16 @@
             <Property Name="VertFormatting" Value="TopAligned" />
             <Property Name="UnifiedAreaRect" Value="{{0.2,0},{0.2875,0},{0.8,0},{0.6375,0}}" />
-            <Window Type="TaharezLook/StaticText" Name="orxonox/MasterVolume" >
+            <Window Type="MenuWidgets/StaticText" Name="orxonox/MasterVolume" >
                 <Property Name="Text" Value="Master volume               " />
                 <Property Name="InheritsAlpha" Value="False" />
@@ -23 +23 @@
                 <Property Name="VertFormatting" Value="TopAligned" />
                 <Property Name="UnifiedAreaRect" Value="{{0.041666,0},{0.15,0},{0.5625,0},{0.3525,0}}" />
-                <Window Type="TaharezLook/HorizontalScrollbar" Name="orxonox/MasterScrollbar" >
+                <Window Type="MenuWidgets/HorizontalScrollbar" Name="orxonox/MasterScrollbar" >
                     <Property Name="PageSize" Value="0" />
                     <Property Name="StepSize" Value="1" />
@@ -36 +36 @@
                     <Event Name="ScrollPosChanged" Function="AudioMenu.AudioMasterScrollbar_changed" />
                 </Window>
-                <Window Type="TaharezLook/Checkbox" Name="orxonox/MasterCheckbox" >
+                <Window Type="MenuWidgets/Checkbox" Name="orxonox/MasterCheckbox" >
                     <Property Name="Text" Value="Mute" />
                     <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -43 +43 @@
                 </Window>
             </Window>
-            <Window Type="TaharezLook/StaticText" Name="orxonox/MusicVolume" >
+            <Window Type="MenuWidgets/StaticText" Name="orxonox/MusicVolume" >
                 <Property Name="Text" Value="Music volume               " />
                 <Property Name="InheritsAlpha" Value="False" />
@@ -50 +50 @@
                 <Property Name="VertFormatting" Value="TopAligned" />
                 <Property Name="UnifiedAreaRect" Value="{{0.041666,0},{0.4335,0},{0.5625,0},{0.636,0}}" />
-                <Window Type="TaharezLook/HorizontalScrollbar" Name="orxonox/MusicScrollbar" >
+                <Window Type="MenuWidgets/HorizontalScrollbar" Name="orxonox/MusicScrollbar" >
                     <Property Name="PageSize" Value="0" />
                     <Property Name="StepSize" Value="1" />
@@ -63 +63 @@
                     <Event Name="ScrollPosChanged" Function="AudioMenu.AudioMusicScrollbar_changed" />
                 </Window>
-                <Window Type="TaharezLook/Checkbox" Name="orxonox/MusicCheckbox" >
+                <Window Type="MenuWidgets/Checkbox" Name="orxonox/MusicCheckbox" >
                     <Property Name="Text" Value="Mute" />
                     <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -70 +70 @@
                 </Window>
             </Window>
-            <Window Type="TaharezLook/StaticText" Name="orxonox/EffectsVolume" >
+            <Window Type="MenuWidgets/StaticText" Name="orxonox/EffectsVolume" >
                 <Property Name="Text" Value="Effects volume               " />
                 <Property Name="InheritsAlpha" Value="False" />
@@ -77 +77 @@
                 <Property Name="VertFormatting" Value="TopAligned" />
                 <Property Name="UnifiedAreaRect" Value="{{0.041666,0},{0.717,0},{0.5625,0},{0.9195,0}}" />
-                <Window Type="TaharezLook/HorizontalScrollbar" Name="orxonox/EffectsScrollbar" >
+                <Window Type="MenuWidgets/HorizontalScrollbar" Name="orxonox/EffectsScrollbar" >
                     <Property Name="PageSize" Value="0" />
                     <Property Name="StepSize" Value="1" />
@@ -90 +90 @@
                     <Event Name="ScrollPosChanged" Function="AudioMenu.AudioEffectsScrollbar_changed" />
                 </Window>
-                <Window Type="TaharezLook/Checkbox" Name="orxonox/EffectsCheckbox" >
+                <Window Type="MenuWidgets/Checkbox" Name="orxonox/EffectsCheckbox" >
                     <Property Name="Text" Value="Mute" />
                     <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -97 +97 @@
                 </Window>
             </Window>
-            <Window Type="TaharezLook/StaticText" Name="orxonox/AudioTheme" >
+            <Window Type="MenuWidgets/StaticText" Name="orxonox/AudioTheme" >
                 <Property Name="Text" Value="Theme" />
                 <Property Name="InheritsAlpha" Value="False" />
@@ -104 +104 @@
                 <Property Name="VertFormatting" Value="TopAligned" />
                 <Property Name="UnifiedAreaRect" Value="{{0.604166,0},{0.15,0},{0.958333,0},{0.636,0}}" />
-                <Window Type="TaharezLook/Listbox" Name="orxonox/AudioThemeListbox" >
+                <Window Type="MenuWidgets/Listbox" Name="orxonox/AudioThemeListbox" >
                     <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
                     <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.225,0},{0.95,0},{0.92,0}}" />
@@ -110 +110 @@
                 </Window>
             </Window>
-            <Window Type="TaharezLook/StaticText" Name="orxonox/AudioInfo" >
+            <Window Type="MenuWidgets/StaticText" Name="orxonox/AudioInfo" >
                 <Property Name="Text" >Theme changes might take
 up to a minute.</Property>
@@ -121 +121 @@
             </Window>
         </Window>
-        <Window Type="TaharezLook/Button" Name="orxonox/AudioBackButton" >
+        <Window Type="MenuWidgets/Button" Name="orxonox/AudioBackButton" >
             <Property Name="Text" Value="Back" />
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />

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

@@ -2 +2 @@
 
 <GUILayout >
-    <Window Type="TaharezLook/StaticImage" Name="orxonox/ControlsBackground" >
+    <Window Type="MenuWidgets/StaticImage" Name="orxonox/ControlsBackground" >
         <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/ControlsWindow" >
+        <Window Type="MenuWidgets/StaticText" Name="orxonox/ControlsWindow" >
             <Property Name="Text" Value="Controls" />
             <Property Name="Alpha" Value="0.8" />
@@ -16 +16 @@
             <Property Name="VertFormatting" Value="TopAligned" />
             <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.3625,0},{0.75,0},{0.6375,0}}" />
-            <Window Type="TaharezLook/Button" Name="orxonox/MouseControlsButton" >
+            <Window Type="MenuWidgets/Button" Name="orxonox/MouseControlsButton" >
                 <Property Name="Text" Value="Mouse controls" />
                 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -22 +22 @@
                 <Event Name="Clicked" Function="ControlsMenu.ControlsMouseControlsButton_clicked"/>
             </Window>
-            <Window Type="TaharezLook/Button" Name="orxonox/KeybindingsButton" >
+            <Window Type="MenuWidgets/Button" Name="orxonox/KeybindingsButton" >
                 <Property Name="Text" Value="Keybindings" />
                 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -29 +29 @@
             </Window>
         </Window>
-        <Window Type="TaharezLook/Button" Name="orxonox/ControlsBackButton" >
+        <Window Type="MenuWidgets/Button" Name="orxonox/ControlsBackButton" >
             <Property Name="Text" Value="Back" />
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />

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

@@ -2 +2 @@
 
 <GUILayout >
-    <Window Type="TaharezLook/StaticImage" Name="orxonox/CreditsBackground" >
+    <Window Type="MenuWidgets/StaticImage" Name="orxonox/CreditsBackground" >
         <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/CreditsWindow" >
+        <Window Type="MenuWidgets/StaticText" Name="orxonox/CreditsWindow" >
             <Property Name="Text" Value="Credits" />
             <Property Name="Alpha" Value="0.8" />
@@ -16 +16 @@
             <Property Name="VertFormatting" Value="TopAligned" />
             <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.3625,0},{0.75,0},{0.6375,0}}" />
-            <Window Type="TaharezLook/StaticText" Name="orxonox/CreditsText" >
+            <Window Type="MenuWidgets/StaticText" Name="orxonox/CreditsText" >
                 <Property Name="Text">Orxonox version 0.0.3
 
@@ -32 +32 @@
             </Window>
         </Window>
-        <Window Type="TaharezLook/Button" Name="orxonox/CreditsBackButton" >
+        <Window Type="MenuWidgets/Button" Name="orxonox/CreditsBackButton" >
             <Property Name="Text" Value="Back" />
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />

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

@@ -6 +6 @@
         <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/DecisionPopup_Background" >
+        <Window Type="MenuWidgets/StaticImage" Name="orxonox/DecisionPopup_Background" >
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
             <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
             <Property Name="Alpha" Value="0.6" />
-            <Window Type="TaharezLook/Button" Name="orxonox/DecisionPopup_button_yes" >
-                <Property Name="Font" Value="BlueHighway-12" />
+            <Window Type="MenuWidgets/Button" Name="orxonox/DecisionPopup_button_yes" >
                 <Property Name="Text" Value="Yes" />
                 <Property Name="Alpha" Value="0.7" />
@@ -19 +18 @@
                 <Event Name="Clicked" Function="DecisionPopup.button_yes"/>
             </Window>
-            <Window Type="TaharezLook/Button" Name="orxonox/DecisionPopup_button_no" >
-                <Property Name="Font" Value="BlueHighway-12" />
+            <Window Type="MenuWidgets/Button" Name="orxonox/DecisionPopup_button_no" >
                 <Property Name="Text" Value="No" />
                 <Property Name="Alpha" Value="0.8" />
@@ -28 +26 @@
                 <Event Name="Clicked" Function="DecisionPopup.button_no"/>
             </Window>
-            <Window Type="TaharezLook/StaticText" Name="orxonox/DecisionPopup_text" >
+            <Window Type="MenuWidgets/StaticText" Name="orxonox/DecisionPopup_text" >
                 <Property Name="Text" Value="Template text" />
                 <Property Name="HorzFormatting" Value="WordWrapCentred" />

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

@@ -2 +2 @@
 
 <GUILayout >
-    <Window Type="TaharezLook/StaticImage" Name="orxonox/GameplayBackground" >
+    <Window Type="MenuWidgets/StaticImage" Name="orxonox/GameplayBackground" >
         <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/GameplayWindow" >
+        <Window Type="MenuWidgets/StaticText" Name="orxonox/GameplayWindow" >
             <Property Name="Text" Value="Gameplay" />
             <Property Name="Alpha" Value="0.8" />
@@ -16 +16 @@
             <Property Name="VertFormatting" Value="TopAligned" />
             <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.3625,0},{0.75,0},{0.6375,0}}" />
-            <Window Type="TaharezLook/StaticText" Name="orxonox/Difficulty" >
+            <Window Type="MenuWidgets/StaticText" Name="orxonox/Difficulty" >
                 <Property Name="Text" Value="Difficulty" />
                 <Property Name="InheritsAlpha" Value="False" />
@@ -23 +23 @@
                 <Property Name="VertFormatting" Value="TopAligned" />
                 <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.2,0},{0.475,0},{0.9,0}}" />
-                <Window Type="TaharezLook/RadioButton" Name="orxonox/DifficultyEasyButton" >
+                <Window Type="MenuWidgets/RadioButton" Name="orxonox/DifficultyEasyButton" >
                     <Property Name="Text" Value="Easy" />
                     <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -29 +29 @@
                     <Event Name="SelectStateChanged" Function="GameplayMenu.GameplayDifficultyEasyButton_clicked"/>
                 </Window>
-                <Window Type="TaharezLook/RadioButton" Name="orxonox/DifficultyNormalButton" >
+                <Window Type="MenuWidgets/RadioButton" Name="orxonox/DifficultyNormalButton" >
                     <Property Name="Text" Value="Normal" />
                     <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -35 +35 @@
                     <Event Name="SelectStateChanged" Function="GameplayMenu.GameplayDifficultyNormalButton_clicked"/>
                 </Window>
-                <Window Type="TaharezLook/RadioButton" Name="orxonox/DifficultyHardButton" >
+                <Window Type="MenuWidgets/RadioButton" Name="orxonox/DifficultyHardButton" >
                     <Property Name="Text" Value="Hard" />
                     <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -42 +42 @@
                 </Window>
             </Window>
-            <Window Type="TaharezLook/StaticText" Name="orxonox/Theme" >
+            <Window Type="MenuWidgets/StaticText" Name="orxonox/Theme" >
                 <Property Name="Text" Value="Theme" />
                 <Property Name="InheritsAlpha" Value="False" />
@@ -49 +49 @@
                 <Property Name="VertFormatting" Value="TopAligned" />
                 <Property Name="UnifiedAreaRect" Value="{{0.525,0},{0.2,0},{0.95,0},{0.9,0}}" />
-                <Window Type="TaharezLook/Combobox" Name="orxonox/ThemeCombobox" >
+                <Window Type="MenuWidgets/Combobox" Name="orxonox/ThemeCombobox" >
                     <Property Name="AlwaysOnTop" Value="True" />
                     <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -59 +59 @@
             </Window>
         </Window>
-        <Window Type="TaharezLook/Button" Name="orxonox/GameplayBackButton" >
+        <Window Type="MenuWidgets/Button" Name="orxonox/GameplayBackButton" >
             <Property Name="Text" Value="Back" />
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />

code/branches/gamestates2/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}}" />

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

@@ -6 +6 @@
         <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
         <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
-        <Window Type="TaharezLook/Button" Name="orxonox/InGameMenu_ReturnButton" >
-            <Property Name="Font" Value="BlueHighway-12" />
+        <Window Type="MenuWidgets/Button" Name="orxonox/InGameMenu_ReturnButton" >
             <Property Name="Text" Value="Return to Game" />
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -14 +13 @@
             <Event Name="Clicked" Function="InGameMenu.button_return_clicked"/>
         </Window>
-        <Window Type="TaharezLook/Button" Name="orxonox/InGameMenu_MainMenuButton" >
-            <Property Name="Font" Value="BlueHighway-12" />
+        <Window Type="MenuWidgets/Button" Name="orxonox/InGameMenu_MainMenuButton" >
             <Property Name="Text" Value="Main Menu" />
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -22 +20 @@
             <Event Name="Clicked" Function="InGameMenu.button_mainmenu_clicked"/>
         </Window>
-        <Window Type="TaharezLook/Button" Name="orxonox/InGameMenu_SettingsButton" >
-            <Property Name="Font" Value="BlueHighway-12" />
+        <Window Type="MenuWidgets/Button" Name="orxonox/InGameMenu_SettingsButton" >
             <Property Name="Text" Value="Settings" />
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -30 +27 @@
             <Event Name="Clicked" Function="InGameMenu.button_settings_clicked"/>
         </Window>
-        <Window Type="TaharezLook/Button" Name="orxonox/InGameMenu_QuitButton" >
-            <Property Name="Font" Value="BlueHighway-12" />
+        <Window Type="MenuWidgets/Button" Name="orxonox/InGameMenu_QuitButton" >
             <Property Name="Text" Value="Quit" />
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />

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

@@ -4 +4 @@
     <Property Name="UnifiedSize" Value="{{1.0,0},{1.0,0}}"/>
 
-        <Window Type="TaharezLook/Button" Name="orxonox/TestButton">
+        <Window Type="MenuWidgets/Button" Name="orxonox/TestButton">
             <Property Name="UnifiedPosition" Value="{{0.11,0},{0.528,0}}"/>
             <Property Name="UnifiedSize" Value="{{0.15,0},{0.05,0}}"/>

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

@@ -6 +6 @@
         <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/InfoPopup_Background" >
+        <Window Type="MenuWidgets/StaticImage" Name="orxonox/InfoPopup_Background" >
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
             <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
             <Property Name="Alpha" Value="0.7" />
-            <Window Type="TaharezLook/Button" Name="orxonox/InfoPopup_close" >
-                <Property Name="Font" Value="BlueHighway-12" />
+            <Window Type="MenuWidgets/Button" Name="orxonox/InfoPopup_close" >
                 <Property Name="Text" Value="Close" />
                 <Property Name="Alpha" Value="0.7" />
@@ -19 +18 @@
                 <Event Name="Clicked" Function="InfoPopup.close"/>
             </Window>
-            <Window Type="TaharezLook/StaticText" Name="orxonox/InfoPopup_text" >
+            <Window Type="MenuWidgets/StaticText" Name="orxonox/InfoPopup_text" >
                 <Property Name="Text" Value="Template text" />
                 <Property Name="TextColours" Value="FF4444FF" />

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

@@ -6 +6 @@
         <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
         <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
-        <Window Type="TaharezLook/StaticText" Name="orxonox/KeyBindWindow" >
+        <Window Type="MenuWidgets/StaticText" Name="orxonox/KeyBindWindow" >
             <Property Name="Text" Value="Keybindings" />
             <Property Name="Alpha" Value="0.8" />
@@ -14 +14 @@
             <Property Name="VertFormatting" Value="TopAligned" />
             <Property Name="UnifiedAreaRect" Value="{{0.15,0},{0.2125,0},{0.85,0},{0.6375,0}}" />
-            <Window Type="TaharezLook/StaticText" Name="orxonox/KeyBindWrapper" >
+            <Window Type="MenuWidgets/StaticText" Name="orxonox/KeyBindWrapper" >
                 <Property Name="TextColours" Value="FF4444FF" />
                 <Property Name="InheritsAlpha" Value="False" />
@@ -21 +21 @@
                 <Property Name="VertFormatting" Value="TopAligned" />
                 <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.15,0},{0.95,0},{0.92,0}}" />
-                <Window Type="TaharezLook/ScrollablePane" Name="orxonox/KeyBindPane" >
+                <Window Type="MenuWidgets/ScrollablePane" Name="orxonox/KeyBindPane" >
                     <Property Name="ContentArea" Value="l:0 t:0 r:0 b:0" />
                     <Property Name="HorzStepSize" Value="0.005" />
@@ -34 +34 @@
             </Window>
         </Window>
-        <Window Type="TaharezLook/Button" Name="orxonox/KeyBindBackButton" >
+        <Window Type="MenuWidgets/Button" Name="orxonox/KeyBindBackButton" >
             <Property Name="Text" Value="Back" />
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />

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

@@ -2 +2 @@
 
 <GUILayout >
-    <Window Type="TaharezLook/StaticImage" Name="orxonox/MainMenuBackground" >
+    <Window Type="MenuWidgets/StaticImage" Name="orxonox/MainMenuBackground" >
         <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.02125,0},{1.02167,0}}" />
+        <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1.0,0},{1.0,0}}" />
         <Property Name="BackgroundEnabled" Value="False" />
-        <Window Type="TaharezLook/Button" Name="orxonox/QuickGameTestButton" >
+        <Window Type="MenuWidgets/Button" Name="orxonox/QuickGameTestButton" >
             <Property Name="Text" Value="Quickstart" />
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -14 +14 @@
             <Event Name="Clicked" Function="MainMenu.QuickGameTestButton_clicked"/>
         </Window>
-        <Window Type="TaharezLook/Button" Name="orxonox/SingleplayerButton" >
+        <Window Type="MenuWidgets/Button" Name="orxonox/SingleplayerButton" >
             <Property Name="Text" Value="Singleplayer" />
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -20 +20 @@
             <Event Name="Clicked" Function="MainMenu.SingleplayerButton_clicked"/>
         </Window>
-        <Window Type="TaharezLook/Button" Name="orxonox/MultiplayerButton" >
+        <Window Type="MenuWidgets/Button" Name="orxonox/MultiplayerButton" >
             <Property Name="Text" Value="Multiplayer" />
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -26 +26 @@
             <Event Name="Clicked" Function="MainMenu.MultiplayerButton_clicked"/>
         </Window>
-        <Window Type="TaharezLook/Button" Name="orxonox/SettingsButton" >
+        <Window Type="MenuWidgets/Button" Name="orxonox/SettingsButton" >
             <Property Name="Text" Value="Settings" />
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -32 +32 @@
             <Event Name="Clicked" Function="MainMenu.SettingsButton_clicked"/>
         </Window>
-        <Window Type="TaharezLook/Button" Name="orxonox/CreditsButton" >
+        <Window Type="MenuWidgets/Button" Name="orxonox/CreditsButton" >
             <Property Name="Text" Value="Credits" />
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -38 +38 @@
             <Event Name="Clicked" Function="MainMenu.CreditsButton_clicked"/>
         </Window>
-        <Window Type="TaharezLook/Button" Name="orxonox/ExitButton" >
+        <Window Type="MenuWidgets/Button" Name="orxonox/ExitButton" >
             <Property Name="Text" Value="Exit" />
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />

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

@@ -1 +1 @@
 <?xml version="1.0" ?>
 <GUILayout>
-    <Window Type="TaharezLook/StaticImage" Name="orxonox/Background">
+    <Window Type="MenuWidgets/StaticImage" Name="orxonox/Background">
     <Property Name="UnifiedSize" Value="{{1.0,0},{1.0,0}}"/>
     <Property Name="Image" Value="set:MainMenuBackground image:Background"/>

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

@@ -2 +2 @@
 
 <GUILayout >
-    <Window Type="TaharezLook/StaticImage" Name="orxonox/MouseControlsBackground" >
+    <Window Type="MenuWidgets/StaticImage" Name="orxonox/MouseControlsBackground" >
         <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/MouseControlsWindow" >
+        <Window Type="MenuWidgets/StaticText" Name="orxonox/MouseControlsWindow" >
             <Property Name="Text" Value="Mouse controls" />
             <Property Name="Alpha" Value="0.8" />
@@ -16 +16 @@
             <Property Name="VertFormatting" Value="TopAligned" />
             <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.3625,0},{0.75,0},{0.6375,0}}" />
-            <Window Type="TaharezLook/StaticText" Name="orxonox/MouseNormalSensitivity" >
+            <Window Type="MenuWidgets/StaticText" Name="orxonox/MouseNormalSensitivity" >
                 <Property Name="Text" Value="Sensitivity (normal mode)                                      " />
                 <Property Name="InheritsAlpha" Value="False" />
@@ -23 +23 @@
                 <Property Name="VertFormatting" Value="TopAligned" />
                 <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.2,0},{0.95,0},{0.45,0}}" />
-                <Window Type="TaharezLook/HorizontalScrollbar" Name="orxonox/MouseNormalScrollbar" >
+                <Window Type="MenuWidgets/HorizontalScrollbar" Name="orxonox/MouseNormalScrollbar" >
                     <Property Name="PageSize" Value="0" />
                     <Property Name="StepSize" Value="1" />
@@ -36 +36 @@
                     <Event Name="ScrollPosChanged" Function="MouseControlsMenu.MouseControlsMouseNormalScrollbar_changed" />
                 </Window>
-                <Window Type="TaharezLook/RadioButton" Name="orxonox/MouseNormalButton" >
+                <Window Type="MenuWidgets/RadioButton" Name="orxonox/MouseNormalButton" >
                     <Property Name="Text" Value="Normal mouse input" />
                     <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -43 +43 @@
                 </Window>
             </Window>
-            <Window Type="TaharezLook/StaticText" Name="orxonox/MouseDeriveSensitivity" >
+            <Window Type="MenuWidgets/StaticText" Name="orxonox/MouseDeriveSensitivity" >
                 <Property Name="Text" Value="Sensitivity (derive mode)                                      " />
                 <Property Name="InheritsAlpha" Value="False" />
@@ -50 +50 @@
                 <Property Name="VertFormatting" Value="TopAligned" />
                 <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.55,0},{0.95,0},{0.8,0}}" />
-                <Window Type="TaharezLook/HorizontalScrollbar" Name="orxonox/MouseDeriveScrollbar" >
+                <Window Type="MenuWidgets/HorizontalScrollbar" Name="orxonox/MouseDeriveScrollbar" >
                     <Property Name="PageSize" Value="0" />
                     <Property Name="StepSize" Value="1" />
@@ -63 +63 @@
                     <Event Name="ScrollPosChanged" Function="MouseControlsMenu.MouseControlsMouseDeriveScrollbar_changed" />
                 </Window>
-                <Window Type="TaharezLook/RadioButton" Name="orxonox/MouseDeriveButton" >
+                <Window Type="MenuWidgets/RadioButton" Name="orxonox/MouseDeriveButton" >
                     <Property Name="Text" Value="Derive mouse input" />
                     <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -70 +70 @@
                 </Window>
             </Window>
-            <Window Type="TaharezLook/Checkbox" Name="orxonox/MouseInvertCheckbox" >
+            <Window Type="MenuWidgets/Checkbox" Name="orxonox/MouseInvertCheckbox" >
                 <Property Name="Text" Value="Invert mouse" />
                 <Property Name="Disabled" Value="true" />
@@ -78 +78 @@
             </Window>
         </Window>
-        <Window Type="TaharezLook/Button" Name="orxonox/MouseControlsBackButton" >
+        <Window Type="MenuWidgets/Button" Name="orxonox/MouseControlsBackButton" >
             <Property Name="Text" Value="Back" />
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />

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

@@ -2 +2 @@
 
 <GUILayout >
-    <Window Type="TaharezLook/StaticImage" Name="orxonox/MultiplayerBackground" >
+    <Window Type="MenuWidgets/StaticImage" Name="orxonox/MultiplayerBackground" >
         <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/MultiplayerWindow" >
+        <Window Type="MenuWidgets/StaticText" Name="orxonox/MultiplayerWindow" >
             <Property Name="Text" Value="Multiplayer" />
             <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/Listbox" Name="orxonox/MultiplayerLevelListbox" >
+            <Window Type="MenuWidgets/Listbox" Name="orxonox/MultiplayerLevelListbox" >
                 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
                 <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.15,0},{0.95,0},{0.8,0}}" />
             </Window>
-            <Window Type="TaharezLook/RadioButton" Name="orxonox/MultiplayerJoinButton" >
+            <Window Type="MenuWidgets/RadioButton" Name="orxonox/MultiplayerJoinButton" >
                 <Property Name="Text" Value="Join" />
                 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -26 +26 @@
                 <Event Name="SelectStateChanged" Function="MultiplayerMenu.MultiplayerJoinButton_clicked"/>
             </Window>
-            <Window Type="TaharezLook/RadioButton" Name="orxonox/MultiplayerHostButton" >
+            <Window Type="MenuWidgets/RadioButton" Name="orxonox/MultiplayerHostButton" >
                 <Property Name="Text" Value="Host" />
                 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -32 +32 @@
                 <Event Name="SelectStateChanged" Function="MultiplayerMenu.MultiplayerHostButton_clicked"/>
             </Window>
-            <Window Type="TaharezLook/RadioButton" Name="orxonox/MultiplayerDedicatedButton" >
+            <Window Type="MenuWidgets/RadioButton" Name="orxonox/MultiplayerDedicatedButton" >
                 <Property Name="Text" Value="Dedicated" />
                 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -39 +39 @@
             </Window>
         </Window>
-        <Window Type="TaharezLook/Button" Name="orxonox/MultiplayerStartButton" >
+        <Window Type="MenuWidgets/Button" Name="orxonox/MultiplayerStartButton" >
             <Property Name="Text" Value="Start" />
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -45 +45 @@
             <Event Name="Clicked" Function="MultiplayerMenu.MultiplayerStartButton_clicked"/>
         </Window>
-        <Window Type="TaharezLook/Button" Name="orxonox/MultiplayerBackButton" >
+        <Window Type="MenuWidgets/Button" Name="orxonox/MultiplayerBackButton" >
             <Property Name="Text" Value="Back" />
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />

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

@@ -2 +2 @@
 
 <GUILayout >
-    <Window Type="TaharezLook/StaticImage" Name="orxonox/MultiplayerOptionsBackground" >
+    <Window Type="MenuWidgets/StaticImage" Name="orxonox/MultiplayerOptionsBackground" >
         <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/MultiplayerOptionsWindow" >
+        <Window Type="MenuWidgets/StaticText" Name="orxonox/MultiplayerOptionsWindow" >
             <Property Name="Text" Value="Multiplayer options" />
             <Property Name="Alpha" Value="0.8" />
@@ -17 +17 @@
             <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.3625,0},{0.75,0},{0.6375,0}}" />
         </Window>
-        <Window Type="TaharezLook/Button" Name="orxonox/MultiplayerOptionsBackButton" >
+        <Window Type="MenuWidgets/Button" Name="orxonox/MultiplayerOptionsBackButton" >
             <Property Name="Text" Value="Back" />
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />

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}}"/>

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

@@ -1 +1 @@
 <?xml version="1.0" ?>
 <GUILayout>
-    <Window Type="TaharezLook/StaticImage" Name="orxonox/QuestGUI/Background">
+    <Window Type="MenuWidgets/StaticImage" Name="orxonox/QuestGUI/Background">
     <Property Name="UnifiedSize" Value="{{1.0,0},{1.0,0}}"/>
     <Property Name="Image" Value="set:MainMenuBackground image:Background"/>
@@ -8 +8 @@
     <Property Name="InheritsAlpha" Value="False" />
 
-        <Window Type="TaharezLook/Titlebar" Name="orxonox/QuestGUI/Title">
+        <Window Type="MenuWidgets/Titlebar" Name="orxonox/QuestGUI/Title">
             <Property Name="UnifiedPosition" Value="{{0.05,0},{0.05,0}}"/>
             <Property Name="UnifiedSize" Value="{{0.9,0},{0.05,0}}"/>
@@ -14 +14 @@
         </Window>
 
-        <Window Type="TaharezLook/Listbox" Name="orxonox/QuestGUI/QuestsList">
+        <Window Type="MenuWidgets/Listbox" Name="orxonox/QuestGUI/QuestsList">
             <Property Name="UnifiedPosition" Value="{{0.07,0},{0.18,0}}" />
             <Property Name="UnifiedSize" Value="{{0.86,0},{0.8,0}}" />

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

@@ -2 +2 @@
 
 <GUILayout >
-    <Window Type="TaharezLook/StaticImage" Name="orxonox/SettingsBackground" >
+    <Window Type="MenuWidgets/StaticImage" Name="orxonox/SettingsBackground" >
         <Property Name="InheritsAlpha" Value="False" />
         <Property Name="FrameEnabled" 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/SettingsWindow" >
+        <Window Type="MenuWidgets/StaticText" Name="orxonox/SettingsWindow" >
             <Property Name="Text" Value="Settings" />
             <Property Name="Alpha" Value="0.8" />
@@ -16 +16 @@
             <Property Name="VertFormatting" Value="TopAligned" />
             <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.3625,0},{0.75,0},{0.6375,0}}" />
-            <Window Type="TaharezLook/Button" Name="orxonox/GameplayButton" >
+            <Window Type="MenuWidgets/Button" Name="orxonox/GameplayButton" >
                 <Property Name="Text" Value="Gameplay" />
                 <Property Name="Disabled" Value="True" />
@@ -23 +23 @@
                 <Event Name="Clicked" Function="SettingsMenu.SettingsGameplayButton_clicked"/>
             </Window>
-            <Window Type="TaharezLook/Button" Name="orxonox/MultiplayerOptionsButton" >
+            <Window Type="MenuWidgets/Button" Name="orxonox/MultiplayerOptionsButton" >
                 <Property Name="Text" Value="Multiplayer options" />
                 <Property Name="Disabled" Value="True" />
@@ -30 +30 @@
                 <Event Name="Clicked" Function="SettingsMenu.SettingsMultiplayerOptionsButton_clicked"/>
             </Window>
-            <Window Type="TaharezLook/Button" Name="orxonox/ControlsButton" >
+            <Window Type="MenuWidgets/Button" Name="orxonox/ControlsButton" >
                 <Property Name="Text" Value="Controls" />
                 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -36 +36 @@
                 <Event Name="Clicked" Function="SettingsMenu.SettingsControlsButton_clicked"/>
             </Window>
-            <Window Type="TaharezLook/Button" Name="orxonox/GraphicsButton" >
+            <Window Type="MenuWidgets/Button" Name="orxonox/GraphicsButton" >
                 <Property Name="Text" Value="Graphics" />
                 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -42 +42 @@
                 <Event Name="Clicked" Function="SettingsMenu.SettingsGraphicsButton_clicked"/>
             </Window>
-            <Window Type="TaharezLook/Button" Name="orxonox/AudioButton" >
+            <Window Type="MenuWidgets/Button" Name="orxonox/AudioButton" >
                 <Property Name="Text" Value="Audio" />
                 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -48 +48 @@
                 <Event Name="Clicked" Function="SettingsMenu.SettingsAudioButton_clicked"/>
             </Window>
-            <Window Type="TaharezLook/Button" Name="orxonox/ResetSettingsButton" >
+            <Window Type="MenuWidgets/Button" Name="orxonox/ResetSettingsButton" >
                 <Property Name="Text" Value="Reset settings" />
                 <Property Name="Disabled" Value="True" />
@@ -56 +56 @@
             </Window>
         </Window>
-        <Window Type="TaharezLook/Button" Name="orxonox/SettingsBackButton" >
+        <Window Type="MenuWidgets/Button" Name="orxonox/SettingsBackButton" >
             <Property Name="Text" Value="Back" />
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />

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

@@ -2 +2 @@
 
 <GUILayout >
-    <Window Type="TaharezLook/StaticImage" Name="orxonox/SingleplayerBackground" >
+    <Window Type="MenuWidgets/StaticImage" Name="orxonox/SingleplayerBackground" >
         <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/SingleplayerWindow" >
+        <Window Type="MenuWidgets/StaticText" Name="orxonox/SingleplayerWindow" >
             <Property Name="Text" Value="Singleplayer" />
             <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/Listbox" Name="orxonox/SingleplayerLevelListbox" >
+            <Window Type="MenuWidgets/Listbox" Name="orxonox/SingleplayerLevelListbox" >
                 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
                 <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.15,0},{0.95,0},{0.92,0}}" />
             </Window>
         </Window>
-        <Window Type="TaharezLook/Button" Name="orxonox/SingleplayerStartButton" >
+        <Window Type="MenuWidgets/Button" Name="orxonox/SingleplayerStartButton" >
             <Property Name="Text" Value="Start" />
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
@@ -27 +27 @@
             <Event Name="Clicked" Function="SingleplayerMenu.SingleplayerStartButton_clicked"/>
         </Window>
-        <Window Type="TaharezLook/Button" Name="orxonox/SingleplayerBackButton" >
+        <Window Type="MenuWidgets/Button" Name="orxonox/SingleplayerBackButton" >
             <Property Name="Text" Value="Back" />
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />

code/branches/gamestates2/data/gui/schemes/OrxonoxGUIScheme.scheme

@@ -2 +2 @@
 <GUIScheme Name="OrxonoxGUI">
     <Imageset Name="MainMenuBackground" Filename="MainMenuBackground.imageset"/>
+    <Font Name="BlueHighway-12" Filename="bluehighway-12.font" />
+    <Font Name="BlueHighway-10" Filename="bluehighway-10.font" />
+    <Font Name="BlueHighway-8"  Filename="bluehighway-8.font"  />
 </GUIScheme>

code/branches/gamestates2/data/gui/schemes/TaharezLook.scheme

@@ -2 +2 @@
 <GUIScheme Name="TaharezLook">
         <Imageset Name="TaharezLook" Filename="TaharezLook.imageset" />
-        <Font Name="Commonwealth-10" Filename="Commonwealth-10.font" />
         <LookNFeel Filename="TaharezLook.looknfeel" />
         <WindowRendererSet Filename="CEGUIFalagardWRBase" />
-        <FalagardMapping WindowType="TaharezLook/Button"      TargetType="CEGUI/PushButton"  Renderer="Falagard/Button"       LookNFeel="TaharezLook/Button" />
-        <FalagardMapping WindowType="TaharezLook/Checkbox"    TargetType="CEGUI/Checkbox"    Renderer="Falagard/ToggleButton" LookNFeel="TaharezLook/Checkbox" />
-        <FalagardMapping WindowType="TaharezLook/ImageButton" TargetType="CEGUI/PushButton"  Renderer="Falagard/Button"       LookNFeel="TaharezLook/ImageButton" />
-        <FalagardMapping WindowType="TaharezLook/RadioButton" TargetType="CEGUI/RadioButton" Renderer="Falagard/ToggleButton" LookNFeel="TaharezLook/RadioButton" />
-        <FalagardMapping WindowType="TaharezLook/FrameWindow"  TargetType="CEGUI/FrameWindow" Renderer="Falagard/FrameWindow"  LookNFeel="TaharezLook/FrameWindow" />
-        <FalagardMapping WindowType="TaharezLook/Titlebar"     TargetType="CEGUI/Titlebar"    Renderer="Falagard/Titlebar"     LookNFeel="TaharezLook/Titlebar" />
-        <FalagardMapping WindowType="TaharezLook/SystemButton" TargetType="CEGUI/PushButton"  Renderer="Falagard/SystemButton" LookNFeel="TaharezLook/Button" />
-        <FalagardMapping WindowType="TaharezLook/Editbox"          TargetType="CEGUI/Editbox"          Renderer="Falagard/Editbox"          LookNFeel="TaharezLook/Editbox" />
-        <FalagardMapping WindowType="TaharezLook/MultiLineEditbox" TargetType="CEGUI/MultiLineEditbox" Renderer="Falagard/MultiLineEditbox" LookNFeel="TaharezLook/MultiLineEditbox" />
-        <FalagardMapping WindowType="TaharezLook/Menubar"   TargetType="CEGUI/Menubar"   Renderer="Falagard/Menubar"   LookNFeel="TaharezLook/Menubar" />
-        <FalagardMapping WindowType="TaharezLook/PopupMenu" TargetType="CEGUI/PopupMenu" Renderer="Falagard/PopupMenu" LookNFeel="TaharezLook/PopupMenu" />
-        <FalagardMapping WindowType="TaharezLook/MenuItem"  TargetType="CEGUI/MenuItem"  Renderer="Falagard/MenuItem"  LookNFeel="TaharezLook/MenuItem" />
-        <FalagardMapping WindowType="TaharezLook/AlternateProgressBar" TargetType="CEGUI/ProgressBar" Renderer="Falagard/ProgressBar" LookNFeel="TaharezLook/AltProgressBar" />
-        <FalagardMapping WindowType="TaharezLook/ProgressBar"          TargetType="CEGUI/ProgressBar" Renderer="Falagard/ProgressBar" LookNFeel="TaharezLook/ProgressBar" />
-        <FalagardMapping WindowType="TaharezLook/VUMeter"              TargetType="CEGUI/ProgressBar" Renderer="Falagard/ProgressBar" LookNFeel="TaharezLook/VUMeter" />
-        <FalagardMapping WindowType="TaharezLook/VerticalScrollbar"   TargetType="CEGUI/Scrollbar" Renderer="Falagard/Scrollbar" LookNFeel="TaharezLook/VerticalScrollbar" />
-        <FalagardMapping WindowType="TaharezLook/HorizontalScrollbar" TargetType="CEGUI/Scrollbar" Renderer="Falagard/Scrollbar" LookNFeel="TaharezLook/HorizontalScrollbar" />
-        <FalagardMapping WindowType="TaharezLook/VerticalScrollbarThumb"   TargetType="CEGUI/Thumb" Renderer="Falagard/Button" LookNFeel="TaharezLook/VerticalScrollbarThumb" />
-        <FalagardMapping WindowType="TaharezLook/HorizontalScrollbarThumb" TargetType="CEGUI/Thumb" Renderer="Falagard/Button" LookNFeel="TaharezLook/HorizontalScrollbarThumb" />
-        <FalagardMapping WindowType="TaharezLook/LargeVerticalScrollbar"      TargetType="CEGUI/Scrollbar" Renderer="Falagard/Scrollbar" LookNFeel="TaharezLook/LargeVerticalScrollbar" />
-        <FalagardMapping WindowType="TaharezLook/LargeVerticalScrollbarThumb" TargetType="CEGUI/Thumb"     Renderer="Falagard/Button"    LookNFeel="TaharezLook/LargeVerticalScrollbarThumb" />
-        <FalagardMapping WindowType="TaharezLook/TabButton"  TargetType="CEGUI/TabButton"  Renderer="Falagard/TabButton"  LookNFeel="TaharezLook/TabButton" />
-        <FalagardMapping WindowType="TaharezLook/TabControl" TargetType="CEGUI/TabControl" Renderer="Falagard/TabControl" LookNFeel="TaharezLook/TabControl" />
-        <FalagardMapping WindowType="TaharezLook/TabContentPane"    TargetType="DefaultWindow"    Renderer="Falagard/Default"    LookNFeel="TaharezLook/TabContentPane" />
-        <FalagardMapping WindowType="TaharezLook/TabButtonPane"    TargetType="DefaultWindow"    Renderer="Falagard/Default"    LookNFeel="TaharezLook/TabButtonPane" />
-        <FalagardMapping WindowType="TaharezLook/ComboDropList" TargetType="CEGUI/ComboDropList" Renderer="Falagard/Listbox" LookNFeel="TaharezLook/ComboDropList" />
-        <FalagardMapping WindowType="TaharezLook/ComboEditbox"  TargetType="CEGUI/Editbox"       Renderer="Falagard/Editbox" LookNFeel="TaharezLook/ComboEditbox" />
-        <FalagardMapping WindowType="TaharezLook/Combobox"      TargetType="CEGUI/Combobox"      Renderer="Falagard/Default" LookNFeel="TaharezLook/Combobox" />
-        <FalagardMapping WindowType="TaharezLook/Listbox"           TargetType="CEGUI/Listbox"           Renderer="Falagard/Listbox"           LookNFeel="TaharezLook/Listbox" />
-        <FalagardMapping WindowType="TaharezLook/ListHeader"        TargetType="CEGUI/ListHeader"        Renderer="Falagard/ListHeader"        LookNFeel="TaharezLook/ListHeader" />
-        <FalagardMapping WindowType="TaharezLook/ListHeaderSegment" TargetType="CEGUI/ListHeaderSegment" Renderer="Falagard/ListHeaderSegment" LookNFeel="TaharezLook/ListHeaderSegment" />
-        <FalagardMapping WindowType="TaharezLook/MultiColumnList"   TargetType="CEGUI/MultiColumnList"   Renderer="Falagard/MultiColumnList"   LookNFeel="TaharezLook/MultiColumnList" />
-        <FalagardMapping WindowType="TaharezLook/Slider"      TargetType="CEGUI/Slider"      Renderer="Falagard/Slider"  LookNFeel="TaharezLook/Slider" />
-        <FalagardMapping WindowType="TaharezLook/SliderThumb" TargetType="CEGUI/Thumb" Renderer="Falagard/Button"  LookNFeel="TaharezLook/SliderThumb" />
-        <FalagardMapping WindowType="TaharezLook/ScrollablePane" TargetType="CEGUI/ScrollablePane" Renderer="Falagard/ScrollablePane" LookNFeel="TaharezLook/ScrollablePane" />
-        <FalagardMapping WindowType="TaharezLook/Spinner" TargetType="CEGUI/Spinner" Renderer="Falagard/Default" LookNFeel="TaharezLook/Spinner" />
-        <FalagardMapping WindowType="TaharezLook/Tooltip" TargetType="CEGUI/Tooltip" Renderer="Falagard/Tooltip" LookNFeel="TaharezLook/Tooltip" />
-        <FalagardMapping WindowType="TaharezLook/StaticImage" TargetType="DefaultWindow" Renderer="Falagard/StaticImage" LookNFeel="TaharezLook/StaticImage" />
-        <FalagardMapping WindowType="TaharezLook/StaticText"  TargetType="DefaultWindow" Renderer="Falagard/StaticText"  LookNFeel="TaharezLook/StaticText" />
-        <FalagardMapping WindowType="TaharezLook/ItemListbox" TargetType="CEGUI/ItemListbox" Renderer="Falagard/ItemListbox" LookNFeel="TaharezLook/ItemListbox" />
-        <FalagardMapping WindowType="TaharezLook/ListboxItem" TargetType="CEGUI/ItemEntry"   Renderer="Falagard/ItemEntry"   LookNFeel="TaharezLook/ListboxItem" />
-        <FalagardMapping WindowType="TaharezLook/GroupBox" TargetType="CEGUI/GroupBox"   Renderer="Falagard/Default"   LookNFeel="TaharezLook/GroupBox" />
-      <FalagardMapping WindowType="TaharezLook/Tree" TargetType="CEGUI/Tree"   Renderer="Falagard/Tree"   LookNFeel="TaharezLook/Tree" />
+
+    <!-- Standard widgets -->
+    <FalagardMapping WindowType="TaharezLook/StaticImage"              TargetType="DefaultWindow"           Renderer="Falagard/StaticImage"       LookNFeel="TaharezLook/StaticImage" />
+    <FalagardMapping WindowType="TaharezLook/StaticText"               TargetType="DefaultWindow"           Renderer="Falagard/StaticText"        LookNFeel="TaharezLook/StaticText" />
+    <FalagardMapping WindowType="TaharezLook/TabButtonPane"            TargetType="DefaultWindow"           Renderer="Falagard/Default"           LookNFeel="TaharezLook/TabButtonPane" />
+    <FalagardMapping WindowType="TaharezLook/TabContentPane"           TargetType="DefaultWindow"           Renderer="Falagard/Default"           LookNFeel="TaharezLook/TabContentPane" />
+    <FalagardMapping WindowType="TaharezLook/Checkbox"                 TargetType="CEGUI/Checkbox"          Renderer="Falagard/ToggleButton"      LookNFeel="TaharezLook/Checkbox" />
+    <FalagardMapping WindowType="TaharezLook/Combobox"                 TargetType="CEGUI/Combobox"          Renderer="Falagard/Default"           LookNFeel="TaharezLook/Combobox" />
+    <FalagardMapping WindowType="TaharezLook/ComboDropList"            TargetType="CEGUI/ComboDropList"     Renderer="Falagard/Listbox"           LookNFeel="TaharezLook/ComboDropList" />
+    <FalagardMapping WindowType="TaharezLook/ComboEditbox"             TargetType="CEGUI/Editbox"           Renderer="Falagard/Editbox"           LookNFeel="TaharezLook/ComboEditbox" />
+    <FalagardMapping WindowType="TaharezLook/Editbox"                  TargetType="CEGUI/Editbox"           Renderer="Falagard/Editbox"           LookNFeel="TaharezLook/Editbox" />
+    <FalagardMapping WindowType="TaharezLook/FrameWindow"              TargetType="CEGUI/FrameWindow"       Renderer="Falagard/FrameWindow"       LookNFeel="TaharezLook/FrameWindow" />
+    <FalagardMapping WindowType="TaharezLook/GroupBox"                 TargetType="CEGUI/GroupBox"          Renderer="Falagard/Default"           LookNFeel="TaharezLook/GroupBox" />
+    <FalagardMapping WindowType="TaharezLook/ItemListbox"              TargetType="CEGUI/ItemListbox"       Renderer="Falagard/ItemListbox"       LookNFeel="TaharezLook/ItemListbox" />
+    <FalagardMapping WindowType="TaharezLook/ListboxItem"              TargetType="CEGUI/ItemEntry"         Renderer="Falagard/ItemEntry"         LookNFeel="TaharezLook/ListboxItem" />
+    <FalagardMapping WindowType="TaharezLook/Listbox"                  TargetType="CEGUI/Listbox"           Renderer="Falagard/Listbox"           LookNFeel="TaharezLook/Listbox" />
+    <FalagardMapping WindowType="TaharezLook/ListHeader"               TargetType="CEGUI/ListHeader"        Renderer="Falagard/ListHeader"        LookNFeel="TaharezLook/ListHeader" />
+    <FalagardMapping WindowType="TaharezLook/ListHeaderSegment"        TargetType="CEGUI/ListHeaderSegment" Renderer="Falagard/ListHeaderSegment" LookNFeel="TaharezLook/ListHeaderSegment" />
+    <FalagardMapping WindowType="TaharezLook/MultiLineEditbox"         TargetType="CEGUI/MultiLineEditbox"  Renderer="Falagard/MultiLineEditbox"  LookNFeel="TaharezLook/MultiLineEditbox" />
+    <FalagardMapping WindowType="TaharezLook/Menubar"                  TargetType="CEGUI/Menubar"           Renderer="Falagard/Menubar"           LookNFeel="TaharezLook/Menubar" />
+    <FalagardMapping WindowType="TaharezLook/MenuItem"                 TargetType="CEGUI/MenuItem"          Renderer="Falagard/MenuItem"          LookNFeel="TaharezLook/MenuItem" />
+    <FalagardMapping WindowType="TaharezLook/MultiColumnList"          TargetType="CEGUI/MultiColumnList"   Renderer="Falagard/MultiColumnList"   LookNFeel="TaharezLook/MultiColumnList" />
+    <FalagardMapping WindowType="TaharezLook/PopupMenu"                TargetType="CEGUI/PopupMenu"         Renderer="Falagard/PopupMenu"         LookNFeel="TaharezLook/PopupMenu" />
+    <FalagardMapping WindowType="TaharezLook/ProgressBar"              TargetType="CEGUI/ProgressBar"       Renderer="Falagard/ProgressBar"       LookNFeel="TaharezLook/ProgressBar" />
+    <FalagardMapping WindowType="TaharezLook/Button"                   TargetType="CEGUI/PushButton"        Renderer="Falagard/Button"            LookNFeel="TaharezLook/Button" />
+    <FalagardMapping WindowType="TaharezLook/ImageButton"              TargetType="CEGUI/PushButton"        Renderer="Falagard/Button"            LookNFeel="TaharezLook/ImageButton" />
+    <FalagardMapping WindowType="TaharezLook/RadioButton"              TargetType="CEGUI/RadioButton"       Renderer="Falagard/ToggleButton"      LookNFeel="TaharezLook/RadioButton" />
+    <FalagardMapping WindowType="TaharezLook/SystemButton"             TargetType="CEGUI/PushButton"        Renderer="Falagard/SystemButton"      LookNFeel="TaharezLook/Button" />
+    <FalagardMapping WindowType="TaharezLook/ScrollablePane"           TargetType="CEGUI/ScrollablePane"    Renderer="Falagard/ScrollablePane"    LookNFeel="TaharezLook/ScrollablePane" />
+    <FalagardMapping WindowType="TaharezLook/HorizontalScrollbar"      TargetType="CEGUI/Scrollbar"         Renderer="Falagard/Scrollbar"         LookNFeel="TaharezLook/HorizontalScrollbar" />
+    <FalagardMapping WindowType="TaharezLook/VerticalScrollbar"        TargetType="CEGUI/Scrollbar"         Renderer="Falagard/Scrollbar"         LookNFeel="TaharezLook/VerticalScrollbar" />
+    <FalagardMapping WindowType="TaharezLook/Slider"                   TargetType="CEGUI/Slider"            Renderer="Falagard/Slider"            LookNFeel="TaharezLook/Slider" />
+    <FalagardMapping WindowType="TaharezLook/Spinner"                  TargetType="CEGUI/Spinner"           Renderer="Falagard/Default"           LookNFeel="TaharezLook/Spinner" />
+    <FalagardMapping WindowType="TaharezLook/TabButton"                TargetType="CEGUI/TabButton"         Renderer="Falagard/TabButton"         LookNFeel="TaharezLook/TabButton" />
+    <FalagardMapping WindowType="TaharezLook/TabControl"               TargetType="CEGUI/TabControl"        Renderer="Falagard/TabControl"        LookNFeel="TaharezLook/TabControl" />
+    <FalagardMapping WindowType="TaharezLook/HorizontalScrollbarThumb" TargetType="CEGUI/Thumb"             Renderer="Falagard/Button"            LookNFeel="TaharezLook/HorizontalScrollbarThumb" />
+    <FalagardMapping WindowType="TaharezLook/SliderThumb"              TargetType="CEGUI/Thumb"             Renderer="Falagard/Button"            LookNFeel="TaharezLook/SliderThumb" />
+    <FalagardMapping WindowType="TaharezLook/VerticalScrollbarThumb"   TargetType="CEGUI/Thumb"             Renderer="Falagard/Button"            LookNFeel="TaharezLook/VerticalScrollbarThumb" />
+    <FalagardMapping WindowType="TaharezLook/Titlebar"                 TargetType="CEGUI/Titlebar"          Renderer="Falagard/Titlebar"          LookNFeel="TaharezLook/Titlebar" />
+    <FalagardMapping WindowType="TaharezLook/Tooltip"                  TargetType="CEGUI/Tooltip"           Renderer="Falagard/Tooltip"           LookNFeel="TaharezLook/Tooltip" />
+    <FalagardMapping WindowType="TaharezLook/Tree"                     TargetType="CEGUI/Tree"              Renderer="Falagard/Tree"              LookNFeel="TaharezLook/Tree" />
+    
+    <!-- Additional widgets -->
+    <FalagardMapping WindowType="TaharezLook/AlternateProgressBar"        TargetType="CEGUI/ProgressBar"       Renderer="Falagard/ProgressBar"       LookNFeel="TaharezLook/AltProgressBar" />
+    <FalagardMapping WindowType="TaharezLook/VUMeter"                     TargetType="CEGUI/ProgressBar"       Renderer="Falagard/ProgressBar"       LookNFeel="TaharezLook/VUMeter" />
+    <FalagardMapping WindowType="TaharezLook/LargeVerticalScrollbar"      TargetType="CEGUI/Scrollbar"         Renderer="Falagard/Scrollbar"         LookNFeel="TaharezLook/LargeVerticalScrollbar" />
+    <FalagardMapping WindowType="TaharezLook/LargeVerticalScrollbarThumb" TargetType="CEGUI/Thumb"             Renderer="Falagard/Button"            LookNFeel="TaharezLook/LargeVerticalScrollbarThumb" />
 </GUIScheme>

code/branches/gamestates2/data/gui/schemes/WindowsLook.scheme

@@ -1 +1 @@
 <?xml version="1.0" ?>
-<GUIScheme Name="WindowsLookSkin">
-        <Imageset Name="WindowsLook" Filename="WindowsLook.imageset" />
-        <LookNFeel Filename="WindowsLook.looknfeel" />
-        <WindowSet Filename="CEGUIFalagardWRBase" />
-        <FalagardMapping WindowType="WindowsLook/Button"      TargetType="CEGUI/PushButton"  Renderer="Falagard/Button"       LookNFeel="WindowsLook/Button" />
-        <FalagardMapping WindowType="WindowsLook/Checkbox"    TargetType="CEGUI/Checkbox"    Renderer="Falagard/ToggleButton" LookNFeel="WindowsLook/Checkbox" />
-        <FalagardMapping WindowType="WindowsLook/IconButton"  TargetType="CEGUI/PushButton"  Renderer="Falagard/Button"       LookNFeel="WindowsLook/IconButton" />
-        <FalagardMapping WindowType="WindowsLook/RadioButton" TargetType="CEGUI/RadioButton" Renderer="Falagard/ToggleButton" LookNFeel="WindowsLook/RadioButton" />
-        <FalagardMapping WindowType="WindowsLook/FrameWindow"  TargetType="CEGUI/FrameWindow" Renderer="Falagard/FrameWindow"  LookNFeel="WindowsLook/FrameWindow" />
-        <FalagardMapping WindowType="WindowsLook/Titlebar"     TargetType="CEGUI/Titlebar"    Renderer="Falagard/Titlebar"     LookNFeel="WindowsLook/Titlebar" />
-        <FalagardMapping WindowType="WindowsLook/SystemButton" TargetType="CEGUI/PushButton"  Renderer="Falagard/SystemButton" LookNFeel="WindowsLook/SystemButton" />
-        <FalagardMapping WindowType="WindowsLook/Editbox"          TargetType="CEGUI/Editbox"          Renderer="Falagard/Editbox"          LookNFeel="WindowsLook/Editbox" />
-        <FalagardMapping WindowType="WindowsLook/MultiLineEditbox" TargetType="CEGUI/MultiLineEditbox" Renderer="Falagard/MultiLineEditbox" LookNFeel="WindowsLook/MultiLineEditbox" />
-        <FalagardMapping WindowType="WindowsLook/Menubar"   TargetType="CEGUI/Menubar"   Renderer="Falagard/Menubar"   LookNFeel="WindowsLook/Menubar" />
-        <FalagardMapping WindowType="WindowsLook/PopupMenu" TargetType="CEGUI/PopupMenu" Renderer="Falagard/PopupMenu" LookNFeel="WindowsLook/PopupMenu" />
-        <FalagardMapping WindowType="WindowsLook/MenuItem"  TargetType="CEGUI/MenuItem"  Renderer="Falagard/MenuItem"  LookNFeel="WindowsLook/MenuItem" />
-        <FalagardMapping WindowType="WindowsLook/ProgressBar"          TargetType="CEGUI/ProgressBar" Renderer="Falagard/ProgressBar" LookNFeel="WindowsLook/ProgressBar" />
-        <FalagardMapping WindowType="WindowsLook/VerticalScrollbar"   TargetType="CEGUI/Scrollbar" Renderer="Falagard/Scrollbar" LookNFeel="WindowsLook/VerticalScrollbar" />
-        <FalagardMapping WindowType="WindowsLook/HorizontalScrollbar" TargetType="CEGUI/Scrollbar" Renderer="Falagard/Scrollbar" LookNFeel="WindowsLook/HorizontalScrollbar" />
-        <FalagardMapping WindowType="WindowsLook/VerticalScrollbarThumb"   TargetType="CEGUI/Thumb" Renderer="Falagard/Button" LookNFeel="WindowsLook/VerticalScrollbarThumb" />
-        <FalagardMapping WindowType="WindowsLook/HorizontalScrollbarThumb" TargetType="CEGUI/Thumb" Renderer="Falagard/Button" LookNFeel="WindowsLook/HorizontalScrollbarThumb" />
-        <FalagardMapping WindowType="WindowsLook/TabButton"  TargetType="CEGUI/TabButton"  Renderer="Falagard/TabButton"  LookNFeel="WindowsLook/TabButton" />
-        <FalagardMapping WindowType="WindowsLook/TabControl" TargetType="CEGUI/TabControl" Renderer="Falagard/TabControl" LookNFeel="WindowsLook/TabControl" />
-        <FalagardMapping WindowType="WindowsLook/TabContentPane"    TargetType="DefaultWindow"    Renderer="Falagard/Default"    LookNFeel="WindowsLook/TabContentPane" />
-        <FalagardMapping WindowType="WindowsLook/TabButtonPane"    TargetType="DefaultWindow"    Renderer="Falagard/Default"    LookNFeel="WindowsLook/TabButtonPane" />
-        <FalagardMapping WindowType="WindowsLook/ComboDropList" TargetType="CEGUI/ComboDropList" Renderer="Falagard/Listbox" LookNFeel="WindowsLook/ComboDropList" />
-        <FalagardMapping WindowType="WindowsLook/Combobox"      TargetType="CEGUI/Combobox"      Renderer="Falagard/Default" LookNFeel="WindowsLook/Combobox" />
-        <FalagardMapping WindowType="WindowsLook/Listbox"           TargetType="CEGUI/Listbox"           Renderer="Falagard/Listbox"           LookNFeel="WindowsLook/Listbox" />
-        <FalagardMapping WindowType="WindowsLook/ListHeader"        TargetType="CEGUI/ListHeader"        Renderer="Falagard/ListHeader"        LookNFeel="WindowsLook/ListHeader" />
-        <FalagardMapping WindowType="WindowsLook/ListHeaderSegment" TargetType="CEGUI/ListHeaderSegment" Renderer="Falagard/ListHeaderSegment" LookNFeel="WindowsLook/ListHeaderSegment" />
-        <FalagardMapping WindowType="WindowsLook/MultiColumnList"   TargetType="CEGUI/MultiColumnList"   Renderer="Falagard/MultiColumnList"   LookNFeel="WindowsLook/MultiColumnList" />
-        <FalagardMapping WindowType="WindowsLook/Slider"      TargetType="CEGUI/Slider" Renderer="Falagard/Slider"  LookNFeel="WindowsLook/Slider" />
-        <FalagardMapping WindowType="WindowsLook/SliderThumb" TargetType="CEGUI/Thumb"  Renderer="Falagard/Button"  LookNFeel="WindowsLook/SliderThumb" />
-        <FalagardMapping WindowType="WindowsLook/ScrollablePane" TargetType="CEGUI/ScrollablePane" Renderer="Falagard/ScrollablePane" LookNFeel="WindowsLook/ScrollablePane" />
-        <FalagardMapping WindowType="WindowsLook/Spinner" TargetType="CEGUI/Spinner" Renderer="Falagard/Default" LookNFeel="WindowsLook/Spinner" />
-        <FalagardMapping WindowType="WindowsLook/Tooltip" TargetType="CEGUI/Tooltip" Renderer="Falagard/Tooltip" LookNFeel="WindowsLook/Tooltip" />
-        <FalagardMapping WindowType="WindowsLook/Static"      TargetType="DefaultWindow" Renderer="Falagard/Static"      LookNFeel="WindowsLook/Static" />
-        <FalagardMapping WindowType="WindowsLook/StaticImage" TargetType="DefaultWindow" Renderer="Falagard/StaticImage" LookNFeel="WindowsLook/StaticImage" />
-        <FalagardMapping WindowType="WindowsLook/StaticText"  TargetType="DefaultWindow" Renderer="Falagard/StaticText"  LookNFeel="WindowsLook/StaticText" />
-        <FalagardMapping WindowType="WindowsLook/ItemListbox" TargetType="CEGUI/ItemListbox" Renderer="Falagard/ItemListbox" LookNFeel="WindowsLook/ItemListbox" />
-        <FalagardMapping WindowType="WindowsLook/ListboxItem" TargetType="CEGUI/ItemEntry"   Renderer="Falagard/ItemEntry"   LookNFeel="WindowsLook/ListboxItem" />
-        <FalagardMapping WindowType="WindowsLook/GroupBox" TargetType="CEGUI/GroupBox"   Renderer="Falagard/Default"   LookNFeel="WindowsLook/GroupBox" />
+<GUIScheme Name="WindowsLook">
+    <Imageset Name="WindowsLook" Filename="WindowsLook.imageset" />
+    <Imageset Name="TaharezLook" Filename="TaharezLook.imageset" />
+    <LookNFeel Filename="WindowsLook.looknfeel" />
+    <LookNFeel Filename="TaharezLook.looknfeel" />
+    <WindowRendererSet Filename="CEGUIFalagardWRBase" />
+
+    <!-- Standard widgets -->
+    <FalagardMapping WindowType="WindowsLook/StaticImage"                 TargetType="DefaultWindow"           Renderer="Falagard/StaticImage"       LookNFeel="WindowsLook/StaticImage" />
+    <FalagardMapping WindowType="WindowsLook/StaticText"                  TargetType="DefaultWindow"           Renderer="Falagard/StaticText"        LookNFeel="WindowsLook/StaticText" />
+    <FalagardMapping WindowType="WindowsLook/TabButtonPane"               TargetType="DefaultWindow"           Renderer="Falagard/Default"           LookNFeel="WindowsLook/TabButtonPane" />
+    <FalagardMapping WindowType="WindowsLook/TabContentPane"              TargetType="DefaultWindow"           Renderer="Falagard/Default"           LookNFeel="WindowsLook/TabContentPane" />
+    <FalagardMapping WindowType="WindowsLook/Checkbox"                    TargetType="CEGUI/Checkbox"          Renderer="Falagard/ToggleButton"      LookNFeel="WindowsLook/Checkbox" />
+    <FalagardMapping WindowType="WindowsLook/Combobox"                    TargetType="CEGUI/Combobox"          Renderer="Falagard/Default"           LookNFeel="WindowsLook/Combobox" />
+    <FalagardMapping WindowType="WindowsLook/ComboDropList"               TargetType="CEGUI/ComboDropList"     Renderer="Falagard/Listbox"           LookNFeel="WindowsLook/ComboDropList" />
+    <FalagardMapping WindowType="WindowsLook/Editbox"                     TargetType="CEGUI/Editbox"           Renderer="Falagard/Editbox"           LookNFeel="WindowsLook/Editbox" />
+    <FalagardMapping WindowType="WindowsLook/FrameWindow"                 TargetType="CEGUI/FrameWindow"       Renderer="Falagard/FrameWindow"       LookNFeel="WindowsLook/FrameWindow" />
+    <FalagardMapping WindowType="WindowsLook/GroupBox"                    TargetType="CEGUI/GroupBox"          Renderer="Falagard/Default"           LookNFeel="WindowsLook/GroupBox" />
+    <FalagardMapping WindowType="WindowsLook/ItemListbox"                 TargetType="CEGUI/ItemListbox"       Renderer="Falagard/ItemListbox"       LookNFeel="WindowsLook/ItemListbox" />
+    <FalagardMapping WindowType="WindowsLook/ListboxItem"                 TargetType="CEGUI/ItemEntry"         Renderer="Falagard/ItemEntry"         LookNFeel="WindowsLook/ListboxItem" />
+    <FalagardMapping WindowType="WindowsLook/Listbox"                     TargetType="CEGUI/Listbox"           Renderer="Falagard/Listbox"           LookNFeel="WindowsLook/Listbox" />
+    <FalagardMapping WindowType="WindowsLook/ListHeader"                  TargetType="CEGUI/ListHeader"        Renderer="Falagard/ListHeader"        LookNFeel="WindowsLook/ListHeader" />
+    <FalagardMapping WindowType="WindowsLook/ListHeaderSegment"           TargetType="CEGUI/ListHeaderSegment" Renderer="Falagard/ListHeaderSegment" LookNFeel="WindowsLook/ListHeaderSegment" />
+    <FalagardMapping WindowType="WindowsLook/MultiLineEditbox"            TargetType="CEGUI/MultiLineEditbox"  Renderer="Falagard/MultiLineEditbox"  LookNFeel="WindowsLook/MultiLineEditbox" />
+    <FalagardMapping WindowType="WindowsLook/Menubar"                     TargetType="CEGUI/Menubar"           Renderer="Falagard/Menubar"           LookNFeel="WindowsLook/Menubar" />
+    <FalagardMapping WindowType="WindowsLook/MenuItem"                    TargetType="CEGUI/MenuItem"          Renderer="Falagard/MenuItem"          LookNFeel="WindowsLook/MenuItem" />
+    <FalagardMapping WindowType="WindowsLook/MultiColumnList"             TargetType="CEGUI/MultiColumnList"   Renderer="Falagard/MultiColumnList"   LookNFeel="WindowsLook/MultiColumnList" />
+    <FalagardMapping WindowType="WindowsLook/PopupMenu"                   TargetType="CEGUI/PopupMenu"         Renderer="Falagard/PopupMenu"         LookNFeel="WindowsLook/PopupMenu" />
+    <FalagardMapping WindowType="WindowsLook/ProgressBar"                 TargetType="CEGUI/ProgressBar"       Renderer="Falagard/ProgressBar"       LookNFeel="WindowsLook/ProgressBar" />
+    <FalagardMapping WindowType="WindowsLook/Button"                      TargetType="CEGUI/PushButton"        Renderer="Falagard/Button"            LookNFeel="WindowsLook/Button" />
+    <FalagardMapping WindowType="WindowsLook/RadioButton"                 TargetType="CEGUI/RadioButton"       Renderer="Falagard/ToggleButton"      LookNFeel="WindowsLook/RadioButton" />
+    <FalagardMapping WindowType="WindowsLook/SystemButton"                TargetType="CEGUI/PushButton"        Renderer="Falagard/SystemButton"      LookNFeel="WindowsLook/Button" />
+    <FalagardMapping WindowType="WindowsLook/ScrollablePane"              TargetType="CEGUI/ScrollablePane"    Renderer="Falagard/ScrollablePane"    LookNFeel="WindowsLook/ScrollablePane" />
+    <FalagardMapping WindowType="WindowsLook/HorizontalScrollbar"         TargetType="CEGUI/Scrollbar"         Renderer="Falagard/Scrollbar"         LookNFeel="WindowsLook/HorizontalScrollbar" />
+    <FalagardMapping WindowType="WindowsLook/VerticalScrollbar"           TargetType="CEGUI/Scrollbar"         Renderer="Falagard/Scrollbar"         LookNFeel="WindowsLook/VerticalScrollbar" />
+    <FalagardMapping WindowType="WindowsLook/Slider"                      TargetType="CEGUI/Slider"            Renderer="Falagard/Slider"            LookNFeel="WindowsLook/Slider" />
+    <FalagardMapping WindowType="WindowsLook/Spinner"                     TargetType="CEGUI/Spinner"           Renderer="Falagard/Default"           LookNFeel="WindowsLook/Spinner" />
+    <FalagardMapping WindowType="WindowsLook/TabButton"                   TargetType="CEGUI/TabButton"         Renderer="Falagard/TabButton"         LookNFeel="WindowsLook/TabButton" />
+    <FalagardMapping WindowType="WindowsLook/TabControl"                  TargetType="CEGUI/TabControl"        Renderer="Falagard/TabControl"        LookNFeel="WindowsLook/TabControl" />
+    <FalagardMapping WindowType="WindowsLook/HorizontalScrollbarThumb"    TargetType="CEGUI/Thumb"             Renderer="Falagard/Button"            LookNFeel="WindowsLook/HorizontalScrollbarThumb" />
+    <FalagardMapping WindowType="WindowsLook/SliderThumb"                 TargetType="CEGUI/Thumb"             Renderer="Falagard/Button"            LookNFeel="WindowsLook/SliderThumb" />
+    <FalagardMapping WindowType="WindowsLook/VerticalScrollbarThumb"      TargetType="CEGUI/Thumb"             Renderer="Falagard/Button"            LookNFeel="WindowsLook/VerticalScrollbarThumb" />
+    <FalagardMapping WindowType="WindowsLook/Titlebar"                    TargetType="CEGUI/Titlebar"          Renderer="Falagard/Titlebar"          LookNFeel="WindowsLook/Titlebar" />
+    <FalagardMapping WindowType="WindowsLook/Tooltip"                     TargetType="CEGUI/Tooltip"           Renderer="Falagard/Tooltip"           LookNFeel="WindowsLook/Tooltip" />
+    
+    <!-- Missing widgets (using Taharez LookNFeel) -->
+    <FalagardMapping WindowType="WindowsLook/ComboEditbox"                TargetType="CEGUI/Editbox"           Renderer="Falagard/Editbox"           LookNFeel="TaharezLook/ComboEditbox" />
+    <FalagardMapping WindowType="WindowsLook/ImageButton"                 TargetType="CEGUI/PushButton"        Renderer="Falagard/Button"            LookNFeel="TaharezLook/ImageButton" />
+    <FalagardMapping WindowType="WindowsLook/Tree"                        TargetType="CEGUI/Tree"              Renderer="Falagard/Tree"              LookNFeel="TaharezLook/Tree" />
+
+    <!-- Additional widgets -->
+    <FalagardMapping WindowType="WindowsLook/IconButton"                  TargetType="CEGUI/PushButton"        Renderer="Falagard/Button"            LookNFeel="WindowsLook/IconButton" />
+    <FalagardMapping WindowType="WindowsLook/Static"                      TargetType="DefaultWindow"           Renderer="Falagard/Static"            LookNFeel="WindowsLook/Static" />
 </GUIScheme>

code/branches/gamestates2/data/gui/scripts/AudioMenu.lua

@@ -2 +2 @@
 
 BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("AudioMenu")
 if _REQUIREDNAME == nil then
     AudioMenu = P
@@ -8 +8 @@
     _G[_REQUIREDNAME] = P
 end
-
-P.filename = "AudioMenu"
-P.layoutString = "AudioMenu.layout"
 
 function P:init()
@@ -43 +40 @@
     for k,v in pairs(themeList) do
         item = CEGUI.createListboxTextItem(v)
-        item:setSelectionBrushImage("TaharezLook", "MultiListSelectionBrush")
+        item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
         CEGUI.toListbox(listboxwindow):addItem(item)
     end

code/branches/gamestates2/data/gui/scripts/BasicGUI.lua

@@ -8 +8 @@
 end
 
+-- useless, even wrong? P is the class, not the object..
 P.overlay = nil
 
 -- constructor of the GUI
-function P:new (gui, fname)
-    local newElement = { window = gui, filename = fname, visible = false } or {}
+function P:new(_filename, _gui, _visible)
+    local newElement = {
+        filename = _filename,
+        gui = _gui,
+        visible = _visible or false
+    } or {}
     setmetatable(newElement, self) -- connects new element with class
     self.__index = self
@@ -18 +23 @@
 end
 
+-- Override this function if you need to
 function P:init()
--- this function is empty and intended for inheriting GUIs to use
+end
+
+-- Override this function if you need to
+-- But don't forget to stick to the naming convention ("GUI_" .. self.filename)
+function P:createInputState()
+    self.inputState = guiMgr:createInputState("GUI_" .. self.filename)
 end
 
 -- hide function for the GUI
-function P:hide ()
+function P:hide()
     self.window:hide()
     self.visible = false
@@ -29 +40 @@
 
 -- show function for the GUI
-function P:show ()
+function P:show()
     self.window:show()
     self.visible = true
 end
 
-function P:load ()
-    self.window = winMgr:loadWindowLayout(self.layoutString)
+function P:load()
+    self.window = winMgr:loadWindowLayout(self.filename .. ".layout")
+    self:createInputState()
     self:init()
     return self

code/branches/gamestates2/data/gui/scripts/ControlsMenu.lua

@@ -2 +2 @@
 
 BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("ControlsMenu")
 if _REQUIREDNAME == nil then
     ControlsMenu = P
@@ -8 +8 @@
     _G[_REQUIREDNAME] = P
 end
-
-P.filename = "ControlsMenu"
-P.layoutString = "ControlsMenu.layout"
 
 function P.ControlsMouseControlsButton_clicked(e)

code/branches/gamestates2/data/gui/scripts/CreditsMenu.lua

@@ -2 +2 @@
 
 BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("CreditsMenu")
 if _REQUIREDNAME == nil then
     CreditsMenu = P
@@ -8 +8 @@
     _G[_REQUIREDNAME] = P
 end
-
-P.filename = "CreditsMenu"
-P.layoutString = "CreditsMenu.layout"
 
 function P.CreditsBackButton_clicked(e)

code/branches/gamestates2/data/gui/scripts/DecisionPopup.lua

@@ -2 +2 @@
 
 BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("DecisionPopup")
 if _REQUIREDNAME == nil then
     DecisionPopup = P
 else
     _G[_REQUIREDNAME] = P
-end
-
-P.filename = "DecisionPopup"
-P.layoutString = "DecisionPopup.layout"
-
-function P:init()
 end
 

code/branches/gamestates2/data/gui/scripts/GameplayMenu.lua

@@ -2 +2 @@
 
 BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("GameplayMenu")
 if _REQUIREDNAME == nil then
     GameplayMenu = P
@@ -8 +8 @@
     _G[_REQUIREDNAME] = P
 end
-
-P.filename = "GameplayMenu"
-P.layoutString = "GameplayMenu.layout"
 
 function P:init()
@@ -20 +17 @@
     for k,v in pairs(themeList) do
         item = CEGUI.createListboxTextItem(v)
-        item:setSelectionBrushImage("TaharezLook", "MultiListSelectionBrush")
+        item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
         CEGUI.toCombobox(dropdown):addItem(item)
     end

code/branches/gamestates2/data/gui/scripts/GraphicsMenu.lua

@@ -2 +2 @@
 
 BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("GraphicsMenu")
 if _REQUIREDNAME == nil then
     GraphicsMenu = P
@@ -8 +8 @@
     _G[_REQUIREDNAME] = P
 end
-
-P.filename = "GraphicsMenu"
-P.layoutString = "GraphicsMenu.layout"
 
 function P:init()
@@ -62 +59 @@
     for k,v in pairs(resolutionList) do
         item = CEGUI.createListboxTextItem(v)
-        item:setSelectionBrushImage("TaharezLook", "MultiListSelectionBrush")
+        item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
         CEGUI.toListbox(listboxwindow):addItem(item)
     end

code/branches/gamestates2/data/gui/scripts/InGameMenu.lua

@@ -2 +2 @@
 
 BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("InGameMenu")
 if _REQUIREDNAME == nil then
     InGameMenu = P
@@ -8 +8 @@
     _G[_REQUIREDNAME] = P
 end
-
-P.filename = "InGameMenu"
-P.layoutString = "InGameMenu.layout"
-
-function P:init()
-end
-
 
 -- events for ingamemenu

code/branches/gamestates2/data/gui/scripts/InfoPopup.lua

@@ -2 +2 @@
 
 BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("InfoPopup")
 
 if _REQUIREDNAME == nil then
@@ -8 +8 @@
 else
     _G[_REQUIREDNAME] = P
-end
-
-P.filename = "InfoPopup"
-P.layoutString = "InfoPopup.layout"
-
-function P:init()
 end
 
@@ -26 +20 @@
 end
 
-function P.setText( text )
+function P.setText(text)
     winMgr:getWindow("orxonox/InfoPopup_text"):setText( text )
 end
@@ -42 +36 @@
 -- events for ingamemenu
 function P.close(e)
-    hideGUI("InfoPopup")
+    hideGUI(P.filename)
 end
 

code/branches/gamestates2/data/gui/scripts/InitialiseGUI.lua

@@ +1 @@
+winMgr   = CEGUI.WindowManager:getSingleton()
+guiMgr   = orxonox.GUIManager:getInstance()
+inputMgr = orxonox.InputManager:getInstance()
+
 local schemeMgr = CEGUI.SchemeManager:getSingleton()
-winMgr = CEGUI.WindowManager:getSingleton()
-local logger = CEGUI.Logger:getSingleton()
-local system = CEGUI.System:getSingleton()
-local cursor = CEGUI.MouseCursor:getSingleton()
-
-schemeMgr:loadScheme("TaharezLookSkin.scheme")
--- load scheme with our own images
+local system    = CEGUI.System:getSingleton()
+local cursor    = CEGUI.MouseCursor:getSingleton()
+
+-- Load all required skins
+schemeMgr:loadScheme("TaharezGreenLook.scheme")
+--schemeMgr:loadScheme("TaharezLook.scheme")
+--schemeMgr:loadScheme("WindowsLook.scheme")
+--schemeMgr:loadScheme("VanillaLook.scheme")
+--schemeMgr:loadScheme("SleekSpaceLook.scheme")
+
+-- Connect skin specific window types with our own window types
+-- By loading a different file (if there is) you can change the skin
+-- of the menus or the HUD independently
+schemeMgr:loadScheme("TaharezGreenMenuWidgets.scheme")
+menuImageSet = "TaharezGreenLook"
+schemeMgr:loadScheme("TaharezGreenHUDWidgets.scheme")
+hudImageSet = "TaharezGreenLook"
+
+-- Just a remaining test hack
 schemeMgr:loadScheme("OrxonoxGUIScheme.scheme")
 
-system:setDefaultMouseCursor("TaharezLook", "MouseArrow")
+system:setDefaultMouseCursor(menuImageSet, "MouseArrow")
 system:setDefaultFont("BlueHighway-12")
-system:setDefaultTooltip("TaharezLook/Tooltip")
+system:setDefaultTooltip("MenuWidgets/Tooltip")
 
 loadedGUIs = {}
@@ -51 +67 @@
 end
 
--- shows the specified and loads it if not loaded already
--- be sure to set the global variable "filename" before calling this function
+-- shows the specified GUI sheet and loads it if not loaded already
 function showGUI(filename, hidePrevious, bCursorVisible)
     if bCursorVisible == nil then
@@ -87 +102 @@
     else
         if nrOfActiveSheets == 0 then
-            orxonox.InputManager:getInstance():enterState("guiMouseOnly")
+            --orxonox.InputManager:getInstance():enterState("guiMouseOnly")
             orxonox.HumanController:pauseControl()
         end
     end
+    orxonox.InputManager:getInstance():enterState(currentGUI.inputState)
+
     nrOfActiveSheets = nrOfActiveSheets + 1
     table.insert(activeSheets, filename)
@@ -161 +178 @@
     bHidePrevious[filename] = nil
     if nrOfActiveSheets == 0 then
-        orxonox.InputManager:getInstance():leaveState("guiMouseOnly")
+        --orxonox.InputManager:getInstance():leaveState("guiMouseOnly")
         orxonox.HumanController:resumeControl()
         hideCursor()
     end
+    orxonox.InputManager:getInstance():leaveState(currentGUI.inputState)
 end
 

code/branches/gamestates2/data/gui/scripts/KeyBindMenu.lua

@@ -2 +2 @@
 
 BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("KeyBindMenu")
 
 if _REQUIREDNAME == nil then
@@ -9 +9 @@
     _G[_REQUIREDNAME] = P
 end
-
-P.filename = "KeyBindMenu"
-P.layoutString = "KeyBindMenu.layout"
 
 function P:init()
@@ -68 +65 @@
 
     --Calculate design parameters:
-    sampleWindow = winMgr:createWindow("TaharezLook/StaticText", "orxonox/KeyBindPane/SampleWindow")
+    sampleWindow = winMgr:createWindow("MenuWidgets/StaticText", "orxonox/KeyBindPane/SampleWindow")
     sampleWindow:setText("SampleText")
 
@@ -125 +122 @@
     line:setPosition(CEGUI.UVector2(CEGUI.UDim(0, 0), CEGUI.UDim(0, lineHeight*(k-1))))
 
-    local command = winMgr:createWindow("TaharezLook/StaticText", "orxonox/KeyBindPane/Binding" .. k .. "/Command")
+    local command = winMgr:createWindow("MenuWidgets/StaticText", "orxonox/KeyBindPane/Binding" .. k .. "/Command")
     command:setText(nameList[k])
     command:setSize(CEGUI.UVector2(CEGUI.UDim(0, commandWidth), CEGUI.UDim(1, 0)))
@@ -132 +129 @@
     offset = offset + commandWidth + spaceWidth
 
-    local plus = winMgr:createWindow("TaharezLook/TabButton", "orxonox/KeyBindPane/Binding" .. k .. "/Plus")
+    local plus = winMgr:createWindow("MenuWidgets/TabButton", "orxonox/KeyBindPane/Binding" .. k .. "/Plus")
     plus:setSize(CEGUI.UVector2(CEGUI.UDim(0, addWidth), CEGUI.UDim(0.7, 0)))
     plus:setPosition(CEGUI.UVector2(CEGUI.UDim(0, offset), CEGUI.UDim(0.15, 0)))
@@ -142 +139 @@
     local numButtons = orxonox.KeyBinderManager:getInstance():getCurrent():getNumberOfBindings(commandList[k]);
     for i=0,(numButtons-1) do
-        local button = winMgr:createWindow("TaharezLook/TabButton", "orxonox/KeyBindPane/Binding" .. k .. "/Button" .. i)
+        local button = winMgr:createWindow("MenuWidgets/TabButton", "orxonox/KeyBindPane/Binding" .. k .. "/Button" .. i)
         local name = orxonox.KeyBinderManager:getInstance():getCurrent():getBinding(commandList[k],i)
         name = P.KeyNameNiceifier(name)
@@ -156 +153 @@
         offset = offset + buttonWidth
 
-        local clear = winMgr:createWindow("TaharezLook/TabButton", "orxonox/KeyBindPane/Binding" .. k .. "/Clear" .. i)
+        local clear = winMgr:createWindow("MenuWidgets/TabButton", "orxonox/KeyBindPane/Binding" .. k .. "/Clear" .. i)
         clear:setSize(CEGUI.UVector2(CEGUI.UDim(0, clearWidth), CEGUI.UDim(0.7, 0)))
         clear:setPosition(CEGUI.UVector2(CEGUI.UDim(0, offset), CEGUI.UDim(0.15, 0)))

code/branches/gamestates2/data/gui/scripts/MainMenu.lua

@@ -2 +2 @@
 
 BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("MainMenu")
 if _REQUIREDNAME == nil then
     MainMenu = P
@@ -8 +8 @@
     _G[_REQUIREDNAME] = P
 end
-
-P.filename = "MainMenu"
-P.layoutString = "MainMenu.layout"
 
 -- events for MainMenu

code/branches/gamestates2/data/gui/scripts/MouseControlsMenu.lua

@@ -2 +2 @@
 
 BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("MouseControlsMenu")
 if _REQUIREDNAME == nil then
     MouseControlsMenu = P
@@ -8 +8 @@
     _G[_REQUIREDNAME] = P
 end
-
-P.filename = "MouseControlsMenu"
-P.layoutString = "MouseControlsMenu.layout"
 
 function P:init()

code/branches/gamestates2/data/gui/scripts/MultiplayerMenu.lua

@@ -2 +2 @@
 
 BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("MultiplayerMenu")
 if _REQUIREDNAME == nil then
     MultiplayerMenu = P
@@ -8 +8 @@
     _G[_REQUIREDNAME] = P
 end
-
-P.filename = "MultiplayerMenu"
-P.layoutString = "MultiplayerMenu.layout"
 
 function P:init()
@@ -30 +27 @@
     for k,v in pairs(levelList) do
         item = CEGUI.createListboxTextItem(v)
-        item:setSelectionBrushImage("TaharezLook", "MultiListSelectionBrush")
+        item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
         CEGUI.toListbox(listbox):addItem(item)
         if v .. ".oxw" == preselect then

code/branches/gamestates2/data/gui/scripts/MultiplayerOptionsMenu.lua

@@ -2 +2 @@
 
 BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("MultiplayerOptionsMenu")
 if _REQUIREDNAME == nil then
     MultiplayerOptionsMenu = P
@@ -9 +9 @@
 end
 
-P.filename = "MultiplayerOptionsMenu"
-P.layoutString = "MultiplayerOptionsMenu.layout"
-
 function P.MultiplayerOptionsBackButton_clicked(e)
     hideGUI(P.filename)

code/branches/gamestates2/data/gui/scripts/PickupInventory.lua

@@ -2 +2 @@
 
 BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("PickupInventory")
 if _REQUIREDNAME == nil then
     PickupInventory = P
@@ -8 +8 @@
     _G[_REQUIREDNAME] = P
 end
-
-P.filename = "PickupInventory"
-P.layoutString = "PickupInventory.layout"
 
 P.lastEquipmentCount_ = 0

code/branches/gamestates2/data/gui/scripts/QuestGUI.lua

@@ -1 +1 @@
 gui = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("QuestGUI")
 if _REQUIREDNAME == nil then
     QuestGUI = P
@@ -6 +6 @@
     _G[_REQUIREDNAME] = P
 end
-
-P.filename = "QuestGUI"
-P.layoutString = "QuestGUI.layout"
 
 function P:show()

code/branches/gamestates2/data/gui/scripts/SettingsMenu.lua

@@ -2 +2 @@
 
 BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("SettingsMenu")
 if _REQUIREDNAME == nil then
     SettingsMenu = P
@@ -8 +8 @@
     _G[_REQUIREDNAME] = P
 end
-
-P.filename = "SettingsMenu"
-P.layoutString = "SettingsMenu.layout"
 
 function P.SettingsGameplayButton_clicked(e)

code/branches/gamestates2/data/gui/scripts/SingleplayerMenu.lua

@@ -2 +2 @@
 
 BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("SingleplayerMenu")
 if _REQUIREDNAME == nil then
     SingleplayerMenu = P
@@ -8 +8 @@
     _G[_REQUIREDNAME] = P
 end
-
-P.filename = "SingleplayerMenu"
-P.layoutString = "SingleplayerMenu.layout"
 
 function P:init()
@@ -30 +27 @@
     for k,v in pairs(levelList) do
         item = CEGUI.createListboxTextItem(v)
-        item:setSelectionBrushImage("TaharezLook", "MultiListSelectionBrush")
+        item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
         CEGUI.toListbox(listbox):addItem(item)
         if v .. ".oxw" == preselect then

code/branches/gamestates2/src/libraries/core/Core.cc

@@ -225 +225 @@
 
         // Load the CEGUI interface
-        guiManager_.reset(new GUIManager(graphicsManager_->getRenderWindow(),
-            inputManager_->getMousePosition(), graphicsManager_->isFullScreen()));
+        guiManager_.reset(new GUIManager(inputManager_->getMousePosition()));
 
         bGraphicsLoaded_ = true;

code/branches/gamestates2/src/libraries/core/Core.h

@@ -38 +38 @@
 #include "util/ScopeGuard.h"
 #include "util/Singleton.h"
-#include "core/OrxonoxClass.h"
+#include "OrxonoxClass.h"
 
 namespace orxonox

code/branches/gamestates2/src/libraries/core/GUIManager.cc

@@ -57 +57 @@
 #include "ConsoleCommand.h"
 #include "Core.h"
+#include "GraphicsManager.h"
 #include "LuaState.h"
 #include "PathConfig.h"
 #include "Resource.h"
+#include "input/InputManager.h"
+#include "input/InputState.h"
+#include "input/KeyBinderManager.h"
 
 namespace orxonox
@@ -108 +112 @@
     @return true if success, otherwise false
     */
-    GUIManager::GUIManager(Ogre::RenderWindow* renderWindow, const std::pair<int, int>& mousePosition, bool bFullScreen)
-        : renderWindow_(renderWindow)
-        , resourceProvider_(0)
+    GUIManager::GUIManager(const std::pair<int, int>& mousePosition)
+        : resourceProvider_(NULL)
         , camera_(NULL)
-        , bShowIngameGUI_(false)
     {
         using namespace CEGUI;
@@ -119 +121 @@
 
         // Note: No SceneManager specified yet
-        guiRenderer_.reset(new OgreCEGUIRenderer(renderWindow_, Ogre::RENDER_QUEUE_OVERLAY, false, 3000));
+        guiRenderer_.reset(new OgreCEGUIRenderer(GraphicsManager::getInstance().getRenderWindow(), Ogre::RENDER_QUEUE_OVERLAY, false, 3000));
         resourceProvider_ = guiRenderer_->createResourceProvider();
         resourceProvider_->setDefaultResourceGroup("GUI");
@@ -141 +143 @@
         guiSystem_.reset(new System(guiRenderer_.get(), resourceProvider_, 0, scriptModule_.get()));
 
+        // Align CEGUI mouse with OIS mouse
+        guiSystem_->injectMousePosition((float)mousePosition.first, (float)mousePosition.second);
+
+        // Hide the mouse cursor unless playing in full screen mode
+        if (!GraphicsManager::getInstance().isFullScreen())
+            CEGUI::MouseCursor::getSingleton().hide();
+
         // Initialise the basic Lua code
         this->luaState_->doFile("InitialiseGUI.lua");
-
-        // Align CEGUI mouse with OIS mouse
-        guiSystem_->injectMousePosition((float)mousePosition.first, (float)mousePosition.second);
-
-        // Hide the mouse cursor unless playing in full screen mode
-        if (!bFullScreen)
-            CEGUI::MouseCursor::getSingleton().hide();
     }
 
@@ -208 +210 @@
     }
 
+    /** Loads a GUI sheet by Lua script
+    @param name
+        The name of the GUI (like the script name, but without the extension)
+    */
+    void GUIManager::loadGUI(const std::string& name)
+    {
+        this->executeCode("loadGUI(\"" + name + "\")");
+    }
+
     /**
     @brief
@@ -240 +251 @@
     {
         GUIManager::getInstance().executeCode("hideGUI(\"" + name + "\")");
+    }
+
+    const std::string& GUIManager::createInputState(const std::string& name, TriBool::Value showMouse, TriBool::Value useKeyboard, bool bBlockJoyStick)
+    {
+        InputState* state = InputManager::getInstance().createInputState(name);
+
+        if (GraphicsManager::getInstance().isFullScreen() && showMouse == TriBool::True ||
+           !GraphicsManager::getInstance().isFullScreen() && showMouse == TriBool::False)
+            state->setMouseExclusive(TriBool::True);
+        else
+            state->setMouseExclusive(TriBool::Dontcare);
+
+        if (showMouse == TriBool::True)
+            state->setMouseHandler(this);
+        else if (showMouse == TriBool::False)
+            state->setMouseHandler(&InputHandler::EMPTY);
+
+        if (useKeyboard == TriBool::True)
+            state->setKeyHandler(this);
+        else if (useKeyboard == TriBool::False)
+            state->setKeyHandler(&InputHandler::EMPTY);
+
+        if (bBlockJoyStick)
+            state->setJoyStickHandler(&InputHandler::EMPTY);
+
+        return state->getName();
     }
 

code/branches/gamestates2/src/libraries/core/GUIManager.h

@@ -41 +41 @@
 
 #include "util/OgreForwardRefs.h"
+#include "util/TriBool.h"
 #include "util/Singleton.h"
 #include "input/InputHandler.h"
+
+// Tolua includes (have to be relative to the current directory)
+/*
+$cfile "../util/TriBool.h" // tolua_export
+*/
 
 namespace orxonox // tolua_export
@@ -54 +60 @@
 
         The GUIManager is a singleton and can be called anywhere when access on the GUI is needed.
-        Creation of the GUIManager is therefore not possible and the cunstructor is private.
 
         Since the GUI needs user input, the GUIManager implements the functions needed to act as a key and/or mouse handler.
@@ -64 +69 @@
         friend class Singleton<GUIManager>;
     public:
-        GUIManager(Ogre::RenderWindow* renderWindow, const std::pair<int, int>& mousePosition, bool bFullScreen);
+        GUIManager(const std::pair<int, int>& mousePosition);
         ~GUIManager();
 
         void preUpdate(const Clock& time);
 
+        void loadGUI(const std::string& name);
         static void showGUI(const std::string& name, bool hidePrevious=false, bool showCursor=true);
         void showGUIExtra(const std::string& name, const std::string& ptr, bool hidePrevious=false, bool showCursor=true);
@@ -75 +81 @@
         void setBackground(const std::string& name);
 
+        const std::string& createInputState(const std::string& name, TriBool::Value showMouse = TriBool::True, TriBool::Value useKeyboard = TriBool::True, bool bBlockJoyStick = false); // tolua_export
+
         void setCamera(Ogre::Camera* camera);
         Ogre::Camera* getCamera() { return this->camera_; }
-
-        static GUIManager* getInstancePtr() { return singletonPtr_s; }
 
         inline void setPlayer(const std::string& guiname, PlayerInfo* player)
@@ -87 +93 @@
         // TODO: Temporary hack because the tolua exported CEGUI method does not seem to work
         static void subscribeEventHelper(CEGUI::Window* window, const std::string& event, const std::string& function); //tolua_export
+
+        static GUIManager& getInstance() { return Singleton<GUIManager>::getInstance(); } // tolua_export
 
     private:
@@ -102 +110 @@
         void mouseMoved    (IntVector2 abs, IntVector2 rel, IntVector2 clippingSize);
         void mouseScrolled (int abs, int rel);
-
         scoped_ptr<CEGUI::OgreCEGUIRenderer> guiRenderer_;      //!< CEGUI's interface to the Ogre Engine
         scoped_ptr<LuaState>                 luaState_;         //!< LuaState, access point to the Lua engine
@@ -108 +115 @@
         scoped_ptr<CEGUI::System>            guiSystem_;        //!< CEGUI's main system
         shared_ptr<ResourceInfo>             rootFileInfo_;     //!< Resource information about the root script
-        Ogre::RenderWindow*                  renderWindow_;     //!< Ogre's render window to give CEGUI access to it
         CEGUI::ResourceProvider*             resourceProvider_; //!< CEGUI's resource provider
         CEGUI::Logger*                       ceguiLogger_;      //!< CEGUI's logger to be able to log CEGUI errors in our log
-        std::map<std::string, PlayerInfo*>   players_;          //!< Stores the player (owner) for each gui
+        std::map<std::string, PlayerInfo*>   players_;          //!< Stores the player (owner) for each GUI
         Ogre::Camera*                        camera_;           //!< Camera used to render the scene with the GUI
 
         static GUIManager*                   singletonPtr_s;    //!< Singleton reference to GUIManager
-        bool                                 bShowIngameGUI_;
 
     }; // tolua_export

code/branches/gamestates2/src/libraries/core/Game.h

@@ -50 +50 @@
 #include "util/ScopeGuard.h"
 #include "util/Singleton.h"
-#include "core/OrxonoxClass.h"
+#include "OrxonoxClass.h"
 
 /**

code/branches/gamestates2/src/libraries/core/IOConsole.cc

@@ -35 +35 @@
 #include "util/Clock.h"
 #include "util/Math.h"
-#include "core/Game.h"
-#include "core/input/InputBuffer.h"
+#include "Game.h"
+#include "input/InputBuffer.h"
 
 // ##########################

code/branches/gamestates2/src/libraries/core/IOConsole.h

@@ -37 +37 @@
 #include <vector>
 #include "util/Singleton.h"
-#include "core/Shell.h"
+#include "Shell.h"
 
 #ifdef ORXONOX_PLATFORM_UNIX

code/branches/gamestates2/src/libraries/core/LuaState.h

@@ -40 +40 @@
 
 #include "util/ScopeGuard.h"
-#include "core/Functor.h"
+#include "Functor.h"
 #include "ToluaInterface.h"
 

code/branches/gamestates2/src/libraries/core/Template.cc

@@ -33 +33 @@
 
 #include "util/Debug.h"
-#include "core/CoreIncludes.h"
-#include "core/XMLPort.h"
+#include "CoreIncludes.h"
+#include "XMLPort.h"
 
 namespace orxonox

code/branches/gamestates2/src/libraries/core/input/InputManager.cc

@@ -87 +87 @@
         , oisInputManager_(0)
         , devices_(2)
-        , mouseMode_(MouseMode::Nonexclusive)
+        , exclusiveMouse_(TriBool::False)
         , emptyState_(0)
         , calibratorCallbackHandler_(0)
@@ -98 +98 @@
 
         if (GraphicsManager::getInstance().isFullScreen())
-            mouseMode_ = MouseMode::Exclusive;
+            exclusiveMouse_ = TriBool::True;
         this->loadDevices();
 
@@ -155 +155 @@
         paramList.insert(std::make_pair("w32_keyboard", "DISCL_FOREGROUND"));
         paramList.insert(std::make_pair("w32_mouse", "DISCL_FOREGROUND"));
-        if (mouseMode_ == MouseMode::Exclusive || GraphicsManager::getInstance().isFullScreen())
+        if (exclusiveMouse_ == TriBool::True || GraphicsManager::getInstance().isFullScreen())
         {
             // Disable Windows key plus special keys (like play, stop, next, etc.)
@@ -168 +168 @@
         paramList.insert(std::make_pair("XAutoRepeatOn", "true"));
 
-        if (mouseMode_ == MouseMode::Exclusive || GraphicsManager::getInstance().isFullScreen())
+        if (exclusiveMouse_ == TriBool::True || GraphicsManager::getInstance().isFullScreen())
         {
             if (CommandLineParser::getValue("keyboard_no_grab").getBool())
@@ -504 +504 @@
 
         // Check whether we have to change the mouse mode
-        MouseMode::Value requestedMode = MouseMode::Dontcare;
+        TriBool::Value requestedMode = TriBool::Dontcare;
         std::vector<InputState*>& mouseStates = devices_[InputDeviceEnumerator::Mouse]->getStateListRef();
         if (mouseStates.empty())
-            requestedMode = MouseMode::Nonexclusive;
+            requestedMode = TriBool::False;
         else
-            requestedMode = mouseStates.front()->getMouseMode();
-        if (requestedMode != MouseMode::Dontcare && mouseMode_ != requestedMode)
-        {
-            mouseMode_ = requestedMode;
+            requestedMode = mouseStates.front()->getMouseExclusive();
+        if (requestedMode != TriBool::Dontcare && exclusiveMouse_ != requestedMode)
+        {
+            exclusiveMouse_ = requestedMode;
             if (!GraphicsManager::getInstance().isFullScreen())
                 this->reloadInternal();

code/branches/gamestates2/src/libraries/core/input/InputManager.h

@@ -38 +38 @@
 
 #include "util/Singleton.h"
+#include "util/TriBool.h"
 #include "core/WindowEventListener.h"
 #include "InputState.h"
@@ -159 +160 @@
             - The removal process is being postponed if InputManager::preUpdate() is currently running.
         */
-        bool destroyState(const std::string& name);
+        bool destroyState(const std::string& name); // tolua_export
 
         //-------------------------------
@@ -196 +197 @@
         OIS::InputManager*                  oisInputManager_;      //!< OIS input manager
         std::vector<InputDevice*>           devices_;              //!< List of all input devices (keyboard, mouse, joy sticks)
-        MouseMode::Value                    mouseMode_;            //!< Currently applied mouse mode
+        TriBool::Value                      exclusiveMouse_;       //!< Currently applied mouse mode
 
         // some internally handled states and handlers

code/branches/gamestates2/src/libraries/core/input/InputState.cc

@@ -37 +37 @@
         , bAlwaysGetsInput_(bAlwaysGetsInput)
         , bTransparent_(bTransparent)
-        , mouseMode_(MouseMode::Dontcare)
+        , exclusiveMouse_(TriBool::Dontcare)
         , bExpired_(true)
         , handlers_(2)

code/branches/gamestates2/src/libraries/core/input/InputState.h

@@ -37 +37 @@
 
 #include "util/OrxEnum.h"
+#include "util/TriBool.h"
 #include "InputHandler.h"
 #include "JoyStickQuantityListener.h"
@@ -56 +57 @@
     };
 
-    namespace MouseMode
-    {
-        enum Value
-        {
-            Exclusive,
-            Nonexclusive,
-            Dontcare
-        };
-    }
 
     /**
@@ -73 +65 @@
         that stack and only the top one gets the input events. This is done for
         every device (keyboard, mouse, all joy sticks) separately to allow
-        for intance keyboard input capturing for the console while you can still
+        for instance keyboard input capturing for the console while you can still
         steer a ship with the mouse.
         There are two exceptions to this behaviour though:
@@ -83 +75 @@
           the state will always receive input as long as it is activated.
         - Note: If you mark an InputState with both parameters on, then it will
-          not influence ony other InputState at all.
+          not influence only other InputState at all.
 
     @par Priorities
@@ -95 +87 @@
     @par Exclusive/Non-Exclusive mouse Mode
         You can select a specific mouse mode that tells whether the application
-        should have exclusive accessto it or not.
+        should have exclusive access to it or not.
         When in non-exclusive mode, you can move the mouse out of the window
         like with any other normal window (only for windowed mode!).
@@ -130 +122 @@
         void setHandler        (InputHandler* handler);
 
-        void setMouseMode(MouseMode::Value value) { mouseMode_ = value; this->bExpired_ = true; }
-        MouseMode::Value getMouseMode() const { return mouseMode_; }
+        void setMouseExclusive(TriBool::Value value) { exclusiveMouse_ = value; this->bExpired_ = true; }
+        TriBool::Value getMouseExclusive() const { return exclusiveMouse_; }
 
         //! Returns the name of the state (which is unique!)
@@ -184 +176 @@
         const bool                  bAlwaysGetsInput_;      //!< See class declaration for explanation
         const bool                  bTransparent_;          //!< See class declaration for explanation
-        MouseMode::Value            mouseMode_;             //!< See class declaration for explanation
+        TriBool::Value              exclusiveMouse_;        //!< See class declaration for explanation
         int                         priority_;              //!< Current priority (might change)
         bool                        bExpired_;              //!< See hasExpired()

code/branches/gamestates2/src/libraries/network/TrafficControl.h

@@ -34 +34 @@
 #include <list>
 #include <map>
-#include "network/ClientConnectionListener.h"
+#include "ClientConnectionListener.h"
 
 namespace orxonox {

code/branches/gamestates2/src/libraries/util/Serialise.h

@@ -35 +35 @@
 #define _Serialise_H__
 
+#include "UtilPrereqs.h"
+
 #include <cstring>
-#include "util/Math.h"
-#include "util/mbool.h"
+#include "Math.h"
+#include "mbool.h"
 
 namespace orxonox{

code/branches/gamestates2/src/modules/questsystem/QuestGUI.cc

@@ -109 +109 @@
 
         //! Create root window.
-        this->rootWindow_ = this->windowManager_->createWindow("TaharezLook/ScrollablePane", "QuestGUI/Quests");
+        this->rootWindow_ = this->windowManager_->createWindow("MenuWidgets/ScrollablePane", "QuestGUI/Quests");
         this->rootWindow_->setSize(CEGUI::UVector2(CEGUI::UDim(1, 0),CEGUI::UDim(1, 0)));
 
@@ -161 +161 @@
         Get a CEGUI Window to use.
         Windows that are no longer used are collected with giveWindow, and are given out again with getWindow, so save some time recreating new windows everytime.
-        The retreived window is of type "TaharezLook/TabButton".
-    @return
-        Returns a CEGUI Window of type "TaharezLook/TabButton".
+        The retreived window is of type "MenuWidgets/TabButton".
+    @return
+        Returns a CEGUI Window of type "MenuWidgets/TabButton".
     */
     CEGUI::Window* QuestGUI::getWindow(void)
@@ -177 +177 @@
         std::ostringstream stream;
         stream << "QuestGUI/Quests/EmptyWindows/" << this->windows_.size()+1;
-        return this->windowManager_->createWindow("TaharezLook/TabButton", stream.str());
+        return this->windowManager_->createWindow("MenuWidgets/TabButton", stream.str());
     }
 

code/branches/gamestates2/src/modules/questsystem/QuestGUINode.cc

@@ -160 +160 @@
             stream << this->window_->getName() << "/Details";
             const QuestDescription* description = this->item_->getDescription();
-            this->details_ = this->gui_->getWindowManager()->createWindow("TaharezLook/FrameWindow", stream.str());
+            this->details_ = this->gui_->getWindowManager()->createWindow("MenuWidgets/FrameWindow", stream.str());
             this->details_->setSize(CEGUI::UVector2(CEGUI::UDim(0.7f, 0),CEGUI::UDim(0.7f, 0)));
             this->details_->setPosition(CEGUI::UVector2(CEGUI::UDim(0.1f, 0),CEGUI::UDim(0.1f, 0)));
@@ -171 +171 @@
             //! Create a ScrollablePane.
             stream << "/Scrollable";
-            CEGUI::Window* window = this->gui_->getWindowManager()->createWindow("TaharezLook/ScrollablePane", stream.str());
+            CEGUI::Window* window = this->gui_->getWindowManager()->createWindow("MenuWidgets/ScrollablePane", stream.str());
             window->setSize(CEGUI::UVector2(CEGUI::UDim(1.0, -2*QuestGUINode::BORDER_WIDTH),CEGUI::UDim(1.0, -QuestGUINode::TITLE_HEIGHT)));
             window->setPosition(CEGUI::UVector2(CEGUI::UDim(0, (float)QuestGUINode::BORDER_WIDTH),CEGUI::UDim(0, (float)QuestGUINode::TITLE_HEIGHT)));
@@ -185 +185 @@
                 stream.str("");
                 stream << this->details_->getName() << "/Status";
-                CEGUI::Window* statusWindow = this->gui_->getWindowManager()->createWindow("TaharezLook/StaticText", stream.str());
+                CEGUI::Window* statusWindow = this->gui_->getWindowManager()->createWindow("MenuWidgets/StaticText", stream.str());
                 window->addChildWindow(statusWindow);
                 std::string status;
@@ -214 +214 @@
             stream << this->details_->getName() << "/Description";
             stream << "/Title";
-            CEGUI::Window* descriptionWindowTitle = this->gui_->getWindowManager()->createWindow("TaharezLook/StaticText", stream.str());
+            CEGUI::Window* descriptionWindowTitle = this->gui_->getWindowManager()->createWindow("MenuWidgets/StaticText", stream.str());
             window->addChildWindow(descriptionWindowTitle);
             descriptionWindowTitle->setProperty("HorzFormatting", "HorzCentred");
@@ -227 +227 @@
             stream.str("");
             stream << this->details_->getName() << "/Description";
-            CEGUI::Window* descriptionWindow = this->gui_->getWindowManager()->createWindow("TaharezLook/StaticText", stream.str());
+            CEGUI::Window* descriptionWindow = this->gui_->getWindowManager()->createWindow("MenuWidgets/StaticText", stream.str());
             window->addChildWindow(descriptionWindow);
             descriptionWindow->setProperty("HorzFormatting", "WordWrapLeftAligned");
@@ -250 +250 @@
                             stream.str("");
                             stream << this->details_->getName() << "/Hints/Title";
-                            CEGUI::Window* hintsTitle = this->gui_->getWindowManager()->createWindow("TaharezLook/StaticText", stream.str());
+                            CEGUI::Window* hintsTitle = this->gui_->getWindowManager()->createWindow("MenuWidgets/StaticText", stream.str());
                             window->addChildWindow(hintsTitle);
                             hintsTitle->setProperty("HorzFormatting", "HorzCentred");

code/branches/gamestates2/src/orxonox/gamestates/GSLevel.cc

@@ -69 +69 @@
         {
             gameInputState_ = InputManager::getInstance().createInputState("game");
-            gameInputState_->setMouseMode(MouseMode::Exclusive);
+            gameInputState_->setMouseExclusive(TriBool::True);
             gameInputState_->setHandler(KeyBinderManager::getInstance().getDefaultAsHandler());
             KeyBinderManager::getInstance().setToDefault();
 
             guiMouseOnlyInputState_ = InputManager::getInstance().createInputState("guiMouseOnly");
-            guiMouseOnlyInputState_->setMouseMode(MouseMode::Exclusive);
-            guiMouseOnlyInputState_->setMouseHandler(GUIManager::getInstancePtr());
+            guiMouseOnlyInputState_->setMouseExclusive(TriBool::True);
+            guiMouseOnlyInputState_->setMouseHandler(&GUIManager::getInstance());
 
             guiKeysOnlyInputState_ = InputManager::getInstance().createInputState("guiKeysOnly");
-            guiKeysOnlyInputState_->setKeyHandler(GUIManager::getInstancePtr());
+            guiKeysOnlyInputState_->setKeyHandler(&GUIManager::getInstance());
         }
 

code/branches/gamestates2/src/orxonox/gamestates/GSMainMenu.cc

@@ -53 +53 @@
         RegisterRootObject(GSMainMenu);
         inputState_ = InputManager::getInstance().createInputState("mainMenu");
-        inputState_->setMouseMode(MouseMode::Nonexclusive);
-        inputState_->setHandler(GUIManager::getInstancePtr());
+        inputState_->setMouseExclusive(TriBool::False);
+        inputState_->setHandler(&GUIManager::getInstance());
         inputState_->setKeyHandler(KeyBinderManager::getInstance().getDefaultAsHandler());
         inputState_->setJoyStickHandler(&InputHandler::EMPTY);
@@ -101 +101 @@
 
         KeyBinderManager::getInstance().setToDefault();
-        InputManager::getInstance().enterState("mainMenu");
+        //InputManager::getInstance().enterState("mainMenu");
 
         this->setConfigValues();
@@ -119 +119 @@
         }
 
-        InputManager::getInstance().leaveState("mainMenu");
+        //InputManager::getInstance().leaveState("mainMenu");
 
         GUIManager::getInstance().setCamera(0);

code/branches/gamestates2/src/orxonox/overlays/CMakeLists.txt

@@ -1 +1 @@
 ADD_SOURCE_FILES(ORXONOX_SRC_FILES
+  GUISheet.cc
   OrxonoxOverlay.cc
   OverlayGroup.cc