From d6bbfaaf473f369b3bd893aa5e52403ea575e5c7 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 25 Jul 2016 18:00:58 +0300 Subject: Move attrdisplay class into separate file. --- src/CMakeLists.txt | 2 + src/Makefile.am | 2 + src/gui/widgets/attrs/attrdisplay.cpp | 66 ++++++++++++++++++++++++++++ src/gui/widgets/attrs/attrdisplay.h | 81 +++++++++++++++++++++++++++++++++++ src/gui/widgets/statuswindowattrs.h | 51 +--------------------- src/gui/windows/statuswindow.cpp | 36 +--------------- 6 files changed, 154 insertions(+), 84 deletions(-) create mode 100644 src/gui/widgets/attrs/attrdisplay.cpp create mode 100644 src/gui/widgets/attrs/attrdisplay.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e9d94246e..b6eb88a56 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -135,6 +135,8 @@ SET(SRCS gui/widgets/characterviewnormal.h gui/widgets/characterviewsmall.cpp gui/widgets/characterviewsmall.h + gui/widgets/attrs/attrdisplay.cpp + gui/widgets/attrs/attrdisplay.h gui/widgets/tabs/debugwindowtabs.cpp gui/widgets/tabs/debugwindowtabs.h gui/widgets/tabs/chat/chattab.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 40cd06fc6..87f5f8773 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -943,6 +943,8 @@ manaplus_SOURCES += main.cpp \ gui/widgets/tabs/chat/battletab.h \ gui/widgets/tabs/chat/channeltab.cpp \ gui/widgets/tabs/chat/channeltab.h \ + gui/widgets/attrs/attrdisplay.cpp \ + gui/widgets/attrs/attrdisplay.h \ gui/widgets/tabs/debugwindowtabs.cpp \ gui/widgets/tabs/debugwindowtabs.h \ gui/widgets/tabs/chat/chattab.cpp \ diff --git a/src/gui/widgets/attrs/attrdisplay.cpp b/src/gui/widgets/attrs/attrdisplay.cpp new file mode 100644 index 000000000..8efadfcf0 --- /dev/null +++ b/src/gui/widgets/attrs/attrdisplay.cpp @@ -0,0 +1,66 @@ +/* + * The ManaPlus Client + * Copyright (C) 2004-2009 The Mana World Development Team + * Copyright (C) 2009-2010 The Mana Developers + * Copyright (C) 2011-2016 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 "gui/widgets/attrs/attrdisplay.h" + +#include "being/playerinfo.h" + +#include "gui/widgets/layouthelper.h" + +#include "utils/delete2.h" +#include "utils/stringutils.h" + +#include "debug.h" + +AttrDisplay::AttrDisplay(const Widget2 *const widget, + const AttributesT id, + const std::string &restrict name, + const std::string &restrict shortName) : + Container(widget), + mId(id), + mName(name), + mShortName(shortName), + mLayout(new LayoutHelper(this)), + mLabel(new Label(this, name)), + mValue(new Label(this, "1 ")) +{ + setSize(100, 32); + + mLabel->setAlignment(Graphics::CENTER); + mValue->setAlignment(Graphics::CENTER); +} + +AttrDisplay::~AttrDisplay() +{ + delete2(mLayout); +} + +std::string AttrDisplay::update() +{ + const int base = PlayerInfo::getStatBase(mId); + const int bonus = PlayerInfo::getStatMod(mId); + std::string value = toString(base + bonus); + if (bonus) + value.append(strprintf("=%d%+d", base, bonus)); + mValue->setCaption(value); + return mName; +} diff --git a/src/gui/widgets/attrs/attrdisplay.h b/src/gui/widgets/attrs/attrdisplay.h new file mode 100644 index 000000000..693bbc349 --- /dev/null +++ b/src/gui/widgets/attrs/attrdisplay.h @@ -0,0 +1,81 @@ +/* + * The ManaPlus Client + * Copyright (C) 2004-2009 The Mana World Development Team + * Copyright (C) 2009-2010 The Mana Developers + * Copyright (C) 2011-2016 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_WIDGETS_ATTRS_ATTRDISPLAY_H +#define GUI_WIDGETS_ATTRS_ATTRDISPLAY_H + +#include "enums/being/attributes.h" + +#include "gui/widgets/container.h" + +#include "gui/widgets/label.h" + +#include "localconsts.h" + +class LayoutHelper; + +class AttrDisplay notfinal : 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 AttributesT id, + const std::string &restrict name, + const std::string &restrict shortName); + + const AttributesT mId; + const std::string mName; + const std::string mShortName; + + LayoutHelper *mLayout; + Label *mLabel; + Label *mValue; +}; + +#endif // GUI_WIDGETS_ATTRS_ATTRDISPLAY_H diff --git a/src/gui/widgets/statuswindowattrs.h b/src/gui/widgets/statuswindowattrs.h index e4be9d05c..3a84889f7 100644 --- a/src/gui/widgets/statuswindowattrs.h +++ b/src/gui/widgets/statuswindowattrs.h @@ -23,11 +23,7 @@ #ifndef GUI_WIDGETS_STATUSWINDOWATTRS_H #define GUI_WIDGETS_STATUSWINDOWATTRS_H -#include "enums/being/attributes.h" - -#include "gui/widgets/container.h" - -#include "gui/widgets/label.h" +#include "gui/widgets/attrs/attrdisplay.h" #include "listeners/actionlistener.h" @@ -36,51 +32,6 @@ class Button; class LayoutHelper; -class AttrDisplay notfinal : 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 AttributesT id, - const std::string &restrict name, - const std::string &restrict shortName); - - const AttributesT mId; - const std::string mName; - const std::string mShortName; - - LayoutHelper *mLayout; - Label *mLabel; - Label *mValue; -}; - class DerDisplay final : public AttrDisplay { public: diff --git a/src/gui/windows/statuswindow.cpp b/src/gui/windows/statuswindow.cpp index b37896476..4cc02794c 100644 --- a/src/gui/windows/statuswindow.cpp +++ b/src/gui/windows/statuswindow.cpp @@ -45,6 +45,8 @@ #include "gui/widgets/vertcontainer.h" #include "gui/widgets/windowcontainer.h" +#include "gui/widgets/attrs/attrdisplay.h" + #include "net/inventoryhandler.h" #include "net/playerhandler.h" #include "net/serverfeatures.h" @@ -712,40 +714,6 @@ void StatusWindow::action(const ActionEvent &event) } } -AttrDisplay::AttrDisplay(const Widget2 *const widget, - const AttributesT id, - const std::string &restrict name, - const std::string &restrict shortName) : - Container(widget), - mId(id), - mName(name), - mShortName(shortName), - mLayout(new LayoutHelper(this)), - mLabel(new Label(this, name)), - mValue(new Label(this, "1 ")) -{ - setSize(100, 32); - - mLabel->setAlignment(Graphics::CENTER); - mValue->setAlignment(Graphics::CENTER); -} - -AttrDisplay::~AttrDisplay() -{ - delete2(mLayout); -} - -std::string AttrDisplay::update() -{ - const int base = PlayerInfo::getStatBase(mId); - const int bonus = PlayerInfo::getStatMod(mId); - std::string value = toString(base + bonus); - if (bonus) - value.append(strprintf("=%d%+d", base, bonus)); - mValue->setCaption(value); - return mName; -} - DerDisplay::DerDisplay(const Widget2 *const widget, const AttributesT id, const std::string &restrict name, -- cgit v1.2.3-70-g09d2