From 4adbe6036ac29080bb8d02d92efe1175209a85a3 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 22 Feb 2014 21:35:13 +0300 Subject: Move themesmodel into gui/models directory. --- src/gui/models/themesmodel.h | 45 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 src/gui/models/themesmodel.h (limited to 'src/gui/models/themesmodel.h') diff --git a/src/gui/models/themesmodel.h b/src/gui/models/themesmodel.h new file mode 100644 index 000000000..b8b9dbae6 --- /dev/null +++ b/src/gui/models/themesmodel.h @@ -0,0 +1,45 @@ +/* + * The ManaPlus Client + * Copyright (C) 2009-2010 Andrei Karas + * 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 . + */ + +#ifndef GUI_MODELS_THEMESMODEL_H +#define GUI_MODELS_THEMESMODEL_H + +#include "gui/models/namesmodel.h" + +#include "utils/gettext.h" + +#include "debug.h" + +class ThemesModel final : public NamesModel +{ + public: + ThemesModel() : + NamesModel() + { + mNames.push_back(gettext("(default)")); + Theme::fillSkinsList(mNames); + } + + ~ThemesModel() + { } +}; + +#endif // GUI_MODELS_THEMESMODEL_H -- cgit v1.2.3-70-g09d2 From 56c7ed4647d168842bda18ee797e735ccc5fd557 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 22 Feb 2014 22:28:59 +0300 Subject: Move themesmodel into gui/models directory. --- src/CMakeLists.txt | 1 + src/Makefile.am | 1 + src/gui/models/fontsmodel.h | 42 ++++++++++++++++++++++++++++++++++++ src/gui/models/themesmodel.h | 2 ++ src/gui/widgets/tabs/setup_theme.cpp | 12 +---------- 5 files changed, 47 insertions(+), 11 deletions(-) create mode 100644 src/gui/models/fontsmodel.h (limited to 'src/gui/models/themesmodel.h') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index af1191eee..06dfac28e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -141,6 +141,7 @@ SET(SRCS gui/models/extendedlistmodel.h gui/models/extendednamesmodel.cpp gui/models/extendednamesmodel.h + gui/models/fontsmodel.h gui/widgets/flowcontainer.cpp gui/widgets/flowcontainer.h gui/widgets/tabs/gmtab.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 733c470d0..b8e8abc3f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -237,6 +237,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ gui/models/extendedlistmodel.h \ gui/models/extendednamesmodel.cpp \ gui/models/extendednamesmodel.h \ + gui/models/fontsmodel.h \ gui/widgets/flowcontainer.cpp \ gui/widgets/flowcontainer.h \ gui/widgets/tabs/gmtab.cpp \ diff --git a/src/gui/models/fontsmodel.h b/src/gui/models/fontsmodel.h new file mode 100644 index 000000000..b20d3386b --- /dev/null +++ b/src/gui/models/fontsmodel.h @@ -0,0 +1,42 @@ +/* + * The ManaPlus Client + * Copyright (C) 2009-2010 Andrei Karas + * 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 . + */ + +#ifndef GUI_MODELS_FONTSMODEL_H +#define GUI_MODELS_FONTSMODEL_H + +#include "gui/theme.h" + +#include "gui/models/namesmodel.h" + +#include "debug.h" + +class FontsModel final : public NamesModel +{ + public: + FontsModel() : + NamesModel() + { Theme::fillFontsList(mNames); } + + ~FontsModel() + { } +}; + +#endif // GUI_MODELS_FONTSMODEL_H diff --git a/src/gui/models/themesmodel.h b/src/gui/models/themesmodel.h index b8b9dbae6..b19c698fc 100644 --- a/src/gui/models/themesmodel.h +++ b/src/gui/models/themesmodel.h @@ -22,6 +22,8 @@ #ifndef GUI_MODELS_THEMESMODEL_H #define GUI_MODELS_THEMESMODEL_H +#include "gui/theme.h" + #include "gui/models/namesmodel.h" #include "utils/gettext.h" diff --git a/src/gui/widgets/tabs/setup_theme.cpp b/src/gui/widgets/tabs/setup_theme.cpp index 7f2804c2f..4bde4b35e 100644 --- a/src/gui/widgets/tabs/setup_theme.cpp +++ b/src/gui/widgets/tabs/setup_theme.cpp @@ -27,6 +27,7 @@ #include "gui/windows/okdialog.h" #include "gui/models/extendedlistmodel.h" +#include "gui/models/fontsmodel.h" #include "gui/models/namesmodel.h" #include "gui/models/themesmodel.h" @@ -55,17 +56,6 @@ const char* ACTION_JAPAN_FONT = "japanese font"; const char* ACTION_CHINA_FONT = "chinese font"; const char* ACTION_INFO = "info"; -class FontsModel final : public NamesModel -{ -public: - FontsModel() : - NamesModel() - { Theme::fillFontsList(mNames); } - - ~FontsModel() - { } -}; - const int maxFontSizes = 16; const char *SIZE_NAME[maxFontSizes] = -- cgit v1.2.3-70-g09d2 From 409cee51fe11e2495a2741226432666a8702dceb Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 27 Feb 2014 20:26:18 +0300 Subject: fix compilation errors with debug flags. --- src/gui/models/fontsmodel.h | 2 +- src/gui/models/iconsmodel.h | 2 +- src/gui/models/itemsmodel.h | 2 +- src/gui/models/magicschoolmodel.h | 2 +- src/gui/models/soundsmodel.h | 2 +- src/gui/models/themesmodel.h | 2 +- src/gui/models/updatelistmodel.h | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/gui/models/themesmodel.h') diff --git a/src/gui/models/fontsmodel.h b/src/gui/models/fontsmodel.h index b20d3386b..036e3f9c4 100644 --- a/src/gui/models/fontsmodel.h +++ b/src/gui/models/fontsmodel.h @@ -26,7 +26,7 @@ #include "gui/models/namesmodel.h" -#include "debug.h" +#include "localconsts.h" class FontsModel final : public NamesModel { diff --git a/src/gui/models/iconsmodel.h b/src/gui/models/iconsmodel.h index 4c549953b..c3031169c 100644 --- a/src/gui/models/iconsmodel.h +++ b/src/gui/models/iconsmodel.h @@ -29,7 +29,7 @@ #include "resources/db/itemdb.h" -#include "debug.h" +#include "localconsts.h" class IconsModel final : public ListModel { diff --git a/src/gui/models/itemsmodel.h b/src/gui/models/itemsmodel.h index 383bb9c14..808ae0f04 100644 --- a/src/gui/models/itemsmodel.h +++ b/src/gui/models/itemsmodel.h @@ -31,7 +31,7 @@ #include "utils/gettext.h" -#include "debug.h" +#include "localconsts.h" class ItemsModal final : public ListModel { diff --git a/src/gui/models/magicschoolmodel.h b/src/gui/models/magicschoolmodel.h index b30147f3d..1f7c4f0f7 100644 --- a/src/gui/models/magicschoolmodel.h +++ b/src/gui/models/magicschoolmodel.h @@ -27,7 +27,7 @@ #include "utils/gettext.h" -#include "debug.h" +#include "localconsts.h" const char *MAGIC_SCHOOL_TEXT[6] = { diff --git a/src/gui/models/soundsmodel.h b/src/gui/models/soundsmodel.h index 2851e2265..2f645e666 100644 --- a/src/gui/models/soundsmodel.h +++ b/src/gui/models/soundsmodel.h @@ -25,7 +25,7 @@ #include "utils/gettext.h" -#include "debug.h" +#include "localconsts.h" class SoundsModel final : public NamesModel { diff --git a/src/gui/models/themesmodel.h b/src/gui/models/themesmodel.h index b19c698fc..7f76534f0 100644 --- a/src/gui/models/themesmodel.h +++ b/src/gui/models/themesmodel.h @@ -28,7 +28,7 @@ #include "utils/gettext.h" -#include "debug.h" +#include "localconsts.h" class ThemesModel final : public NamesModel { diff --git a/src/gui/models/updatelistmodel.h b/src/gui/models/updatelistmodel.h index 31f96c959..2e1d2a7d5 100644 --- a/src/gui/models/updatelistmodel.h +++ b/src/gui/models/updatelistmodel.h @@ -29,7 +29,7 @@ #include "utils/gettext.h" -#include "debug.h" +#include "localconsts.h" class UpdateListModel final : public ListModel { -- cgit v1.2.3-70-g09d2