From 4e8fa233199a83d9745c708316c28a55cdb1197c Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 16 May 2014 23:17:38 +0300 Subject: Move socialguildtab into separate file. --- src/CMakeLists.txt | 1 + src/Makefile.am | 1 + src/gui/widgets/tabs/socialguildtab.h | 175 ++++++++++++++++++++++++++++++++++ src/gui/windows/socialwindow.cpp | 141 +-------------------------- 4 files changed, 178 insertions(+), 140 deletions(-) create mode 100644 src/gui/widgets/tabs/socialguildtab.h (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2b177e673..a03bed29d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -260,6 +260,7 @@ SET(SRCS gui/widgets/sliderlist.h gui/widgets/tabs/shortcuttab.h gui/widgets/tabs/skilltab.h + gui/widgets/tabs/socialguildtab.h gui/widgets/tabs/socialtab.h gui/widgets/tabs/tab.cpp gui/widgets/tabs/tab.h diff --git a/src/Makefile.am b/src/Makefile.am index 7ad4eacf1..e703de911 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -358,6 +358,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ gui/widgets/sliderlist.h \ gui/widgets/tabs/shortcuttab.h \ gui/widgets/tabs/skilltab.h \ + gui/widgets/tabs/socialguildtab.h \ gui/widgets/tabs/socialtab.h \ gui/widgets/tabs/tab.cpp \ gui/widgets/tabs/tab.h \ diff --git a/src/gui/widgets/tabs/socialguildtab.h b/src/gui/widgets/tabs/socialguildtab.h new file mode 100644 index 000000000..d88387930 --- /dev/null +++ b/src/gui/widgets/tabs/socialguildtab.h @@ -0,0 +1,175 @@ +/* + * The ManaPlus Client + * Copyright (C) 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_WIDGETS_TABS_SOCIALGUILDTAB_H +#define GUI_WIDGETS_TABS_SOCIALGUILDTAB_H + +#include "gui/widgets/tabs/socialtab.h" + +#include "utils/delete2.h" +#include "utils/gettext.h" + +#include "net/net.h" +#include "net/guildhandler.h" + +#include "localconsts.h" + +class SocialGuildTab final : public SocialTab, + public ActionListener +{ + public: + SocialGuildTab(const Widget2 *const widget, + Guild *const guild, + const bool showBackground) : + SocialTab(widget), + ActionListener(), + mGuild(guild) + { + // TRANSLATORS: tab in social window + setCaption(_("Guild")); + + setTabColor(&getThemeColor(Theme::GUILD_SOCIAL_TAB), + &getThemeColor(Theme::GUILD_SOCIAL_TAB_OUTLINE)); + setHighlightedTabColor(&getThemeColor( + Theme::GUILD_SOCIAL_TAB_HIGHLIGHTED), &getThemeColor( + Theme::GUILD_SOCIAL_TAB_HIGHLIGHTED_OUTLINE)); + setSelectedTabColor(&getThemeColor(Theme::GUILD_SOCIAL_TAB_SELECTED), + &getThemeColor(Theme::GUILD_SOCIAL_TAB_SELECTED_OUTLINE)); + + mList = new AvatarListBox(this, guild); + mList->postInit(); + mScroll = new ScrollArea(this, mList, showBackground, + "social_background.xml"); + + mScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_AUTO); + mScroll->setVerticalScrollPolicy(ScrollArea::SHOW_ALWAYS); + } + + A_DELETE_COPY(SocialGuildTab) + + ~SocialGuildTab() + { + delete2(mList) + delete2(mScroll) + } + + void action(const ActionEvent &event) override final + { + const std::string &eventId = event.getId(); + if (eventId == "do invite") + { + const std::string name = mInviteDialog->getText(); + Net::getGuildHandler()->invite(mGuild->getId(), name); + + if (localChatTab) + { + localChatTab->chatLog(strprintf( + // TRANSLATORS: chat message + _("Invited user %s to guild %s."), + name.c_str(), mGuild->getName().c_str()), ChatMsgType::BY_SERVER); + } + mInviteDialog = nullptr; + } + else if (eventId == "~do invite") + { + mInviteDialog = nullptr; + } + else if (eventId == "yes") + { + Net::getGuildHandler()->leave(mGuild->getId()); + if (localChatTab) + { + // TRANSLATORS: chat message + localChatTab->chatLog(strprintf(_("Guild %s quit requested."), + mGuild->getName().c_str()), ChatMsgType::BY_SERVER); + } + mConfirmDialog = nullptr; + } + else if (eventId == "~yes") + { + mConfirmDialog = nullptr; + } + } + + void invite() override final + { + // TRANSLATORS: guild invite message + mInviteDialog = new TextDialog(_("Member Invite to Guild"), + // TRANSLATORS: guild invite message + strprintf(_("Who would you like to invite to guild %s?"), + mGuild->getName().c_str()), socialWindow); + mInviteDialog->postInit(); + mInviteDialog->setActionEventId("do invite"); + mInviteDialog->addActionListener(this); + } + + void leave() override final + { + // TRANSLATORS: guild leave message + mConfirmDialog = new ConfirmDialog(_("Leave Guild?"), + // TRANSLATORS: guild leave message + strprintf(_("Are you sure you want to leave guild %s?"), + mGuild->getName().c_str()), SOUND_REQUEST, socialWindow); + mConfirmDialog->postInit(); + mConfirmDialog->addActionListener(this); + } + + void buildCounter(const int online0, const int total0) + { + if (online0 || total0) + { + // TRANSLATORS: social window label + mCounterString = strprintf(_("Members: %u/%u"), + static_cast(online0), + static_cast(total0)); + } + else + { + if (!player_node) + return; + + const Guild *const guild = player_node->getGuild(); + if (!guild) + return; + + const Guild::MemberList *const members = guild->getMembers(); + int online = 0; + int total = 0; + FOR_EACHP (Guild::MemberList::const_iterator, it, members) + { + if ((*it)->getOnline()) + online ++; + total ++; + } + + // TRANSLATORS: social window label + mCounterString = strprintf(_("Players: %u/%u"), + static_cast(online), + static_cast(total)); + } + updateCounter(); + } + + private: + Guild *mGuild; +}; + +#endif // GUI_WIDGETS_TABS_SOCIALGUILDTAB_H diff --git a/src/gui/windows/socialwindow.cpp b/src/gui/windows/socialwindow.cpp index eb16cddf8..487bbcc2e 100644 --- a/src/gui/windows/socialwindow.cpp +++ b/src/gui/windows/socialwindow.cpp @@ -55,7 +55,7 @@ #include "gui/widgets/tabbedarea.h" #include "gui/widgets/tabs/chattab.h" -#include "gui/widgets/tabs/socialtab.h" +#include "gui/widgets/tabs/socialguildtab.h" #include "net/net.h" #include "net/guildhandler.h" @@ -95,145 +95,6 @@ namespace } friendSorter; } // namespace -class SocialGuildTab final : public SocialTab, public ActionListener -{ -public: - SocialGuildTab(const Widget2 *const widget, - Guild *const guild, - const bool showBackground) : - SocialTab(widget), - ActionListener(), - mGuild(guild) - { - // TRANSLATORS: tab in social window - setCaption(_("Guild")); - - setTabColor(&getThemeColor(Theme::GUILD_SOCIAL_TAB), - &getThemeColor(Theme::GUILD_SOCIAL_TAB_OUTLINE)); - setHighlightedTabColor(&getThemeColor( - Theme::GUILD_SOCIAL_TAB_HIGHLIGHTED), &getThemeColor( - Theme::GUILD_SOCIAL_TAB_HIGHLIGHTED_OUTLINE)); - setSelectedTabColor(&getThemeColor(Theme::GUILD_SOCIAL_TAB_SELECTED), - &getThemeColor(Theme::GUILD_SOCIAL_TAB_SELECTED_OUTLINE)); - - mList = new AvatarListBox(this, guild); - mList->postInit(); - mScroll = new ScrollArea(this, mList, showBackground, - "social_background.xml"); - - mScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_AUTO); - mScroll->setVerticalScrollPolicy(ScrollArea::SHOW_ALWAYS); - } - - A_DELETE_COPY(SocialGuildTab) - - ~SocialGuildTab() - { - delete2(mList) - delete2(mScroll) - } - - void action(const ActionEvent &event) override final - { - const std::string &eventId = event.getId(); - if (eventId == "do invite") - { - const std::string name = mInviteDialog->getText(); - Net::getGuildHandler()->invite(mGuild->getId(), name); - - if (localChatTab) - { - localChatTab->chatLog(strprintf( - // TRANSLATORS: chat message - _("Invited user %s to guild %s."), - name.c_str(), mGuild->getName().c_str()), ChatMsgType::BY_SERVER); - } - mInviteDialog = nullptr; - } - else if (eventId == "~do invite") - { - mInviteDialog = nullptr; - } - else if (eventId == "yes") - { - Net::getGuildHandler()->leave(mGuild->getId()); - if (localChatTab) - { - // TRANSLATORS: chat message - localChatTab->chatLog(strprintf(_("Guild %s quit requested."), - mGuild->getName().c_str()), ChatMsgType::BY_SERVER); - } - mConfirmDialog = nullptr; - } - else if (eventId == "~yes") - { - mConfirmDialog = nullptr; - } - } - - void invite() override final - { - // TRANSLATORS: guild invite message - mInviteDialog = new TextDialog(_("Member Invite to Guild"), - // TRANSLATORS: guild invite message - strprintf(_("Who would you like to invite to guild %s?"), - mGuild->getName().c_str()), socialWindow); - mInviteDialog->postInit(); - mInviteDialog->setActionEventId("do invite"); - mInviteDialog->addActionListener(this); - } - - void leave() override final - { - // TRANSLATORS: guild leave message - mConfirmDialog = new ConfirmDialog(_("Leave Guild?"), - // TRANSLATORS: guild leave message - strprintf(_("Are you sure you want to leave guild %s?"), - mGuild->getName().c_str()), SOUND_REQUEST, socialWindow); - mConfirmDialog->postInit(); - mConfirmDialog->addActionListener(this); - } - - void buildCounter(const int online0, const int total0) - { - if (online0 || total0) - { - // TRANSLATORS: social window label - mCounterString = strprintf(_("Members: %u/%u"), - static_cast(online0), - static_cast(total0)); - } - else - { - if (!player_node) - return; - - const Guild *const guild = player_node->getGuild(); - if (!guild) - return; - - const Guild::MemberList *const members = guild->getMembers(); - int online = 0; - int total = 0; - FOR_EACHP (Guild::MemberList::const_iterator, it, members) - { - if ((*it)->getOnline()) - online ++; - total ++; - } - - // TRANSLATORS: social window label - mCounterString = strprintf(_("Players: %u/%u"), - static_cast(online), - static_cast(total)); - } - updateCounter(); - } - -private: - Guild *mGuild; -}; - class SocialGuildTab2 final : public SocialTab, public ActionListener { public: -- cgit v1.2.3-60-g2f50