Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7012 for code


Ignore:
Timestamp:
May 30, 2010, 1:37:33 PM (14 years ago)
Author:
dafrick
Message:

Config values can now be changed in a menu.

Location:
code/branches/presentation3
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • code/branches/presentation3/data/gui/layouts/SettingsMenu.layout

    r7006 r7012  
    5050            <Window Type="MenuWidgets/Button" Name="orxonox/SettingsMenu/MiscellaneousButton" >
    5151                <Property Name="Text" Value="Miscellaneous" />
    52                 <Property Name="Disabled" Value="True" />
    5352                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    5453                <Property Name="UnifiedAreaRect" Value="{{0.55,0},{0.727272,0},{0.95,0},{0.909090,0}}" />
  • code/branches/presentation3/data/gui/scripts/MiscConfigMenu.lua

    r7006 r7012  
    11-- MiscConfigMenu.lua
    22
    3 local P = createMenuSheet("MiscConfigMenu")
     3local P = createMenuSheet("MiscConfigMenu", true, TriBool.True, TriBool.True)
    44
    55P.commandList = {}
  • code/branches/presentation3/src/libraries/core/GUIManager.cc

    r6763 r7012  
    321321    }
    322322
    323     void GUIManager::keyPressed(const KeyEvent& evt)
     323    void GUIManager::buttonPressed(const KeyEvent& evt)
    324324    {
    325325        this->protectedCall(boost::bind(&CEGUI::System::injectKeyDown, _1, evt.getKeyCode()));
     
    327327    }
    328328
    329     void GUIManager::keyReleased(const KeyEvent& evt)
     329    void GUIManager::buttonReleased(const KeyEvent& evt)
    330330    {
    331331        this->protectedCall(boost::bind(&CEGUI::System::injectKeyUp, _1, evt.getKeyCode()));
  • code/branches/presentation3/src/libraries/core/GUIManager.h

    r6996 r7012  
    113113
    114114        // keyHandler functions
    115         void keyPressed (const KeyEvent& evt);
    116         void keyReleased(const KeyEvent& evt);
     115        void buttonPressed (const KeyEvent& evt);
     116        void buttonReleased(const KeyEvent& evt);
    117117
    118118        // mouseHandler functions
Note: See TracChangeset for help on using the changeset viewer.