diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-04-08 19:41:19 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-04-08 19:41:19 +0300 |
| commit | 30ef016b0a14f36dc480284e2d775295b5501dd4 (patch) | |
| tree | a269c0983efb8dc9160bfe10b1dba26a302aff0c /src/gui/widgets | |
| parent | 25a6eae7f4fb561bbf930be28ee09510b40ebc80 (diff) | |
| download | manaplus-30ef016b0a14f36dc480284e2d775295b5501dd4.tar.gz manaplus-30ef016b0a14f36dc480284e2d775295b5501dd4.tar.bz2 manaplus-30ef016b0a14f36dc480284e2d775295b5501dd4.tar.xz manaplus-30ef016b0a14f36dc480284e2d775295b5501dd4.zip | |
Move most input code from keyboardconfig to inputmanager.
Diffstat (limited to 'src/gui/widgets')
| -rw-r--r-- | src/gui/widgets/emoteshortcutcontainer.cpp | 3 | ||||
| -rw-r--r-- | src/gui/widgets/itemshortcutcontainer.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp index f46ee579c..f1f040966 100644 --- a/src/gui/widgets/emoteshortcutcontainer.cpp +++ b/src/gui/widgets/emoteshortcutcontainer.cpp @@ -25,6 +25,7 @@ #include "configuration.h" #include "emoteshortcut.h" #include "graphics.h" +#include "inputmanager.h" #include "inventory.h" #include "item.h" #include "itemshortcut.h" @@ -117,7 +118,7 @@ void EmoteShortcutContainer::draw(gcn::Graphics *graphics) g->drawImage(mBackgroundImg, emoteX, emoteY); // Draw emote keyboard shortcut. - std::string key = keyboard.getKeyValueString( + std::string key = inputManager.getKeyValueString( Input::KEY_EMOTE_1 + i); graphics->setColor(getForegroundColor()); diff --git a/src/gui/widgets/itemshortcutcontainer.cpp b/src/gui/widgets/itemshortcutcontainer.cpp index 981491dd7..a6f7f60a3 100644 --- a/src/gui/widgets/itemshortcutcontainer.cpp +++ b/src/gui/widgets/itemshortcutcontainer.cpp @@ -25,6 +25,7 @@ #include "configuration.h" #include "graphics.h" #include "inventory.h" +#include "inputmanager.h" #include "item.h" #include "itemshortcut.h" #include "spellshortcut.h" @@ -121,7 +122,7 @@ void ItemShortcutContainer::draw(gcn::Graphics *graphics) g->drawImage(mBackgroundImg, itemX, itemY); // Draw item keyboard shortcut. - std::string key = keyboard.getKeyValueString( + std::string key = inputManager.getKeyValueString( Input::KEY_SHORTCUT_1 + i); graphics->setColor(getForegroundColor()); |