4 files changed, 109 insertions, 1 deletions
diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp
index 675ad8e86..4829b6789 100644
--- a/src/gui/theme.cpp
+++ b/src/gui/theme.cpp
@@ -726,6 +726,8 @@ static int readColorType(const std::string &type)
         "GUILD_SOCIAL_TAB_OUTLINE",
         "GM_CHAT_TAB",
         "GM_CHAT_TAB_OUTLINE",
+        "CLAN_CHAT_TAB",
+        "CLAN_CHAT_TAB_OUTLINE",
         "BATTLE_CHAT_TAB_HIGHLIGHTED",
         "BATTLE_CHAT_TAB_HIGHLIGHTED_OUTLINE",
         "CHANNEL_CHAT_TAB_HIGHLIGHTED",
@@ -740,6 +742,8 @@ static int readColorType(const std::string &type)
         "GUILD_SOCIAL_TAB_HIGHLIGHTED_OUTLINE",
         "GM_CHAT_TAB_HIGHLIGHTED",
         "GM_CHAT_TAB_HIGHLIGHTED_OUTLINE",
+        "CLAN_CHAT_TAB_HIGHLIGHTED",
+        "CLAN_CHAT_TAB_HIGHLIGHTED_OUTLINE",
         "BATTLE_CHAT_TAB_SELECTED",
         "BATTLE_CHAT_TAB_SELECTED_OUTLINE",
         "CHANNEL_CHAT_TAB_SELECTED",
@@ -754,6 +758,8 @@ static int readColorType(const std::string &type)
         "GUILD_SOCIAL_TAB_SELECTED_OUTLINE",
         "GM_CHAT_TAB_SELECTED",
         "GM_CHAT_TAB_SELECTED_OUTLINE",
+        "CLAN_CHAT_TAB_SELECTED",
+        "CLAN_CHAT_TAB_SELECTED_OUTLINE",
         "BACKGROUND",
         "BACKGROUND_GRAY",
         "SCROLLBAR_GRAY",
diff --git a/src/gui/widgets/tabs/chat/clantab.cpp b/src/gui/widgets/tabs/chat/clantab.cpp
new file mode 100644
index 000000000..0f34d30c3
--- /dev/null
+++ b/src/gui/widgets/tabs/chat/clantab.cpp
@@ -0,0 +1,56 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2011-2018  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 "gui/widgets/tabs/chat/clantab.h"
+
+#include "soundmanager.h"
+
+#include "const/sound.h"
+
+#include "gui/windows/chatwindow.h"
+
+#include "net/clanhandler.h"
+
+#include "utils/gettext.h"
+
+#include "debug.h"
+
+ClanTab *clanTab = nullptr;
+
+ClanTab::ClanTab(const Widget2 *const widget) :
+    // TRANSLATORS: clan chat tab name
+    ChatTab(widget, _("Clan"), "", "#Clan", ChatTabType::CLAN)
+{
+    setTabColors(ThemeColorId::CLAN_CHAT_TAB);
+}
+
+ClanTab::~ClanTab()
+{
+}
+
+void ClanTab::handleInput(const std::string &msg)
+{
+    clanHandler->chat(ChatWindow::doReplace(msg));
+}
+
+void ClanTab::playNewMessageSound() const
+{
+    soundManager.playGuiSound(SOUND_GUILD);
+}
diff --git a/src/gui/widgets/tabs/chat/clantab.h b/src/gui/widgets/tabs/chat/clantab.h
new file mode 100644
index 000000000..0b6b1df13
--- /dev/null
+++ b/src/gui/widgets/tabs/chat/clantab.h
@@ -0,0 +1,46 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2011-2018  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 GUI_WIDGETS_TABS_CHAT_CLANTAB_H
+#define GUI_WIDGETS_TABS_CHAT_CLANTAB_H
+
+#include "gui/widgets/tabs/chat/chattab.h"
+
+/**
+ * A tab for a clan chat channel.
+ */
+class ClanTab final : public ChatTab
+{
+    public:
+        explicit ClanTab(const Widget2 *const widget);
+
+        A_DELETE_COPY(ClanTab)
+
+        ~ClanTab() override final;
+
+        void playNewMessageSound() const override final;
+
+    protected:
+        void handleInput(const std::string &msg) override final;
+};
+
+extern ClanTab *clanTab;
+
+#endif  // GUI_WIDGETS_TABS_CHAT_CLANTAB_H
diff --git a/src/gui/widgets/tabs/setup_audio.cpp b/src/gui/widgets/tabs/setup_audio.cpp
index 8d52c4fdb..b11a67287 100644
--- a/src/gui/widgets/tabs/setup_audio.cpp
+++ b/src/gui/widgets/tabs/setup_audio.cpp
@@ -140,7 +140,7 @@ Setup_Audio::Setup_Audio(const Widget2 *const widget) :
         150, OnTheFly_false, MainConfig_true);
 
     // TRANSLATORS: settings option
-    new SetupItemSound(_("Guild / Party message sound"), "",
+    new SetupItemSound(_("Guild / party / clan message sound"), "",
         "soundguild", this, "soundguildEvent", mSoundModel,
         150, OnTheFly_false, MainConfig_true);