Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Dec 3, 2009, 8:10:07 PM (15 years ago)
Author:
cmueri
Message:

The audio menu and all its functions are now enabled.

Location:
code/branches/presentation2/data/gui/layouts
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/branches/presentation2/data/gui/layouts/AudioMenu.layout

    r6206 r6233  
    1515            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    1616            <Property Name="VertFormatting" Value="TopAligned" />
    17             <Property Name="UnifiedAreaRect" Value="{{0.15,0},{0.325,0},{0.85,0},{0.6,0}}" />
     17            <Property Name="UnifiedAreaRect" Value="{{0.2,0},{0.325,0},{0.8,0},{0.6,0}}" />
    1818            <Window Type="TaharezLook/StaticText" Name="orxonox/MasterVolume" >
    19                 <Property Name="Text" Value="Master volume" />
     19                <Property Name="Text" Value="Master volume               " />
    2020                <Property Name="InheritsAlpha" Value="False" />
    2121                <Property Name="HorzFormatting" Value="HorzCentred" />
    2222                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    2323                <Property Name="VertFormatting" Value="TopAligned" />
    24                 <Property Name="UnifiedAreaRect" Value="{{0.03,0},{0.2,0},{0.34,0},{0.4,0}}" />
     24                <Property Name="UnifiedAreaRect" Value="{{0.041666,0},{0.2,0},{0.5625,0},{0.4,0}}" />
    2525                <Window Type="TaharezLook/HorizontalScrollbar" Name="orxonox/MasterScrollbar" >
    2626                    <Property Name="PageSize" Value="0" />
     
    3131                    <Property Name="StepSize" Value="0.1" />
    3232                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    33                     <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.6,0},{0.95,0},{0.8,0}}" />
     33                    <Property Name="UnifiedAreaRect" Value="{{0.04,0},{0.6,0},{0.71,0},{0.8,0}}" />
    3434                    <Event Name="ThumbTrackStarted" Function="AudioMenu.AudioMasterScrollbar_started" />
    3535                    <Event Name="ThumbTrackEnded" Function="AudioMenu.AudioMasterScrollbar_ended" />
    3636                    <Event Name="ScrollPosChanged" Function="AudioMenu.AudioMasterScrollbar_changed" />
    3737                </Window>
     38                <Window Type="TaharezLook/Checkbox" Name="orxonox/MasterCheckbox" >
     39                    <Property Name="Text" Value="Mute" />
     40                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
     41                    <Property Name="UnifiedAreaRect" Value="{{0.775,0},{0.45,0},{0.96,0},{0.9,0}}" />
     42                    <Event Name="CheckStateChanged" Function="AudioMenu.AudioMuteMasterCheckbox_clicked"/>
     43                </Window>
    3844            </Window>
    3945            <Window Type="TaharezLook/StaticText" Name="orxonox/MusicVolume" >
    40                 <Property Name="Text" Value="Music volume" />
     46                <Property Name="Text" Value="Music volume               " />
    4147                <Property Name="InheritsAlpha" Value="False" />
    4248                <Property Name="HorzFormatting" Value="HorzCentred" />
    4349                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    4450                <Property Name="VertFormatting" Value="TopAligned" />
    45                 <Property Name="UnifiedAreaRect" Value="{{0.03,0},{0.45,0},{0.34,0},{0.65,0}}" />
     51                <Property Name="UnifiedAreaRect" Value="{{0.041666,0},{0.45,0},{0.5625,0},{0.65,0}}" />
    4652                <Window Type="TaharezLook/HorizontalScrollbar" Name="orxonox/MusicScrollbar" >
    4753                    <Property Name="PageSize" Value="0" />
     
    5258                    <Property Name="StepSize" Value="0.1" />
    5359                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    54                     <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.6,0},{0.95,0},{0.8,0}}" />
     60                    <Property Name="UnifiedAreaRect" Value="{{0.04,0},{0.6,0},{0.71,0},{0.8,0}}" />
    5561                    <Event Name="ThumbTrackStarted" Function="AudioMenu.AudioMusicScrollbar_started" />
    5662                    <Event Name="ThumbTrackEnded" Function="AudioMenu.AudioMusicScrollbar_ended" />
    5763                    <Event Name="ScrollPosChanged" Function="AudioMenu.AudioMusicScrollbar_changed" />
    5864                </Window>
     65                <Window Type="TaharezLook/Checkbox" Name="orxonox/MusicCheckbox" >
     66                    <Property Name="Text" Value="Mute" />
     67                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
     68                    <Property Name="UnifiedAreaRect" Value="{{0.775,0},{0.45,0},{0.96,0},{0.9,0}}" />
     69                    <Event Name="CheckStateChanged" Function="AudioMenu.AudioMuteMusicCheckbox_clicked"/>
     70                </Window>
    5971            </Window>
    6072            <Window Type="TaharezLook/StaticText" Name="orxonox/EffectsVolume" >
    61                 <Property Name="Text" Value="Effects volume" />
     73                <Property Name="Text" Value="Effects volume               " />
    6274                <Property Name="InheritsAlpha" Value="False" />
    6375                <Property Name="HorzFormatting" Value="HorzCentred" />
    6476                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    6577                <Property Name="VertFormatting" Value="TopAligned" />
    66                 <Property Name="UnifiedAreaRect" Value="{{0.03,0},{0.7,0},{0.34,0},{0.9,0}}" />
     78                <Property Name="UnifiedAreaRect" Value="{{0.041666,0},{0.7,0},{0.5625,0},{0.9,0}}" />
    6779                <Window Type="TaharezLook/HorizontalScrollbar" Name="orxonox/EffectsScrollbar" >
    6880                    <Property Name="PageSize" Value="0" />
     
    7385                    <Property Name="StepSize" Value="0.1" />
    7486                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    75                     <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.6,0},{0.95,0},{0.8,0}}" />
     87                    <Property Name="UnifiedAreaRect" Value="{{0.04,0},{0.6,0},{0.71,0},{0.8,0}}" />
    7688                    <Event Name="ThumbTrackStarted" Function="AudioMenu.AudioEffectsScrollbar_started" />
    7789                    <Event Name="ThumbTrackEnded" Function="AudioMenu.AudioEffectsScrollbar_ended" />
    7890                    <Event Name="ScrollPosChanged" Function="AudioMenu.AudioEffectsScrollbar_changed" />
     91                </Window>
     92                <Window Type="TaharezLook/Checkbox" Name="orxonox/EffectsCheckbox" >
     93                    <Property Name="Text" Value="Mute" />
     94                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
     95                    <Property Name="UnifiedAreaRect" Value="{{0.775,0},{0.45,0},{0.96,0},{0.9,0}}" />
     96                    <Event Name="CheckStateChanged" Function="AudioMenu.AudioMuteEffectsCheckbox_clicked"/>
    7997                </Window>
    8098            </Window>
     
    85103                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    86104                <Property Name="VertFormatting" Value="TopAligned" />
    87                 <Property Name="UnifiedAreaRect" Value="{{0.66,0},{0.2,0},{0.97,0},{0.9,0}}" />
     105                <Property Name="UnifiedAreaRect" Value="{{0.604166,0},{0.2,0},{0.958333,0},{0.9,0}}" />
    88106                <Window Type="TaharezLook/Combobox" Name="orxonox/AudioThemeCombobox" >
    89107                    <Property Name="AlwaysOnTop" Value="True" />
     
    95113                </Window>
    96114            </Window>
    97             <Window Type="TaharezLook/Checkbox" Name="orxonox/MasterCheckbox" >
    98                 <Property Name="Text" Value="Mute master" />
    99                 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    100                 <Property Name="UnifiedAreaRect" Value="{{0.375,0},{0.275,0},{0.625,0},{0.375,0}}" />
    101                 <Event Name="CheckStateChanged" Function="AudioMenu.AudioMuteMasterCheckbox_clicked"/>
    102             </Window>
    103             <Window Type="TaharezLook/Checkbox" Name="orxonox/MusicCheckbox" >
    104                 <Property Name="Text" Value="Mute music" />
    105                 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    106                 <Property Name="UnifiedAreaRect" Value="{{0.375,0},{0.525,0},{0.625,0},{0.625,0}}" />
    107                 <Event Name="CheckStateChanged" Function="AudioMenu.AudioMuteMusicCheckbox_clicked"/>
    108             </Window>
    109             <Window Type="TaharezLook/Checkbox" Name="orxonox/EffectsCheckbox" >
    110                 <Property Name="Text" Value="Mute effects" />
    111                 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    112                 <Property Name="UnifiedAreaRect" Value="{{0.375,0},{0.775,0},{0.625,0},{0.875,0}}" />
    113                 <Event Name="CheckStateChanged" Function="AudioMenu.AudioMuteEffectsCheckbox_clicked"/>
    114             </Window>
    115115        </Window>
    116116        <Window Type="TaharezLook/Button" Name="orxonox/AudioBackButton" >
     
    120120            <Event Name="Clicked" Function="AudioMenu.AudioBackButton_clicked"/>
    121121        </Window>
    122         <Window Type="TaharezLook/StaticText" Name="orxonox/AudioAvailable" >
    123             <Property Name="Text" Value="Changes in audio settings are not yet available." />
    124             <Property Name="TextColours" Value="FFFF0000" />
    125             <Property Name="InheritsAlpha" Value="False" />
    126             <Property Name="HorzFormatting" Value="HorzCentred" />
    127             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    128             <Property Name="VertFormatting" Value="TopAligned" />
    129             <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.75,0},{0.75,0},{0.8,0}}" />
    130         </Window>
    131122    </Window>
    132123</GUILayout>
  • code/branches/presentation2/data/gui/layouts/SettingsMenu.layout

    r6206 r6233  
    2626            <Window Type="TaharezLook/Button" Name="orxonox/MultiplayerOptionsButton" >
    2727                <Property Name="Text" Value="Multiplayer options" />
     28                <Property Name="Disabled" Value="True" />
    2829                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    2930                <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.454545,0},{0.45,0},{0.636363,0}}" />
Note: See TracChangeset for help on using the changeset viewer.