Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Mar 18, 2010, 10:07:48 PM (15 years ago)
Author:
rgrieder
Message:

Changed use of CEGUI widgets: Instead of addressing a type with "TaharezLook/Button" I changed it to "MenuWidgets/MyWidget".
That allows to define multiple skins for the menu and simply load the one we like.
Furthermore the idea is to use "HUDWidgets/MyWidget" for HUD elements. But I haven't added that.

Location:
code/branches/gamestate/data/gui
Files:
2 added
22 edited

Legend:

Unmodified
Added
Removed

  • code/branches/gamestate/data/gui/layouts/AudioMenu.layout

    r6417 r6564  
    22
    33<GUILayout >
    4     <Window Type="TaharezLook/StaticImage" Name="orxonox/AudioBackground" >
     4    <Window Type="MenuWidgets/StaticImage" Name="orxonox/AudioBackground" >
    55        <Property Name="FrameEnabled" Value="False" />
    66        <Property Name="InheritsAlpha" Value="False" />
    … …  
    88        <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
    99        <Property Name="BackgroundEnabled" Value="False" />
    10         <Window Type="TaharezLook/StaticText" Name="orxonox/AudioWindow" >
     10        <Window Type="MenuWidgets/StaticText" Name="orxonox/AudioWindow" >
    1111            <Property Name="Text" Value="Audio" />
    1212            <Property Name="Alpha" Value="0.8" />
    … …  
    1616            <Property Name="VertFormatting" Value="TopAligned" />
    1717            <Property Name="UnifiedAreaRect" Value="{{0.2,0},{0.2875,0},{0.8,0},{0.6375,0}}" />
    18             <Window Type="TaharezLook/StaticText" Name="orxonox/MasterVolume" >
     18            <Window Type="MenuWidgets/StaticText" Name="orxonox/MasterVolume" >
    1919                <Property Name="Text" Value="Master volume               " />
    2020                <Property Name="InheritsAlpha" Value="False" />
    … …  
    2323                <Property Name="VertFormatting" Value="TopAligned" />
    2424                <Property Name="UnifiedAreaRect" Value="{{0.041666,0},{0.15,0},{0.5625,0},{0.3525,0}}" />
    25                 <Window Type="TaharezLook/HorizontalScrollbar" Name="orxonox/MasterScrollbar" >
     25                <Window Type="MenuWidgets/HorizontalScrollbar" Name="orxonox/MasterScrollbar" >
    2626                    <Property Name="PageSize" Value="0" />
    2727                    <Property Name="StepSize" Value="1" />
    … …  
    3636                    <Event Name="ScrollPosChanged" Function="AudioMenu.AudioMasterScrollbar_changed" />
    3737                </Window>
    38                 <Window Type="TaharezLook/Checkbox" Name="orxonox/MasterCheckbox" >
     38                <Window Type="MenuWidgets/Checkbox" Name="orxonox/MasterCheckbox" >
    3939                    <Property Name="Text" Value="Mute" />
    4040                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    … …  
    4343                </Window>
    4444            </Window>
    45             <Window Type="TaharezLook/StaticText" Name="orxonox/MusicVolume" >
     45            <Window Type="MenuWidgets/StaticText" Name="orxonox/MusicVolume" >
    4646                <Property Name="Text" Value="Music volume               " />
    4747                <Property Name="InheritsAlpha" Value="False" />
    … …  
    5050                <Property Name="VertFormatting" Value="TopAligned" />
    5151                <Property Name="UnifiedAreaRect" Value="{{0.041666,0},{0.4335,0},{0.5625,0},{0.636,0}}" />
    52                 <Window Type="TaharezLook/HorizontalScrollbar" Name="orxonox/MusicScrollbar" >
     52                <Window Type="MenuWidgets/HorizontalScrollbar" Name="orxonox/MusicScrollbar" >
    5353                    <Property Name="PageSize" Value="0" />
    5454                    <Property Name="StepSize" Value="1" />
    … …  
    6363                    <Event Name="ScrollPosChanged" Function="AudioMenu.AudioMusicScrollbar_changed" />
    6464                </Window>
    65                 <Window Type="TaharezLook/Checkbox" Name="orxonox/MusicCheckbox" >
     65                <Window Type="MenuWidgets/Checkbox" Name="orxonox/MusicCheckbox" >
    6666                    <Property Name="Text" Value="Mute" />
    6767                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    … …  
    7070                </Window>
    7171            </Window>
    72             <Window Type="TaharezLook/StaticText" Name="orxonox/EffectsVolume" >
     72            <Window Type="MenuWidgets/StaticText" Name="orxonox/EffectsVolume" >
    7373                <Property Name="Text" Value="Effects volume               " />
    7474                <Property Name="InheritsAlpha" Value="False" />
    … …  
    7777                <Property Name="VertFormatting" Value="TopAligned" />
    7878                <Property Name="UnifiedAreaRect" Value="{{0.041666,0},{0.717,0},{0.5625,0},{0.9195,0}}" />
    79                 <Window Type="TaharezLook/HorizontalScrollbar" Name="orxonox/EffectsScrollbar" >
     79                <Window Type="MenuWidgets/HorizontalScrollbar" Name="orxonox/EffectsScrollbar" >
    8080                    <Property Name="PageSize" Value="0" />
    8181                    <Property Name="StepSize" Value="1" />
    … …  
    9090                    <Event Name="ScrollPosChanged" Function="AudioMenu.AudioEffectsScrollbar_changed" />
    9191                </Window>
    92                 <Window Type="TaharezLook/Checkbox" Name="orxonox/EffectsCheckbox" >
     92                <Window Type="MenuWidgets/Checkbox" Name="orxonox/EffectsCheckbox" >
    9393                    <Property Name="Text" Value="Mute" />
    9494                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    … …  
    9797                </Window>
    9898            </Window>
    99             <Window Type="TaharezLook/StaticText" Name="orxonox/AudioTheme" >
     99            <Window Type="MenuWidgets/StaticText" Name="orxonox/AudioTheme" >
    100100                <Property Name="Text" Value="Theme" />
    101101                <Property Name="InheritsAlpha" Value="False" />
    … …  
    104104                <Property Name="VertFormatting" Value="TopAligned" />
    105105                <Property Name="UnifiedAreaRect" Value="{{0.604166,0},{0.15,0},{0.958333,0},{0.636,0}}" />
    106                 <Window Type="TaharezLook/Listbox" Name="orxonox/AudioThemeListbox" >
     106                <Window Type="MenuWidgets/Listbox" Name="orxonox/AudioThemeListbox" >
    107107                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    108108                    <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.225,0},{0.95,0},{0.92,0}}" />
    … …  
    110110                </Window>
    111111            </Window>
    112             <Window Type="TaharezLook/StaticText" Name="orxonox/AudioInfo" >
     112            <Window Type="MenuWidgets/StaticText" Name="orxonox/AudioInfo" >
    113113                <Property Name="Text" >Theme changes might take
    114114up to a minute.</Property>
    … …  
    121121            </Window>
    122122        </Window>
    123         <Window Type="TaharezLook/Button" Name="orxonox/AudioBackButton" >
     123        <Window Type="MenuWidgets/Button" Name="orxonox/AudioBackButton" >
    124124            <Property Name="Text" Value="Back" />
    125125            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />

  • code/branches/gamestate/data/gui/layouts/ControlsMenu.layout

    r6417 r6564  
    22
    33<GUILayout >
    4     <Window Type="TaharezLook/StaticImage" Name="orxonox/ControlsBackground" >
     4    <Window Type="MenuWidgets/StaticImage" Name="orxonox/ControlsBackground" >
    55        <Property Name="FrameEnabled" Value="False" />
    66        <Property Name="InheritsAlpha" Value="False" />
    … …  
    88        <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
    99        <Property Name="BackgroundEnabled" Value="False" />
    10         <Window Type="TaharezLook/StaticText" Name="orxonox/ControlsWindow" >
     10        <Window Type="MenuWidgets/StaticText" Name="orxonox/ControlsWindow" >
    1111            <Property Name="Text" Value="Controls" />
    1212            <Property Name="Alpha" Value="0.8" />
    … …  
    1616            <Property Name="VertFormatting" Value="TopAligned" />
    1717            <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.3625,0},{0.75,0},{0.6375,0}}" />
    18             <Window Type="TaharezLook/Button" Name="orxonox/MouseControlsButton" >
     18            <Window Type="MenuWidgets/Button" Name="orxonox/MouseControlsButton" >
    1919                <Property Name="Text" Value="Mouse controls" />
    2020                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    … …  
    2222                <Event Name="Clicked" Function="ControlsMenu.ControlsMouseControlsButton_clicked"/>
    2323            </Window>
    24             <Window Type="TaharezLook/Button" Name="orxonox/KeybindingsButton" >
     24            <Window Type="MenuWidgets/Button" Name="orxonox/KeybindingsButton" >
    2525                <Property Name="Text" Value="Keybindings" />
    2626                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    … …  
    2929            </Window>
    3030        </Window>
    31         <Window Type="TaharezLook/Button" Name="orxonox/ControlsBackButton" >
     31        <Window Type="MenuWidgets/Button" Name="orxonox/ControlsBackButton" >
    3232            <Property Name="Text" Value="Back" />
    3333            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />

  • code/branches/gamestate/data/gui/layouts/CreditsMenu.layout

    r6417 r6564  
    22
    33<GUILayout >
    4     <Window Type="TaharezLook/StaticImage" Name="orxonox/CreditsBackground" >
     4    <Window Type="MenuWidgets/StaticImage" Name="orxonox/CreditsBackground" >
    55        <Property Name="FrameEnabled" Value="False" />
    66        <Property Name="InheritsAlpha" Value="False" />
    … …  
    88        <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
    99        <Property Name="BackgroundEnabled" Value="False" />
    10         <Window Type="TaharezLook/StaticText" Name="orxonox/CreditsWindow" >
     10        <Window Type="MenuWidgets/StaticText" Name="orxonox/CreditsWindow" >
    1111            <Property Name="Text" Value="Credits" />
    1212            <Property Name="Alpha" Value="0.8" />
    … …  
    1616            <Property Name="VertFormatting" Value="TopAligned" />
    1717            <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.3625,0},{0.75,0},{0.6375,0}}" />
    18             <Window Type="TaharezLook/StaticText" Name="orxonox/CreditsText" >
     18            <Window Type="MenuWidgets/StaticText" Name="orxonox/CreditsText" >
    1919                <Property Name="Text">Orxonox version 0.0.3
    2020
    … …  
    3232            </Window>
    3333        </Window>
    34         <Window Type="TaharezLook/Button" Name="orxonox/CreditsBackButton" >
     34        <Window Type="MenuWidgets/Button" Name="orxonox/CreditsBackButton" >
    3535            <Property Name="Text" Value="Back" />
    3636            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />

  • code/branches/gamestate/data/gui/layouts/DecisionPopup.layout

    r6545 r6564  
    66        <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    77        <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
    8         <Window Type="TaharezLook/StaticImage" Name="orxonox/DecisionPopup_Background" >
     8        <Window Type="MenuWidgets/StaticImage" Name="orxonox/DecisionPopup_Background" >
    99            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    1010            <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
    1111            <Property Name="Alpha" Value="0.6" />
    12             <Window Type="TaharezLook/Button" Name="orxonox/DecisionPopup_button_yes" >
     12            <Window Type="MenuWidgets/Button" Name="orxonox/DecisionPopup_button_yes" >
    1313                <Property Name="Text" Value="Yes" />
    1414                <Property Name="Alpha" Value="0.7" />
    … …  
    1818                <Event Name="Clicked" Function="DecisionPopup.button_yes"/>
    1919            </Window>
    20             <Window Type="TaharezLook/Button" Name="orxonox/DecisionPopup_button_no" >
     20            <Window Type="MenuWidgets/Button" Name="orxonox/DecisionPopup_button_no" >
    2121                <Property Name="Text" Value="No" />
    2222                <Property Name="Alpha" Value="0.8" />
    … …  
    2626                <Event Name="Clicked" Function="DecisionPopup.button_no"/>
    2727            </Window>
    28             <Window Type="TaharezLook/StaticText" Name="orxonox/DecisionPopup_text" >
     28            <Window Type="MenuWidgets/StaticText" Name="orxonox/DecisionPopup_text" >
    2929                <Property Name="Text" Value="Template text" />
    3030                <Property Name="HorzFormatting" Value="WordWrapCentred" />

  • code/branches/gamestate/data/gui/layouts/GameplayMenu.layout

    r6417 r6564  
    22
    33<GUILayout >
    4     <Window Type="TaharezLook/StaticImage" Name="orxonox/GameplayBackground" >
     4    <Window Type="MenuWidgets/StaticImage" Name="orxonox/GameplayBackground" >
    55        <Property Name="FrameEnabled" Value="False" />
    66        <Property Name="InheritsAlpha" Value="False" />
    … …  
    88        <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
    99        <Property Name="BackgroundEnabled" Value="False" />
    10         <Window Type="TaharezLook/StaticText" Name="orxonox/GameplayWindow" >
     10        <Window Type="MenuWidgets/StaticText" Name="orxonox/GameplayWindow" >
    1111            <Property Name="Text" Value="Gameplay" />
    1212            <Property Name="Alpha" Value="0.8" />
    … …  
    1616            <Property Name="VertFormatting" Value="TopAligned" />
    1717            <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.3625,0},{0.75,0},{0.6375,0}}" />
    18             <Window Type="TaharezLook/StaticText" Name="orxonox/Difficulty" >
     18            <Window Type="MenuWidgets/StaticText" Name="orxonox/Difficulty" >
    1919                <Property Name="Text" Value="Difficulty" />
    2020                <Property Name="InheritsAlpha" Value="False" />
    … …  
    2323                <Property Name="VertFormatting" Value="TopAligned" />
    2424                <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.2,0},{0.475,0},{0.9,0}}" />
    25                 <Window Type="TaharezLook/RadioButton" Name="orxonox/DifficultyEasyButton" >
     25                <Window Type="MenuWidgets/RadioButton" Name="orxonox/DifficultyEasyButton" >
    2626                    <Property Name="Text" Value="Easy" />
    2727                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    … …  
    2929                    <Event Name="SelectStateChanged" Function="GameplayMenu.GameplayDifficultyEasyButton_clicked"/>
    3030                </Window>
    31                 <Window Type="TaharezLook/RadioButton" Name="orxonox/DifficultyNormalButton" >
     31                <Window Type="MenuWidgets/RadioButton" Name="orxonox/DifficultyNormalButton" >
    3232                    <Property Name="Text" Value="Normal" />
    3333                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    … …  
    3535                    <Event Name="SelectStateChanged" Function="GameplayMenu.GameplayDifficultyNormalButton_clicked"/>
    3636                </Window>
    37                 <Window Type="TaharezLook/RadioButton" Name="orxonox/DifficultyHardButton" >
     37                <Window Type="MenuWidgets/RadioButton" Name="orxonox/DifficultyHardButton" >
    3838                    <Property Name="Text" Value="Hard" />
    3939                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    … …  
    4242                </Window>
    4343            </Window>
    44             <Window Type="TaharezLook/StaticText" Name="orxonox/Theme" >
     44            <Window Type="MenuWidgets/StaticText" Name="orxonox/Theme" >
    4545                <Property Name="Text" Value="Theme" />
    4646                <Property Name="InheritsAlpha" Value="False" />
    … …  
    4949                <Property Name="VertFormatting" Value="TopAligned" />
    5050                <Property Name="UnifiedAreaRect" Value="{{0.525,0},{0.2,0},{0.95,0},{0.9,0}}" />
    51                 <Window Type="TaharezLook/Combobox" Name="orxonox/ThemeCombobox" >
     51                <Window Type="MenuWidgets/Combobox" Name="orxonox/ThemeCombobox" >
    5252                    <Property Name="AlwaysOnTop" Value="True" />
    5353                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    … …  
    5959            </Window>
    6060        </Window>
    61         <Window Type="TaharezLook/Button" Name="orxonox/GameplayBackButton" >
     61        <Window Type="MenuWidgets/Button" Name="orxonox/GameplayBackButton" >
    6262            <Property Name="Text" Value="Back" />
    6363            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />

  • code/branches/gamestate/data/gui/layouts/GraphicsMenu.layout

    r6417 r6564  
    22
    33<GUILayout >
    4     <Window Type="TaharezLook/StaticImage" Name="orxonox/GraphicsBackground" >
     4    <Window Type="MenuWidgets/StaticImage" Name="orxonox/GraphicsBackground" >
    55        <Property Name="FrameEnabled" Value="False" />
    66        <Property Name="InheritsAlpha" Value="False" />
    … …  
    88        <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
    99        <Property Name="BackgroundEnabled" Value="False" />
    10         <Window Type="TaharezLook/StaticText" Name="orxonox/GraphicsWindow" >
     10        <Window Type="MenuWidgets/StaticText" Name="orxonox/GraphicsWindow" >
    1111            <Property Name="Text" Value="Graphics" />
    1212            <Property Name="Alpha" Value="0.8" />
    … …  
    1616            <Property Name="VertFormatting" Value="TopAligned" />
    1717            <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.2875,0},{0.75,0},{0.6375,0}}" />
    18             <Window Type="TaharezLook/StaticText" Name="orxonox/Resolution" >
     18            <Window Type="MenuWidgets/StaticText" Name="orxonox/Resolution" >
    1919                <Property Name="Text" Value="Resolution" />
    2020                <Property Name="InheritsAlpha" Value="False" />
    … …  
    2323                <Property Name="VertFormatting" Value="TopAligned" />
    2424                <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.15,0},{0.475,0},{0.92,0}}" />
    25                 <Window Type="TaharezLook/Listbox" Name="orxonox/ResolutionListbox" >
     25                <Window Type="MenuWidgets/Listbox" Name="orxonox/ResolutionListbox" >
    2626                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    2727                    <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.15,0},{0.95,0},{0.95,0}}" />
    … …  
    2929                </Window>
    3030            </Window>
    31             <Window Type="TaharezLook/StaticText" Name="orxonox/Brightness" >
     31            <Window Type="MenuWidgets/StaticText" Name="orxonox/Brightness" >
    3232                <Property Name="Text" Value="Brightness" />
    3333                <Property Name="InheritsAlpha" Value="False" />
    … …  
    3636                <Property Name="VertFormatting" Value="TopAligned" />
    3737                <Property Name="UnifiedAreaRect" Value="{{0.525,0},{0.15,0},{0.95,0},{0.35,0}}" />
    38                 <Window Type="TaharezLook/HorizontalScrollbar" Name="orxonox/BrightnessScrollbar" >
     38                <Window Type="MenuWidgets/HorizontalScrollbar" Name="orxonox/BrightnessScrollbar" >
    3939                    <Property Name="Disabled" Value="true" />
    4040                    <Property Name="PageSize" Value="0" />
    … …  
    5050                </Window>
    5151            </Window>
    52             <Window Type="TaharezLook/Checkbox" Name="orxonox/FullscreenCheckbox" >
     52            <Window Type="MenuWidgets/Checkbox" Name="orxonox/FullscreenCheckbox" >
    5353                <Property Name="Text" Value="Fullscreen" />
    5454                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    … …  
    5656                <Event Name="CheckStateChanged" Function="GraphicsMenu.GraphicsFullscreenCheckbox_clicked"/>
    5757            </Window>
    58             <Window Type="TaharezLook/StaticText" Name="orxonox/GraphicsInfo" >
     58            <Window Type="MenuWidgets/StaticText" Name="orxonox/GraphicsInfo" >
    5959                <Property Name="Text" >
    6060Changes in graphics
    … …  
    6969            </Window>
    7070        </Window>
    71         <Window Type="TaharezLook/Button" Name="orxonox/GraphicsBackButton" >
     71        <Window Type="MenuWidgets/Button" Name="orxonox/GraphicsBackButton" >
    7272            <Property Name="Text" Value="Back" />
    7373            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />

  • code/branches/gamestate/data/gui/layouts/InGameMenu.layout

    r6545 r6564  
    66        <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    77        <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
    8         <Window Type="TaharezLook/Button" Name="orxonox/InGameMenu_ReturnButton" >
     8        <Window Type="MenuWidgets/Button" Name="orxonox/InGameMenu_ReturnButton" >
    99            <Property Name="Text" Value="Return to Game" />
    1010            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    … …  
    1313            <Event Name="Clicked" Function="InGameMenu.button_return_clicked"/>
    1414        </Window>
    15         <Window Type="TaharezLook/Button" Name="orxonox/InGameMenu_MainMenuButton" >
     15        <Window Type="MenuWidgets/Button" Name="orxonox/InGameMenu_MainMenuButton" >
    1616            <Property Name="Text" Value="Main Menu" />
    1717            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    … …  
    2020            <Event Name="Clicked" Function="InGameMenu.button_mainmenu_clicked"/>
    2121        </Window>
    22         <Window Type="TaharezLook/Button" Name="orxonox/InGameMenu_SettingsButton" >
     22        <Window Type="MenuWidgets/Button" Name="orxonox/InGameMenu_SettingsButton" >
    2323            <Property Name="Text" Value="Settings" />
    2424            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    … …  
    2727            <Event Name="Clicked" Function="InGameMenu.button_settings_clicked"/>
    2828        </Window>
    29         <Window Type="TaharezLook/Button" Name="orxonox/InGameMenu_QuitButton" >
     29        <Window Type="MenuWidgets/Button" Name="orxonox/InGameMenu_QuitButton" >
    3030            <Property Name="Text" Value="Quit" />
    3131            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />

  • code/branches/gamestate/data/gui/layouts/InGameTest.layout

    r5781 r6564  
    44    <Property Name="UnifiedSize" Value="{{1.0,0},{1.0,0}}"/>
    55
    6         <Window Type="TaharezLook/Button" Name="orxonox/TestButton">
     6        <Window Type="MenuWidgets/Button" Name="orxonox/TestButton">
    77            <Property Name="UnifiedPosition" Value="{{0.11,0},{0.528,0}}"/>
    88            <Property Name="UnifiedSize" Value="{{0.15,0},{0.05,0}}"/>

  • code/branches/gamestate/data/gui/layouts/InfoPopup.layout

    r6545 r6564  
    66        <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    77        <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
    8         <Window Type="TaharezLook/StaticImage" Name="orxonox/InfoPopup_Background" >
     8        <Window Type="MenuWidgets/StaticImage" Name="orxonox/InfoPopup_Background" >
    99            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    1010            <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
    1111            <Property Name="Alpha" Value="0.7" />
    12             <Window Type="TaharezLook/Button" Name="orxonox/InfoPopup_close" >
     12            <Window Type="MenuWidgets/Button" Name="orxonox/InfoPopup_close" >
    1313                <Property Name="Text" Value="Close" />
    1414                <Property Name="Alpha" Value="0.7" />
    … …  
    1818                <Event Name="Clicked" Function="InfoPopup.close"/>
    1919            </Window>
    20             <Window Type="TaharezLook/StaticText" Name="orxonox/InfoPopup_text" >
     20            <Window Type="MenuWidgets/StaticText" Name="orxonox/InfoPopup_text" >
    2121                <Property Name="Text" Value="Template text" />
    2222                <Property Name="TextColours" Value="FF4444FF" />

  • code/branches/gamestate/data/gui/layouts/KeyBindMenu.layout

    r6417 r6564  
    66        <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    77        <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
    8         <Window Type="TaharezLook/StaticText" Name="orxonox/KeyBindWindow" >
     8        <Window Type="MenuWidgets/StaticText" Name="orxonox/KeyBindWindow" >
    99            <Property Name="Text" Value="Keybindings" />
    1010            <Property Name="Alpha" Value="0.8" />
    … …  
    1414            <Property Name="VertFormatting" Value="TopAligned" />
    1515            <Property Name="UnifiedAreaRect" Value="{{0.15,0},{0.2125,0},{0.85,0},{0.6375,0}}" />
    16             <Window Type="TaharezLook/StaticText" Name="orxonox/KeyBindWrapper" >
     16            <Window Type="MenuWidgets/StaticText" Name="orxonox/KeyBindWrapper" >
    1717                <Property Name="TextColours" Value="FF4444FF" />
    1818                <Property Name="InheritsAlpha" Value="False" />
    … …  
    2121                <Property Name="VertFormatting" Value="TopAligned" />
    2222                <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.15,0},{0.95,0},{0.92,0}}" />
    23                 <Window Type="TaharezLook/ScrollablePane" Name="orxonox/KeyBindPane" >
     23                <Window Type="MenuWidgets/ScrollablePane" Name="orxonox/KeyBindPane" >
    2424                    <Property Name="ContentArea" Value="l:0 t:0 r:0 b:0" />
    2525                    <Property Name="HorzStepSize" Value="0.005" />
    … …  
    3434            </Window>
    3535        </Window>
    36         <Window Type="TaharezLook/Button" Name="orxonox/KeyBindBackButton" >
     36        <Window Type="MenuWidgets/Button" Name="orxonox/KeyBindBackButton" >
    3737            <Property Name="Text" Value="Back" />
    3838            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />

  • code/branches/gamestate/data/gui/layouts/MainMenu.layout

    r6417 r6564  
    22
    33<GUILayout >
    4     <Window Type="TaharezLook/StaticImage" Name="orxonox/MainMenuBackground" >
     4    <Window Type="MenuWidgets/StaticImage" Name="orxonox/MainMenuBackground" >
    55        <Property Name="FrameEnabled" Value="False" />
    66        <Property Name="InheritsAlpha" Value="False" />
    77        <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    8         <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1.02125,0},{1.02167,0}}" />
     8        <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1.0,0},{1.0,0}}" />
    99        <Property Name="BackgroundEnabled" Value="False" />
    10         <Window Type="TaharezLook/Button" Name="orxonox/QuickGameTestButton" >
     10        <Window Type="MenuWidgets/Button" Name="orxonox/QuickGameTestButton" >
    1111            <Property Name="Text" Value="Quickstart" />
    1212            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    … …  
    1414            <Event Name="Clicked" Function="MainMenu.QuickGameTestButton_clicked"/>
    1515        </Window>
    16         <Window Type="TaharezLook/Button" Name="orxonox/SingleplayerButton" >
     16        <Window Type="MenuWidgets/Button" Name="orxonox/SingleplayerButton" >
    1717            <Property Name="Text" Value="Singleplayer" />
    1818            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    … …  
    2020            <Event Name="Clicked" Function="MainMenu.SingleplayerButton_clicked"/>
    2121        </Window>
    22         <Window Type="TaharezLook/Button" Name="orxonox/MultiplayerButton" >
     22        <Window Type="MenuWidgets/Button" Name="orxonox/MultiplayerButton" >
    2323            <Property Name="Text" Value="Multiplayer" />
    2424            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    … …  
    2626            <Event Name="Clicked" Function="MainMenu.MultiplayerButton_clicked"/>
    2727        </Window>
    28         <Window Type="TaharezLook/Button" Name="orxonox/SettingsButton" >
     28        <Window Type="MenuWidgets/Button" Name="orxonox/SettingsButton" >
    2929            <Property Name="Text" Value="Settings" />
    3030            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    … …  
    3232            <Event Name="Clicked" Function="MainMenu.SettingsButton_clicked"/>
    3333        </Window>
    34         <Window Type="TaharezLook/Button" Name="orxonox/CreditsButton" >
     34        <Window Type="MenuWidgets/Button" Name="orxonox/CreditsButton" >
    3535            <Property Name="Text" Value="Credits" />
    3636            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    … …  
    3838            <Event Name="Clicked" Function="MainMenu.CreditsButton_clicked"/>
    3939        </Window>
    40         <Window Type="TaharezLook/Button" Name="orxonox/ExitButton" >
     40        <Window Type="MenuWidgets/Button" Name="orxonox/ExitButton" >
    4141            <Property Name="Text" Value="Exit" />
    4242            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />

  • code/branches/gamestate/data/gui/layouts/MainMenuBackground.layout

    r6417 r6564  
    11<?xml version="1.0" ?>
    22<GUILayout>
    3     <Window Type="TaharezLook/StaticImage" Name="orxonox/Background">
     3    <Window Type="MenuWidgets/StaticImage" Name="orxonox/Background">
    44    <Property Name="UnifiedSize" Value="{{1.0,0},{1.0,0}}"/>
    55    <Property Name="Image" Value="set:MainMenuBackground image:Background"/>

  • code/branches/gamestate/data/gui/layouts/MouseControlsMenu.layout

    r6417 r6564  
    22
    33<GUILayout >
    4     <Window Type="TaharezLook/StaticImage" Name="orxonox/MouseControlsBackground" >
     4    <Window Type="MenuWidgets/StaticImage" Name="orxonox/MouseControlsBackground" >
    55        <Property Name="FrameEnabled" Value="False" />
    66        <Property Name="InheritsAlpha" Value="False" />
    … …  
    88        <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
    99        <Property Name="BackgroundEnabled" Value="False" />
    10         <Window Type="TaharezLook/StaticText" Name="orxonox/MouseControlsWindow" >
     10        <Window Type="MenuWidgets/StaticText" Name="orxonox/MouseControlsWindow" >
    1111            <Property Name="Text" Value="Mouse controls" />
    1212            <Property Name="Alpha" Value="0.8" />
    … …  
    1616            <Property Name="VertFormatting" Value="TopAligned" />
    1717            <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.3625,0},{0.75,0},{0.6375,0}}" />
    18             <Window Type="TaharezLook/StaticText" Name="orxonox/MouseNormalSensitivity" >
     18            <Window Type="MenuWidgets/StaticText" Name="orxonox/MouseNormalSensitivity" >
    1919                <Property Name="Text" Value="Sensitivity (normal mode)                                      " />
    2020                <Property Name="InheritsAlpha" Value="False" />
    … …  
    2323                <Property Name="VertFormatting" Value="TopAligned" />
    2424                <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.2,0},{0.95,0},{0.45,0}}" />
    25                 <Window Type="TaharezLook/HorizontalScrollbar" Name="orxonox/MouseNormalScrollbar" >
     25                <Window Type="MenuWidgets/HorizontalScrollbar" Name="orxonox/MouseNormalScrollbar" >
    2626                    <Property Name="PageSize" Value="0" />
    2727                    <Property Name="StepSize" Value="1" />
    … …  
    3636                    <Event Name="ScrollPosChanged" Function="MouseControlsMenu.MouseControlsMouseNormalScrollbar_changed" />
    3737                </Window>
    38                 <Window Type="TaharezLook/RadioButton" Name="orxonox/MouseNormalButton" >
     38                <Window Type="MenuWidgets/RadioButton" Name="orxonox/MouseNormalButton" >
    3939                    <Property Name="Text" Value="Normal mouse input" />
    4040                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    … …  
    4343                </Window>
    4444            </Window>
    45             <Window Type="TaharezLook/StaticText" Name="orxonox/MouseDeriveSensitivity" >
     45            <Window Type="MenuWidgets/StaticText" Name="orxonox/MouseDeriveSensitivity" >
    4646                <Property Name="Text" Value="Sensitivity (derive mode)                                      " />
    4747                <Property Name="InheritsAlpha" Value="False" />
    … …  
    5050                <Property Name="VertFormatting" Value="TopAligned" />
    5151                <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.55,0},{0.95,0},{0.8,0}}" />
    52                 <Window Type="TaharezLook/HorizontalScrollbar" Name="orxonox/MouseDeriveScrollbar" >
     52                <Window Type="MenuWidgets/HorizontalScrollbar" Name="orxonox/MouseDeriveScrollbar" >
    5353                    <Property Name="PageSize" Value="0" />
    5454                    <Property Name="StepSize" Value="1" />
    … …  
    6363                    <Event Name="ScrollPosChanged" Function="MouseControlsMenu.MouseControlsMouseDeriveScrollbar_changed" />
    6464                </Window>
    65                 <Window Type="TaharezLook/RadioButton" Name="orxonox/MouseDeriveButton" >
     65                <Window Type="MenuWidgets/RadioButton" Name="orxonox/MouseDeriveButton" >
    6666                    <Property Name="Text" Value="Derive mouse input" />
    6767                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    … …  
    7070                </Window>
    7171            </Window>
    72             <Window Type="TaharezLook/Checkbox" Name="orxonox/MouseInvertCheckbox" >
     72            <Window Type="MenuWidgets/Checkbox" Name="orxonox/MouseInvertCheckbox" >
    7373                <Property Name="Text" Value="Invert mouse" />
    7474                <Property Name="Disabled" Value="true" />
    … …  
    7878            </Window>
    7979        </Window>
    80         <Window Type="TaharezLook/Button" Name="orxonox/MouseControlsBackButton" >
     80        <Window Type="MenuWidgets/Button" Name="orxonox/MouseControlsBackButton" >
    8181            <Property Name="Text" Value="Back" />
    8282            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />

  • code/branches/gamestate/data/gui/layouts/MultiplayerMenu.layout

    r6417 r6564  
    22
    33<GUILayout >
    4     <Window Type="TaharezLook/StaticImage" Name="orxonox/MultiplayerBackground" >
     4    <Window Type="MenuWidgets/StaticImage" Name="orxonox/MultiplayerBackground" >
    55        <Property Name="FrameEnabled" Value="False" />
    66        <Property Name="InheritsAlpha" Value="False" />
    … …  
    88        <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
    99        <Property Name="BackgroundEnabled" Value="False" />
    10         <Window Type="TaharezLook/StaticText" Name="orxonox/MultiplayerWindow" >
     10        <Window Type="MenuWidgets/StaticText" Name="orxonox/MultiplayerWindow" >
    1111            <Property Name="Text" Value="Multiplayer" />
    1212            <Property Name="Alpha" Value="0.8" />
    … …  
    1616            <Property Name="VertFormatting" Value="TopAligned" />
    1717            <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.2875,0},{0.75,0},{0.6375,0}}" />
    18             <Window Type="TaharezLook/Listbox" Name="orxonox/MultiplayerLevelListbox" >
     18            <Window Type="MenuWidgets/Listbox" Name="orxonox/MultiplayerLevelListbox" >
    1919                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    2020                <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.15,0},{0.95,0},{0.8,0}}" />
    2121            </Window>
    22             <Window Type="TaharezLook/RadioButton" Name="orxonox/MultiplayerJoinButton" >
     22            <Window Type="MenuWidgets/RadioButton" Name="orxonox/MultiplayerJoinButton" >
    2323                <Property Name="Text" Value="Join" />
    2424                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    … …  
    2626                <Event Name="SelectStateChanged" Function="MultiplayerMenu.MultiplayerJoinButton_clicked"/>
    2727            </Window>
    28             <Window Type="TaharezLook/RadioButton" Name="orxonox/MultiplayerHostButton" >
     28            <Window Type="MenuWidgets/RadioButton" Name="orxonox/MultiplayerHostButton" >
    2929                <Property Name="Text" Value="Host" />
    3030                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    … …  
    3232                <Event Name="SelectStateChanged" Function="MultiplayerMenu.MultiplayerHostButton_clicked"/>
    3333            </Window>
    34             <Window Type="TaharezLook/RadioButton" Name="orxonox/MultiplayerDedicatedButton" >
     34            <Window Type="MenuWidgets/RadioButton" Name="orxonox/MultiplayerDedicatedButton" >
    3535                <Property Name="Text" Value="Dedicated" />
    3636                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    … …  
    3939            </Window>
    4040        </Window>
    41         <Window Type="TaharezLook/Button" Name="orxonox/MultiplayerStartButton" >
     41        <Window Type="MenuWidgets/Button" Name="orxonox/MultiplayerStartButton" >
    4242            <Property Name="Text" Value="Start" />
    4343            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    … …  
    4545            <Event Name="Clicked" Function="MultiplayerMenu.MultiplayerStartButton_clicked"/>
    4646        </Window>
    47         <Window Type="TaharezLook/Button" Name="orxonox/MultiplayerBackButton" >
     47        <Window Type="MenuWidgets/Button" Name="orxonox/MultiplayerBackButton" >
    4848            <Property Name="Text" Value="Back" />
    4949            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />

  • code/branches/gamestate/data/gui/layouts/MultiplayerOptionsMenu.layout

    r6417 r6564  
    22
    33<GUILayout >
    4     <Window Type="TaharezLook/StaticImage" Name="orxonox/MultiplayerOptionsBackground" >
     4    <Window Type="MenuWidgets/StaticImage" Name="orxonox/MultiplayerOptionsBackground" >
    55        <Property Name="FrameEnabled" Value="False" />
    66        <Property Name="InheritsAlpha" Value="False" />
    … …  
    88        <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
    99        <Property Name="BackgroundEnabled" Value="False" />
    10         <Window Type="TaharezLook/StaticText" Name="orxonox/MultiplayerOptionsWindow" >
     10        <Window Type="MenuWidgets/StaticText" Name="orxonox/MultiplayerOptionsWindow" >
    1111            <Property Name="Text" Value="Multiplayer options" />
    1212            <Property Name="Alpha" Value="0.8" />
    … …  
    1717            <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.3625,0},{0.75,0},{0.6375,0}}" />
    1818        </Window>
    19         <Window Type="TaharezLook/Button" Name="orxonox/MultiplayerOptionsBackButton" >
     19        <Window Type="MenuWidgets/Button" Name="orxonox/MultiplayerOptionsBackButton" >
    2020            <Property Name="Text" Value="Back" />
    2121            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />

  • code/branches/gamestate/data/gui/layouts/PickupInventory.layout

    r6417 r6564  
    11<?xml version="1.0" encoding="UTF-8" ?>
    22<GUILayout>
    3     <Window Type="TaharezLook/FrameWindow" Name="orxonox/Inventory">
     3    <Window Type="MenuWidgets/FrameWindow" Name="orxonox/Inventory">
    44        <Property Name="UnifiedMinSize" Value="{{0.0,385},{0.0,200}}" />
    55        <Property Name="UnifiedMaxSize" Value="{{0.0,385},{0.0,200}}" />
    … …  
    99        <Property Name="CloseButtonEnabled" Value="False" />
    1010
    11         <Window Type="TaharezLook/TabControl" Name="orxonox/Inventory/TabControl" >
     11        <Window Type="MenuWidgets/TabControl" Name="orxonox/Inventory/TabControl" >
    1212            <Property Name="Tooltip" Value="Inventory" />
    1313            <Property Name="TabHeight" Value="{0,-1}" />
    … …  
    1616            <Property Name="UnifiedAreaRect" Value="{{0,10},{0,30},{1,-10},{1,-10}}" />
    1717
    18             <Window Type="TaharezLook/ScrollablePane" Name="orxonox/Inventory/TabControl/TabEquipment">
     18            <Window Type="MenuWidgets/ScrollablePane" Name="orxonox/Inventory/TabControl/TabEquipment">
    1919                <Property Name="Text" Value="Equipment" />
    2020                <Property Name="UnifiedPosition" Value="{{0.0,3},{0.0,3}}"/>
    2121                <Property Name="UnifiedSize" Value="{{1.0,-6},{1.0,-6}}"/>
    2222            </Window>
    23             <Window Type="TaharezLook/ScrollablePane" Name="orxonox/Inventory/TabControl/TabUsable">
     23            <Window Type="MenuWidgets/ScrollablePane" Name="orxonox/Inventory/TabControl/TabUsable">
    2424                <Property Name="Text" Value="Usable" />
    2525                <Property Name="UnifiedPosition" Value="{{0.0,3},{0.0,3}}"/>

  • code/branches/gamestate/data/gui/layouts/QuestGUI.layout

    r6417 r6564  
    11<?xml version="1.0" ?>
    22<GUILayout>
    3     <Window Type="TaharezLook/StaticImage" Name="orxonox/QuestGUI/Background">
     3    <Window Type="MenuWidgets/StaticImage" Name="orxonox/QuestGUI/Background">
    44    <Property Name="UnifiedSize" Value="{{1.0,0},{1.0,0}}"/>
    55    <Property Name="Image" Value="set:MainMenuBackground image:Background"/>
    … …  
    88    <Property Name="InheritsAlpha" Value="False" />
    99
    10         <Window Type="TaharezLook/Titlebar" Name="orxonox/QuestGUI/Title">
     10        <Window Type="MenuWidgets/Titlebar" Name="orxonox/QuestGUI/Title">
    1111            <Property Name="UnifiedPosition" Value="{{0.05,0},{0.05,0}}"/>
    1212            <Property Name="UnifiedSize" Value="{{0.9,0},{0.05,0}}"/>
    … …  
    1414        </Window>
    1515
    16         <Window Type="TaharezLook/Listbox" Name="orxonox/QuestGUI/QuestsList">
     16        <Window Type="MenuWidgets/Listbox" Name="orxonox/QuestGUI/QuestsList">
    1717            <Property Name="UnifiedPosition" Value="{{0.07,0},{0.18,0}}" />
    1818            <Property Name="UnifiedSize" Value="{{0.86,0},{0.8,0}}" />

  • code/branches/gamestate/data/gui/layouts/SettingsMenu.layout

    r6417 r6564  
    22
    33<GUILayout >
    4     <Window Type="TaharezLook/StaticImage" Name="orxonox/SettingsBackground" >
     4    <Window Type="MenuWidgets/StaticImage" Name="orxonox/SettingsBackground" >
    55        <Property Name="InheritsAlpha" Value="False" />
    66        <Property Name="FrameEnabled" Value="False" />
    … …  
    88        <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
    99        <Property Name="BackgroundEnabled" Value="False" />
    10         <Window Type="TaharezLook/StaticText" Name="orxonox/SettingsWindow" >
     10        <Window Type="MenuWidgets/StaticText" Name="orxonox/SettingsWindow" >
    1111            <Property Name="Text" Value="Settings" />
    1212            <Property Name="Alpha" Value="0.8" />
    … …  
    1616            <Property Name="VertFormatting" Value="TopAligned" />
    1717            <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.3625,0},{0.75,0},{0.6375,0}}" />
    18             <Window Type="TaharezLook/Button" Name="orxonox/GameplayButton" >
     18            <Window Type="MenuWidgets/Button" Name="orxonox/GameplayButton" >
    1919                <Property Name="Text" Value="Gameplay" />
    2020                <Property Name="Disabled" Value="True" />
    … …  
    2323                <Event Name="Clicked" Function="SettingsMenu.SettingsGameplayButton_clicked"/>
    2424            </Window>
    25             <Window Type="TaharezLook/Button" Name="orxonox/MultiplayerOptionsButton" >
     25            <Window Type="MenuWidgets/Button" Name="orxonox/MultiplayerOptionsButton" >
    2626                <Property Name="Text" Value="Multiplayer options" />
    2727                <Property Name="Disabled" Value="True" />
    … …  
    3030                <Event Name="Clicked" Function="SettingsMenu.SettingsMultiplayerOptionsButton_clicked"/>
    3131            </Window>
    32             <Window Type="TaharezLook/Button" Name="orxonox/ControlsButton" >
     32            <Window Type="MenuWidgets/Button" Name="orxonox/ControlsButton" >
    3333                <Property Name="Text" Value="Controls" />
    3434                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    … …  
    3636                <Event Name="Clicked" Function="SettingsMenu.SettingsControlsButton_clicked"/>
    3737            </Window>
    38             <Window Type="TaharezLook/Button" Name="orxonox/GraphicsButton" >
     38            <Window Type="MenuWidgets/Button" Name="orxonox/GraphicsButton" >
    3939                <Property Name="Text" Value="Graphics" />
    4040                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    … …  
    4242                <Event Name="Clicked" Function="SettingsMenu.SettingsGraphicsButton_clicked"/>
    4343            </Window>
    44             <Window Type="TaharezLook/Button" Name="orxonox/AudioButton" >
     44            <Window Type="MenuWidgets/Button" Name="orxonox/AudioButton" >
    4545                <Property Name="Text" Value="Audio" />
    4646                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    … …  
    4848                <Event Name="Clicked" Function="SettingsMenu.SettingsAudioButton_clicked"/>
    4949            </Window>
    50             <Window Type="TaharezLook/Button" Name="orxonox/ResetSettingsButton" >
     50            <Window Type="MenuWidgets/Button" Name="orxonox/ResetSettingsButton" >
    5151                <Property Name="Text" Value="Reset settings" />
    5252                <Property Name="Disabled" Value="True" />
    … …  
    5656            </Window>
    5757        </Window>
    58         <Window Type="TaharezLook/Button" Name="orxonox/SettingsBackButton" >
     58        <Window Type="MenuWidgets/Button" Name="orxonox/SettingsBackButton" >
    5959            <Property Name="Text" Value="Back" />
    6060            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />

  • code/branches/gamestate/data/gui/layouts/SingleplayerMenu.layout

    r6417 r6564  
    22
    33<GUILayout >
    4     <Window Type="TaharezLook/StaticImage" Name="orxonox/SingleplayerBackground" >
     4    <Window Type="MenuWidgets/StaticImage" Name="orxonox/SingleplayerBackground" >
    55        <Property Name="FrameEnabled" Value="False" />
    66        <Property Name="InheritsAlpha" Value="False" />
    … …  
    88        <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
    99        <Property Name="BackgroundEnabled" Value="False" />
    10         <Window Type="TaharezLook/StaticText" Name="orxonox/SingleplayerWindow" >
     10        <Window Type="MenuWidgets/StaticText" Name="orxonox/SingleplayerWindow" >
    1111            <Property Name="Text" Value="Singleplayer" />
    1212            <Property Name="Alpha" Value="0.8" />
    … …  
    1616            <Property Name="VertFormatting" Value="TopAligned" />
    1717            <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.2875,0},{0.75,0},{0.6375,0}}" />
    18             <Window Type="TaharezLook/Listbox" Name="orxonox/SingleplayerLevelListbox" >
     18            <Window Type="MenuWidgets/Listbox" Name="orxonox/SingleplayerLevelListbox" >
    1919                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    2020                <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.15,0},{0.95,0},{0.92,0}}" />
    2121            </Window>
    2222        </Window>
    23         <Window Type="TaharezLook/Button" Name="orxonox/SingleplayerStartButton" >
     23        <Window Type="MenuWidgets/Button" Name="orxonox/SingleplayerStartButton" >
    2424            <Property Name="Text" Value="Start" />
    2525            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    … …  
    2727            <Event Name="Clicked" Function="SingleplayerMenu.SingleplayerStartButton_clicked"/>
    2828        </Window>
    29         <Window Type="TaharezLook/Button" Name="orxonox/SingleplayerBackButton" >
     29        <Window Type="MenuWidgets/Button" Name="orxonox/SingleplayerBackButton" >
    3030            <Property Name="Text" Value="Back" />
    3131            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />

  • code/branches/gamestate/data/gui/schemes/WindowsLook.scheme

    r5781 r6564  
    11<?xml version="1.0" ?>
    2 <GUIScheme Name="WindowsLookSkin">
     2<GUIScheme Name="WindowsLook">
    33        <Imageset Name="WindowsLook" Filename="WindowsLook.imageset" />
    44        <LookNFeel Filename="WindowsLook.looknfeel" />

  • code/branches/gamestate/data/gui/scripts/InitialiseGUI.lua

    r6544 r6564  
    77local cursor    = CEGUI.MouseCursor:getSingleton()
    88
    9 schemeMgr:loadScheme("TaharezLook.scheme")
    10 -- load scheme with our own images
     9schemeMgr:loadScheme("TaharezMenuWidgets.scheme")
     10schemeMgr:loadScheme("TaharezMenuWidgetsAliases.scheme")
     11-- load scheme with our own images, hack!
    1112schemeMgr:loadScheme("OrxonoxGUIScheme.scheme")
    1213
    1314system:setDefaultMouseCursor("TaharezLook", "MouseArrow")
    1415system:setDefaultFont("BlueHighway-12")
    15 system:setDefaultTooltip("TaharezLook/Tooltip")
     16system:setDefaultTooltip("MenuWidgets/Tooltip")
    1617
    1718loadedGUIs = {}

  • code/branches/gamestate/data/gui/scripts/KeyBindMenu.lua

    r6459 r6564  
    6565
    6666    --Calculate design parameters:
    67     sampleWindow = winMgr:createWindow("TaharezLook/StaticText", "orxonox/KeyBindPane/SampleWindow")
     67    sampleWindow = winMgr:createWindow("MenuWidgets/StaticText", "orxonox/KeyBindPane/SampleWindow")
    6868    sampleWindow:setText("SampleText")
    6969
    … …  
    122122    line:setPosition(CEGUI.UVector2(CEGUI.UDim(0, 0), CEGUI.UDim(0, lineHeight*(k-1))))
    123123
    124     local command = winMgr:createWindow("TaharezLook/StaticText", "orxonox/KeyBindPane/Binding" .. k .. "/Command")
     124    local command = winMgr:createWindow("MenuWidgets/StaticText", "orxonox/KeyBindPane/Binding" .. k .. "/Command")
    125125    command:setText(nameList[k])
    126126    command:setSize(CEGUI.UVector2(CEGUI.UDim(0, commandWidth), CEGUI.UDim(1, 0)))
    … …  
    129129    offset = offset + commandWidth + spaceWidth
    130130
    131     local plus = winMgr:createWindow("TaharezLook/TabButton", "orxonox/KeyBindPane/Binding" .. k .. "/Plus")
     131    local plus = winMgr:createWindow("MenuWidgets/TabButton", "orxonox/KeyBindPane/Binding" .. k .. "/Plus")
    132132    plus:setSize(CEGUI.UVector2(CEGUI.UDim(0, addWidth), CEGUI.UDim(0.7, 0)))
    133133    plus:setPosition(CEGUI.UVector2(CEGUI.UDim(0, offset), CEGUI.UDim(0.15, 0)))
    … …  
    139139    local numButtons = orxonox.KeyBinderManager:getInstance():getCurrent():getNumberOfBindings(commandList[k]);
    140140    for i=0,(numButtons-1) do
    141         local button = winMgr:createWindow("TaharezLook/TabButton", "orxonox/KeyBindPane/Binding" .. k .. "/Button" .. i)
     141        local button = winMgr:createWindow("MenuWidgets/TabButton", "orxonox/KeyBindPane/Binding" .. k .. "/Button" .. i)
    142142        local name = orxonox.KeyBinderManager:getInstance():getCurrent():getBinding(commandList[k],i)
    143143        name = P.KeyNameNiceifier(name)
    … …  
    153153        offset = offset + buttonWidth
    154154
    155         local clear = winMgr:createWindow("TaharezLook/TabButton", "orxonox/KeyBindPane/Binding" .. k .. "/Clear" .. i)
     155        local clear = winMgr:createWindow("MenuWidgets/TabButton", "orxonox/KeyBindPane/Binding" .. k .. "/Clear" .. i)
    156156        clear:setSize(CEGUI.UVector2(CEGUI.UDim(0, clearWidth), CEGUI.UDim(0.7, 0)))
    157157        clear:setPosition(CEGUI.UVector2(CEGUI.UDim(0, offset), CEGUI.UDim(0.15, 0)))
Note: See TracChangeset for help on using the changeset viewer.