From 628c14231ce3a1b88ce6082cffc234d2a59df60a Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 15 May 2014 23:34:41 +0300 Subject: Move modelistmodel into separate file. --- src/CMakeLists.txt | 2 + src/Makefile.am | 2 + src/gui/models/modelistmodel.cpp | 101 +++++++++++++++++++++++++++++++++ src/gui/models/modelistmodel.h | 67 ++++++++++++++++++++++ src/gui/widgets/tabs/setup_video.cpp | 107 +---------------------------------- 5 files changed, 173 insertions(+), 106 deletions(-) create mode 100644 src/gui/models/modelistmodel.cpp create mode 100644 src/gui/models/modelistmodel.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 42c2ae992..67db760fe 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -197,6 +197,8 @@ SET(SRCS gui/widgets/linkhandler.h gui/widgets/listbox.cpp gui/widgets/listbox.h + gui/models/modelistmodel.cpp + gui/models/modelistmodel.h gui/models/namesmodel.cpp gui/models/namesmodel.h gui/models/playerrelationlistmodel.h diff --git a/src/Makefile.am b/src/Makefile.am index 217048e4f..812af500d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -290,6 +290,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ gui/widgets/linkhandler.h \ gui/widgets/listbox.cpp \ gui/widgets/listbox.h \ + gui/models/modelistmodel.cpp \ + gui/models/modelistmodel.h \ gui/models/namesmodel.cpp \ gui/models/namesmodel.h \ gui/models/playerrelationlistmodel.h \ diff --git a/src/gui/models/modelistmodel.cpp b/src/gui/models/modelistmodel.cpp new file mode 100644 index 000000000..20e4348bb --- /dev/null +++ b/src/gui/models/modelistmodel.cpp @@ -0,0 +1,101 @@ +/* + * 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 . + */ + +#include "render/graphics.h" + +#include "utils/sdlhelper.h" +#include "utils/stringutils.h" + +#include "gui/models/modelistmodel.h" + +#include + +#include "debug.h" + +#ifndef ANDROID +static bool modeSorter(const std::string &mode1, const std::string &mode2) +{ + const int width1 = atoi(mode1.substr(0, mode1.find("x")).c_str()); + const int height1 = atoi(mode1.substr(mode1.find("x") + 1).c_str()); + if (!width1 || !height1) + return false; + + const int width2 = atoi(mode2.substr(0, mode2.find("x")).c_str()); + const int height2 = atoi(mode2.substr(mode2.find("x") + 1).c_str()); + if (!width2 || !height2) + return false; + if (width1 != width2) + return width1 < width2; + + if (height1 != height2) + return height1 < height2; + + return false; +} +#endif + +ModeListModel::ModeListModel() : + mVideoModes() +{ + SDL::getAllVideoModes(mVideoModes); +#ifndef ANDROID + addCustomMode("640x480"); + addCustomMode("800x600"); + addCustomMode("1024x768"); + addCustomMode("1280x1024"); + addCustomMode("1400x900"); + addCustomMode("1500x990"); + addCustomMode(toString(mainGraphics->mActualWidth).append("x") + .append(toString(mainGraphics->mActualHeight))); + + std::sort(mVideoModes.begin(), mVideoModes.end(), &modeSorter); + mVideoModes.push_back("custom"); +#endif +} + +#ifndef ANDROID +void ModeListModel::addCustomMode(const std::string &mode) +{ + StringVectCIter it = mVideoModes.begin(); + const StringVectCIter it_end = mVideoModes.end(); + while (it != it_end) + { + if (*it == mode) + return; + ++ it; + } + mVideoModes.push_back(mode); +} +#endif + +int ModeListModel::getIndexOf(const std::string &widthXHeightMode) +{ + std::string currentMode(""); + for (int i = 0; i < getNumberOfElements(); i++) + { + currentMode = getElementAt(i); + if (currentMode == widthXHeightMode) + return i; + } + return -1; +} + diff --git a/src/gui/models/modelistmodel.h b/src/gui/models/modelistmodel.h new file mode 100644 index 000000000..a34ba810a --- /dev/null +++ b/src/gui/models/modelistmodel.h @@ -0,0 +1,67 @@ +/* + * 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_MODELISTMODEL_H +#define GUI_MODELS_MODELISTMODEL_H + +#include "gui/models/listmodel.h" + +#include "localconsts.h" + +class ModeListModel final : public ListModel +{ + public: + ModeListModel(); + + A_DELETE_COPY(ModeListModel) + + ~ModeListModel() + { } + + /** + * Returns the number of elements in container. + */ + int getNumberOfElements() override final + { return static_cast(mVideoModes.size()); } + + /** + * Returns element from container. + */ + std::string getElementAt(int i) + { return mVideoModes[i]; } + + /** + * Returns the index corresponding to the given video mode. + * E.g.: "800x600". + * or -1 if not found. + */ + int getIndexOf(const std::string &widthXHeightMode); + + private: +#ifndef ANDROID + void addCustomMode(const std::string &mode); +#endif + + StringVect mVideoModes; +}; + +#endif // GUI_MODELS_MODELISTMODEL_H diff --git a/src/gui/widgets/tabs/setup_video.cpp b/src/gui/widgets/tabs/setup_video.cpp index 9ecec5981..e33ea2919 100644 --- a/src/gui/widgets/tabs/setup_video.cpp +++ b/src/gui/widgets/tabs/setup_video.cpp @@ -48,7 +48,7 @@ #include "test/testmain.h" -#include "gui/models/listmodel.h" +#include "gui/models/modelistmodel.h" #include @@ -56,111 +56,6 @@ extern Graphics *mainGraphics; -class ModeListModel final : public ListModel -{ - public: - ModeListModel(); - - A_DELETE_COPY(ModeListModel) - - ~ModeListModel() - { } - - /** - * Returns the number of elements in container. - */ - int getNumberOfElements() override final - { return static_cast(mVideoModes.size()); } - - /** - * Returns element from container. - */ - std::string getElementAt(int i) - { return mVideoModes[i]; } - - /** - * Returns the index corresponding to the given video mode. - * E.g.: "800x600". - * or -1 if not found. - */ - int getIndexOf(const std::string &widthXHeightMode); - - private: -#ifndef ANDROID - void addCustomMode(const std::string &mode); -#endif - - StringVect mVideoModes; -}; - -#ifndef ANDROID -static bool modeSorter(const std::string &mode1, const std::string &mode2) -{ - const int width1 = atoi(mode1.substr(0, mode1.find("x")).c_str()); - const int height1 = atoi(mode1.substr(mode1.find("x") + 1).c_str()); - if (!width1 || !height1) - return false; - - const int width2 = atoi(mode2.substr(0, mode2.find("x")).c_str()); - const int height2 = atoi(mode2.substr(mode2.find("x") + 1).c_str()); - if (!width2 || !height2) - return false; - if (width1 != width2) - return width1 < width2; - - if (height1 != height2) - return height1 < height2; - - return false; -} -#endif - -ModeListModel::ModeListModel() : - mVideoModes() -{ - SDL::getAllVideoModes(mVideoModes); -#ifndef ANDROID - addCustomMode("640x480"); - addCustomMode("800x600"); - addCustomMode("1024x768"); - addCustomMode("1280x1024"); - addCustomMode("1400x900"); - addCustomMode("1500x990"); - addCustomMode(toString(mainGraphics->mActualWidth).append("x") - .append(toString(mainGraphics->mActualHeight))); - - std::sort(mVideoModes.begin(), mVideoModes.end(), &modeSorter); - mVideoModes.push_back("custom"); -#endif -} - -#ifndef ANDROID -void ModeListModel::addCustomMode(const std::string &mode) -{ - StringVectCIter it = mVideoModes.begin(); - const StringVectCIter it_end = mVideoModes.end(); - while (it != it_end) - { - if (*it == mode) - return; - ++ it; - } - mVideoModes.push_back(mode); -} -#endif - -int ModeListModel::getIndexOf(const std::string &widthXHeightMode) -{ - std::string currentMode(""); - for (int i = 0; i < getNumberOfElements(); i++) - { - currentMode = getElementAt(i); - if (currentMode == widthXHeightMode) - return i; - } - return -1; -} - class OpenGLListModel final : public ListModel { public: -- cgit v1.2.3-70-g09d2