From abbe2e84657fdb3afc6f07b6df82918938862fd8 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 23 Feb 2014 14:03:30 +0300 Subject: Move sortlistmodelbuy into gui/models directory. --- src/CMakeLists.txt | 1 + src/Makefile.am | 1 + src/gui/models/sortlistmodelbuy.h | 65 +++++++++++++++++++++++++++++++++++++++ src/gui/windows/buydialog.cpp | 36 +--------------------- 4 files changed, 68 insertions(+), 35 deletions(-) create mode 100644 src/gui/models/sortlistmodelbuy.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index dec92abe1..01d842f87 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -222,6 +222,7 @@ SET(SRCS gui/widgets/skillinfo.h gui/models/skillmodel.cpp gui/models/skillmodel.h + gui/models/sortlistmodelbuy.h gui/models/soundsmodel.h gui/widgets/slider.cpp gui/widgets/slider.h diff --git a/src/Makefile.am b/src/Makefile.am index dc9475d48..73a69231b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -320,6 +320,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ gui/widgets/skillinfo.h \ gui/models/skillmodel.cpp \ gui/models/skillmodel.h \ + gui/models/sortlistmodelbuy.h \ gui/models/soundsmodel.h \ gui/widgets/slider.cpp \ gui/widgets/slider.h \ diff --git a/src/gui/models/sortlistmodelbuy.h b/src/gui/models/sortlistmodelbuy.h new file mode 100644 index 000000000..1647ae822 --- /dev/null +++ b/src/gui/models/sortlistmodelbuy.h @@ -0,0 +1,65 @@ +/* + * 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 . + */ + +#ifndef GUI_MODELS_SORTLISTMODELBUY_H +#define GUI_MODELS_SORTLISTMODELBUY_H + +#include "gui/models/listmodel.h" + +#include "utils/gettext.h" + +static const char *const SORT_NAME_BUY[7] = +{ + // TRANSLATORS: buy dialog sort type. + N_("unsorted"), + // TRANSLATORS: buy dialog sort type. + N_("by price"), + // TRANSLATORS: buy dialog sort type. + N_("by name"), + // TRANSLATORS: buy dialog sort type. + N_("by id"), + // TRANSLATORS: buy dialog sort type. + N_("by weight"), + // TRANSLATORS: buy dialog sort type. + N_("by amount"), + // TRANSLATORS: buy dialog sort type. + N_("by type") +}; + +class SortListModelBuy final : public ListModel +{ + public: + ~SortListModelBuy() + { } + + int getNumberOfElements() + { return 7; } + + std::string getElementAt(int i) + { + if (i >= getNumberOfElements() || i < 0) + return "???"; + return gettext(SORT_NAME_BUY[i]); + } +}; + +#endif // GUI_MODELS_SORTLISTMODELBUY_H diff --git a/src/gui/windows/buydialog.cpp b/src/gui/windows/buydialog.cpp index e64a7489b..c2514a15d 100644 --- a/src/gui/windows/buydialog.cpp +++ b/src/gui/windows/buydialog.cpp @@ -29,6 +29,7 @@ #include "gui/windows/tradewindow.h" #include "gui/models/shopitems.h" +#include "gui/models/sortlistmodelbuy.h" #include "gui/widgets/button.h" #include "gui/widgets/dropdown.h" @@ -52,41 +53,6 @@ #include "debug.h" -static const char *const SORT_NAME_BUY[7] = -{ - // TRANSLATORS: buy dialog sort type. - N_("unsorted"), - // TRANSLATORS: buy dialog sort type. - N_("by price"), - // TRANSLATORS: buy dialog sort type. - N_("by name"), - // TRANSLATORS: buy dialog sort type. - N_("by id"), - // TRANSLATORS: buy dialog sort type. - N_("by weight"), - // TRANSLATORS: buy dialog sort type. - N_("by amount"), - // TRANSLATORS: buy dialog sort type. - N_("by type") -}; - -class SortListModelBuy final : public ListModel -{ -public: - ~SortListModelBuy() - { } - - int getNumberOfElements() - { return 7; } - - std::string getElementAt(int i) - { - if (i >= getNumberOfElements() || i < 0) - return "???"; - return gettext(SORT_NAME_BUY[i]); - } -}; - class SortItemPriceFunctor final { public: -- cgit v1.2.3-70-g09d2