summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-05-16 13:14:40 +0300
committerAndrei Karas <akaras@inbox.ru>2014-05-16 13:14:40 +0300
commit70e36aca580fd6ebce8f28a301de3cc2660023d1 (patch)
treefade54b3e3144068978ed48a06dff5251debfbfb
parentce699929e853c21d4cbd4e5a84ed76ca904f5bab (diff)
downloadManaVerse-70e36aca580fd6ebce8f28a301de3cc2660023d1.tar.gz
ManaVerse-70e36aca580fd6ebce8f28a301de3cc2660023d1.tar.bz2
ManaVerse-70e36aca580fd6ebce8f28a301de3cc2660023d1.tar.xz
ManaVerse-70e36aca580fd6ebce8f28a301de3cc2660023d1.zip
Move chardeleteconfirm into separate file.
-rw-r--r--src/CMakeLists.txt1
-rw-r--r--src/Makefile.am1
-rw-r--r--src/gui/windows/chardeleteconfirm.h60
-rw-r--r--src/gui/windows/charselectdialog.cpp33
4 files changed, 63 insertions, 32 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f130c7f95..d6d20e489 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -304,6 +304,7 @@ SET(SRCS
gui/windows/charselectdialog.h
gui/windows/charcreatedialog.cpp
gui/windows/charcreatedialog.h
+ gui/windows/chardeleteconfirm.h
gui/windows/chatwindow.cpp
gui/windows/chatwindow.h
gui/windows/confirmdialog.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 6a7057c1f..cb3e94ea6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -395,6 +395,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
gui/windows/charselectdialog.h \
gui/windows/charcreatedialog.cpp \
gui/windows/charcreatedialog.h \
+ gui/windows/chardeleteconfirm.h \
gui/windows/chatwindow.cpp \
gui/windows/chatwindow.h \
gui/windows/confirmdialog.cpp \
diff --git a/src/gui/windows/chardeleteconfirm.h b/src/gui/windows/chardeleteconfirm.h
new file mode 100644
index 000000000..4ab990eae
--- /dev/null
+++ b/src/gui/windows/chardeleteconfirm.h
@@ -0,0 +1,60 @@
+/*
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#include "gui/windows/charselectdialog.h"
+#include "gui/windows/confirmdialog.h"
+
+#include "utils/gettext.h"
+
+#include "localconsts.h"
+
+/**
+ * Listener for confirming character deletion.
+ */
+class CharDeleteConfirm final : public ConfirmDialog
+{
+ public:
+ CharDeleteConfirm(CharSelectDialog *const m, const int index) :
+ // TRANSLATORS: char deletion message
+ ConfirmDialog(_("Confirm Character Delete"),
+ // TRANSLATORS: char deletion message
+ _("Are you sure you want to delete this character?"),
+ SOUND_REQUEST, false, false, m),
+ mMaster(m),
+ mIndex(index)
+ {
+ }
+
+ A_DELETE_COPY(CharDeleteConfirm)
+
+ void action(const ActionEvent &event)
+ {
+ if (event.getId() == "yes" && mMaster)
+ mMaster->askPasswordForDeletion(mIndex);
+
+ ConfirmDialog::action(event);
+ }
+
+ private:
+ CharSelectDialog *mMaster;
+ int mIndex;
+};
diff --git a/src/gui/windows/charselectdialog.cpp b/src/gui/windows/charselectdialog.cpp
index c9801e26a..559b1f349 100644
--- a/src/gui/windows/charselectdialog.cpp
+++ b/src/gui/windows/charselectdialog.cpp
@@ -33,6 +33,7 @@
#include "being/attributes.h"
#include "gui/windows/charcreatedialog.h"
+#include "gui/windows/chardeleteconfirm.h"
#include "gui/windows/confirmdialog.h"
#include "gui/windows/logindialog.h"
#include "gui/windows/okdialog.h"
@@ -56,38 +57,6 @@
// Character slots per row in the dialog
static const int SLOTS_PER_ROW = 5;
-/**
- * Listener for confirming character deletion.
- */
-class CharDeleteConfirm final : public ConfirmDialog
-{
- public:
- CharDeleteConfirm(CharSelectDialog *const m, const int index) :
- // TRANSLATORS: char deletion message
- ConfirmDialog(_("Confirm Character Delete"),
- // TRANSLATORS: char deletion message
- _("Are you sure you want to delete this character?"),
- SOUND_REQUEST, false, false, m),
- mMaster(m),
- mIndex(index)
- {
- }
-
- A_DELETE_COPY(CharDeleteConfirm)
-
- void action(const ActionEvent &event)
- {
- if (event.getId() == "yes" && mMaster)
- mMaster->askPasswordForDeletion(mIndex);
-
- ConfirmDialog::action(event);
- }
-
- private:
- CharSelectDialog *mMaster;
- int mIndex;
-};
-
CharSelectDialog::CharSelectDialog(LoginData *const data):
// TRANSLATORS: char select dialog name
Window(strprintf(_("Account %s (last login time %s)"),