From 741d50e884d8a8b783b3980db775ebc07045a65a Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 16 May 2014 19:33:44 +0300 Subject: Move wrongdatanoticelistener into separate file. --- src/CMakeLists.txt | 2 ++ src/Makefile.am | 2 ++ src/gui/windows/changeemaildialog.cpp | 2 ++ src/gui/windows/changepassworddialog.cpp | 2 ++ src/gui/windows/registerdialog.cpp | 19 ++---------- src/gui/windows/registerdialog.h | 20 +------------ src/gui/windows/unregisterdialog.cpp | 2 ++ src/listeners/wrongdatanoticelistener.cpp | 45 ++++++++++++++++++++++++++++ src/listeners/wrongdatanoticelistener.h | 49 +++++++++++++++++++++++++++++++ 9 files changed, 107 insertions(+), 36 deletions(-) create mode 100644 src/listeners/wrongdatanoticelistener.cpp create mode 100644 src/listeners/wrongdatanoticelistener.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4d8d2b512..76a870599 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -900,6 +900,8 @@ SET(SRCS utils/sdlpixel.h gui/widgets/widget.h listeners/widgetlistener.h + listeners/wrongdatanoticelistener.cpp + listeners/wrongdatanoticelistener.h gui/widgets/basiccontainer2.h gui/widgets/basiccontainer.cpp gui/cliprect.cpp diff --git a/src/Makefile.am b/src/Makefile.am index b9707fe80..3c73374e0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -190,6 +190,8 @@ manaplus_SOURCES += events/actionevent.h \ utils/sdlpixel.h \ gui/widgets/widget.h \ listeners/widgetlistener.h \ + listeners/wrongdatanoticelistener.cpp \ + listeners/wrongdatanoticelistener.h \ gui/widgets/basiccontainer2.h \ gui/widgets/basiccontainer.cpp \ gui/cliprect.cpp \ diff --git a/src/gui/windows/changeemaildialog.cpp b/src/gui/windows/changeemaildialog.cpp index 1e5b526d7..d95773cc7 100644 --- a/src/gui/windows/changeemaildialog.cpp +++ b/src/gui/windows/changeemaildialog.cpp @@ -31,6 +31,8 @@ #include "gui/widgets/label.h" #include "gui/widgets/textfield.h" +#include "listeners/wrongdatanoticelistener.h" + #include "net/logindata.h" #include "net/loginhandler.h" #include "net/net.h" diff --git a/src/gui/windows/changepassworddialog.cpp b/src/gui/windows/changepassworddialog.cpp index e8f6a5c0b..ccad64b69 100644 --- a/src/gui/windows/changepassworddialog.cpp +++ b/src/gui/windows/changepassworddialog.cpp @@ -32,6 +32,8 @@ #include "gui/widgets/label.h" #include "gui/widgets/layoutcell.h" +#include "listeners/wrongdatanoticelistener.h" + #include "net/logindata.h" #include "net/loginhandler.h" #include "net/net.h" diff --git a/src/gui/windows/registerdialog.cpp b/src/gui/windows/registerdialog.cpp index 0f0d85c9c..2ecf5fc87 100644 --- a/src/gui/windows/registerdialog.cpp +++ b/src/gui/windows/registerdialog.cpp @@ -28,6 +28,8 @@ #include "input/keydata.h" +#include "listeners/wrongdatanoticelistener.h" + #include "gui/windows/okdialog.h" #include "gui/widgets/button.h" @@ -46,23 +48,6 @@ #include "debug.h" -WrongDataNoticeListener::WrongDataNoticeListener(): - ActionListener(), - mTarget(nullptr) -{ -} - -void WrongDataNoticeListener::setTarget(TextField *const textField) -{ - mTarget = textField; -} - -void WrongDataNoticeListener::action(const ActionEvent &event) -{ - if (event.getId() == "ok" && mTarget) - mTarget->requestFocus(); -} - RegisterDialog::RegisterDialog(LoginData *const data) : // TRANSLATORS: register dialog name Window(_("Register"), false, nullptr, "register.xml"), diff --git a/src/gui/windows/registerdialog.h b/src/gui/windows/registerdialog.h index 90087b5e2..fc063ac14 100644 --- a/src/gui/windows/registerdialog.h +++ b/src/gui/windows/registerdialog.h @@ -32,25 +32,7 @@ class Button; class LoginData; class RadioButton; class TextField; - -/** - * Listener used while dealing with wrong data. It is used to direct the focus - * to the field which contained wrong data when the Ok button was pressed on - * the error notice. - */ -class WrongDataNoticeListener final : public ActionListener -{ - public: - WrongDataNoticeListener(); - - A_DELETE_COPY(WrongDataNoticeListener) - - void setTarget(TextField *const textField); - - void action(const ActionEvent &event) override final; - private: - TextField *mTarget; -}; +class WrongDataNoticeListener; /** * The registration dialog. diff --git a/src/gui/windows/unregisterdialog.cpp b/src/gui/windows/unregisterdialog.cpp index 8b9721f40..99336405c 100644 --- a/src/gui/windows/unregisterdialog.cpp +++ b/src/gui/windows/unregisterdialog.cpp @@ -31,6 +31,8 @@ #include "gui/widgets/label.h" #include "gui/widgets/passwordfield.h" +#include "listeners/wrongdatanoticelistener.h" + #include "net/logindata.h" #include "net/loginhandler.h" #include "net/net.h" diff --git a/src/listeners/wrongdatanoticelistener.cpp b/src/listeners/wrongdatanoticelistener.cpp new file mode 100644 index 000000000..157ce8a4e --- /dev/null +++ b/src/listeners/wrongdatanoticelistener.cpp @@ -0,0 +1,45 @@ +/* + * The ManaPlus Client + * Copyright (C) 2004-2009 The Mana World Development Team + * Copyright (C) 2009-2010 The Mana Developers + * Copyright (C) 2011-2014 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/wrongdatanoticelistener.h" + +#include "gui/widgets/textfield.h" + +#include "debug.h" + +WrongDataNoticeListener::WrongDataNoticeListener(): + ActionListener(), + mTarget(nullptr) +{ +} + +void WrongDataNoticeListener::setTarget(TextField *const textField) +{ + mTarget = textField; +} + +void WrongDataNoticeListener::action(const ActionEvent &event) +{ + if (event.getId() == "ok" && mTarget) + mTarget->requestFocus(); +} + diff --git a/src/listeners/wrongdatanoticelistener.h b/src/listeners/wrongdatanoticelistener.h new file mode 100644 index 000000000..fb84e1062 --- /dev/null +++ b/src/listeners/wrongdatanoticelistener.h @@ -0,0 +1,49 @@ +/* + * The ManaPlus Client + * Copyright (C) 2004-2009 The Mana World Development Team + * Copyright (C) 2009-2010 The Mana Developers + * Copyright (C) 2011-2014 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_WRONGDATANOTICELISTENER_H +#define LISTENERS_WRONGDATANOTICELISTENER_H + +#include "listeners/actionlistener.h" + +class TextField; + +/** + * Listener used while dealing with wrong data. It is used to direct the focus + * to the field which contained wrong data when the Ok button was pressed on + * the error notice. + */ +class WrongDataNoticeListener final : public ActionListener +{ + public: + WrongDataNoticeListener(); + + A_DELETE_COPY(WrongDataNoticeListener) + + void setTarget(TextField *const textField); + + void action(const ActionEvent &event) override final; + private: + TextField *mTarget; +}; + +#endif // LISTENERS_WRONGDATANOTICELISTENER_H -- cgit v1.2.3-60-g2f50