added SpecialChannelPage with a description for /mentions

chatterino.pro

@@ -165,7 +165,8 @@ SOURCES += \
     src/widgets/streamview.cpp \
     src/util/networkrequest.cpp \
     src/widgets/settingspages/ignoreuserspage.cpp \
-    src/widgets/settingspages/ignoremessagespage.cpp
+    src/widgets/settingspages/ignoremessagespage.cpp \
+    src/widgets/settingspages/specialchannelspage.cpp
 
 HEADERS  += \
     src/precompiled_header.hpp \
@@ -270,7 +271,8 @@ HEADERS  += \
     src/util/networkworker.hpp \
     src/util/networkrequester.hpp \
     src/widgets/settingspages/ignoreuserspage.hpp \
-    src/widgets/settingspages/ignoremessagespage.hpp
+    src/widgets/settingspages/ignoremessagespage.hpp \
+    src/widgets/settingspages/specialchannelspage.hpp
 
 RESOURCES += \
     resources/resources.qrc

src/widgets/settingsdialog.cpp

@@ -12,6 +12,7 @@
 #include "widgets/settingspages/ignoreuserspage.hpp"
 #include "widgets/settingspages/logspage.hpp"
 #include "widgets/settingspages/moderationpage.hpp"
+#include "widgets/settingspages/specialchannelspage.hpp"
 
 #include <QDialogButtonBox>
 
@@ -79,11 +80,13 @@ void SettingsDialog::addTabs()
     this->addTab(new settingspages::BehaviourPage);
     this->addTab(new settingspages::CommandPage);
     this->addTab(new settingspages::EmotesPage);
-    this->addTab(new settingspages::IgnoreUsersPage);
-    this->addTab(new settingspages::IgnoreMessagesPage);
     this->addTab(new settingspages::HighlightingPage);
-    //    this->addTab(new settingspages::LogsPage);
+    this->addTab(new settingspages::IgnoreMessagesPage);
+    this->addTab(new settingspages::IgnoreUsersPage);
+    this->addTab(new settingspages::LogsPage);
     this->addTab(new settingspages::ModerationPage);
+    this->addTab(new settingspages::SpecialChannelsPage);
+
     this->ui.tabContainer->addStretch(1);
     this->addTab(new settingspages::AboutPage, Qt::AlignBottom);
 }

src/widgets/settingspages/ignoremessagespage.cpp

@@ -9,7 +9,7 @@ namespace chatterino {
 namespace widgets {
 namespace settingspages {
 IgnoreMessagesPage::IgnoreMessagesPage()
-    : SettingsPage("Ignore Messages", ":/images/theme.svg")
+    : SettingsPage("Ignore Messages", "")
 {
     singletons::SettingManager &settings = singletons::SettingManager::getInstance();
     util::LayoutCreator<IgnoreMessagesPage> layoutCreator(this);

src/widgets/settingspages/ignoreuserspage.cpp

@@ -4,20 +4,21 @@
 #include "util/layoutcreator.hpp"
 
 #include <QCheckBox>
+#include <QGroupBox>
 #include <QLabel>
 #include <QListView>
 #include <QPushButton>
 #include <QVBoxLayout>
 
 // clang-format off
-#define INFO "/ignore <user> in chat ignores a user\n/unignore <user> in chat unignores a user\n\nChatterino uses the twitch api for ignored users so they are shared with the webchat.\nIf you use your own oauth key make sure that it has the correct permissions."
+#define INFO "/ignore <user> in chat ignores a user\n/unignore <user> in chat unignores a user\n\nChatterino uses the twitch api for ignored users so they are shared with the webchat.\nIf you use your own oauth key make sure that it has the correct permissions.\n"
 // clang-format on
 
 namespace chatterino {
 namespace widgets {
 namespace settingspages {
 IgnoreUsersPage::IgnoreUsersPage()
-    : SettingsPage("Ignore Users", ":/images/theme.svg")
+    : SettingsPage("Ignore Users", "")
 {
     singletons::SettingManager &settings = singletons::SettingManager::getInstance();
     util::LayoutCreator<IgnoreUsersPage> layoutCreator(this);
@@ -27,24 +28,27 @@ IgnoreUsersPage::IgnoreUsersPage()
     label->setWordWrap(true);
     label->setStyleSheet("color: #BBB");
 
-    layout.append(
+    auto group = layout.emplace<QGroupBox>("Ignored users").setLayoutType<QVBoxLayout>();
+    {
+        group.append(
             this->createCheckBox("Enable twitch ignored users", settings.enableTwitchIgnoredUsers));
 
-    auto anyways = layout.emplace<QHBoxLayout>().withoutMargin();
+        auto anyways = group.emplace<QHBoxLayout>().withoutMargin();
         {
             anyways.emplace<QLabel>("Show anyways if:");
             anyways.emplace<QComboBox>();
             anyways->addStretch(1);
         }
 
-    auto addremove = layout.emplace<QHBoxLayout>().withoutMargin();
+        auto addremove = group.emplace<QHBoxLayout>().withoutMargin();
         {
             auto add = addremove.emplace<QPushButton>("Ignore user");
             auto remove = addremove.emplace<QPushButton>("Unignore User");
             addremove->addStretch(1);
         }
 
-    auto userList = layout.emplace<QListView>();
+        auto userList = group.emplace<QListView>();
+    }
 }
 }  // namespace settingspages
 }  // namespace widgets

src/widgets/settingspages/logspage.cpp

@@ -4,7 +4,7 @@ namespace chatterino {
 namespace widgets {
 namespace settingspages {
 LogsPage::LogsPage()
-    : SettingsPage("Logs", ":/images/VSO_Link_blue_16x.png")
+    : SettingsPage("Logs", "")
 {
 }
 }  // namespace settingspages

src/widgets/settingspages/specialchannelspage.cpp

@@ -0,0 +1,28 @@
+#include "specialchannelspage.hpp"
+
+#include "singletons/settingsmanager.hpp"
+#include "util/layoutcreator.hpp"
+
+#include <QGroupBox>
+#include <QLabel>
+#include <QVBoxLayout>
+
+namespace chatterino {
+namespace widgets {
+namespace settingspages {
+SpecialChannelsPage::SpecialChannelsPage()
+    : SettingsPage("Special channels", "")
+{
+    util::LayoutCreator<SpecialChannelsPage> layoutCreator(this);
+    auto layout = layoutCreator.setLayoutType<QVBoxLayout>();
+
+    auto mentions = layout.emplace<QGroupBox>("Mentions channel").setLayoutType<QVBoxLayout>();
+    {
+        mentions.emplace<QLabel>("Join /mentions to view your mentions.");
+    }
+
+    layout->addStretch(1);
+}
+}  // namespace settingspages
+}  // namespace widgets
+}  // namespace chatterino

src/widgets/settingspages/specialchannelspage.hpp

@@ -0,0 +1,15 @@
+#pragma once
+
+#include "widgets/settingspages/settingspage.hpp"
+
+namespace chatterino {
+namespace widgets {
+namespace settingspages {
+class SpecialChannelsPage : public SettingsPage
+{
+public:
+    SpecialChannelsPage();
+};
+}  // namespace settingspages
+}  // namespace widgets
+}  // namespace chatterino