summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-02-23 00:28:25 +0300
committerAndrei Karas <akaras@inbox.ru>2014-02-23 00:30:55 +0300
commit76165a338ca9679ab029e95f6c4d691e85ddb7fb (patch)
treeeb983271c4e59b157f21e25eb7ee6e9e1e61b339
parent90bef86efe7fcd0a6f6c0cbefc3645ffcf689d9e (diff)
downloadmanaverse-76165a338ca9679ab029e95f6c4d691e85ddb7fb.tar.gz
manaverse-76165a338ca9679ab029e95f6c4d691e85ddb7fb.tar.bz2
manaverse-76165a338ca9679ab029e95f6c4d691e85ddb7fb.tar.xz
manaverse-76165a338ca9679ab029e95f6c4d691e85ddb7fb.zip
Move updatetypemodel into gui/models directory.
-rw-r--r--src/CMakeLists.txt1
-rw-r--r--src/Makefile.am1
-rw-r--r--src/gui/models/updatetypemodel.h63
-rw-r--r--src/gui/windows/logindialog.cpp36
4 files changed, 67 insertions, 34 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 857b09896..608314038 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -234,6 +234,7 @@ SET(SRCS
gui/models/tablemodel.h
gui/models/touchactionmodel.cpp
gui/models/touchactionmodel.h
+ gui/models/updatetypemodel.h
gui/models/themesmodel.h
gui/widgets/tabstrip.cpp
gui/widgets/tabstrip.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 931a5da9f..62de23970 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -330,6 +330,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
gui/models/tablemodel.h \
gui/models/touchactionmodel.cpp \
gui/models/touchactionmodel.h \
+ gui/models/updatetypemodel.h \
gui/models/themesmodel.h \
gui/widgets/tabstrip.cpp \
gui/widgets/tabstrip.h \
diff --git a/src/gui/models/updatetypemodel.h b/src/gui/models/updatetypemodel.h
new file mode 100644
index 000000000..f96c11e87
--- /dev/null
+++ b/src/gui/models/updatetypemodel.h
@@ -0,0 +1,63 @@
+/*
+ * The ManaPlus Client
+ * 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/>.
+ */
+
+#ifndef GUI_MODELS_UPDATETYPEMODEL_H
+#define GUI_MODELS_UPDATETYPEMODEL_H
+
+#include "utils/gettext.h"
+
+#include "gui/models/listmodel.h"
+
+const char *UPDATE_TYPE_TEXT[3] =
+{
+ // TRANSLATORS: update type
+ N_("Normal"),
+ // TRANSLATORS: update type
+ N_("Auto Close"),
+ // TRANSLATORS: update type
+ N_("Skip"),
+};
+
+class UpdateTypeModel final : public ListModel
+{
+ public:
+ UpdateTypeModel()
+ { }
+
+ A_DELETE_COPY(UpdateTypeModel)
+
+ ~UpdateTypeModel()
+ { }
+
+ int getNumberOfElements() override final
+ {
+ return 3;
+ }
+
+ std::string getElementAt(int i) override final
+ {
+ if (i >= getNumberOfElements() || i < 0)
+ return "???";
+ return gettext(UPDATE_TYPE_TEXT[i]);
+ }
+};
+
+#endif // GUI_MODELS_UPDATETYPEMODEL_H
diff --git a/src/gui/windows/logindialog.cpp b/src/gui/windows/logindialog.cpp
index ac060817d..edd010707 100644
--- a/src/gui/windows/logindialog.cpp
+++ b/src/gui/windows/logindialog.cpp
@@ -29,6 +29,8 @@
#include "input/keydata.h"
+#include "gui/models/updatetypemodel.h"
+
#include "gui/windows/confirmdialog.h"
#include "gui/widgets/button.h"
@@ -74,40 +76,6 @@ namespace
} urlListener;
} // namespace
-const char *UPDATE_TYPE_TEXT[3] =
-{
- // TRANSLATORS: update type
- N_("Normal"),
- // TRANSLATORS: update type
- N_("Auto Close"),
- // TRANSLATORS: update type
- N_("Skip"),
-};
-
-class UpdateTypeModel final : public ListModel
-{
- public:
- UpdateTypeModel()
- { }
-
- A_DELETE_COPY(UpdateTypeModel)
-
- ~UpdateTypeModel()
- { }
-
- int getNumberOfElements() override final
- {
- return 3;
- }
-
- std::string getElementAt(int i) override final
- {
- if (i >= getNumberOfElements() || i < 0)
- return "???";
- return gettext(UPDATE_TYPE_TEXT[i]);
- }
-};
-
class UpdateListModel final : public ListModel
{
public: