summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/CMakeLists.txt1
-rw-r--r--src/Makefile.am1
-rw-r--r--src/gui/models/colorlistmodel.h81
-rw-r--r--src/gui/windows/chatwindow.cpp54
4 files changed, 85 insertions, 52 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index db705332c..930729f36 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -107,6 +107,7 @@ MARK_AS_ADVANCED(SDL_LIBRARY)
SET(SRCS
gui/widgets/avatarlistbox.cpp
gui/widgets/avatarlistbox.h
+ gui/models/colorlistmodel.h
gui/widgets/tabs/battletab.cpp
gui/widgets/tabs/battletab.h
gui/widgets/browserbox.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 4db3f1fa5..0391b1bde 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -203,6 +203,7 @@ manaplus_SOURCES += events/actionevent.h \
manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
gui/widgets/avatarlistbox.h \
+ gui/models/colorlistmodel.h \
gui/widgets/tabs/battletab.cpp \
gui/widgets/tabs/battletab.h \
gui/widgets/browserbox.cpp \
diff --git a/src/gui/models/colorlistmodel.h b/src/gui/models/colorlistmodel.h
new file mode 100644
index 000000000..d4b2e4237
--- /dev/null
+++ b/src/gui/models/colorlistmodel.h
@@ -0,0 +1,81 @@
+/*
+ * 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/>.
+ */
+
+#ifndef GUI_MODELS_COLORLISTMODEL_H
+#define GUI_MODELS_COLORLISTMODEL_H
+
+#include "gui/models/listmodel.h"
+
+#include "utils/gettext.h"
+
+const char *COLOR_NAME[14] =
+{
+ // TRANSLATORS: chat color
+ N_("default"),
+ // TRANSLATORS: chat color
+ N_("black"),
+ // TRANSLATORS: chat color
+ N_("red"),
+ // TRANSLATORS: chat color
+ N_("green"),
+ // TRANSLATORS: chat color
+ N_("blue"),
+ // TRANSLATORS: chat color
+ N_("gold"),
+ // TRANSLATORS: chat color
+ N_("yellow"),
+ // TRANSLATORS: chat color
+ N_("pink"),
+ // TRANSLATORS: chat color
+ N_("purple"),
+ // TRANSLATORS: chat color
+ N_("grey"),
+ // TRANSLATORS: chat color
+ N_("brown"),
+ // TRANSLATORS: chat color
+ N_("rainbow 1"),
+ // TRANSLATORS: chat color
+ N_("rainbow 2"),
+ // TRANSLATORS: chat color
+ N_("rainbow 3"),
+};
+
+class ColorListModel final : public ListModel
+{
+ public:
+ ~ColorListModel()
+ { }
+
+ int getNumberOfElements()
+ {
+ return 14;
+ }
+
+ std::string getElementAt(int i)
+ {
+ if (i >= getNumberOfElements() || i < 0)
+ return "???";
+ return gettext(COLOR_NAME[i]);
+ }
+};
+
+#endif // GUI_MODELS_COLORLISTMODEL_H
diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp
index eb4a0fb44..3c0e09ad5 100644
--- a/src/gui/windows/chatwindow.cpp
+++ b/src/gui/windows/chatwindow.cpp
@@ -43,6 +43,8 @@
#include "gui/gui.h"
#include "gui/viewport.h"
+#include "gui/models/colorlistmodel.h"
+
#include "gui/windows/emotewindow.h"
#include "gui/windows/setupwindow.h"
#include "gui/widgets/tabbedarea.h"
@@ -144,58 +146,6 @@ class ChatInput final : public TextField
bool mFocusGaining;
};
-const char *COLOR_NAME[14] =
-{
- // TRANSLATORS: chat color
- N_("default"),
- // TRANSLATORS: chat color
- N_("black"),
- // TRANSLATORS: chat color
- N_("red"),
- // TRANSLATORS: chat color
- N_("green"),
- // TRANSLATORS: chat color
- N_("blue"),
- // TRANSLATORS: chat color
- N_("gold"),
- // TRANSLATORS: chat color
- N_("yellow"),
- // TRANSLATORS: chat color
- N_("pink"),
- // TRANSLATORS: chat color
- N_("purple"),
- // TRANSLATORS: chat color
- N_("grey"),
- // TRANSLATORS: chat color
- N_("brown"),
- // TRANSLATORS: chat color
- N_("rainbow 1"),
- // TRANSLATORS: chat color
- N_("rainbow 2"),
- // TRANSLATORS: chat color
- N_("rainbow 3"),
-};
-
-
-class ColorListModel final : public ListModel
-{
-public:
- ~ColorListModel()
- { }
-
- int getNumberOfElements()
- {
- return 14;
- }
-
- std::string getElementAt(int i)
- {
- if (i >= getNumberOfElements() || i < 0)
- return "???";
- return gettext(COLOR_NAME[i]);
- }
-};
-
static const char *const ACTION_COLOR_PICKER = "color picker";
ChatWindow::ChatWindow():