From 3121b17f34cb74e1b54ef5bde8b3937627d79d91 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 12 Oct 2014 13:20:31 +0300 Subject: Rename guildchattab into emulateguildtab. --- src/CMakeLists.txt | 4 +- src/Makefile.am | 4 +- src/gui/widgets/tabs/chat/emulateguildtab.cpp | 113 ++++++++++++++++++++++++++ src/gui/widgets/tabs/chat/emulateguildtab.h | 62 ++++++++++++++ src/gui/widgets/tabs/chat/guildchattab.cpp | 113 -------------------------- src/gui/widgets/tabs/chat/guildchattab.h | 62 -------------- src/guildmanager.cpp | 4 +- src/guildmanager.h | 4 +- 8 files changed, 183 insertions(+), 183 deletions(-) create mode 100644 src/gui/widgets/tabs/chat/emulateguildtab.cpp create mode 100644 src/gui/widgets/tabs/chat/emulateguildtab.h delete mode 100644 src/gui/widgets/tabs/chat/guildchattab.cpp delete mode 100644 src/gui/widgets/tabs/chat/guildchattab.h (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f88213bb5..43a9f748b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -170,10 +170,10 @@ SET(SRCS gui/models/langlistmodel.h gui/widgets/flowcontainer.cpp gui/widgets/flowcontainer.h + gui/widgets/tabs/chat/emulateguildtab.cpp + gui/widgets/tabs/chat/emulateguildtab.h gui/widgets/tabs/chat/gmtab.cpp gui/widgets/tabs/chat/gmtab.h - gui/widgets/tabs/chat/guildchattab.cpp - gui/widgets/tabs/chat/guildchattab.h gui/widgets/horizontcontainer.cpp gui/widgets/horizontcontainer.h gui/widgets/icon.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 3693d270e..aed69a54d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -292,10 +292,10 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ gui/models/langlistmodel.h \ gui/widgets/flowcontainer.cpp \ gui/widgets/flowcontainer.h \ + gui/widgets/tabs/chat/emulateguildtab.cpp \ + gui/widgets/tabs/chat/emulateguildtab.h \ gui/widgets/tabs/chat/gmtab.cpp \ gui/widgets/tabs/chat/gmtab.h \ - gui/widgets/tabs/chat/guildchattab.cpp \ - gui/widgets/tabs/chat/guildchattab.h \ gui/widgets/guitable.cpp \ gui/widgets/guitable.h \ gui/widgets/horizontcontainer.cpp \ diff --git a/src/gui/widgets/tabs/chat/emulateguildtab.cpp b/src/gui/widgets/tabs/chat/emulateguildtab.cpp new file mode 100644 index 000000000..9c8eb7085 --- /dev/null +++ b/src/gui/widgets/tabs/chat/emulateguildtab.cpp @@ -0,0 +1,113 @@ +/* + * 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/emulateguildtab.h" + +#include "chatlogger.h" +#include "configuration.h" +#include "guildmanager.h" +#include "soundconsts.h" +#include "soundmanager.h" + +#include "gui/windows/chatwindow.h" + +#include "utils/gettext.h" + +#include "debug.h" + +EmulateGuildTab::EmulateGuildTab(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); +} + +EmulateGuildTab::~EmulateGuildTab() +{ + config.removeListeners(this); + CHECKLISTENERS +} + +bool EmulateGuildTab::handleCommand(const std::string &restrict type, + const std::string &restrict args) +{ + if (type == "invite" && guildManager) + guildManager->invite(args); + else if (type == "leave" && guildManager) + guildManager->leave(); + else if (type == "kick" && guildManager) + guildManager->kick(args); + else if (type == "notice" && guildManager) + guildManager->notice(args); + else + return false; + + return true; +} + +void EmulateGuildTab::handleInput(const std::string &msg) +{ + if (!guildManager) + return; + guildManager->chat(ChatWindow::doReplace(msg)); +} + +void EmulateGuildTab::getAutoCompleteList(StringVect &names) const +{ + if (!guildManager) + return; + + guildManager->getNames(names); +} + +void EmulateGuildTab::getAutoCompleteCommands(StringVect &names) const +{ + names.push_back("/help"); + names.push_back("/invite "); + names.push_back("/leave"); + names.push_back("/kick "); + names.push_back("/notice "); +} + +void EmulateGuildTab::saveToLogFile(const std::string &msg) const +{ + if (chatLogger) + chatLogger->log("#Guild", msg); +} + +void EmulateGuildTab::playNewMessageSound() const +{ + soundManager.playGuiSound(SOUND_GUILD); +} + +void EmulateGuildTab::optionChanged(const std::string &value) +{ + if (value == "showGuildOnline") + mShowOnline = config.getBoolValue("showGuildOnline"); +} diff --git a/src/gui/widgets/tabs/chat/emulateguildtab.h b/src/gui/widgets/tabs/chat/emulateguildtab.h new file mode 100644 index 000000000..f614fb092 --- /dev/null +++ b/src/gui/widgets/tabs/chat/emulateguildtab.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_EMULATEGUILDTAB_H +#define GUI_WIDGETS_TABS_CHAT_EMULATEGUILDTAB_H + +#include "gui/widgets/tabs/chat/chattab.h" +#include "gui/widgets/tabs/chat/chattabtype.h" + +/** + * Emulate guild tab, because server not support normal guilds. + */ +class EmulateGuildTab final : public ChatTab, + public ConfigListener +{ + public: + explicit EmulateGuildTab(const Widget2 *const widget); + + A_DELETE_COPY(EmulateGuildTab) + + ~EmulateGuildTab(); + + 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 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_EMULATEGUILDTAB_H diff --git a/src/gui/widgets/tabs/chat/guildchattab.cpp b/src/gui/widgets/tabs/chat/guildchattab.cpp deleted file mode 100644 index 8a261c6de..000000000 --- a/src/gui/widgets/tabs/chat/guildchattab.cpp +++ /dev/null @@ -1,113 +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 "gui/widgets/tabs/chat/guildchattab.h" - -#include "chatlogger.h" -#include "configuration.h" -#include "guildmanager.h" -#include "soundconsts.h" -#include "soundmanager.h" - -#include "gui/windows/chatwindow.h" - -#include "utils/gettext.h" - -#include "debug.h" - -GuildChatTab::GuildChatTab(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); -} - -GuildChatTab::~GuildChatTab() -{ - config.removeListeners(this); - CHECKLISTENERS -} - -bool GuildChatTab::handleCommand(const std::string &restrict type, - const std::string &restrict args) -{ - if (type == "invite" && guildManager) - guildManager->invite(args); - else if (type == "leave" && guildManager) - guildManager->leave(); - else if (type == "kick" && guildManager) - guildManager->kick(args); - else if (type == "notice" && guildManager) - guildManager->notice(args); - else - return false; - - return true; -} - -void GuildChatTab::handleInput(const std::string &msg) -{ - if (!guildManager) - return; - guildManager->chat(ChatWindow::doReplace(msg)); -} - -void GuildChatTab::getAutoCompleteList(StringVect &names) const -{ - if (!guildManager) - return; - - guildManager->getNames(names); -} - -void GuildChatTab::getAutoCompleteCommands(StringVect &names) const -{ - names.push_back("/help"); - names.push_back("/invite "); - names.push_back("/leave"); - names.push_back("/kick "); - names.push_back("/notice "); -} - -void GuildChatTab::saveToLogFile(const std::string &msg) const -{ - if (chatLogger) - chatLogger->log("#Guild", msg); -} - -void GuildChatTab::playNewMessageSound() const -{ - soundManager.playGuiSound(SOUND_GUILD); -} - -void GuildChatTab::optionChanged(const std::string &value) -{ - if (value == "showGuildOnline") - mShowOnline = config.getBoolValue("showGuildOnline"); -} diff --git a/src/gui/widgets/tabs/chat/guildchattab.h b/src/gui/widgets/tabs/chat/guildchattab.h deleted file mode 100644 index 3af652928..000000000 --- a/src/gui/widgets/tabs/chat/guildchattab.h +++ /dev/null @@ -1,62 +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 GUI_WIDGETS_TABS_CHAT_GUILDCHATTAB_H -#define GUI_WIDGETS_TABS_CHAT_GUILDCHATTAB_H - -#include "gui/widgets/tabs/chat/chattab.h" -#include "gui/widgets/tabs/chat/chattabtype.h" - -/** - * A tab for a guild chat channel. - */ -class GuildChatTab final : public ChatTab, - public ConfigListener -{ - public: - explicit GuildChatTab(const Widget2 *const widget); - - A_DELETE_COPY(GuildChatTab) - - ~GuildChatTab(); - - 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 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_GUILDCHATTAB_H diff --git a/src/guildmanager.cpp b/src/guildmanager.cpp index 0bde0b5bb..bd3e9b745 100644 --- a/src/guildmanager.cpp +++ b/src/guildmanager.cpp @@ -31,7 +31,7 @@ #include "gui/windows/chatwindow.h" #include "gui/windows/socialwindow.h" -#include "gui/widgets/tabs/chat/guildchattab.h" +#include "gui/widgets/tabs/chat/emulateguildtab.h" #include "net/chathandler.h" #include "net/packetlimiter.h" @@ -229,7 +229,7 @@ void GuildManager::createTab(Guild *const guild) { if (!mTab) { - mTab = new GuildChatTab(chatWindow); + mTab = new EmulateGuildTab(chatWindow); if (config.getBoolValue("showChatHistory")) mTab->loadFromLogFile("#Guild"); if (localPlayer) diff --git a/src/guildmanager.h b/src/guildmanager.h index 4c7c80c4c..d3a8b9ab1 100644 --- a/src/guildmanager.h +++ b/src/guildmanager.h @@ -27,7 +27,7 @@ class ChatTab; class Guild; -class GuildChatTab; +class EmulateGuildTab; class GuildManager final { @@ -92,7 +92,7 @@ class GuildManager final bool mSentNameRequest; bool mHavePower; StringVect mTempList; - GuildChatTab *mTab; + EmulateGuildTab *mTab; bool mRequest; int mRequestTime; bool mGotOnlineInfo; -- cgit v1.2.3-60-g2f50