Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Dec 13, 2009, 1:12:13 PM (15 years ago)
Author:
cmueri
Message:

All the menus (inclusive InGameMenus) have an equal design, some menus have a larger window. They should be ready to presentate now.
BUG REPORT in KeyBindMenu: If there are >4 buttons in a row, the GUI doesn't show those correctly.

Location:
code/branches/presentation2/data/gui/layouts
Files:
1 deleted
15 edited

Legend:

Unmodified
Added
Removed

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

    r6233 r6334  
    1515            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    1616            <Property Name="VertFormatting" Value="TopAligned" />
    17             <Property Name="UnifiedAreaRect" Value="{{0.2,0},{0.325,0},{0.8,0},{0.6,0}}" />
     17            <Property Name="UnifiedAreaRect" Value="{{0.2,0},{0.2875,0},{0.8,0},{0.6375,0}}" />
    1818            <Window Type="TaharezLook/StaticText" Name="orxonox/MasterVolume" >
    1919                <Property Name="Text" Value="Master volume               " />
    … …  
    2222                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    2323                <Property Name="VertFormatting" Value="TopAligned" />
    24                 <Property Name="UnifiedAreaRect" Value="{{0.041666,0},{0.2,0},{0.5625,0},{0.4,0}}" />
     24                <Property Name="UnifiedAreaRect" Value="{{0.041666,0},{0.15,0},{0.5625,0},{0.3525,0}}" />
    2525                <Window Type="TaharezLook/HorizontalScrollbar" Name="orxonox/MasterScrollbar" >
    2626                    <Property Name="PageSize" Value="0" />
    … …  
    4949                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    5050                <Property Name="VertFormatting" Value="TopAligned" />
    51                 <Property Name="UnifiedAreaRect" Value="{{0.041666,0},{0.45,0},{0.5625,0},{0.65,0}}" />
     51                <Property Name="UnifiedAreaRect" Value="{{0.041666,0},{0.4335,0},{0.5625,0},{0.636,0}}" />
    5252                <Window Type="TaharezLook/HorizontalScrollbar" Name="orxonox/MusicScrollbar" >
    5353                    <Property Name="PageSize" Value="0" />
    … …  
    7676                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    7777                <Property Name="VertFormatting" Value="TopAligned" />
    78                 <Property Name="UnifiedAreaRect" Value="{{0.041666,0},{0.7,0},{0.5625,0},{0.9,0}}" />
     78                <Property Name="UnifiedAreaRect" Value="{{0.041666,0},{0.717,0},{0.5625,0},{0.9195,0}}" />
    7979                <Window Type="TaharezLook/HorizontalScrollbar" Name="orxonox/EffectsScrollbar" >
    8080                    <Property Name="PageSize" Value="0" />
    … …  
    103103                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    104104                <Property Name="VertFormatting" Value="TopAligned" />
    105                 <Property Name="UnifiedAreaRect" Value="{{0.604166,0},{0.2,0},{0.958333,0},{0.9,0}}" />
    106                 <Window Type="TaharezLook/Combobox" Name="orxonox/AudioThemeCombobox" >
    107                     <Property Name="AlwaysOnTop" Value="True" />
     105                <Property Name="UnifiedAreaRect" Value="{{0.604166,0},{0.15,0},{0.958333,0},{0.636,0}}" />
     106                <Window Type="TaharezLook/Listbox" Name="orxonox/AudioThemeListbox" >
    108107                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    109                     <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.21,0},{0.95,0},{0.9,0}}" />
    110                     <Property Name="MaxEditTextLength" Value="1073741823" />
    111                     <Property Name="ReadOnly" Value="True" />
    112                     <Event Name="ListSelectionAccepted" Function="AudioMenu.AudioThemeCombobox_changed" />
     108                    <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.225,0},{0.95,0},{0.92,0}}" />
     109                    <Event Name="ItemSelectionChanged" Function="AudioMenu.AudioThemeListbox_changed" />
    113110                </Window>
     111            </Window>
     112            <Window Type="TaharezLook/StaticText" Name="orxonox/AudioInfo" >
     113                <Property Name="Text" >Theme changes require
     114a game restart.</Property>
     115                <Property Name="TextColours" Value="FF4444FF" />
     116                <Property Name="InheritsAlpha" Value="False" />
     117                <Property Name="HorzFormatting" Value="HorzCentred" />
     118                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
     119                <Property Name="VertFormatting" Value="TopAligned" />
     120                <Property Name="UnifiedAreaRect" Value="{{0.604166,0},{0.717,0},{0.958333,0},{0.9195,0}}" />
    114121            </Window>
    115122        </Window>
    … …  
    117124            <Property Name="Text" Value="Back" />
    118125            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    119             <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.625,0},{0.6,0},{0.675,0}}" />
    120             <Event Name="Clicked" Function="AudioMenu.AudioBackButton_clicked"/>
     126            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.6625,0},{0.6,0},{0.7125,0}}" />
     127            <Event Name="Clicked" Function="AudioMenu.AudioBackButton_clicked" />
    121128        </Window>
    122129    </Window>

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

    r6235 r6334  
    1515            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    1616            <Property Name="VertFormatting" Value="TopAligned" />
    17             <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.325,0},{0.75,0},{0.6,0}}" />
     17            <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.3625,0},{0.75,0},{0.6375,0}}" />
    1818            <Window Type="TaharezLook/Button" Name="orxonox/MouseControlsButton" >
    1919                <Property Name="Text" Value="Mouse controls" />
    … …  
    3232            <Property Name="Text" Value="Back" />
    3333            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    34             <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.625,0},{0.6,0},{0.675,0}}" />
     34            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.6625,0},{0.6,0},{0.7125,0}}" />
    3535            <Event Name="Clicked" Function="ControlsMenu.ControlsBackButton_clicked"/>
    3636        </Window>

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

    r6206 r6334  
    1515            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    1616            <Property Name="VertFormatting" Value="TopAligned" />
    17             <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.325,0},{0.75,0},{0.6,0}}" />
     17            <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.3625,0},{0.75,0},{0.6375,0}}" />
    1818            <Window Type="TaharezLook/StaticText" Name="orxonox/CreditsText" >
    1919                <Property Name="Text">Orxonox version 0.0.3
    … …  
    3535            <Property Name="Text" Value="Back" />
    3636            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    37             <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.625,0},{0.6,0},{0.675,0}}" />
     37            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.6625,0},{0.6,0},{0.7125,0}}" />
    3838            <Event Name="Clicked" Function="CreditsMenu.CreditsBackButton_clicked"/>
    3939        </Window>

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

    r6217 r6334  
    11<?xml version="1.0" encoding="UTF-8"?>
    22
     3
     4
    35<GUILayout >
     6
    47    <Window Type="DefaultWindow" Name="orxonox/DecisionPopup_RootWindow" >
     8
    59        <Property Name="InheritsAlpha" Value="False" />
     10
    611        <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
     12
    713        <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
     14
    815        <Window Type="TaharezLook/StaticImage" Name="orxonox/DecisionPopup_Background" >
     16
    917            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
     18
    1019            <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
     20
    1121            <Property Name="Alpha" Value="0.6" />
     22
    1223            <Window Type="TaharezLook/Button" Name="orxonox/DecisionPopup_button_yes" >
     24
    1325                <Property Name="Font" Value="BlueHighway-12" />
     26
    1427                <Property Name="Text" Value="Yes" />
     28
    1529                <Property Name="Alpha" Value="0.7" />
    16                 <Property Name="InheritsAlpha" Value="False" />
     30
     31                <Property Name="InheritsAlpha" Value="False" />
     32 
    1733                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    18                 <Property Name="UnifiedAreaRect" Value="{{0.3,0},{0.55,0},{0.45,0},{0.6,0}}" />
     34
     35                <Property Name="UnifiedAreaRect" Value="{{0.2875,0},{0.5625,0},{0.4875,0},{0.6125,0}}" />
     36
    1937                <Event Name="Clicked" Function="DecisionPopup.button_yes"/>
     38
    2039            </Window>
     40
    2141            <Window Type="TaharezLook/Button" Name="orxonox/DecisionPopup_button_no" >
     42
    2243                <Property Name="Font" Value="BlueHighway-12" />
     44
    2345                <Property Name="Text" Value="No" />
     46
    2447                <Property Name="Alpha" Value="0.8" />
    25                 <Property Name="InheritsAlpha" Value="False" />
     48
     49                <Property Name="InheritsAlpha" Value="False" />
     50 
    2651                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    27                 <Property Name="UnifiedAreaRect" Value="{{0.55,0},{0.55,0},{0.7,0},{0.6,0}}" />
     52
     53                <Property Name="UnifiedAreaRect" Value="{{0.5125,0},{0.5625,0},{0.7125,0},{0.6125,0}}" />
     54
    2855                <Event Name="Clicked" Function="DecisionPopup.button_no"/>
     56
    2957            </Window>
     58
    3059            <Window Type="TaharezLook/StaticText" Name="orxonox/DecisionPopup_text" >
     60
    3161                <Property Name="Text" Value="Template text" />
     62
    3263                <Property Name="HorzFormatting" Value="WordWrapCentred" />
     64
    3365                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    34                 <Property Name="UnifiedAreaRect" Value="{{0.2,0},{0.4,0},{0.8,0},{0.5,0}}" />
    35                 <Property Name="InheritsAlpha" Value="False" />
     66
     67                <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.4375,0},{0.75,0},{0.5375,0}}" />
     68
     69                <Property Name="InheritsAlpha" Value="False" />
     70 
    3671                <Property Name="Alpha" Value="0.8" />
     72
    3773            </Window>
     74
    3875        </Window>
     76
    3977    </Window>
     78
    4079</GUILayout>

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

    r6206 r6334  
    1515            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    1616            <Property Name="VertFormatting" Value="TopAligned" />
    17             <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.325,0},{0.75,0},{0.6,0}}" />
     17            <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.3625,0},{0.75,0},{0.6375,0}}" />
    1818            <Window Type="TaharezLook/StaticText" Name="orxonox/Difficulty" >
    1919                <Property Name="Text" Value="Difficulty" />
    … …  
    6262            <Property Name="Text" Value="Back" />
    6363            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    64             <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.625,0},{0.6,0},{0.675,0}}" />
     64            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.6625,0},{0.6,0},{0.7125,0}}" />
    6565            <Event Name="Clicked" Function="GameplayMenu.GameplayBackButton_clicked"/>
    66         </Window>
    67         <Window Type="TaharezLook/StaticText" Name="orxonox/GameplayAvailable" >
    68             <Property Name="Text" Value="Changes in gameplay settings are not yet available." />
    69             <Property Name="TextColours" Value="FFFF0000" />
    70             <Property Name="InheritsAlpha" Value="False" />
    71             <Property Name="HorzFormatting" Value="HorzCentred" />
    72             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    73             <Property Name="VertFormatting" Value="TopAligned" />
    74             <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.75,0},{0.75,0},{0.8,0}}" />
    7566        </Window>
    7667    </Window>

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

    r6292 r6334  
    1515            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    1616            <Property Name="VertFormatting" Value="TopAligned" />
    17             <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.25,0},{0.75,0},{0.6,0}}" />
     17            <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.2875,0},{0.75,0},{0.6375,0}}" />
    1818            <Window Type="TaharezLook/StaticText" Name="orxonox/Resolution" >
    1919                <Property Name="Text" Value="Resolution" />
    … …  
    2525                <Window Type="TaharezLook/Listbox" Name="orxonox/ResolutionListbox" >
    2626                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    27                     <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.15,0},{0.95,0},{0.92,0}}" />
     27                    <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.15,0},{0.95,0},{0.95,0}}" />
    2828                    <Event Name="ItemSelectionChanged" Function="GraphicsMenu.GraphicsResolutionListbox_changed"/>
    2929                </Window>
    … …  
    7272            <Property Name="Text" Value="Back" />
    7373            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    74             <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.625,0},{0.6,0},{0.675,0}}" />
     74            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.6625,0},{0.6,0},{0.7125,0}}" />
    7575            <Event Name="Clicked" Function="GraphicsMenu.GraphicsBackButton_clicked"/>
    76         </Window>
    77         <Window Type="TaharezLook/StaticText" Name="orxonox/GraphicsAvailable" >
    78             <Property Name="Text" Value="The brightness scrollbar is not yet available." />
    79             <Property Name="TextColours" Value="FFFF0000" />
    80             <Property Name="InheritsAlpha" Value="False" />
    81             <Property Name="HorzFormatting" Value="HorzCentred" />
    82             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    83             <Property Name="VertFormatting" Value="TopAligned" />
    84             <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.75,0},{0.75,0},{0.8,0}}" />
    8576        </Window>
    8677    </Window>

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

    r6217 r6334  
    11<?xml version="1.0" encoding="UTF-8"?>
    22
     3
     4
    35<GUILayout >
     6
    47    <Window Type="DefaultWindow" Name="orxonox/InGameMenu_RootWindow" >
     8
    59        <Property Name="InheritsAlpha" Value="False" />
     10
    611        <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
     12
    713        <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
     14
    815        <Window Type="TaharezLook/Button" Name="orxonox/InGameMenu_ReturnButton" >
     16
    917            <Property Name="Font" Value="BlueHighway-12" />
     18
    1019            <Property Name="Text" Value="Return to Game" />
     20
    1121            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    12             <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.3,0},{0.6,0},{0.36,0}}" />
     22
     23            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.3625,0},{0.6,0},{0.4125,0}}" />
     24
    1325            <Property Name="Alpha" Value="0.7" />
     26
    1427            <Event Name="Clicked" Function="InGameMenu.button_return_clicked"/>
     28
    1529        </Window>
     30
    1631        <Window Type="TaharezLook/Button" Name="orxonox/InGameMenu_MainMenuButton" >
     32
    1733            <Property Name="Font" Value="BlueHighway-12" />
     34
    1835            <Property Name="Text" Value="Main Menu" />
     36
    1937            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    20             <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.4,0},{0.6,0},{0.46,0}}" />
     38
     39            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.4625,0},{0.6,0},{0.5125,0}}" />
     40
    2141            <Property Name="Alpha" Value="0.7" />
     42
    2243            <Event Name="Clicked" Function="InGameMenu.button_mainmenu_clicked"/>
     44
    2345        </Window>
     46
    2447        <Window Type="TaharezLook/Button" Name="orxonox/InGameMenu_SettingsButton" >
     48
    2549            <Property Name="Font" Value="BlueHighway-12" />
     50
    2651            <Property Name="Text" Value="Settings" />
     52
    2753            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    28             <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.5,0},{0.6,0},{0.56,0}}" />
     54
     55            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.5625,0},{0.6,0},{0.6125,0}}" />
     56
    2957            <Property Name="Alpha" Value="0.7" />
     58
    3059            <Event Name="Clicked" Function="InGameMenu.button_settings_clicked"/>
     60
    3161        </Window>
     62
    3263        <Window Type="TaharezLook/Button" Name="orxonox/InGameMenu_QuitButton" >
     64
    3365            <Property Name="Font" Value="BlueHighway-12" />
     66
    3467            <Property Name="Text" Value="Quit" />
     68
    3569            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    36             <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.6,0},{0.6,0},{0.66,0}}" />
     70
     71            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.6625,0},{0.6,0},{0.7125,0}}" />
     72
    3773            <Property Name="Alpha" Value="0.7" />
     74
    3875            <Event Name="Clicked" Function="InGameMenu.button_quit_clicked"/>
     76
    3977        </Window>
     78
    4079    </Window>
     80
    4181</GUILayout>

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

    r6283 r6334  
    11<?xml version="1.0" encoding="UTF-8"?>
    22
     3
     4
    35<GUILayout >
     6
    47    <Window Type="DefaultWindow" Name="orxonox/InfoPopup_RootWindow" >
     8
    59        <Property Name="InheritsAlpha" Value="False" />
     10
    611        <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
     12
    713        <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
     14
    815        <Window Type="TaharezLook/StaticImage" Name="orxonox/InfoPopup_Background" >
     16
    917            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
     18
    1019            <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
     20
    1121            <Property Name="Alpha" Value="0.7" />
     22
    1223            <Window Type="TaharezLook/Button" Name="orxonox/InfoPopup_close" >
     24
    1325                <Property Name="Font" Value="BlueHighway-12" />
     26
    1427                <Property Name="Text" Value="Close" />
     28
    1529                <Property Name="Alpha" Value="0.7" />
    16                 <Property Name="InheritsAlpha" Value="False" />
     30
     31                <Property Name="InheritsAlpha" Value="False" />
     32 
     33               <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
     34
     35                <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.5,0},{0.6,0},{0.55,0}}" />
     36
     37                <Event Name="Clicked" Function="InfoPopup.close"/>
     38
     39            </Window>
     40
     41            <Window Type="TaharezLook/StaticText" Name="orxonox/InfoPopup_text" >
     42
     43                <Property Name="Text" Value="Template text" />
     44
     45                <Property Name="TextColours" Value="FF4444FF" />
     46                <Property Name="HorzFormatting" Value="WordWrapCentred" />
     47
    1748                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    18                 <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.55,0},{0.6,0},{0.6,0}}" />
    19                 <Event Name="Clicked" Function="InfoPopup.close"/>
     49
     50                <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.375,0},{0.75,0},{0.475,0}}" />
     51
     52                <Property Name="InheritsAlpha" Value="False" />
     53 
     54               <Property Name="Alpha" Value="0.8" />
     55
    2056            </Window>
    21             <Window Type="TaharezLook/StaticText" Name="orxonox/InfoPopup_text" >
    22                 <Property Name="Text" Value="Template text" />
    23                 <Property Name="HorzFormatting" Value="WordWrapCentred" />
    24                 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    25                 <Property Name="UnifiedAreaRect" Value="{{0.2,0},{0.4,0},{0.8,0},{0.5,0}}" />
    26                 <Property Name="InheritsAlpha" Value="False" />
    27                 <Property Name="Alpha" Value="0.8" />
    28             </Window>
     57
    2958        </Window>
     59
    3060    </Window>
     61
    3162</GUILayout>

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

    r6324 r6334  
    11<?xml version="1.0" encoding="UTF-8"?>
    22
     3
     4
    35<GUILayout >
     6
    47    <Window Type="DefaultWindow" Name="orxonox/KeyBindMenu/Background" >
     8
    59        <Property Name="InheritsAlpha" Value="False" />
     10
    611        <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
     12
    713        <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
     14
    815        <Window Type="TaharezLook/StaticText" Name="orxonox/KeyBindWindow" >
     16
    917            <Property Name="Text" Value="Keybindings" />
     18
    1019            <Property Name="Alpha" Value="0.8" />
     20
    1121            <Property Name="InheritsAlpha" Value="False" />
     22
    1223            <Property Name="HorzFormatting" Value="HorzCentred" />
     24
    1325            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
     26
    1427            <Property Name="VertFormatting" Value="TopAligned" />
    15             <Property Name="UnifiedAreaRect" Value="{{0.1,0},{0.1,0},{0.9,0},{0.8,0}}" />
     28
     29            <Property Name="UnifiedAreaRect" Value="{{0.15,0},{0.2125,0},{0.85,0},{0.6375,0}}" />
     30
    1631            <Window Type="TaharezLook/StaticText" Name="orxonox/KeyBindWrapper" >
     32
    1733                <Property Name="TextColours" Value="FF4444FF" />
     34
    1835                <Property Name="InheritsAlpha" Value="False" />
     36
    1937                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
     38
    2039                <Property Name="HorzFormatting" Value="HorzCentred" />
     40
    2141                <Property Name="VertFormatting" Value="TopAligned" />
    22                     <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.1,0},{0.95,0},{0.95,0}}" />
     42
     43                <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.15,0},{0.95,0},{0.92,0}}" />
     44
    2345                <Window Type="TaharezLook/ScrollablePane" Name="orxonox/KeyBindPane" >
     46
    2447                    <Property Name="ContentArea" Value="l:0 t:0 r:0 b:0" />
     48
    2549                    <Property Name="HorzStepSize" Value="0.1" />
     50
    2651                    <Property Name="VertStepSize" Value="0.1" />
     52
    2753                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
     54
    2855                    <Property Name="HorzOverlapSize" Value="0.01" />
    29                     <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
     56
     57                    <Property Name="UnifiedAreaRect" Value="{{0.005,0},{0.01,0},{0.995,0},{0.99,0}}" />
     58
    3059                    <Property Name="VertOverlapSize" Value="0.01" />
     60
    3161                    <Property Name="HorzScrollPosition" Value="0" />
     62
    3263                    <Property Name="VertScrollPosition" Value="0" />
     64
    3365                </Window>
     66
    3467            </Window>
     68
    3569        </Window>
     70
    3671        <Window Type="TaharezLook/Button" Name="orxonox/KeyBindBackButton" >
    3772            <Property Name="Text" Value="Back" />
     73
    3874            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    39             <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.825,0},{0.6,0},{0.875,0}}" />
     75
     76            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.6625,0},{0.6,0},{0.7125,0}}" />
     77
    4078            <Event Name="Clicked" Function="KeyBindMenu.KeyBindBackButton_clicked"/>
     79
    4180        </Window>
     81
    4282    </Window>
     83
    4384</GUILayout>

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

    r6217 r6334  
    1111            <Property Name="Text" Value="Quickstart" />
    1212            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    13             <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.25,0},{0.6,0},{0.3,0}}" />
     13            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.2875,0},{0.6,0},{0.3375,0}}" />
    1414            <Event Name="Clicked" Function="MainMenu.QuickGameTestButton_clicked"/>
    1515        </Window>
    … …  
    1717            <Property Name="Text" Value="Singleplayer" />
    1818            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    19             <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.325,0},{0.6,0},{0.375,0}}" />
     19            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.3625,0},{0.6,0},{0.4125,0}}" />
    2020            <Event Name="Clicked" Function="MainMenu.SingleplayerButton_clicked"/>
    2121        </Window>
    … …  
    2323            <Property Name="Text" Value="Multiplayer" />
    2424            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    25             <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.4,0},{0.6,0},{0.45,0}}" />
     25            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.4375,0},{0.6,0},{0.4875,0}}" />
    2626            <Event Name="Clicked" Function="MainMenu.MultiplayerButton_clicked"/>
    2727        </Window>
    … …  
    2929            <Property Name="Text" Value="Settings" />
    3030            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    31             <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.475,0},{0.6,0},{0.525,0}}" />
     31            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.5125,0},{0.6,0},{0.5625,0}}" />
    3232            <Event Name="Clicked" Function="MainMenu.SettingsButton_clicked"/>
    3333        </Window>
    … …  
    3535            <Property Name="Text" Value="Credits" />
    3636            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    37             <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.55,0},{0.6,0},{0.6,0}}" />
     37            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.5875,0},{0.6,0},{0.6375,0}}" />
    3838            <Event Name="Clicked" Function="MainMenu.CreditsButton_clicked"/>
    3939        </Window>
    … …  
    4141            <Property Name="Text" Value="Exit" />
    4242            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    43             <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.625,0},{0.6,0},{0.675,0}}" />
     43            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.6625,0},{0.6,0},{0.7125,0}}" />
    4444            <Event Name="Clicked" Function="MainMenu.ExitButton_clicked"/>
    4545        </Window>

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

    r6251 r6334  
    1515            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    1616            <Property Name="VertFormatting" Value="TopAligned" />
    17             <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.325,0},{0.75,0},{0.6,0}}" />
     17            <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.3625,0},{0.75,0},{0.6375,0}}" />
    1818            <Window Type="TaharezLook/StaticText" Name="orxonox/MouseNormalSensitivity" >
    1919                <Property Name="Text" Value="Sensitivity (normal mode)                                      " />
    … …  
    8181            <Property Name="Text" Value="Back" />
    8282            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    83             <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.625,0},{0.6,0},{0.675,0}}" />
     83            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.6625,0},{0.6,0},{0.7125,0}}" />
    8484            <Event Name="Clicked" Function="MouseControlsMenu.MouseControlsBackButton_clicked"/>
    85         </Window>
    86         <Window Type="TaharezLook/StaticText" Name="orxonox/MouseControlsAvailable" >
    87             <Property Name="Text" Value="The invert mouse button is not yet available." />
    88             <Property Name="TextColours" Value="FFFF0000" />
    89             <Property Name="InheritsAlpha" Value="False" />
    90             <Property Name="HorzFormatting" Value="HorzCentred" />
    91             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    92             <Property Name="VertFormatting" Value="TopAligned" />
    93             <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.75,0},{0.75,0},{0.8,0}}" />
    9485        </Window>
    9586    </Window>

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

    r6206 r6334  
    1515            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    1616            <Property Name="VertFormatting" Value="TopAligned" />
    17             <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.325,0},{0.75,0},{0.6,0}}" />
     17            <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.2875,0},{0.75,0},{0.6375,0}}" />
    1818            <Window Type="TaharezLook/Listbox" Name="orxonox/MultiplayerLevelListbox" >
    1919                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    20                 <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.2,0},{0.95,0},{0.8,0}}" />
     20                <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.15,0},{0.95,0},{0.8,0}}" />
    2121            </Window>
    2222            <Window Type="TaharezLook/RadioButton" Name="orxonox/MultiplayerJoinButton" >
    … …  
    4242            <Property Name="Text" Value="Start" />
    4343            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    44             <Property Name="UnifiedAreaRect" Value="{{0.2875,0},{0.625,0},{0.4875,0},{0.675,0}}" />
     44            <Property Name="UnifiedAreaRect" Value="{{0.2875,0},{0.6625,0},{0.4875,0},{0.7125,0}}" />
    4545            <Event Name="Clicked" Function="MultiplayerMenu.MultiplayerStartButton_clicked"/>
    4646        </Window>
    … …  
    4848            <Property Name="Text" Value="Back" />
    4949            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    50             <Property Name="UnifiedAreaRect" Value="{{0.5125,0},{0.625,0},{0.7125,0},{0.675,0}}" />
     50            <Property Name="UnifiedAreaRect" Value="{{0.5125,0},{0.6625,0},{0.7125,0},{0.7125,0}}" />
    5151            <Event Name="Clicked" Function="MultiplayerMenu.MultiplayerBackButton_clicked"/>
    5252        </Window>

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

    r6206 r6334  
    1515            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    1616            <Property Name="VertFormatting" Value="TopAligned" />
    17             <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.325,0},{0.75,0},{0.6,0}}" />
     17            <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.3625,0},{0.75,0},{0.6375,0}}" />
    1818        </Window>
    1919        <Window Type="TaharezLook/Button" Name="orxonox/MultiplayerOptionsBackButton" >
    … …  
    2323            <Event Name="Clicked" Function="MultiplayerOptionsMenu.MultiplayerOptionsBackButton_clicked"/>
    2424        </Window>
    25         <Window Type="TaharezLook/StaticText" Name="orxonox/MultiplayerOptionsAvailable" >
    26             <Property Name="Text" Value="The multiplayer options menu is not yet available." />
    27             <Property Name="TextColours" Value="FFFF0000" />
    28             <Property Name="InheritsAlpha" Value="False" />
    29             <Property Name="HorzFormatting" Value="HorzCentred" />
    30             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    31             <Property Name="VertFormatting" Value="TopAligned" />
    32             <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.75,0},{0.75,0},{0.8,0}}" />
    33         </Window>
    3425    </Window>
    3526</GUILayout>

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

    r6233 r6334  
    88        <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
    99        <Property Name="BackgroundEnabled" Value="False" />
    10 
    1110        <Window Type="TaharezLook/StaticText" Name="orxonox/SettingsWindow" >
    1211            <Property Name="Text" Value="Settings" />
    … …  
    1615            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    1716            <Property Name="VertFormatting" Value="TopAligned" />
    18             <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.325,0},{0.75,0},{0.6,0}}" />
     17            <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.3625,0},{0.75,0},{0.6375,0}}" />
    1918            <Window Type="TaharezLook/Button" Name="orxonox/GameplayButton" >
    2019                <Property Name="Text" Value="Gameplay" />
    … …  
    6059            <Property Name="Text" Value="Back" />
    6160            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    62             <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.625,0},{0.6,0},{0.675,0}}" />
     61            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.6625,0},{0.6,0},{0.7125,0}}" />
    6362            <Event Name="Clicked" Function="SettingsMenu.SettingsBackButton_clicked"/>
    6463        </Window>

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

    r6206 r6334  
    1515            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    1616            <Property Name="VertFormatting" Value="TopAligned" />
    17             <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.325,0},{0.75,0},{0.6,0}}" />
     17            <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.2875,0},{0.75,0},{0.6375,0}}" />
    1818            <Window Type="TaharezLook/Listbox" Name="orxonox/SingleplayerLevelListbox" >
    1919                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    20                 <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.2,0},{0.95,0},{0.9,0}}" />
     20                <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.15,0},{0.95,0},{0.92,0}}" />
    2121            </Window>
    2222        </Window>
    … …  
    2424            <Property Name="Text" Value="Start" />
    2525            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    26             <Property Name="UnifiedAreaRect" Value="{{0.2875,0},{0.625,0},{0.4875,0},{0.675,0}}" />
     26            <Property Name="UnifiedAreaRect" Value="{{0.2875,0},{0.6625,0},{0.4875,0},{0.7125,0}}" />
    2727            <Event Name="Clicked" Function="SingleplayerMenu.SingleplayerStartButton_clicked"/>
    2828        </Window>
    … …  
    3030            <Property Name="Text" Value="Back" />
    3131            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    32             <Property Name="UnifiedAreaRect" Value="{{0.5125,0},{0.625,0},{0.7125,0},{0.675,0}}" />
     32            <Property Name="UnifiedAreaRect" Value="{{0.5125,0},{0.6625,0},{0.7125,0},{0.7125,0}}" />
    3333            <Event Name="Clicked" Function="SingleplayerMenu.SingleplayerBackButton_clicked"/>
    3434        </Window>
Note: See TracChangeset for help on using the changeset viewer.