From 1b989262bdce0080c83aefc258cdbdaa38648b7d Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 12 Oct 2014 12:12:21 +0300 Subject: Move GmTab into chat subdir. --- src/CMakeLists.txt | 4 +-- src/Makefile.am | 4 +-- src/being/localplayer.cpp | 2 +- src/game.cpp | 2 +- src/gui/widgets/tabs/chat/gmtab.cpp | 64 +++++++++++++++++++++++++++++++++++++ src/gui/widgets/tabs/chat/gmtab.h | 54 +++++++++++++++++++++++++++++++ src/gui/widgets/tabs/gmtab.cpp | 64 ------------------------------------- src/gui/widgets/tabs/gmtab.h | 54 ------------------------------- src/net/ea/chathandler.cpp | 2 +- 9 files changed, 125 insertions(+), 125 deletions(-) create mode 100644 src/gui/widgets/tabs/chat/gmtab.cpp create mode 100644 src/gui/widgets/tabs/chat/gmtab.h delete mode 100644 src/gui/widgets/tabs/gmtab.cpp delete mode 100644 src/gui/widgets/tabs/gmtab.h (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d44db537d..b99f99387 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -170,8 +170,8 @@ SET(SRCS gui/models/langlistmodel.h gui/widgets/flowcontainer.cpp gui/widgets/flowcontainer.h - gui/widgets/tabs/gmtab.cpp - gui/widgets/tabs/gmtab.h + gui/widgets/tabs/chat/gmtab.cpp + gui/widgets/tabs/chat/gmtab.h gui/widgets/tabs/guildchattab.cpp gui/widgets/tabs/guildchattab.h gui/widgets/horizontcontainer.cpp diff --git a/src/Makefile.am b/src/Makefile.am index b0d1cce89..21ac9406b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -292,8 +292,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ gui/models/langlistmodel.h \ gui/widgets/flowcontainer.cpp \ gui/widgets/flowcontainer.h \ - gui/widgets/tabs/gmtab.cpp \ - gui/widgets/tabs/gmtab.h \ + gui/widgets/tabs/chat/gmtab.cpp \ + gui/widgets/tabs/chat/gmtab.h \ gui/widgets/tabs/guildchattab.cpp \ gui/widgets/tabs/guildchattab.h \ gui/widgets/guitable.cpp \ diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp index e8cceadae..48be4c5bc 100644 --- a/src/being/localplayer.cpp +++ b/src/being/localplayer.cpp @@ -57,7 +57,7 @@ #include "gui/windows/socialwindow.h" #include "gui/windows/updaterwindow.h" -#include "gui/widgets/tabs/gmtab.h" +#include "gui/widgets/tabs/chat/gmtab.h" #include "gui/widgets/tabs/whispertab.h" #include "net/beinghandler.h" diff --git a/src/game.cpp b/src/game.cpp index dee43777c..5a67595b2 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -88,7 +88,7 @@ #include "gui/widgets/spellshortcutcontainer.h" #include "gui/widgets/virtshortcutcontainer.h" -#include "gui/widgets/tabs/gmtab.h" +#include "gui/widgets/tabs/chat/gmtab.h" #include "gui/widgets/tabs/langtab.h" #include "gui/widgets/tabs/tradetab.h" diff --git a/src/gui/widgets/tabs/chat/gmtab.cpp b/src/gui/widgets/tabs/chat/gmtab.cpp new file mode 100644 index 000000000..2a80b4fd3 --- /dev/null +++ b/src/gui/widgets/tabs/chat/gmtab.cpp @@ -0,0 +1,64 @@ +/* + * The ManaPlus Client + * Copyright (C) 2013-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/gmtab.h" + +#include "chatlogger.h" + +#include "utils/gettext.h" + +#include "debug.h" + +GmTab *gmChatTab = nullptr; + +GmTab::GmTab(const Widget2 *const widget) : + // TRANSLATORS: gb tab name + ChatTab(widget, _("GM"), "") +{ + setTabColor(&getThemeColor(Theme::GM_CHAT_TAB), + &getThemeColor(Theme::GM_CHAT_TAB_OUTLINE)); + setHighlightedTabColor(&getThemeColor(Theme::GM_CHAT_TAB_HIGHLIGHTED), + &getThemeColor(Theme::GM_CHAT_TAB_HIGHLIGHTED_OUTLINE)); + setSelectedTabColor(&getThemeColor(Theme::GM_CHAT_TAB_SELECTED), + &getThemeColor(Theme::GM_CHAT_TAB_SELECTED_OUTLINE)); +} + +GmTab::~GmTab() +{ +} + +void GmTab::handleInput(const std::string &msg) +{ + ChatTab::handleInput("@wgm " + msg); +} + +void GmTab::handleCommand(const std::string &msg A_UNUSED) +{ +} + +void GmTab::saveToLogFile(const std::string &msg) const +{ + if (chatLogger) + chatLogger->log("#GM", msg); +} + +void GmTab::getAutoCompleteList(StringVect &names A_UNUSED) const +{ +} diff --git a/src/gui/widgets/tabs/chat/gmtab.h b/src/gui/widgets/tabs/chat/gmtab.h new file mode 100644 index 000000000..f71f7e14f --- /dev/null +++ b/src/gui/widgets/tabs/chat/gmtab.h @@ -0,0 +1,54 @@ +/* + * The ManaPlus Client + * Copyright (C) 2013-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_GMTAB_H +#define GUI_WIDGETS_TABS_CHAT_GMTAB_H + +#include "gui/widgets/tabs/chat/chattab.h" +#include "gui/widgets/tabs/chat/chattabtype.h" + +/** + * A tab for whispers from a single player. + */ +class GmTab final : public ChatTab +{ + public: + explicit GmTab(const Widget2 *const widget); + + A_DELETE_COPY(GmTab) + + ~GmTab(); + + int getType() const override final A_WARN_UNUSED + { return ChatTabType::GM; } + + void saveToLogFile(const std::string &msg) const override final; + + protected: + void getAutoCompleteList(StringVect &names) const override final; + + void handleInput(const std::string &msg) override final; + + void handleCommand(const std::string &msg) override final; +}; + +extern GmTab *gmChatTab; + +#endif // GUI_WIDGETS_TABS_CHAT_GMTAB_H diff --git a/src/gui/widgets/tabs/gmtab.cpp b/src/gui/widgets/tabs/gmtab.cpp deleted file mode 100644 index a4a4a9022..000000000 --- a/src/gui/widgets/tabs/gmtab.cpp +++ /dev/null @@ -1,64 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2013-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/gmtab.h" - -#include "chatlogger.h" - -#include "utils/gettext.h" - -#include "debug.h" - -GmTab *gmChatTab = nullptr; - -GmTab::GmTab(const Widget2 *const widget) : - // TRANSLATORS: gb tab name - ChatTab(widget, _("GM"), "") -{ - setTabColor(&getThemeColor(Theme::GM_CHAT_TAB), - &getThemeColor(Theme::GM_CHAT_TAB_OUTLINE)); - setHighlightedTabColor(&getThemeColor(Theme::GM_CHAT_TAB_HIGHLIGHTED), - &getThemeColor(Theme::GM_CHAT_TAB_HIGHLIGHTED_OUTLINE)); - setSelectedTabColor(&getThemeColor(Theme::GM_CHAT_TAB_SELECTED), - &getThemeColor(Theme::GM_CHAT_TAB_SELECTED_OUTLINE)); -} - -GmTab::~GmTab() -{ -} - -void GmTab::handleInput(const std::string &msg) -{ - ChatTab::handleInput("@wgm " + msg); -} - -void GmTab::handleCommand(const std::string &msg A_UNUSED) -{ -} - -void GmTab::saveToLogFile(const std::string &msg) const -{ - if (chatLogger) - chatLogger->log("#GM", msg); -} - -void GmTab::getAutoCompleteList(StringVect &names A_UNUSED) const -{ -} diff --git a/src/gui/widgets/tabs/gmtab.h b/src/gui/widgets/tabs/gmtab.h deleted file mode 100644 index ebd171a5e..000000000 --- a/src/gui/widgets/tabs/gmtab.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2013-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_GMTAB_H -#define GUI_WIDGETS_TABS_GMTAB_H - -#include "gui/widgets/tabs/chat/chattab.h" -#include "gui/widgets/tabs/chat/chattabtype.h" - -/** - * A tab for whispers from a single player. - */ -class GmTab final : public ChatTab -{ - public: - explicit GmTab(const Widget2 *const widget); - - A_DELETE_COPY(GmTab) - - ~GmTab(); - - int getType() const override final A_WARN_UNUSED - { return ChatTabType::GM; } - - void saveToLogFile(const std::string &msg) const override final; - - protected: - void getAutoCompleteList(StringVect &names) const override final; - - void handleInput(const std::string &msg) override final; - - void handleCommand(const std::string &msg) override final; -}; - -extern GmTab *gmChatTab; - -#endif // GUI_WIDGETS_TABS_GMTAB_H diff --git a/src/net/ea/chathandler.cpp b/src/net/ea/chathandler.cpp index 8ac0ce6f5..0f5ae0f36 100644 --- a/src/net/ea/chathandler.cpp +++ b/src/net/ea/chathandler.cpp @@ -33,7 +33,7 @@ #include "gui/windows/chatwindow.h" #include "gui/windows/shopwindow.h" -#include "gui/widgets/tabs/gmtab.h" +#include "gui/widgets/tabs/chat/gmtab.h" #include "net/messagein.h" #include "net/serverfeatures.h" -- cgit v1.2.3-70-g09d2