From 0d9e625499c18a4eaf79d38dfb1ef6abf0c553bd Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 7 Mar 2018 23:32:25 +0300 Subject: Add support for set new pincode. Add pincode dialog and widget. --- src/listeners/newpincodelistener.cpp | 48 +++++++++++++++++++++++++++++++ src/listeners/newpincodelistener.h | 42 +++++++++++++++++++++++++++ src/listeners/newpincoderetrylistener.cpp | 32 +++++++++++++++++++++ src/listeners/newpincoderetrylistener.h | 42 +++++++++++++++++++++++++++ src/listeners/pincodelistener.cpp | 40 -------------------------- src/listeners/pincodelistener.h | 42 --------------------------- 6 files changed, 164 insertions(+), 82 deletions(-) create mode 100644 src/listeners/newpincodelistener.cpp create mode 100644 src/listeners/newpincodelistener.h create mode 100644 src/listeners/newpincoderetrylistener.cpp create mode 100644 src/listeners/newpincoderetrylistener.h delete mode 100644 src/listeners/pincodelistener.cpp delete mode 100644 src/listeners/pincodelistener.h (limited to 'src/listeners') diff --git a/src/listeners/newpincodelistener.cpp b/src/listeners/newpincodelistener.cpp new file mode 100644 index 000000000..ce5a32c90 --- /dev/null +++ b/src/listeners/newpincodelistener.cpp @@ -0,0 +1,48 @@ +/* + * 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 . + */ + +#include "listeners/newpincodelistener.h" + +#include "client.h" +#include "pincodemanager.h" + +#include "gui/windows/pincodedialog.h" + +#include "debug.h" + +NewPincodeListener newPincodeListener; + +void NewPincodeListener::action(const ActionEvent &event) +{ + if (event.getId() == "ok") + { + const PincodeDialog *const dialog = dynamic_cast( + event.getSource()); + if (dialog != nullptr) + { + const std::string pincode = dialog->getMsg(); + pincodeManager.setNewPincode(pincode); + } + } + else + { + client->setState(State::SWITCH_LOGIN); + } +} diff --git a/src/listeners/newpincodelistener.h b/src/listeners/newpincodelistener.h new file mode 100644 index 000000000..f010befc8 --- /dev/null +++ b/src/listeners/newpincodelistener.h @@ -0,0 +1,42 @@ +/* + * 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 . + */ + +#ifndef LISTENERS_NEWPINCODELISTENER_H +#define LISTENERS_NEWPINCODELISTENER_H + +#include "listeners/actionlistener.h" + +#include "localconsts.h" + +class NewPincodeListener final : public ActionListener +{ + public: + NewPincodeListener() : + ActionListener() + { } + + A_DELETE_COPY(NewPincodeListener) + + void action(const ActionEvent &event) override final; +}; + +extern NewPincodeListener newPincodeListener; + +#endif // LISTENERS_NEWPINCODELISTENER_H diff --git a/src/listeners/newpincoderetrylistener.cpp b/src/listeners/newpincoderetrylistener.cpp new file mode 100644 index 000000000..d98b9bd84 --- /dev/null +++ b/src/listeners/newpincoderetrylistener.cpp @@ -0,0 +1,32 @@ +/* + * 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 . + */ + +#include "listeners/newpincoderetrylistener.h" + +#include "pincodemanager.h" + +#include "debug.h" + +NewPincodeRetryListener newPincodeRetryListener; + +void NewPincodeRetryListener::action(const ActionEvent &event A_UNUSED) +{ + pincodeManager.updateState(); +} diff --git a/src/listeners/newpincoderetrylistener.h b/src/listeners/newpincoderetrylistener.h new file mode 100644 index 000000000..cbb1e611d --- /dev/null +++ b/src/listeners/newpincoderetrylistener.h @@ -0,0 +1,42 @@ +/* + * 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 . + */ + +#ifndef LISTENERS_NEWPINCODERETRYLISTENER_H +#define LISTENERS_NEWPINCODERETRYLISTENER_H + +#include "listeners/actionlistener.h" + +#include "localconsts.h" + +class NewPincodeRetryListener final : public ActionListener +{ + public: + NewPincodeRetryListener() : + ActionListener() + { } + + A_DELETE_COPY(NewPincodeRetryListener) + + void action(const ActionEvent &event) override final; +}; + +extern NewPincodeRetryListener newPincodeRetryListener; + +#endif // LISTENERS_NEWPINCODERETRYLISTENER_H diff --git a/src/listeners/pincodelistener.cpp b/src/listeners/pincodelistener.cpp deleted file mode 100644 index 5f810513d..000000000 --- a/src/listeners/pincodelistener.cpp +++ /dev/null @@ -1,40 +0,0 @@ -/* - * 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 . - */ - -#include "listeners/pincodelistener.h" - -#include "net/charserverhandler.h" - -#include "gui/windows/editdialog.h" - -#include "debug.h" - -PincodeListener pincodeListener; - -void PincodeListener::action(const ActionEvent &event) -{ - const EditDialog *const dialog = dynamic_cast( - event.getSource()); - if (dialog != nullptr) - { - const std::string pincode = dialog->getMsg(); - charServerHandler->setNewPincode(pincode); - } -} diff --git a/src/listeners/pincodelistener.h b/src/listeners/pincodelistener.h deleted file mode 100644 index f32bf4ded..000000000 --- a/src/listeners/pincodelistener.h +++ /dev/null @@ -1,42 +0,0 @@ -/* - * 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 . - */ - -#ifndef LISTENERS_PINCODELISTENER_H -#define LISTENERS_PINCODELISTENER_H - -#include "listeners/actionlistener.h" - -#include "localconsts.h" - -class PincodeListener final : public ActionListener -{ - public: - PincodeListener() : - ActionListener() - { } - - A_DELETE_COPY(PincodeListener) - - void action(const ActionEvent &event) override final; -}; - -extern PincodeListener pincodeListener; - -#endif // LISTENERS_PINCODELISTENER_H -- cgit v1.2.3-60-g2f50