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/serverdialog.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/serverdialog.cpp')
| -rw-r--r-- | src/gui/serverdialog.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp index bae1154e3..cde56875f 100644 --- a/src/gui/serverdialog.cpp +++ b/src/gui/serverdialog.cpp @@ -25,6 +25,8 @@ #include "chatlogger.h" #include "client.h" #include "configuration.h" +#include "keydata.h" +#include "keyevent.h" #include "logger.h" #include "main.h" @@ -396,12 +398,17 @@ void ServerDialog::action(const gcn::ActionEvent &event) void ServerDialog::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) + { Client::setState(STATE_EXIT); - else if (key.getValue() == Key::ENTER) + } + else if (actionId == Input::KEY_GUI_SELECT + || actionId == Input::KEY_GUI_SELECT2) + { action(gcn::ActionEvent(nullptr, mConnectButton->getActionEventId())); + } } void ServerDialog::valueChanged(const gcn::SelectionEvent &) |