summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-05-14 01:35:22 +0300
committerAndrei Karas <akaras@inbox.ru>2014-05-14 01:35:22 +0300
commit6673373236287df9ee52a1a01c2c70cd63a8be46 (patch)
tree1fdafc4477f8d75850208d00c0af8faa99f2c99a /src
parenteea8d5e39b746b240a4720c4f48de91ec81c8563 (diff)
downloadmv-6673373236287df9ee52a1a01c2c70cd63a8be46.tar.gz
mv-6673373236287df9ee52a1a01c2c70cd63a8be46.tar.bz2
mv-6673373236287df9ee52a1a01c2c70cd63a8be46.tar.xz
mv-6673373236287df9ee52a1a01c2c70cd63a8be46.zip
Move themeinfo into separate file.
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt1
-rw-r--r--src/Makefile.am1
-rw-r--r--src/gui/theme.cpp1
-rw-r--r--src/gui/theme.h35
-rw-r--r--src/gui/themeinfo.h61
-rw-r--r--src/gui/widgets/tabs/setup_theme.cpp1
6 files changed, 67 insertions, 33 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3773dc41f..85e0bb0fb 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -407,6 +407,7 @@ SET(SRCS
gui/skin.h
gui/theme.cpp
gui/theme.h
+ gui/themeinfo.h
gui/windows/tradewindow.cpp
gui/windows/tradewindow.h
gui/windows/unregisterdialog.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 14f9e4b14..1e8620275 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -493,6 +493,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
gui/skin.h \
gui/theme.cpp \
gui/theme.h \
+ gui/themeinfo.h \
gui/windows/tradewindow.cpp \
gui/windows/tradewindow.h \
gui/windows/unregisterdialog.cpp \
diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp
index 0b0744286..6ac18b412 100644
--- a/src/gui/theme.cpp
+++ b/src/gui/theme.cpp
@@ -29,6 +29,7 @@
#include "graphicsmanager.h"
#include "gui/skin.h"
+#include "gui/themeinfo.h"
#include "resources/dye.h"
#include "resources/image.h"
diff --git a/src/gui/theme.h b/src/gui/theme.h
index cd2c8aa4d..7747519e8 100644
--- a/src/gui/theme.h
+++ b/src/gui/theme.h
@@ -43,43 +43,12 @@ class ImageSet;
class Skin;
class Theme;
+struct ThemeInfo;
+
const int THEME_PALETTES = 5;
extern Theme *theme;
-struct ThemeInfo final
-{
- ThemeInfo() :
- name(),
- copyright(),
- font(),
- boldFont(),
- particleFont(),
- helpFont(),
- secureFont(),
- npcFont(),
- japanFont(),
- chinaFont(),
- fontSize(0),
- npcfontSize(0),
- guiAlpha(0.0F)
- {
- }
- std::string name;
- std::string copyright;
- std::string font;
- std::string boldFont;
- std::string particleFont;
- std::string helpFont;
- std::string secureFont;
- std::string npcFont;
- std::string japanFont;
- std::string chinaFont;
- int fontSize;
- int npcfontSize;
- float guiAlpha;
-};
-
class Theme final : public Palette,
public ConfigListener
{
diff --git a/src/gui/themeinfo.h b/src/gui/themeinfo.h
new file mode 100644
index 000000000..38464b8d0
--- /dev/null
+++ b/src/gui/themeinfo.h
@@ -0,0 +1,61 @@
+/*
+ * Gui Skinning
+ * 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_THEMEINFO_H
+#define GUI_THEMEINFO_H
+
+#include <string>
+
+#include "localconsts.h"
+
+struct ThemeInfo final
+{
+ ThemeInfo() :
+ name(),
+ copyright(),
+ font(),
+ boldFont(),
+ particleFont(),
+ helpFont(),
+ secureFont(),
+ npcFont(),
+ japanFont(),
+ chinaFont(),
+ fontSize(0),
+ npcfontSize(0),
+ guiAlpha(0.0F)
+ {
+ }
+ std::string name;
+ std::string copyright;
+ std::string font;
+ std::string boldFont;
+ std::string particleFont;
+ std::string helpFont;
+ std::string secureFont;
+ std::string npcFont;
+ std::string japanFont;
+ std::string chinaFont;
+ int fontSize;
+ int npcfontSize;
+ float guiAlpha;
+};
+
+#endif // GUI_THEMEINFO_H
diff --git a/src/gui/widgets/tabs/setup_theme.cpp b/src/gui/widgets/tabs/setup_theme.cpp
index 9b23fc3c3..6994939fc 100644
--- a/src/gui/widgets/tabs/setup_theme.cpp
+++ b/src/gui/widgets/tabs/setup_theme.cpp
@@ -23,6 +23,7 @@
#include "gui/widgets/tabs/setup_theme.h"
#include "gui/gui.h"
+#include "gui/themeinfo.h"
#include "gui/windows/okdialog.h"