From c9d8a97059e24d24011870fae89199e1cb44e5ef Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 12 Oct 2014 13:54:02 +0300 Subject: Move GuildTab from net namespace into gui. --- src/CMakeLists.txt | 8 +- src/Makefile.am | 4 +- src/gui/widgets/tabs/chat/guildtab.cpp | 143 ++++++++++++++++++++++++++++++++ src/gui/widgets/tabs/chat/guildtab.h | 62 ++++++++++++++ src/net/ea/gui/guildtab.cpp | 144 --------------------------------- src/net/ea/gui/guildtab.h | 67 --------------- src/net/ea/guildhandler.cpp | 5 +- src/net/ea/guildhandler.h | 7 +- src/net/eathena/generalhandler.cpp | 4 +- src/net/eathena/guildhandler.cpp | 12 +-- src/net/eathena/guildhandler.h | 1 - src/net/tmwa/generalhandler.cpp | 4 +- src/net/tmwa/guildhandler.cpp | 12 +-- src/net/tmwa/guildhandler.h | 3 +- 14 files changed, 236 insertions(+), 240 deletions(-) create mode 100644 src/gui/widgets/tabs/chat/guildtab.cpp create mode 100644 src/gui/widgets/tabs/chat/guildtab.h delete mode 100644 src/net/ea/gui/guildtab.cpp delete mode 100644 src/net/ea/gui/guildtab.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 43a9f748b..f8b42f8c7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -174,6 +174,10 @@ SET(SRCS gui/widgets/tabs/chat/emulateguildtab.h gui/widgets/tabs/chat/gmtab.cpp gui/widgets/tabs/chat/gmtab.h + gui/widgets/tabs/chat/guildtab.cpp + gui/widgets/tabs/chat/guildtab.h + net/ea/gui/partytab.cpp + net/ea/gui/partytab.h gui/widgets/horizontcontainer.cpp gui/widgets/horizontcontainer.h gui/widgets/icon.cpp @@ -1250,10 +1254,6 @@ SET(DYE_CMD_SRCS ) SET(SRCS_EVOL - net/ea/gui/guildtab.cpp - net/ea/gui/guildtab.h - net/ea/gui/partytab.cpp - net/ea/gui/partytab.h net/ea/adminhandler.cpp net/ea/adminhandler.h net/ea/beinghandler.cpp diff --git a/src/Makefile.am b/src/Makefile.am index aed69a54d..a85149b8e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1182,8 +1182,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ resources/map/walklayer.cpp \ resources/map/walklayer.h \ winver.h \ - net/ea/gui/guildtab.cpp \ - net/ea/gui/guildtab.h \ + gui/widgets/tabs/chat/guildtab.cpp \ + gui/widgets/tabs/chat/guildtab.h \ net/ea/gui/partytab.cpp \ net/ea/gui/partytab.h \ net/ea/adminhandler.cpp \ diff --git a/src/gui/widgets/tabs/chat/guildtab.cpp b/src/gui/widgets/tabs/chat/guildtab.cpp new file mode 100644 index 000000000..109c2459b --- /dev/null +++ b/src/gui/widgets/tabs/chat/guildtab.cpp @@ -0,0 +1,143 @@ +/* + * The ManaPlus Client + * Copyright (C) 2008-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 "gui/widgets/tabs/chat/guildtab.h" + +#include "chatlogger.h" +#include "configuration.h" +#include "guild.h" +#include "soundconsts.h" +#include "soundmanager.h" + +#include "net/guildhandler.h" + +#include "gui/windows/chatwindow.h" + +#include "utils/gettext.h" + +#include "debug.h" + +namespace Ea +{ + extern Guild *taGuild; +} // namespace Ea + +GuildTab::GuildTab(const Widget2 *const widget) : + // TRANSLATORS: guild chat tab name + ChatTab(widget, _("Guild"), "") +{ + setTabColor(&getThemeColor(Theme::GUILD_CHAT_TAB), + &getThemeColor(Theme::GUILD_CHAT_TAB_OUTLINE)); + setHighlightedTabColor(&getThemeColor(Theme::GUILD_CHAT_TAB_HIGHLIGHTED), + &getThemeColor(Theme::GUILD_CHAT_TAB_HIGHLIGHTED_OUTLINE)); + setSelectedTabColor(&getThemeColor(Theme::GUILD_CHAT_TAB_SELECTED), + &getThemeColor(Theme::GUILD_CHAT_TAB_SELECTED_OUTLINE)); + mShowOnline = config.getBoolValue("showGuildOnline"); + config.addListener("showGuildOnline", this); +} + +GuildTab::~GuildTab() +{ + config.removeListeners(this); + CHECKLISTENERS +} + +bool GuildTab::handleCommand(const std::string &restrict type, + const std::string &restrict args) +{ +/* + else if (type == "create" || type == "new") + { + if (args.empty()) + chatLog(_("Guild name is missing."), ChatMsgType::BY_SERVER); + else + guildHandler->create(args); + } +*/ + if (type == "invite" && Ea::taGuild) + { + guildHandler->invite(Ea::taGuild->getId(), args); + } + else if (type == "leave" && Ea::taGuild) + { + guildHandler->leave(Ea::taGuild->getId()); + } + else if (type == "kick" && Ea::taGuild) + { + guildHandler->kick(Ea::taGuild->getMember(args), ""); + } + else if (type == "notice" && Ea::taGuild) + { + std::string str1 = args.substr(0, 60); + std::string str2(""); + if (args.size() > 60) + str2 = args.substr(60); + guildHandler->changeNotice(Ea::taGuild->getId(), str1, str2); + } + else + { + return false; + } + + return true; +} + +void GuildTab::handleInput(const std::string &msg) +{ + if (!Ea::taGuild) + return; + + guildHandler->chat(Ea::taGuild->getId(), + ChatWindow::doReplace(msg)); +} + +void GuildTab::getAutoCompleteList(StringVect &names) const +{ + if (Ea::taGuild) + Ea::taGuild->getNames(names); +} + +void GuildTab::getAutoCompleteCommands(StringVect &names) const +{ + names.push_back("/help"); + names.push_back("/invite "); + names.push_back("/kick "); + names.push_back("/notice "); + names.push_back("/leave"); +} + +void GuildTab::saveToLogFile(const std::string &msg) const +{ + if (chatLogger) + chatLogger->log("#Guild", msg); +} + +void GuildTab::playNewMessageSound() const +{ + soundManager.playGuiSound(SOUND_GUILD); +} + +void GuildTab::optionChanged(const std::string &value) +{ + if (value == "showGuildOnline") + mShowOnline = config.getBoolValue("showGuildOnline"); +} diff --git a/src/gui/widgets/tabs/chat/guildtab.h b/src/gui/widgets/tabs/chat/guildtab.h new file mode 100644 index 000000000..e7c38368d --- /dev/null +++ b/src/gui/widgets/tabs/chat/guildtab.h @@ -0,0 +1,62 @@ +/* + * The ManaPlus Client + * Copyright (C) 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_WIDGETS_TABS_CHAT_GUILDTAB_H +#define GUI_WIDGETS_TABS_CHAT_GUILDTAB_H + +#include "gui/widgets/tabs/chat/chattab.h" +#include "gui/widgets/tabs/chat/chattabtype.h" + +/** + * A tab for a guild chat channel. + */ +class GuildTab notfinal : public ChatTab, + public ConfigListener +{ + public: + explicit GuildTab(const Widget2 *const widget); + + A_DELETE_COPY(GuildTab) + + virtual ~GuildTab(); + + bool handleCommand(const std::string &restrict type, + const std::string &restrict args) override final; + + void saveToLogFile(const std::string &msg) const override final; + + int getType() const override final A_WARN_UNUSED + { return ChatTabType::GUILD; } + + void playNewMessageSound() const override final; + + void optionChanged(const std::string &value) override final; + + protected: + void handleInput(const std::string &msg) override final; + + void getAutoCompleteList(StringVect &names) const override final; + + void getAutoCompleteCommands(StringVect &names) const override final; +}; + +#endif // GUI_WIDGETS_TABS_CHAT_GUILDTAB_H diff --git a/src/net/ea/gui/guildtab.cpp b/src/net/ea/gui/guildtab.cpp deleted file mode 100644 index 044df87e7..000000000 --- a/src/net/ea/gui/guildtab.cpp +++ /dev/null @@ -1,144 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2008-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 "net/ea/gui/guildtab.h" - -#include "chatlogger.h" -#include "configuration.h" -#include "guild.h" -#include "soundconsts.h" -#include "soundmanager.h" - -#include "net/guildhandler.h" - -#include "gui/windows/chatwindow.h" - -#include "utils/gettext.h" - -#include "debug.h" - -namespace Ea -{ -extern Guild *taGuild; - -GuildTab::GuildTab(const Widget2 *const widget) : - // TRANSLATORS: guild chat tab name - ChatTab(widget, _("Guild"), "") -{ - setTabColor(&getThemeColor(Theme::GUILD_CHAT_TAB), - &getThemeColor(Theme::GUILD_CHAT_TAB_OUTLINE)); - setHighlightedTabColor(&getThemeColor(Theme::GUILD_CHAT_TAB_HIGHLIGHTED), - &getThemeColor(Theme::GUILD_CHAT_TAB_HIGHLIGHTED_OUTLINE)); - setSelectedTabColor(&getThemeColor(Theme::GUILD_CHAT_TAB_SELECTED), - &getThemeColor(Theme::GUILD_CHAT_TAB_SELECTED_OUTLINE)); - mShowOnline = config.getBoolValue("showGuildOnline"); - config.addListener("showGuildOnline", this); -} - -GuildTab::~GuildTab() -{ - config.removeListeners(this); - CHECKLISTENERS -} - -bool GuildTab::handleCommand(const std::string &restrict type, - const std::string &restrict args) -{ -/* - else if (type == "create" || type == "new") - { - if (args.empty()) - chatLog(_("Guild name is missing."), ChatMsgType::BY_SERVER); - else - guildHandler->create(args); - } -*/ - if (type == "invite" && taGuild) - { - guildHandler->invite(taGuild->getId(), args); - } - else if (type == "leave" && taGuild) - { - guildHandler->leave(taGuild->getId()); - } - else if (type == "kick" && taGuild) - { - guildHandler->kick(taGuild->getMember(args), ""); - } - else if (type == "notice" && taGuild) - { - std::string str1 = args.substr(0, 60); - std::string str2(""); - if (args.size() > 60) - str2 = args.substr(60); - guildHandler->changeNotice(taGuild->getId(), str1, str2); - } - else - { - return false; - } - - return true; -} - -void GuildTab::handleInput(const std::string &msg) -{ - if (!taGuild) - return; - - guildHandler->chat(taGuild->getId(), - ChatWindow::doReplace(msg)); -} - -void GuildTab::getAutoCompleteList(StringVect &names) const -{ - if (taGuild) - taGuild->getNames(names); -} - -void GuildTab::getAutoCompleteCommands(StringVect &names) const -{ - names.push_back("/help"); - names.push_back("/invite "); - names.push_back("/kick "); - names.push_back("/notice "); - names.push_back("/leave"); -} - -void GuildTab::saveToLogFile(const std::string &msg) const -{ - if (chatLogger) - chatLogger->log("#Guild", msg); -} - -void GuildTab::playNewMessageSound() const -{ - soundManager.playGuiSound(SOUND_GUILD); -} - -void GuildTab::optionChanged(const std::string &value) -{ - if (value == "showGuildOnline") - mShowOnline = config.getBoolValue("showGuildOnline"); -} - -} // namespace Ea diff --git a/src/net/ea/gui/guildtab.h b/src/net/ea/gui/guildtab.h deleted file mode 100644 index 01965f538..000000000 --- a/src/net/ea/gui/guildtab.h +++ /dev/null @@ -1,67 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 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 NET_EA_GUI_GUILDTAB_H -#define NET_EA_GUI_GUILDTAB_H - -#include "gui/widgets/tabs/chat/chattab.h" -#include "gui/widgets/tabs/chat/chattabtype.h" - -namespace Ea -{ - -/** - * A tab for a guild chat channel. - */ -class GuildTab notfinal : public ChatTab, - public ConfigListener -{ - public: - explicit GuildTab(const Widget2 *const widget); - - A_DELETE_COPY(GuildTab) - - virtual ~GuildTab(); - - bool handleCommand(const std::string &restrict type, - const std::string &restrict args) override final; - - void saveToLogFile(const std::string &msg) const override final; - - int getType() const override final A_WARN_UNUSED - { return ChatTabType::GUILD; } - - void playNewMessageSound() const override final; - - void optionChanged(const std::string &value) override final; - - protected: - void handleInput(const std::string &msg) override final; - - void getAutoCompleteList(StringVect &names) const override final; - - void getAutoCompleteCommands(StringVect &names) const override final; -}; - -} // namespace Ea - -#endif // NET_EA_GUI_GUILDTAB_H diff --git a/src/net/ea/guildhandler.cpp b/src/net/ea/guildhandler.cpp index ebbb93eaf..605adbebf 100644 --- a/src/net/ea/guildhandler.cpp +++ b/src/net/ea/guildhandler.cpp @@ -32,7 +32,7 @@ #include "net/messagein.h" -#include "net/ea/gui/guildtab.h" +#include "gui/widgets/tabs/chat/guildtab.h" #include "utils/delete2.h" #include "utils/gettext.h" @@ -42,9 +42,10 @@ #include "debug.h" +GuildTab *guildTab = nullptr; + namespace Ea { -GuildTab *guildTab = nullptr; Guild *taGuild = nullptr; GuildHandler::GuildHandler() : diff --git a/src/net/ea/guildhandler.h b/src/net/ea/guildhandler.h index 3c7446605..fb5bc1a6c 100644 --- a/src/net/ea/guildhandler.h +++ b/src/net/ea/guildhandler.h @@ -29,10 +29,10 @@ namespace Net class MessageIn; } -namespace Ea -{ class GuildTab; +namespace Ea +{ class GuildHandler notfinal : public Net::GuildHandler { public: @@ -106,7 +106,8 @@ class GuildHandler notfinal : public Net::GuildHandler }; extern Guild *taGuild; -extern GuildTab *guildTab; } // namespace Ea +extern GuildTab *guildTab; + #endif // NET_EA_GUILDHANDLER_H diff --git a/src/net/eathena/generalhandler.cpp b/src/net/eathena/generalhandler.cpp index 2bf88ed68..25a036bb4 100644 --- a/src/net/eathena/generalhandler.cpp +++ b/src/net/eathena/generalhandler.cpp @@ -35,7 +35,7 @@ #include "net/ea/guildhandler.h" -#include "net/ea/gui/guildtab.h" +#include "gui/widgets/tabs/chat/guildtab.h" #include "net/ea/gui/partytab.h" #include "net/eathena/adminhandler.h" @@ -379,7 +379,7 @@ void GeneralHandler::gameEnded() const socialWindow->removeTab(Ea::taParty); } - delete2(Ea::guildTab); + delete2(guildTab); delete2(Ea::partyTab); } diff --git a/src/net/eathena/guildhandler.cpp b/src/net/eathena/guildhandler.cpp index a1ea449c5..f64569d10 100644 --- a/src/net/eathena/guildhandler.cpp +++ b/src/net/eathena/guildhandler.cpp @@ -30,7 +30,7 @@ #include "gui/windows/chatwindow.h" #include "gui/windows/socialwindow.h" -#include "net/ea/gui/guildtab.h" +#include "gui/widgets/tabs/chat/guildtab.h" #include "net/eathena/messageout.h" #include "net/eathena/protocol.h" @@ -372,11 +372,11 @@ void GuildHandler::processGuildPositionInfo(Net::MessageIn &msg) const g->setEmblemId(emblem); if (!Ea::taGuild) Ea::taGuild = g; - if (!Ea::guildTab && chatWindow) + if (!guildTab && chatWindow) { - Ea::guildTab = new Ea::GuildTab(chatWindow); + guildTab = new GuildTab(chatWindow); if (config.getBoolValue("showChatHistory")) - Ea::guildTab->loadFromLogFile("#Guild"); + guildTab->loadFromLogFile("#Guild"); if (localPlayer) localPlayer->addGuild(Ea::taGuild); memberList(guildId); @@ -406,8 +406,8 @@ void GuildHandler::processGuildMemberLogin(Net::MessageIn &msg) const m->setOnline(online); if (online) m->setGender(gender); - if (Ea::guildTab) - Ea::guildTab->showOnline(m->getName(), online); + if (guildTab) + guildTab->showOnline(m->getName(), online); if (socialWindow) socialWindow->updateGuildCounter(); } diff --git a/src/net/eathena/guildhandler.h b/src/net/eathena/guildhandler.h index af070a3e3..8b19ea51d 100644 --- a/src/net/eathena/guildhandler.h +++ b/src/net/eathena/guildhandler.h @@ -85,7 +85,6 @@ class GuildHandler final : public Ea::GuildHandler, public MessageHandler void processGuildExpulsionList(Net::MessageIn &msg) const; }; -// extern Ea::GuildTab *guildTab; } // namespace EAthena namespace Ea diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp index 9bd209354..fb64617a0 100644 --- a/src/net/tmwa/generalhandler.cpp +++ b/src/net/tmwa/generalhandler.cpp @@ -35,7 +35,7 @@ #include "net/ea/guildhandler.h" -#include "net/ea/gui/guildtab.h" +#include "gui/widgets/tabs/chat/guildtab.h" #include "net/ea/gui/partytab.h" #include "net/tmwa/adminhandler.h" @@ -351,7 +351,7 @@ void GeneralHandler::gameEnded() const socialWindow->removeTab(Ea::taParty); } - delete2(Ea::guildTab); + delete2(guildTab); delete2(Ea::partyTab); } diff --git a/src/net/tmwa/guildhandler.cpp b/src/net/tmwa/guildhandler.cpp index a22cd69b0..3e9faa4c8 100644 --- a/src/net/tmwa/guildhandler.cpp +++ b/src/net/tmwa/guildhandler.cpp @@ -32,7 +32,7 @@ #include "net/serverfeatures.h" -#include "net/ea/gui/guildtab.h" +#include "gui/widgets/tabs/chat/guildtab.h" #include "net/tmwa/messageout.h" #include "net/tmwa/protocol.h" @@ -360,11 +360,11 @@ void GuildHandler::processGuildPositionInfo(Net::MessageIn &msg) const g->setEmblemId(emblem); if (!Ea::taGuild) Ea::taGuild = g; - if (!Ea::guildTab && chatWindow) + if (!guildTab && chatWindow) { - Ea::guildTab = new Ea::GuildTab(chatWindow); + guildTab = new GuildTab(chatWindow); if (config.getBoolValue("showChatHistory")) - Ea::guildTab->loadFromLogFile("#Guild"); + guildTab->loadFromLogFile("#Guild"); if (localPlayer) localPlayer->addGuild(Ea::taGuild); memberList(guildId); @@ -391,8 +391,8 @@ void GuildHandler::processGuildMemberLogin(Net::MessageIn &msg) const if (m) { m->setOnline(online); - if (Ea::guildTab) - Ea::guildTab->showOnline(m->getName(), online); + if (guildTab) + guildTab->showOnline(m->getName(), online); if (socialWindow) socialWindow->updateGuildCounter(); } diff --git a/src/net/tmwa/guildhandler.h b/src/net/tmwa/guildhandler.h index 35f10bbbf..506de89dd 100644 --- a/src/net/tmwa/guildhandler.h +++ b/src/net/tmwa/guildhandler.h @@ -83,9 +83,10 @@ class GuildHandler final : public Ea::GuildHandler, public MessageHandler void processGuildExpulsionList(Net::MessageIn &msg) const; }; - extern Ea::GuildTab *guildTab; } // namespace TmwAthena +extern GuildTab *guildTab; + namespace Ea { extern Guild *taGuild; -- cgit v1.2.3-60-g2f50