diff options
| -rw-r--r-- | src/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 1 | ||||
| -rw-r--r-- | src/gui/widgets/statuswindowattrs.h | 115 | ||||
| -rw-r--r-- | src/gui/windows/statuswindow.cpp | 86 |
4 files changed, 118 insertions, 85 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a4556ea9d..2d816cb98 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -183,6 +183,7 @@ SET(SRCS gui/widgets/itemshortcutcontainer.h gui/widgets/spellshortcutcontainer.cpp gui/widgets/spellshortcutcontainer.h + gui/widgets/statuswindowattrs.h gui/widgets/label.cpp gui/widgets/label.h gui/widgets/tabs/langtab.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 41d81eee8..616c8d99b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -281,6 +281,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ gui/widgets/itemshortcutcontainer.h \ gui/widgets/spellshortcutcontainer.cpp \ gui/widgets/spellshortcutcontainer.h \ + gui/widgets/statuswindowattrs.h \ gui/widgets/label.cpp \ gui/widgets/label.h \ gui/widgets/tabs/langtab.cpp \ diff --git a/src/gui/widgets/statuswindowattrs.h b/src/gui/widgets/statuswindowattrs.h new file mode 100644 index 000000000..0a4110fdc --- /dev/null +++ b/src/gui/widgets/statuswindowattrs.h @@ -0,0 +1,115 @@ +/* + * 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 <http://www.gnu.org/licenses/>. + */ + +#ifndef GUI_WINDOWS_STATUSWINDOWATTRS_H +#define GUI_WINDOWS_STATUSWINDOWATTRS_H + +#include "gui/widgets/container.h" + +#include "localconsts.h" + +class AttrDisplay : public Container +{ + public: + enum Type + { + DERIVED = 0, + CHANGEABLE, + UNKNOWN + }; + + A_DELETE_COPY(AttrDisplay) + + virtual ~AttrDisplay(); + + virtual std::string update(); + + virtual Type getType() const + { return UNKNOWN; } + + std::string getValue() const + { + if (!mValue) + return "-"; + else + return mValue->getCaption(); + } + + const std::string &getShortName() const + { return mShortName; } + + protected: + AttrDisplay(const Widget2 *const widget, + const int id, + const std::string &restrict name, + const std::string &restrict shortName); + + const int mId; + const std::string mName; + const std::string mShortName; + + LayoutHelper *mLayout; + Label *mLabel; + Label *mValue; +}; + +class DerDisplay final : public AttrDisplay +{ + public: + DerDisplay(const Widget2 *const widget, + const int id, const std::string &restrict name, + const std::string &restrict shortName); + + A_DELETE_COPY(DerDisplay) + + Type getType() const override final + { return DERIVED; } +}; + +class ChangeDisplay final : public AttrDisplay, + public ActionListener +{ + public: + ChangeDisplay(const Widget2 *const widget, + const int id, const std::string &restrict name, + const std::string &restrict shortName); + + A_DELETE_COPY(ChangeDisplay) + + std::string update() override final; + + Type getType() const override final + { return CHANGEABLE; } + + void setPointsNeeded(const int needed); + + void action(const ActionEvent &event) override final; + + private: + int mNeeded; + + Label *mPoints; + Button *mDec; + Button *mInc; +}; + +#endif // GUI_WINDOWS_STATUSWINDOWATTRS_H diff --git a/src/gui/windows/statuswindow.cpp b/src/gui/windows/statuswindow.cpp index 99ed112eb..00c5c5c2f 100644 --- a/src/gui/windows/statuswindow.cpp +++ b/src/gui/windows/statuswindow.cpp @@ -46,6 +46,7 @@ #include "gui/widgets/layouttype.h" #include "gui/widgets/progressbar.h" #include "gui/widgets/scrollarea.h" +#include "gui/widgets/statuswindowattrs.h" #include "gui/widgets/vertcontainer.h" #include "net/net.h" @@ -59,91 +60,6 @@ #include "debug.h" -class AttrDisplay : public Container -{ - public: - enum Type - { - DERIVED = 0, - CHANGEABLE, - UNKNOWN - }; - - A_DELETE_COPY(AttrDisplay) - - virtual ~AttrDisplay(); - - virtual std::string update(); - - virtual Type getType() const - { return UNKNOWN; } - - std::string getValue() const - { - if (!mValue) - return "-"; - else - return mValue->getCaption(); - } - - const std::string &getShortName() const - { return mShortName; } - - protected: - AttrDisplay(const Widget2 *const widget, - const int id, - const std::string &restrict name, - const std::string &restrict shortName); - - const int mId; - const std::string mName; - const std::string mShortName; - - LayoutHelper *mLayout; - Label *mLabel; - Label *mValue; -}; - -class DerDisplay final : public AttrDisplay -{ - public: - DerDisplay(const Widget2 *const widget, - const int id, const std::string &restrict name, - const std::string &restrict shortName); - - A_DELETE_COPY(DerDisplay) - - Type getType() const override final - { return DERIVED; } -}; - -class ChangeDisplay final : public AttrDisplay, - public ActionListener -{ - public: - ChangeDisplay(const Widget2 *const widget, - const int id, const std::string &restrict name, - const std::string &restrict shortName); - - A_DELETE_COPY(ChangeDisplay) - - std::string update() override final; - - Type getType() const override final - { return CHANGEABLE; } - - void setPointsNeeded(const int needed); - - void action(const ActionEvent &event) override final; - - private: - int mNeeded; - - Label *mPoints; - Button *mDec; - Button *mInc; -}; - StatusWindow::StatusWindow() : Window(player_node ? player_node->getName() : "?", false, nullptr, "status.xml"), |