Move fontsizechoicelistmodel into separate file.

4 files changed, 89 insertions, 56 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 267a146f4..c6cbcecfc 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -148,6 +148,7 @@ SET(SRCS
     gui/models/extendedlistmodel.h
     gui/models/extendednamesmodel.cpp
     gui/models/extendednamesmodel.h
+    gui/models/fontsizechoicelistmodel.h
     gui/models/fontsmodel.h
     gui/models/iconsmodel.h
     gui/models/ignorechoiceslistmodel.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 516292e55..91a2b3bf2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -239,6 +239,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      gui/models/extendedlistmodel.h \
 	      gui/models/extendednamesmodel.cpp \
 	      gui/models/extendednamesmodel.h \
+	      gui/models/fontsizechoicelistmodel.h \
 	      gui/models/fontsmodel.h \
 	      gui/models/iconsmodel.h \
 	      gui/models/ignorechoiceslistmodel.h \
diff --git a/src/gui/models/fontsizechoicelistmodel.h b/src/gui/models/fontsizechoicelistmodel.h
new file mode 100644
index 000000000..4588c9967
--- /dev/null
+++ b/src/gui/models/fontsizechoicelistmodel.h
@@ -0,0 +1,86 @@
+/*
+ *  The ManaPlus Client
+ *  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_FONTSIZECHOICELISTMODEL_H
+#define GUI_MODELS_FONTSIZECHOICELISTMODEL_H
+
+#include "gui/models/listmodel.h"
+
+#include "utils/gettext.h"
+
+#include "localconsts.h"
+
+const int maxFontSizes = 16;
+
+const char *SIZE_NAME[maxFontSizes] =
+{
+    // TRANSLATORS: font size
+    N_("Very small (8)"),
+    // TRANSLATORS: font size
+    N_("Very small (9)"),
+    // TRANSLATORS: font size
+    N_("Tiny (10)"),
+    // TRANSLATORS: font size
+    N_("Small (11)"),
+    // TRANSLATORS: font size
+    N_("Medium (12)"),
+    // TRANSLATORS: font size
+    N_("Normal (13)"),
+    // TRANSLATORS: font size
+    N_("Large (14)"),
+    // TRANSLATORS: font size
+    N_("Large (15)"),
+    // TRANSLATORS: font size
+    N_("Large (16)"),
+    // TRANSLATORS: font size
+    N_("Big (17)"),
+    // TRANSLATORS: font size
+    N_("Big (18)"),
+    // TRANSLATORS: font size
+    N_("Big (19)"),
+    // TRANSLATORS: font size
+    N_("Very big (20)"),
+    // TRANSLATORS: font size
+    N_("Very big (21)"),
+    // TRANSLATORS: font size
+    N_("Very big (22)"),
+    // TRANSLATORS: font size
+    N_("Huge (23)"),
+};
+
+class FontSizeChoiceListModel final : public ListModel
+{
+    public:
+        ~FontSizeChoiceListModel()
+        { }
+
+        int getNumberOfElements() override final A_WARN_UNUSED
+        { return maxFontSizes; }
+
+        std::string getElementAt(int i) override final A_WARN_UNUSED
+        {
+            if (i >= getNumberOfElements() || i < 0)
+                return "???";
+
+            return gettext(SIZE_NAME[i]);
+        }
+};
+
+#endif  // GUI_MODELS_FONTSIZECHOICELISTMODEL_H
diff --git a/src/gui/widgets/tabs/setup_theme.cpp b/src/gui/widgets/tabs/setup_theme.cpp
index 9e1eb558d..7d818f477 100644
--- a/src/gui/widgets/tabs/setup_theme.cpp
+++ b/src/gui/widgets/tabs/setup_theme.cpp
@@ -28,6 +28,7 @@
 #include "gui/windows/okdialog.h"
 
 #include "gui/models/extendedlistmodel.h"
+#include "gui/models/fontsizechoicelistmodel.h"
 #include "gui/models/fontsmodel.h"
 #include "gui/models/themesmodel.h"
 
@@ -58,62 +59,6 @@ const char* ACTION_JAPAN_FONT = "japanese font";
 const char* ACTION_CHINA_FONT = "chinese font";
 const char* ACTION_INFO = "info";
 
-const int maxFontSizes = 16;
-
-const char *SIZE_NAME[maxFontSizes] =
-{
-    // TRANSLATORS: font size
-    N_("Very small (8)"),
-    // TRANSLATORS: font size
-    N_("Very small (9)"),
-    // TRANSLATORS: font size
-    N_("Tiny (10)"),
-    // TRANSLATORS: font size
-    N_("Small (11)"),
-    // TRANSLATORS: font size
-    N_("Medium (12)"),
-    // TRANSLATORS: font size
-    N_("Normal (13)"),
-    // TRANSLATORS: font size
-    N_("Large (14)"),
-    // TRANSLATORS: font size
-    N_("Large (15)"),
-    // TRANSLATORS: font size
-    N_("Large (16)"),
-    // TRANSLATORS: font size
-    N_("Big (17)"),
-    // TRANSLATORS: font size
-    N_("Big (18)"),
-    // TRANSLATORS: font size
-    N_("Big (19)"),
-    // TRANSLATORS: font size
-    N_("Very big (20)"),
-    // TRANSLATORS: font size
-    N_("Very big (21)"),
-    // TRANSLATORS: font size
-    N_("Very big (22)"),
-    // TRANSLATORS: font size
-    N_("Huge (23)"),
-};
-
-class FontSizeChoiceListModel final : public ListModel
-{
-public:
-    ~FontSizeChoiceListModel()
-    { }
-
-    int getNumberOfElements() override final A_WARN_UNUSED
-    { return maxFontSizes; }
-
-    std::string getElementAt(int i) override final A_WARN_UNUSED
-    {
-        if (i >= getNumberOfElements() || i < 0)
-            return "???";
-
-        return gettext(SIZE_NAME[i]);
-    }
-};
-
 struct Language final
 {
     std::string name;