summaryrefslogtreecommitdiff
path: root/src/gui/setup_touch.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-12-31 17:33:44 +0300
committerAndrei Karas <akaras@inbox.ru>2012-12-31 17:33:44 +0300
commit021fa9fe787fe4dd1a6d97b77e94400fac179f23 (patch)
tree05eebf64884503a17766f1755344568087fec0b2 /src/gui/setup_touch.cpp
parentea886eaeabe20e5a51e91ec58067e2ebc20d4f99 (diff)
downloadplus-021fa9fe787fe4dd1a6d97b77e94400fac179f23.tar.gz
plus-021fa9fe787fe4dd1a6d97b77e94400fac179f23.tar.bz2
plus-021fa9fe787fe4dd1a6d97b77e94400fac179f23.tar.xz
plus-021fa9fe787fe4dd1a6d97b77e94400fac179f23.zip
Add support for changable actions for onscreen controls.
Diffstat (limited to 'src/gui/setup_touch.cpp')
-rw-r--r--src/gui/setup_touch.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/gui/setup_touch.cpp b/src/gui/setup_touch.cpp
index a443af771..719b6277a 100644
--- a/src/gui/setup_touch.cpp
+++ b/src/gui/setup_touch.cpp
@@ -21,7 +21,6 @@
#include "gui/setup_touch.h"
#include "gui/widgets/layouthelper.h"
-#include "gui/widgets/namesmodel.h"
#include "gui/widgets/scrollarea.h"
#include "configuration.h"
@@ -42,7 +41,8 @@ static const char *const sizeList[] =
Setup_Touch::Setup_Touch(const Widget2 *const widget) :
SetupTabScroll(widget),
- mSizeList(new NamesModel)
+ mSizeList(new NamesModel),
+ mActionsList(new TouchActionsModel)
{
setName(_("Touch"));
@@ -66,6 +66,10 @@ Setup_Touch::Setup_Touch(const Widget2 *const widget) :
new SetupItemDropDown(_("Joystick size"), "", "screenJoystickSize", this,
"screenJoystickEvent", mSizeList, 100);
+ new SetupActionDropDown(_("Keyboard icon action"), "",
+ "screenActionKeyboard", this, "screenActionKeyboardEvent",
+ mActionsList, 250);
+
setDimension(gcn::Rectangle(0, 0, 550, 350));
}