summaryrefslogtreecommitdiff
path: root/src/gui/widgets/tabs
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-10-01 01:41:48 +0300
committerAndrei Karas <akaras@inbox.ru>2013-10-01 01:42:56 +0300
commit6915c38ca9c35bfb9a5ea05fe957463d644a75de (patch)
tree9f7473433b42078dcb2d22b9a04dac1b014c89d0 /src/gui/widgets/tabs
parent251c9cccce6252238797bc4ac782175dd0aeb42e (diff)
downloadmanaplus-6915c38ca9c35bfb9a5ea05fe957463d644a75de.tar.gz
manaplus-6915c38ca9c35bfb9a5ea05fe957463d644a75de.tar.bz2
manaplus-6915c38ca9c35bfb9a5ea05fe957463d644a75de.tar.xz
manaplus-6915c38ca9c35bfb9a5ea05fe957463d644a75de.zip
Add on screen buttons layout 3x3, 4x2, 4x3
Diffstat (limited to 'src/gui/widgets/tabs')
-rw-r--r--src/gui/widgets/tabs/setup_touch.cpp32
1 files changed, 12 insertions, 20 deletions
diff --git a/src/gui/widgets/tabs/setup_touch.cpp b/src/gui/widgets/tabs/setup_touch.cpp
index e3081427d..6e3c12a02 100644
--- a/src/gui/widgets/tabs/setup_touch.cpp
+++ b/src/gui/widgets/tabs/setup_touch.cpp
@@ -42,12 +42,15 @@ static const char *const sizeList[] =
N_("Large")
};
-static const int formatListSize = 2;
+static const int formatListSize = 5;
static const char *const formatList[] =
{
"2x1",
"2x2",
+ "3x3",
+ "4x2",
+ "4x3"
};
Setup_Touch::Setup_Touch(const Widget2 *const widget) :
@@ -105,25 +108,14 @@ Setup_Touch::Setup_Touch(const Widget2 *const widget) :
new SetupItemDropDown(_("Buttons size"), "", "screenButtonsSize", this,
"screenButtonsSizeEvent", mSizeList, 100);
- // TRANSLATORS: settings option
- new SetupActionDropDown(strprintf(_("Button %u action"), 1U), "",
- "screenActionButton0", this, "screenActionButton0Event",
- mActionsList, 250);
-
- // TRANSLATORS: settings option
- new SetupActionDropDown(strprintf(_("Button %u action"), 2U), "",
- "screenActionButton1", this, "screenActionButton1Event",
- mActionsList, 250);
-
- // TRANSLATORS: settings option
- new SetupActionDropDown(strprintf(_("Button %u action"), 3U), "",
- "screenActionButton2", this, "screenActionButton2Event",
- mActionsList, 250);
-
- // TRANSLATORS: settings option
- new SetupActionDropDown(strprintf(_("Button %u action"), 4U), "",
- "screenActionButton3", this, "screenActionButton3Event",
- mActionsList, 250);
+ for (unsigned int f = 0; f < 12; f ++)
+ {
+ std::string key = strprintf("screenActionButton%u", f);
+ std::string event = strprintf("screenActionButton%uEvent", f);
+ // TRANSLATORS: settings option
+ new SetupActionDropDown(strprintf(_("Button %u action"), f + 1), "",
+ key, this, event, mActionsList, 250);
+ }
setDimension(gcn::Rectangle(0, 0, 550, 350));
}