summaryrefslogtreecommitdiff
path: root/src/net/ea
diff options
context:
space:
mode:
Diffstat (limited to 'src/net/ea')
-rw-r--r--src/net/ea/gui/guildtab.cpp144
-rw-r--r--src/net/ea/gui/guildtab.h67
-rw-r--r--src/net/ea/guildhandler.cpp5
-rw-r--r--src/net/ea/guildhandler.h7
4 files changed, 7 insertions, 216 deletions
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 <http://www.gnu.org/licenses/>.
- */
-
-#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 <http://www.gnu.org/licenses/>.
- */
-
-#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
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-11 06:45:17 +0000