Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6217


Ignore:
Timestamp:
Dec 2, 2009, 10:13:13 PM (15 years ago)
Author:
dafrick
Message:

Improved GUI. (Especially IngameMenu)

Location:
code/branches/presentation2/data/gui
Files:
4 edited

Legend:

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

    r6150 r6217  
    99            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    1010            <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
    11             <Property Name="Alpha" Value="0.5" />
     11            <Property Name="Alpha" Value="0.6" />
    1212            <Window Type="TaharezLook/Button" Name="orxonox/DecisionPopup_button_yes" >
    1313                <Property Name="Font" Value="BlueHighway-12" />
  • code/branches/presentation2/data/gui/layouts/InGameMenu.layout

    r6150 r6217  
    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" >
     9            <Property Name="Font" Value="BlueHighway-12" />
     10            <Property Name="Text" Value="Return to Game" />
     11            <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}}" />
     13            <Property Name="Alpha" Value="0.7" />
     14            <Event Name="Clicked" Function="InGameMenu.button_return_clicked"/>
     15        </Window>
    816        <Window Type="TaharezLook/Button" Name="orxonox/InGameMenu_MainMenuButton" >
    917            <Property Name="Font" Value="BlueHighway-12" />
    10             <Property Name="Text" Value="MainMenu" />
     18            <Property Name="Text" Value="Main Menu" />
    1119            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    12             <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.2,0},{0.6,0},{0.3,0}}" />
     20            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.4,0},{0.6,0},{0.46,0}}" />
    1321            <Property Name="Alpha" Value="0.7" />
    1422            <Event Name="Clicked" Function="InGameMenu.button_mainmenu_clicked"/>
     23        </Window>
     24        <Window Type="TaharezLook/Button" Name="orxonox/InGameMenu_SettingsButton" >
     25            <Property Name="Font" Value="BlueHighway-12" />
     26            <Property Name="Text" Value="Settings" />
     27            <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}}" />
     29            <Property Name="Alpha" Value="0.7" />
     30            <Event Name="Clicked" Function="InGameMenu.button_settings_clicked"/>
    1531        </Window>
    1632        <Window Type="TaharezLook/Button" Name="orxonox/InGameMenu_QuitButton" >
     
    1834            <Property Name="Text" Value="Quit" />
    1935            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    20             <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.4,0},{0.6,0},{0.5,0}}" />
     36            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.6,0},{0.6,0},{0.66,0}}" />
    2137            <Property Name="Alpha" Value="0.7" />
    2238            <Event Name="Clicked" Function="InGameMenu.button_quit_clicked"/>
    2339        </Window>
    24         <Window Type="TaharezLook/Button" Name="orxonox/InGameMenu_ReturnButton" >
    25             <Property Name="Font" Value="BlueHighway-12" />
    26             <Property Name="Text" Value="return to Game" />
    27             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    28             <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.6,0},{0.6,0},{0.7,0}}" />
    29             <Property Name="Alpha" Value="0.7" />
    30             <Event Name="Clicked" Function="InGameMenu.button_return_clicked"/>
    31         </Window>
    3240    </Window>
    3341</GUILayout>
  • code/branches/presentation2/data/gui/layouts/MainMenu.layout

    r6206 r6217  
    99        <Property Name="BackgroundEnabled" Value="False" />
    1010        <Window Type="TaharezLook/Button" Name="orxonox/QuickGameTestButton" >
    11             <Property Name="Text" Value="QUICK GAME TEST" />
     11            <Property Name="Text" Value="Quickstart" />
    1212            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    1313            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.25,0},{0.6,0},{0.3,0}}" />
  • code/branches/presentation2/data/gui/scripts/InGameMenu.lua

    r6150 r6217  
    2525    orxonox.Game:getInstance():popState()
    2626    orxonox.Game:getInstance():requestState("mainmenu")
    27     orxonox.CommandExecutor:execute("hideGUI InGameMenu")
     27    hideGUI("InGameMenu")
     28end
     29
     30function P.button_settings_clicked(e)
     31    showGUI("SettingsMenu", true)
    2832end
    2933
    3034function P.button_return_clicked(e)
    31     orxonox.CommandExecutor:execute("hideGUI InGameMenu")
     35    hideGUI("InGameMenu")
    3236end
    3337
    3438function P.callback(doExit)
    3539    if doExit then
    36         orxonox.CommandExecutor:execute("hideGUI InGameMenu")
     40        hideGUI("InGameMenu")
    3741        orxonox.CommandExecutor:execute("exit")
    3842    end
Note: See TracChangeset for help on using the changeset viewer.