From 8d30fe18d9e8fec15a0a4ae44abad50ebfc557ab Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 17 May 2014 14:54:21 +0300 Subject: Move socialnavigationtab into separate file. --- src/CMakeLists.txt | 1 + src/Makefile.am | 1 + src/gui/widgets/tabs/socialnavigationtab.h | 308 +++++++++++++++++++++++++++++ src/gui/widgets/tabs/socialplayerstab.h | 1 - src/gui/windows/socialwindow.cpp | 277 +------------------------- 5 files changed, 311 insertions(+), 277 deletions(-) create mode 100644 src/gui/widgets/tabs/socialnavigationtab.h (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 217a2754b..1fd0fda91 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -262,6 +262,7 @@ SET(SRCS gui/widgets/tabs/skilltab.h gui/widgets/tabs/socialguildtab.h gui/widgets/tabs/socialguildtab2.h + gui/widgets/tabs/socialnavigationtab.h gui/widgets/tabs/socialpartytab.h gui/widgets/tabs/socialplayerstab.h gui/widgets/tabs/socialtab.h diff --git a/src/Makefile.am b/src/Makefile.am index 47e54ee56..37b82de0f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -360,6 +360,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ gui/widgets/tabs/skilltab.h \ gui/widgets/tabs/socialguildtab.h \ gui/widgets/tabs/socialguildtab2.h \ + gui/widgets/tabs/socialnavigationtab.h \ gui/widgets/tabs/socialpartytab.h \ gui/widgets/tabs/socialplayerstab.h \ gui/widgets/tabs/socialtab.h \ diff --git a/src/gui/widgets/tabs/socialnavigationtab.h b/src/gui/widgets/tabs/socialnavigationtab.h new file mode 100644 index 000000000..70c92790c --- /dev/null +++ b/src/gui/widgets/tabs/socialnavigationtab.h @@ -0,0 +1,308 @@ +/* + * The ManaPlus Client + * 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_WIDGETS_TABS_SOCIALNAVIGATIONTAB_H +#define GUI_WIDGETS_TABS_SOCIALNAVIGATIONTAB_H + +#include "gui/widgets/tabs/socialtab.h" + +#include "utils/delete2.h" +#include "utils/gettext.h" + +#include "localconsts.h" + +class SocialNavigationTab final : public SocialTab +{ + public: + SocialNavigationTab(const Widget2 *const widget, + const bool showBackground) : + SocialTab(widget), + mBeings(new BeingsListModel) + { + mList = new AvatarListBox(this, mBeings); + mList->postInit(); + mScroll = new ScrollArea(this, mList, showBackground, + "social_background.xml"); + + mScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_AUTO); + mScroll->setVerticalScrollPolicy(ScrollArea::SHOW_ALWAYS); + + // TRANSLATORS: Navigation tab name in social window. + // TRANSLATORS: Should be small + setCaption(_("Nav")); + } + + A_DELETE_COPY(SocialNavigationTab) + + ~SocialNavigationTab() + { + delete2(mList) + delete2(mScroll) + delete2(mBeings) + } + + void updateList() override final + { + if (!socialWindow || !player_node) + return; + + const Map *const map = socialWindow->getMap(); + if (!map || map->empty()) + return; + + if (socialWindow->getProcessedPortals()) + return; + + std::vector *const avatars = mBeings->getMembers(); + std::vector portals = map->getPortals(); + + std::vector::const_iterator i = portals.begin(); + const SpecialLayer *const specialLayer = map->getSpecialLayer(); + + std::vector::iterator ia = avatars->begin(); + + while (ia != avatars->end()) + { + delete *ia; + ++ ia; + } + + avatars->clear(); + + int online = 0; + int total = 0; + + int idx = 0; + while (i != portals.end()) + { + MapItem *portal = *i; + if (!portal) + continue; + + const int x = portal->getX(); + const int y = portal->getY(); + + const std::string name = strprintf("%s [%d %d]", + portal->getComment().c_str(), x, y); + + Avatar *const ava = new Avatar(name); + if (player_node) + ava->setOnline(player_node->isReachable(x, y, true)); + else + ava->setOnline(false); + ava->setLevel(-1); + ava->setType(portal->getType()); + ava->setX(x); + ava->setY(y); + avatars->push_back(ava); + + if (ava->getOnline()) + online ++; + total ++; + + if (config.getBoolValue("drawHotKeys") + && idx < 80 && outfitWindow) + { + Being *const being = actorManager + ->findPortalByTile(x, y); + if (being) + { + being->setName(keyboard.getKeyShortString( + outfitWindow->keyName(idx))); + } + + if (specialLayer) + { + portal = specialLayer->getTile( + ava->getX(), ava->getY()); + if (portal) + { + portal->setName(keyboard.getKeyShortString( + outfitWindow->keyName(idx))); + } + } + } + + ++i; + idx ++; + } + if (socialWindow) + socialWindow->setProcessedPortals(true); + + // TRANSLATORS: social window label + mCounterString = strprintf(_("Portals: %u/%u"), + static_cast(online), + static_cast(total)); + updateCounter(); + } + + void selectIndex(const unsigned num) override final + { + if (!player_node) + return; + + std::vector *const avatars = mBeings->getMembers(); + if (!avatars || avatars->size() <= static_cast(num)) + return; + + const Avatar *const ava = avatars->at(num); + if (ava && player_node) + player_node->navigateTo(ava->getX(), ava->getY()); + } + + void updateNames() + { + if (!socialWindow) + return; + + std::vector *const avatars = mBeings->getMembers(); + if (!avatars) + return; + + const Map *const map = socialWindow->getMap(); + if (!map) + return; + + std::vector::const_iterator i = avatars->begin(); + const std::vector::const_iterator i_end = avatars->end(); + while (i != i_end) + { + Avatar *const ava = *i; + if (!ava) + break; + + const MapItem *const item = map->findPortalXY( + ava->getX(), ava->getY()); + if (item) + { + const std::string name = strprintf("%s [%d %d]", + item->getComment().c_str(), item->getX(), item->getY()); + ava->setName(name); + ava->setOriginalName(name); + } + + ++i; + } + } + + int getPortalIndex(const int x, const int y) + { + if (!socialWindow) + return -1; + + std::vector *const avatars = mBeings->getMembers(); + if (!avatars) + return -1; + + const Map *const map = socialWindow->getMap(); + if (!map) + return -1; + + std::vector::const_iterator i = avatars->begin(); + const std::vector::const_iterator i_end = avatars->end(); + unsigned num = 0; + while (i != i_end) + { + const Avatar *const ava = *i; + if (!ava) + break; + + if (ava->getX() == x && ava->getY() == y) + return num; + + ++i; + num ++; + } + return -1; + } + + void addPortal(const int x, const int y) + { + if (!socialWindow || !player_node) + return; + + const Map *const map = socialWindow->getMap(); + if (!map) + return; + + std::vector *const avatars = mBeings->getMembers(); + + if (!avatars) + return; + + const MapItem *const portal = map->findPortalXY(x, y); + if (!portal) + return; + + const std::string name = strprintf("%s [%d %d]", + portal->getComment().c_str(), x, y); + + Avatar *const ava = new Avatar(name); + if (player_node) + ava->setOnline(player_node->isReachable(x, y, true)); + else + ava->setOnline(false); + ava->setLevel(-1); + ava->setType(portal->getType()); + ava->setX(x); + ava->setY(y); + avatars->push_back(ava); + } + + void removePortal(const int x, const int y) + { + if (!socialWindow || !player_node) + return; + + const Map *const map = socialWindow->getMap(); + if (!map) + return; + + std::vector *const avatars = mBeings->getMembers(); + + if (!avatars) + return; + + std::vector::iterator i = avatars->begin(); + const std::vector::iterator i_end = avatars->end(); + + while (i != i_end) + { + Avatar *ava = (*i); + + if (!ava) + break; + + if (ava->getX() == x && ava->getY() == y) + { + delete ava; + avatars->erase(i); + return; + } + + ++ i; + } + } + + private: + BeingsListModel *mBeings; +}; + +#endif // GUI_WIDGETS_TABS_SOCIALNAVIGATIONTAB_H diff --git a/src/gui/widgets/tabs/socialplayerstab.h b/src/gui/widgets/tabs/socialplayerstab.h index 50ce1210e..5e625b06e 100644 --- a/src/gui/widgets/tabs/socialplayerstab.h +++ b/src/gui/widgets/tabs/socialplayerstab.h @@ -1,6 +1,5 @@ /* * The ManaPlus Client - * Copyright (C) 2010 The Mana Developers * Copyright (C) 2011-2014 The ManaPlus Developers * * This file is part of The ManaPlus Client. diff --git a/src/gui/windows/socialwindow.cpp b/src/gui/windows/socialwindow.cpp index e878e0368..987e0639b 100644 --- a/src/gui/windows/socialwindow.cpp +++ b/src/gui/windows/socialwindow.cpp @@ -57,6 +57,7 @@ #include "gui/widgets/tabs/chattab.h" #include "gui/widgets/tabs/socialguildtab.h" #include "gui/widgets/tabs/socialguildtab2.h" +#include "gui/widgets/tabs/socialnavigationtab.h" #include "gui/widgets/tabs/socialpartytab.h" #include "gui/widgets/tabs/socialplayerstab.h" @@ -98,282 +99,6 @@ namespace } friendSorter; } // namespace -class SocialNavigationTab final : public SocialTab -{ -public: - SocialNavigationTab(const Widget2 *const widget, - const bool showBackground) : - SocialTab(widget), - mBeings(new BeingsListModel) - { - mList = new AvatarListBox(this, mBeings); - mList->postInit(); - mScroll = new ScrollArea(this, mList, showBackground, - "social_background.xml"); - - mScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_AUTO); - mScroll->setVerticalScrollPolicy(ScrollArea::SHOW_ALWAYS); - - // TRANSLATORS: Navigation tab name in social window. Should be small - setCaption(_("Nav")); - } - - A_DELETE_COPY(SocialNavigationTab) - - ~SocialNavigationTab() - { - delete2(mList) - delete2(mScroll) - delete2(mBeings) - } - - void updateList() override final - { - if (!socialWindow || !player_node) - return; - - const Map *const map = socialWindow->getMap(); - if (!map || map->empty()) - return; - - if (socialWindow->getProcessedPortals()) - return; - - std::vector *const avatars = mBeings->getMembers(); - std::vector portals = map->getPortals(); - - std::vector::const_iterator i = portals.begin(); - const SpecialLayer *const specialLayer = map->getSpecialLayer(); - - std::vector::iterator ia = avatars->begin(); - - while (ia != avatars->end()) - { - delete *ia; - ++ ia; - } - - avatars->clear(); - - int online = 0; - int total = 0; - - int idx = 0; - while (i != portals.end()) - { - MapItem *portal = *i; - if (!portal) - continue; - - const int x = portal->getX(); - const int y = portal->getY(); - - const std::string name = strprintf("%s [%d %d]", - portal->getComment().c_str(), x, y); - - Avatar *const ava = new Avatar(name); - if (player_node) - ava->setOnline(player_node->isReachable(x, y, true)); - else - ava->setOnline(false); - ava->setLevel(-1); - ava->setType(portal->getType()); - ava->setX(x); - ava->setY(y); - avatars->push_back(ava); - - if (ava->getOnline()) - online ++; - total ++; - - if (config.getBoolValue("drawHotKeys") && idx < 80 && outfitWindow) - { - Being *const being = actorManager - ->findPortalByTile(x, y); - if (being) - { - being->setName(keyboard.getKeyShortString( - outfitWindow->keyName(idx))); - } - - if (specialLayer) - { - portal = specialLayer->getTile(ava->getX(), ava->getY()); - if (portal) - { - portal->setName(keyboard.getKeyShortString( - outfitWindow->keyName(idx))); - } - } - } - - ++i; - idx ++; - } - if (socialWindow) - socialWindow->setProcessedPortals(true); - - // TRANSLATORS: social window label - mCounterString = strprintf(_("Portals: %u/%u"), - static_cast(online), - static_cast(total)); - updateCounter(); - } - - - void selectIndex(const unsigned num) override final - { - if (!player_node) - return; - - std::vector *const avatars = mBeings->getMembers(); - if (!avatars || avatars->size() <= static_cast(num)) - return; - - const Avatar *const ava = avatars->at(num); - if (ava && player_node) - player_node->navigateTo(ava->getX(), ava->getY()); - } - - void updateNames() - { - if (!socialWindow) - return; - - std::vector *const avatars = mBeings->getMembers(); - if (!avatars) - return; - - const Map *const map = socialWindow->getMap(); - if (!map) - return; - - std::vector::const_iterator i = avatars->begin(); - const std::vector::const_iterator i_end = avatars->end(); - while (i != i_end) - { - Avatar *const ava = *i; - if (!ava) - break; - - const MapItem *const item = map->findPortalXY( - ava->getX(), ava->getY()); - if (item) - { - const std::string name = strprintf("%s [%d %d]", - item->getComment().c_str(), item->getX(), item->getY()); - ava->setName(name); - ava->setOriginalName(name); - } - - ++i; - } - } - - int getPortalIndex(const int x, const int y) - { - if (!socialWindow) - return -1; - - std::vector *const avatars = mBeings->getMembers(); - if (!avatars) - return -1; - - const Map *const map = socialWindow->getMap(); - if (!map) - return -1; - - std::vector::const_iterator i = avatars->begin(); - const std::vector::const_iterator i_end = avatars->end(); - unsigned num = 0; - while (i != i_end) - { - const Avatar *const ava = *i; - if (!ava) - break; - - if (ava->getX() == x && ava->getY() == y) - return num; - - ++i; - num ++; - } - return -1; - } - - void addPortal(const int x, const int y) - { - if (!socialWindow || !player_node) - return; - - const Map *const map = socialWindow->getMap(); - if (!map) - return; - - std::vector *const avatars = mBeings->getMembers(); - - if (!avatars) - return; - - const MapItem *const portal = map->findPortalXY(x, y); - if (!portal) - return; - - const std::string name = strprintf("%s [%d %d]", - portal->getComment().c_str(), x, y); - - Avatar *const ava = new Avatar(name); - if (player_node) - ava->setOnline(player_node->isReachable(x, y, true)); - else - ava->setOnline(false); - ava->setLevel(-1); - ava->setType(portal->getType()); - ava->setX(x); - ava->setY(y); - avatars->push_back(ava); - } - - void removePortal(const int x, const int y) - { - if (!socialWindow || !player_node) - return; - - const Map *const map = socialWindow->getMap(); - if (!map) - return; - - std::vector *const avatars = mBeings->getMembers(); - - if (!avatars) - return; - - std::vector::iterator i = avatars->begin(); - const std::vector::iterator i_end = avatars->end(); - - while (i != i_end) - { - Avatar *ava = (*i); - - if (!ava) - break; - - if (ava->getX() == x && ava->getY() == y) - { - delete ava; - avatars->erase(i); - return; - } - - ++ i; - } - } - -private: - BeingsListModel *mBeings; -}; - - #define addAvatars(mob, str, type) \ {\ ava = new Avatar(str);\ -- cgit v1.2.3-60-g2f50