From df2ba2dd07a6358f9015af6a6549ef766f86a8fb Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 23 Feb 2014 12:09:01 +0300 Subject: Move iconsmodel into gui/models directory. --- src/CMakeLists.txt | 1 + src/Makefile.am | 1 + src/gui/models/iconsmodel.h | 84 +++++++++++++++++++++++++++++++++++ src/gui/windows/textcommandeditor.cpp | 60 +++---------------------- src/gui/windows/textcommandeditor.h | 4 +- 5 files changed, 93 insertions(+), 57 deletions(-) create mode 100644 src/gui/models/iconsmodel.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8e668ce2c..e90c06b0f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -142,6 +142,7 @@ SET(SRCS gui/models/extendednamesmodel.cpp gui/models/extendednamesmodel.h gui/models/fontsmodel.h + gui/models/iconsmodel.h gui/models/ignorechoiceslistmodel.h gui/widgets/flowcontainer.cpp gui/widgets/flowcontainer.h diff --git a/src/Makefile.am b/src/Makefile.am index 0d33eedcb..56840ea85 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -238,6 +238,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ gui/models/extendednamesmodel.cpp \ gui/models/extendednamesmodel.h \ gui/models/fontsmodel.h \ + gui/models/iconsmodel.h \ gui/models/ignorechoiceslistmodel.h \ gui/widgets/flowcontainer.cpp \ gui/widgets/flowcontainer.h \ diff --git a/src/gui/models/iconsmodel.h b/src/gui/models/iconsmodel.h new file mode 100644 index 000000000..4c549953b --- /dev/null +++ b/src/gui/models/iconsmodel.h @@ -0,0 +1,84 @@ +/* + * The ManaPlus Client + * Copyright (C) 2009 The Mana World Development Team + * 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_ICONSMODEL_H +#define GUI_MODELS_ICONSMODEL_H + +#include "gui/models/listmodel.h" + +#include "resources/iteminfo.h" + +#include "resources/db/itemdb.h" + +#include "debug.h" + +class IconsModel final : public ListModel +{ + public: + IconsModel() : + mStrings() + { + const std::map &items = ItemDB::getItemInfos(); + std::list tempStrings; + + for (std::map::const_iterator + i = items.begin(), i_end = items.end(); + i != i_end; ++i) + { + if (i->first < 0) + continue; + + const ItemInfo &info = (*i->second); + const std::string name = info.getName(); + if (name != "unnamed" && !info.getName().empty() + && info.getName() != "unnamed") + { + tempStrings.push_back(name); + } + } + tempStrings.sort(); + mStrings.push_back(""); + FOR_EACH (std::list::const_iterator, i, tempStrings) + mStrings.push_back(*i); + } + + A_DELETE_COPY(IconsModel) + + ~IconsModel() + { } + + int getNumberOfElements() override final + { + return static_cast(mStrings.size()); + } + + std::string getElementAt(int i) override final + { + if (i < 0 || i >= getNumberOfElements()) + return "???"; + return mStrings.at(i); + } + private: + StringVect mStrings; +}; + +#endif // GUI_MODELS_ICONSMODEL_H diff --git a/src/gui/windows/textcommandeditor.cpp b/src/gui/windows/textcommandeditor.cpp index 358077021..c1cd204ac 100644 --- a/src/gui/windows/textcommandeditor.cpp +++ b/src/gui/windows/textcommandeditor.cpp @@ -27,6 +27,7 @@ #include "input/keyboardconfig.h" +#include "gui/models/iconsmodel.h" #include "gui/models/listmodel.h" #include "gui/widgets/button.h" @@ -44,57 +45,6 @@ #include "debug.h" -class IconsModal final : public ListModel -{ -public: - IconsModal() : - mStrings() - { - const std::map &items = ItemDB::getItemInfos(); - std::list tempStrings; - - for (std::map::const_iterator - i = items.begin(), i_end = items.end(); - i != i_end; ++i) - { - if (i->first < 0) - continue; - - const ItemInfo &info = (*i->second); - const std::string name = info.getName(); - if (name != "unnamed" && !info.getName().empty() - && info.getName() != "unnamed") - { - tempStrings.push_back(name); - } - } - tempStrings.sort(); - mStrings.push_back(""); - FOR_EACH (std::list::const_iterator, i, tempStrings) - mStrings.push_back(*i); - } - - A_DELETE_COPY(IconsModal) - - ~IconsModal() - { } - - int getNumberOfElements() override final - { - return static_cast(mStrings.size()); - } - - std::string getElementAt(int i) override final - { - if (i < 0 || i >= getNumberOfElements()) - return "???"; - return mStrings.at(i); - } -private: - StringVect mStrings; -}; - - const char *TARGET_TYPE_TEXT[3] = { // TRANSLATORS: target type @@ -182,10 +132,10 @@ TextCommandEditor::TextCommandEditor(TextCommand *const command) : // TRANSLATORS: command editor label mTypeLabel(new Label(this, _("Target Type:"))), mTypeDropDown(new DropDown(this, mTargetTypeModel)), - mIconsModal(new IconsModal), + mIconsModel(new IconsModel), // TRANSLATORS: command editor label mIconLabel(new Label(this, _("Icon:"))), - mIconDropDown(new DropDown(this, mIconsModal)), + mIconDropDown(new DropDown(this, mIconsModel)), // TRANSLATORS: command editor label mManaLabel(new Label(this, _("Mana:"))), mManaField(new IntTextField(this, 0)), @@ -308,8 +258,8 @@ void TextCommandEditor::postInit() TextCommandEditor::~TextCommandEditor() { - delete mIconsModal; - mIconsModal = nullptr; + delete mIconsModel; + mIconsModel = nullptr; delete mTargetTypeModel; mTargetTypeModel = nullptr; delete mMagicSchoolModel; diff --git a/src/gui/windows/textcommandeditor.h b/src/gui/windows/textcommandeditor.h index 3b5e239cd..de7f3b1a4 100644 --- a/src/gui/windows/textcommandeditor.h +++ b/src/gui/windows/textcommandeditor.h @@ -29,7 +29,7 @@ class Button; class DropDown; -class IconsModal; +class IconsModel; class IntTextField; class Label; class MagicSchoolModel; @@ -83,7 +83,7 @@ class TextCommandEditor final : public Window, TargetTypeModel *mTargetTypeModel; Label *mTypeLabel; DropDown *mTypeDropDown; - IconsModal *mIconsModal; + IconsModel *mIconsModel; Label *mIconLabel; DropDown *mIconDropDown; Label *mManaLabel; -- cgit v1.2.3-70-g09d2