summaryrefslogtreecommitdiff
path: root/src/gui
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
parentea886eaeabe20e5a51e91ec58067e2ebc20d4f99 (diff)
downloadmv-021fa9fe787fe4dd1a6d97b77e94400fac179f23.tar.gz
mv-021fa9fe787fe4dd1a6d97b77e94400fac179f23.tar.bz2
mv-021fa9fe787fe4dd1a6d97b77e94400fac179f23.tar.xz
mv-021fa9fe787fe4dd1a6d97b77e94400fac179f23.zip
Add support for changable actions for onscreen controls.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/setup_input.cpp3
-rw-r--r--src/gui/setup_touch.cpp8
-rw-r--r--src/gui/setup_touch.h4
-rw-r--r--src/gui/setupactiondata.h14
-rw-r--r--src/gui/widgets/setuptouchitem.cpp119
-rw-r--r--src/gui/widgets/setuptouchitem.h109
6 files changed, 249 insertions, 8 deletions
diff --git a/src/gui/setup_input.cpp b/src/gui/setup_input.cpp
index 31743dd7e..7b9c49056 100644
--- a/src/gui/setup_input.cpp
+++ b/src/gui/setup_input.cpp
@@ -43,7 +43,8 @@
#include "debug.h"
-const int setupGroups = 9;
+static int selectedData = 0;
+static const int setupGroups = 9;
/**
* The list model for key function list.
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));
}
diff --git a/src/gui/setup_touch.h b/src/gui/setup_touch.h
index 150bfd79a..2dc270abf 100644
--- a/src/gui/setup_touch.h
+++ b/src/gui/setup_touch.h
@@ -21,12 +21,11 @@
#ifndef GUI_SETUP_TOUCH_H
#define GUI_SETUP_TOUCH_H
-#include "gui/widgets/setupitem.h"
+#include "gui/widgets/setuptouchitem.h"
#include <guichan/actionlistener.hpp>
class EditDialog;
-class NamesModel;
class TextField;
class Setup_Touch final : public SetupTabScroll
@@ -40,6 +39,7 @@ class Setup_Touch final : public SetupTabScroll
protected:
NamesModel *mSizeList;
+ TouchActionsModel *mActionsList;
};
#endif
diff --git a/src/gui/setupactiondata.h b/src/gui/setupactiondata.h
index 935cd95b6..495879104 100644
--- a/src/gui/setupactiondata.h
+++ b/src/gui/setupactiondata.h
@@ -31,9 +31,7 @@
#include <string>
-#include "debug.h"
-
-int selectedData = 0;
+//#include "debug.h"
struct SetupActionData final
{
@@ -1570,4 +1568,14 @@ static const char *const pages[] =
nullptr
};
+const int touchActionDataSize = 4;
+
+static SetupActionData *const touchActionData[] =
+{
+ setupActionData0,
+ setupActionData2,
+ setupActionData5,
+ setupActionData6
+};
+
#endif
diff --git a/src/gui/widgets/setuptouchitem.cpp b/src/gui/widgets/setuptouchitem.cpp
new file mode 100644
index 000000000..59f33b6a5
--- /dev/null
+++ b/src/gui/widgets/setuptouchitem.cpp
@@ -0,0 +1,119 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2012 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "gui/widgets/setuptouchitem.h"
+
+#include "gui/widgets/dropdown.h"
+#include "gui/widgets/horizontcontainer.h"
+#include "gui/widgets/label.h"
+#include "gui/widgets/vertcontainer.h"
+
+#include "debug.h"
+
+SetupActionDropDown::SetupActionDropDown(std::string text,
+ std::string description,
+ std::string keyName,
+ SetupTabScroll *const parent,
+ std::string eventName,
+ TouchActionsModel *const model,
+ int width,
+ const bool mainConfig) :
+ SetupItem(text, description, keyName, parent, eventName, mainConfig),
+ mHorizont(nullptr),
+ mLabel(nullptr),
+ mModel(model),
+ mDropDown(nullptr),
+ mWidth(width)
+{
+ mValueType = VSTR;
+ createControls();
+}
+
+SetupActionDropDown::SetupActionDropDown(std::string text,
+ std::string description,
+ std::string keyName,
+ SetupTabScroll *const parent,
+ std::string eventName,
+ TouchActionsModel *const model,
+ int width,
+ std::string def,
+ const bool mainConfig) :
+ SetupItem(text, description, keyName, parent, eventName, def, mainConfig),
+ mHorizont(nullptr),
+ mLabel(nullptr),
+ mModel(model),
+ mDropDown(nullptr),
+ mWidth(width)
+{
+ mValueType = VSTR;
+ createControls();
+}
+
+SetupActionDropDown::~SetupActionDropDown()
+{
+ mHorizont = nullptr;
+ mWidget = nullptr;
+ mModel = nullptr;
+ mDropDown = nullptr;
+ mLabel = nullptr;
+}
+
+void SetupActionDropDown::createControls()
+{
+ load();
+ mHorizont = new HorizontContainer(this, 32, 2);
+
+ mLabel = new Label(this, mText);
+ mDropDown = new DropDown(this, mModel);
+ mDropDown->setActionEventId(mEventName);
+ mDropDown->addActionListener(mParent);
+ mDropDown->setWidth(mWidth);
+ mDropDown->setSelected(mModel->getSelectionFromAction(
+ atoi(mValue.c_str())));
+
+ mWidget = mDropDown;
+// mTextField->setWidth(50);
+ fixFirstItemSize(mLabel);
+ mHorizont->add(mLabel);
+ mHorizont->add(mDropDown);
+
+ mParent->getContainer()->add2(mHorizont, true, 4);
+ mParent->addControl(this);
+ mParent->addActionListener(this);
+ mWidget->addActionListener(this);
+}
+
+void SetupActionDropDown::fromWidget()
+{
+ if (!mDropDown)
+ return;
+
+ mValue = toString(mModel->getActionFromSelection(
+ mDropDown->getSelected()));
+}
+
+void SetupActionDropDown::toWidget()
+{
+ if (!mDropDown)
+ return;
+
+ mDropDown->setSelected(mModel->getSelectionFromAction(
+ atoi(mValue.c_str())));
+}
diff --git a/src/gui/widgets/setuptouchitem.h b/src/gui/widgets/setuptouchitem.h
new file mode 100644
index 000000000..2f5cf7805
--- /dev/null
+++ b/src/gui/widgets/setuptouchitem.h
@@ -0,0 +1,109 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2012 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef SETUPTOUCHITEM_H
+#define SETUPTOUCHITEM_H
+
+#include "gui/setupactiondata.h"
+
+#include "gui/widgets/namesmodel.h"
+#include "gui/widgets/setupitem.h"
+
+class TouchActionsModel final : public NamesModel
+{
+ public:
+ TouchActionsModel() :
+ NamesModel()
+ {
+ int cnt = 0;
+ for (int f = 0, sz = touchActionDataSize; f < sz; f ++)
+ {
+ int k = 0;
+ while (!touchActionData[f][k].name.empty())
+ {
+ const SetupActionData &data = touchActionData[f][k];
+ mNames.push_back(data.name);
+ mActionId.push_back(data.actionId);
+ mActionToSelection[data.actionId] = cnt;
+ k ++;
+ cnt ++;
+ }
+ }
+ }
+
+ virtual ~TouchActionsModel()
+ { }
+
+ int getActionFromSelection(int sel)
+ {
+ if (sel < 0 || sel > mActionId.size())
+ return -1;
+ return mActionId[sel];
+ }
+
+ int getSelectionFromAction(int action)
+ {
+ std::map<int, int>::const_iterator it
+ = mActionToSelection.find(action);
+ if (it == mActionToSelection.end())
+ return 0;
+ return (*it).second;
+ }
+
+ private:
+ std::vector<int> mActionId;
+ std::map<int, int> mActionToSelection;
+};
+
+class SetupActionDropDown final : public SetupItem
+{
+ public:
+ SetupActionDropDown(std::string text, std::string description,
+ std::string keyName, SetupTabScroll *const parent,
+ std::string eventName,
+ TouchActionsModel *const model,
+ int width, const bool mainConfig = true);
+
+ SetupActionDropDown(std::string text, std::string description,
+ std::string keyName, SetupTabScroll *const parent,
+ std::string eventName,
+ TouchActionsModel *const model,
+ int width, std::string def,
+ const bool mainConfig = true);
+
+ A_DELETE_COPY(SetupActionDropDown)
+
+ ~SetupActionDropDown();
+
+ void createControls();
+
+ void fromWidget() override;
+
+ void toWidget() override;
+
+ protected:
+ HorizontContainer *mHorizont;
+ Label *mLabel;
+ TouchActionsModel *mModel;
+ DropDown *mDropDown;
+ int mWidth;
+};
+
+#endif