summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2018-03-07 23:32:25 +0300
committerAndrei Karas <akaras@inbox.ru>2018-03-07 23:32:25 +0300
commit0d9e625499c18a4eaf79d38dfb1ef6abf0c553bd (patch)
tree1e4c29a0de3697946060410e41910f88bcc5b979 /src/gui
parentb6cd136e3edf9d5c0eaaef47118ff1a72d7b0c75 (diff)
downloadplus-0d9e625499c18a4eaf79d38dfb1ef6abf0c553bd.tar.gz
plus-0d9e625499c18a4eaf79d38dfb1ef6abf0c553bd.tar.bz2
plus-0d9e625499c18a4eaf79d38dfb1ef6abf0c553bd.tar.xz
plus-0d9e625499c18a4eaf79d38dfb1ef6abf0c553bd.zip
Add support for set new pincode.
Add pincode dialog and widget.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/widgets/pincode.cpp198
-rw-r--r--src/gui/widgets/pincode.h76
-rw-r--r--src/gui/widgets/textfield.cpp5
-rw-r--r--src/gui/widgets/textfield.h2
-rw-r--r--src/gui/windows/charselectdialog.cpp1
-rw-r--r--src/gui/windows/pincodedialog.cpp135
-rw-r--r--src/gui/windows/pincodedialog.h67
7 files changed, 483 insertions, 1 deletions
diff --git a/src/gui/widgets/pincode.cpp b/src/gui/widgets/pincode.cpp
new file mode 100644
index 000000000..d05684056
--- /dev/null
+++ b/src/gui/widgets/pincode.cpp
@@ -0,0 +1,198 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2018 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/pincode.h"
+
+#include "gui/gui.h"
+#include "gui/skin.h"
+
+#include "gui/widgets/button.h"
+#include "gui/widgets/textfield.h"
+
+#include "utils/gettext.h"
+#include "utils/stringutils.h"
+
+#include "debug.h"
+
+Skin *Pincode::mSkin = nullptr;
+int Pincode::mInstances = 0;
+
+Pincode::Pincode(const Widget2 *const widget,
+ TextField *const textField) :
+ Container(widget),
+ ActionListener(),
+ WidgetListener(),
+ mButtons(),
+ mText(),
+ mTextField(textField),
+ mPadding(0),
+ mSpacing(2)
+{
+ mAllowLogic = false;
+ setOpaque(Opaque_false);
+
+ if (mInstances == 0)
+ {
+ if (theme != nullptr)
+ {
+ mSkin = theme->load("pin.xml",
+ "",
+ true,
+ Theme::getThemePath());
+ }
+ }
+ mInstances ++;
+
+ if (mSkin != nullptr)
+ {
+ mPadding = mSkin->getPadding();
+ mSpacing = mSkin->getOption("spacing", 2);
+ }
+ setSelectable(false);
+
+ addButtons();
+ adjustSize();
+}
+
+Pincode::~Pincode()
+{
+ if (mWindow != nullptr)
+ mWindow->removeWidgetListener(this);
+
+ if (gui != nullptr)
+ gui->removeDragged(this);
+
+ mInstances --;
+ if (mInstances == 0)
+ {
+ if (theme != nullptr)
+ theme->unload(mSkin);
+ }
+}
+
+void Pincode::addButtons()
+{
+ int buttonWidth = 0;
+ int buttonHeight = 0;
+ for (int f = 0; f < 10; f ++)
+ {
+ const std::string str = toString(f);
+ mButtons[f] = new Button(this, str, str, this);
+ mButtons[f]->adjustSize();
+ const Rect &rect = mButtons[f]->getDimension();
+ if (rect.width > buttonWidth)
+ buttonWidth = rect.width;
+ if (rect.height > buttonHeight)
+ buttonHeight = rect.height;
+ add(mButtons[f]);
+ }
+ int x = 0;
+ int y = 0;
+ const int xSize = buttonWidth + mSpacing;
+ const int ySize = buttonHeight + mSpacing;
+ for (int f = 0; f < 10; f ++)
+ {
+ mButtons[f]->setPosition(mPadding + x * xSize,
+ mPadding + y * ySize);
+ x ++;
+ if (x > 2)
+ {
+ x = 0;
+ y ++;
+ }
+ }
+ mButtons[10] = new Button(this,
+ // TRANSLATORS: clear pin code button
+ _("Clear"),
+ "clear",
+ this);
+ mButtons[10]->adjustSize();
+ add(mButtons[10]);
+ mButtons[10]->setPosition(mPadding + xSize,
+ mPadding + 3 * ySize);
+
+ mButtonWidth = buttonWidth;
+ mButtonHeight = buttonHeight;
+}
+
+void Pincode::adjustSize()
+{
+ const int pad2 = mPadding * 2;
+ setSize(pad2 + 3 * mButtonWidth + 2 * mSpacing,
+ pad2 + 4 * mButtonHeight + 3 * mSpacing);
+}
+
+void Pincode::finalCleanup()
+{
+ mSkin = nullptr;
+}
+
+void Pincode::action(const ActionEvent &event)
+{
+ if (event.getId() == "clear")
+ {
+ mText.clear();
+ mTextField->setText(mText);
+ mTextField->signalEvent();
+ return;
+ }
+ if (mText.size() >= 4)
+ return;
+ Widget *const eventSrc = event.getSource();
+ for (int f = 0; f < 10; f ++)
+ {
+ if (mButtons[f] == eventSrc)
+ {
+ const std::string str = toString(f);
+ mText.append(str);
+ mTextField->setText(mText);
+ mTextField->signalEvent();
+ return;
+ }
+ }
+}
+
+void Pincode::shuffle(uint32_t seed)
+{
+ int tab[10];
+ const uint32_t multiplier = 0x3498;
+ const uint32_t baseSeed = 0x881234;
+ int k = 2;
+
+ for (size_t f = 0; f < 10; f ++)
+ tab[f] = f;
+ for (size_t f = 1; f < 10; f ++)
+ {
+ seed = baseSeed + seed * multiplier;
+ const size_t pos = seed % k;
+ if (f != pos)
+ {
+ const int tmp = tab[f];
+ tab[f] = tab[pos];
+ tab[pos] = tmp;
+ }
+ k = k + 1;
+ }
+ for (size_t f = 0; f < 10; f ++)
+ {
+ const std::string str = toString(tab[f]);
+ mButtons[f]->setCaption(str);
+ }
+}
diff --git a/src/gui/widgets/pincode.h b/src/gui/widgets/pincode.h
new file mode 100644
index 000000000..e707b5915
--- /dev/null
+++ b/src/gui/widgets/pincode.h
@@ -0,0 +1,76 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2018 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 GUI_WIDGETS_PINCODE_H
+#define GUI_WIDGETS_PINCODE_H
+
+#include "gui/fonts/textchunk.h"
+
+#include "gui/widgets/container.h"
+
+#include "listeners/actionlistener.h"
+#include "listeners/widgetlistener.h"
+
+#include "render/graphics.h"
+
+#include "localconsts.h"
+
+class Button;
+class Skin;
+class TextField;
+
+class Pincode final : public Container,
+ public ActionListener,
+ public WidgetListener
+{
+ public:
+ Pincode(const Widget2 *const widget,
+ TextField *const textField);
+
+ A_DELETE_COPY(Pincode)
+
+ ~Pincode() override final;
+
+ void adjustSize();
+
+ void action(const ActionEvent &event) override final;
+
+ void shuffle(uint32_t seed);
+
+ static Skin *mSkin;
+
+ static int mInstances;
+
+ static void finalCleanup();
+
+ protected:
+ void addButtons();
+
+ private:
+ Button *mButtons[11];
+ std::string mText;
+ TextField *mTextField;
+ int mPadding;
+ int mSpacing;
+ int mButtonWidth;
+ int mButtonHeight;
+};
+
+#endif // GUI_WIDGETS_PINCODE_H
diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp
index 6012f6d28..b80404c73 100644
--- a/src/gui/widgets/textfield.cpp
+++ b/src/gui/widgets/textfield.cpp
@@ -838,3 +838,8 @@ void TextField::setWindow(Widget *const widget)
Widget2::setWindow(widget);
}
}
+
+void TextField::signalEvent()
+{
+ distributeActionEvent();
+}
diff --git a/src/gui/widgets/textfield.h b/src/gui/widgets/textfield.h
index e4ac1b173..720a82906 100644
--- a/src/gui/widgets/textfield.h
+++ b/src/gui/widgets/textfield.h
@@ -241,6 +241,8 @@ class TextField notfinal : public Widget,
void setWindow(Widget *const widget) override final;
+ void signalEvent();
+
protected:
void drawCaret(Graphics* graphics, int x) A_NONNULL(2);
diff --git a/src/gui/windows/charselectdialog.cpp b/src/gui/windows/charselectdialog.cpp
index f526f133c..817ecd908 100644
--- a/src/gui/windows/charselectdialog.cpp
+++ b/src/gui/windows/charselectdialog.cpp
@@ -26,7 +26,6 @@
#include "configuration.h"
#include "listeners/charrenamelistener.h"
-#include "listeners/pincodelistener.h"
#include "gui/windows/charcreatedialog.h"
#include "gui/windows/chardeleteconfirm.h"
diff --git a/src/gui/windows/pincodedialog.cpp b/src/gui/windows/pincodedialog.cpp
new file mode 100644
index 000000000..b23ab17d1
--- /dev/null
+++ b/src/gui/windows/pincodedialog.cpp
@@ -0,0 +1,135 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2018 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/windows/pincodedialog.h"
+
+#include "pincodemanager.h"
+
+#include "input/keyboardconfig.h"
+
+#include "gui/widgets/button.h"
+#include "gui/widgets/label.h"
+#include "gui/widgets/passwordfield.h"
+#include "gui/widgets/pincode.h"
+
+#include "utils/gettext.h"
+
+#include "gui/fonts/font.h"
+
+#include "debug.h"
+
+int PincodeDialog::instances = 0;
+
+PincodeDialog::PincodeDialog(const std::string &restrict title,
+ const std::string &restrict msg,
+ uint32_t seed,
+ Window *const parent) :
+ Window(title, Modal_true, parent, "pincode.xml"),
+ ActionListener(),
+ mPasswordField(new PasswordField(this, std::string())),
+ mPincode(new Pincode(this, mPasswordField)),
+ // TRANSLATORS: text dialog button
+ mOkButton(new Button(this, _("OK"), "OK", this)),
+ mEnabledKeyboard(keyboard.isEnabled())
+{
+ setStickyButtonLock(true);
+
+ keyboard.setEnabled(false);
+
+ Label *const textLabel = new Label(this, msg);
+ // TRANSLATORS: text dialog button
+ Button *const cancelButton = new Button(this, _("Cancel"), "CANCEL", this);
+
+ place(0, 0, textLabel, 4, 1);
+ place(0, 1, mPincode, 4, 1);
+ place(0, 2, mPasswordField, 4, 1);
+ place(2, 3, mOkButton, 1, 1);
+ place(3, 3, cancelButton, 1, 1);
+
+ mPasswordField->setEnabled(false);
+ mPasswordField->setActionEventId("pincode");
+ mPasswordField->addActionListener(this);
+
+ mPincode->shuffle(seed);
+ int width = getFont()->getWidth(title);
+ if (width < textLabel->getWidth())
+ width = textLabel->getWidth();
+ reflowLayout(CAST_S32(width + 20), 0);
+ updateButtons();
+}
+
+void PincodeDialog::postInit()
+{
+ Window::postInit();
+ if (getParent() != nullptr)
+ {
+ setLocationRelativeTo(getParent());
+ getParent()->moveToTop(this);
+ }
+ setVisible(Visible_true);
+ requestModalFocus();
+ mPincode->requestFocus();
+
+ instances++;
+}
+
+PincodeDialog::~PincodeDialog()
+{
+ instances--;
+ pincodeManager.clearDialog(this);
+}
+
+void PincodeDialog::action(const ActionEvent &event)
+{
+ const std::string &eventId = event.getId();
+ if (eventId == "pincode")
+ {
+ updateButtons();
+ return;
+ }
+ if (eventId == "CANCEL")
+ setActionEventId("~" + getActionEventId());
+
+ distributeActionEvent();
+ close();
+}
+
+const std::string &PincodeDialog::getMsg() const
+{
+ return mPasswordField->getText();
+}
+
+void PincodeDialog::close()
+{
+ keyboard.setEnabled(mEnabledKeyboard);
+ scheduleDelete();
+}
+
+void PincodeDialog::updateButtons()
+{
+ if (mPasswordField->getText().size() == 4)
+ {
+ mOkButton->setEnabled(true);
+ }
+ else
+ {
+ mOkButton->setEnabled(false);
+ }
+}
diff --git a/src/gui/windows/pincodedialog.h b/src/gui/windows/pincodedialog.h
new file mode 100644
index 000000000..f453f67d7
--- /dev/null
+++ b/src/gui/windows/pincodedialog.h
@@ -0,0 +1,67 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2018 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 GUI_WINDOWS_PINCODEDIALOG_H
+#define GUI_WINDOWS_PINCODEDIALOG_H
+
+#include "gui/widgets/window.h"
+
+#include "listeners/actionlistener.h"
+
+class Button;
+class PasswordField;
+class Pincode;
+
+class PincodeDialog final : public Window,
+ public ActionListener
+{
+ public:
+ PincodeDialog(const std::string &restrict title,
+ const std::string &restrict msg,
+ uint32_t seed,
+ Window *const parent);
+
+ A_DELETE_COPY(PincodeDialog)
+
+ ~PincodeDialog() override final;
+
+ void postInit() override final;
+
+ void action(const ActionEvent &event) override final;
+
+ const std::string &getMsg() const A_WARN_UNUSED;
+
+ static bool isActive() noexcept2 A_WARN_UNUSED
+ { return instances != 0; }
+
+ void close() override final;
+
+ void updateButtons();
+
+ private:
+ static int instances;
+
+ PasswordField *mPasswordField;
+ Pincode *mPincode;
+ Button *mOkButton;
+ bool mEnabledKeyboard;
+};
+
+#endif // GUI_WINDOWS_PINCODEDIALOG_H