diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-04-19 23:48:29 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-04-19 23:48:29 +0300 |
| commit | 0b7e752bd177c90a05ca752fa31810f9e34c432c (patch) | |
| tree | db1809a48faf051af11c94058e8f126c9e9ef1ab /src/gui/updaterwindow.cpp | |
| parent | 23f87c10db7e6b149e9e1f351e1a82516c545df7 (diff) | |
| download | manaverse-0b7e752bd177c90a05ca752fa31810f9e34c432c.tar.gz manaverse-0b7e752bd177c90a05ca752fa31810f9e34c432c.tar.bz2 manaverse-0b7e752bd177c90a05ca752fa31810f9e34c432c.tar.xz manaverse-0b7e752bd177c90a05ca752fa31810f9e34c432c.zip | |
Dehardcode keys in gui widgets.
Add new tab with keys settings in input settings tab.
Diffstat (limited to 'src/gui/updaterwindow.cpp')
| -rw-r--r-- | src/gui/updaterwindow.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/gui/updaterwindow.cpp b/src/gui/updaterwindow.cpp index e6ad1818e..a1c625c32 100644 --- a/src/gui/updaterwindow.cpp +++ b/src/gui/updaterwindow.cpp @@ -24,6 +24,8 @@ #include "client.h" #include "configuration.h" +#include "keydata.h" +#include "keyevent.h" #include "logger.h" #include "main.h" @@ -258,14 +260,15 @@ void UpdaterWindow::action(const gcn::ActionEvent &event) void UpdaterWindow::keyPressed(gcn::KeyEvent &keyEvent) { - gcn::Key key = keyEvent.getKey(); + int actionId = static_cast<KeyEvent*>(&keyEvent)->getActionId(); - if (key.getValue() == Key::ESCAPE) + if (actionId == Input::KEY_GUI_CANCEL) { action(gcn::ActionEvent(nullptr, mCancelButton->getActionEventId())); Client::setState(STATE_LOGIN); } - else if (key.getValue() == Key::ENTER) + else if (actionId == Input::KEY_GUI_SELECT + || actionId == Input::KEY_GUI_SELECT2) { if (mDownloadStatus == UPDATE_COMPLETE || mDownloadStatus == UPDATE_ERROR) |