Merge branch 'master' into apa-notification-on-live

src/widgets/settingspages/FeelPage.cpp

@@ -50,6 +50,12 @@ FeelPage::FeelPage()
         form->addRow("Links:",
                      this->createCheckBox("Open links only on double click",
                                           getSettings()->linksDoubleClickOnly));
+        form->addRow("",
+                     this->createCheckBox("Show link info in tooltips",
+                                          getSettings()->enableLinkInfoTooltip));
+        form->addRow("",
+                     this->createCheckBox("Auto unshort links (requires restart)",
+                                          getSettings()->enableUnshortLinks));
     }
 
     layout->addSpacing(16);

src/widgets/settingspages/KeyboardSettingsPage.cpp

@@ -41,6 +41,8 @@ KeyboardSettingsPage::KeyboardSettingsPage()
     form->addRow(new QLabel("Ctrl + R"), new QLabel("Change channel"));
     form->addRow(new QLabel("Ctrl + F"),
                  new QLabel("Search in current channel"));
+    form->addRow(new QLabel("Ctrl + E"),
+                 new QLabel("Open Emote menu"));
 }
 
 }  // namespace chatterino

src/widgets/settingspages/LookPage.cpp

@@ -59,6 +59,7 @@ void LookPage::initializeUi()
     this->addMessageTab(tabs.appendTab(new QVBoxLayout, "Messages"));
     this->addEmoteTab(tabs.appendTab(new QVBoxLayout, "Emotes"));
     this->addSplitHeaderTab(tabs.appendTab(new QVBoxLayout, "Split header"));
+    this->addBadgesTab(tabs.appendTab(new QVBoxLayout, "Badges"));
 
     layout->addStretch(1);
 
@@ -145,10 +146,6 @@ void LookPage::addMessageTab(LayoutCreator<QVBoxLayout> layout)
         box->addStretch(1);
     }
 
-    // badges
-    layout.append(
-        this->createCheckBox("Show badges", getSettings()->showBadges));
-
     // --
     layout.emplace<Line>(false);
 
@@ -270,16 +267,57 @@ void LookPage::addEmoteTab(LayoutCreator<QVBoxLayout> layout)
 
 void LookPage::addSplitHeaderTab(LayoutCreator<QVBoxLayout> layout)
 {
-    layout.append(this->createCheckBox("Show viewer count",
-                                       getSettings()->showViewerCount));
-    layout.append(this->createCheckBox("Show title", getSettings()->showTitle));
-    layout.append(this->createCheckBox("Show game", getSettings()->showGame));
     layout.append(
         this->createCheckBox("Show uptime", getSettings()->showUptime));
+    layout.append(this->createCheckBox("Show viewer count",
+                                       getSettings()->showViewerCount));
+    layout.append(this->createCheckBox("Show game", getSettings()->showGame));
+    layout.append(this->createCheckBox("Show title", getSettings()->showTitle));
 
     layout->addStretch(1);
 }
 
+void LookPage::addBadgesTab(LayoutCreator<QVBoxLayout> layout)
+{
+    // layout.append(
+    //    this->createCheckBox(("Show all badges"), getSettings()->showBadges));
+    auto fastSelection = layout.emplace<QHBoxLayout>();
+    {
+        auto addAll = fastSelection.emplace<QPushButton>("Enable all");
+        QObject::connect(addAll.getElement(), &QPushButton::clicked, this, [] {
+            getSettings()->showBadgesGlobalAuthority = true;
+            getSettings()->showBadgesChannelAuthority = true;
+            getSettings()->showBadgesSubscription = true;
+            getSettings()->showBadgesVanity = true;
+            getSettings()->showBadgesChatterino = true;
+        });
+        auto removeAll = fastSelection.emplace<QPushButton>("Disable all");
+        QObject::connect(removeAll.getElement(), &QPushButton::clicked, this,
+                         [] {
+                             getSettings()->showBadgesGlobalAuthority = false;
+                             getSettings()->showBadgesChannelAuthority = false;
+                             getSettings()->showBadgesSubscription = false;
+                             getSettings()->showBadgesVanity = false;
+                             getSettings()->showBadgesChatterino = false;
+                         });
+    }
+    layout.emplace<Line>(false);
+    layout.append(this->createCheckBox(
+        ("Show authorty badges (staff, admin, turbo, etc)"),
+        getSettings()->showBadgesGlobalAuthority));
+    layout.append(
+        this->createCheckBox(("Show channel badges (broadcaster, moderator)"),
+                             getSettings()->showBadgesChannelAuthority));
+    layout.append(this->createCheckBox(("Show subscriber badges "),
+                                       getSettings()->showBadgesSubscription));
+    layout.append(
+        this->createCheckBox(("Show vanity badges (prime, bits, subgifter)"),
+                             getSettings()->showBadgesVanity));
+    layout.append(this->createCheckBox(("Show chatterino badges"),
+                                       getSettings()->showBadgesChatterino));
+    layout->addStretch(1);
+}
+
 void LookPage::addLastReadMessageIndicatorPatternSelector(
     LayoutCreator<QVBoxLayout> layout)
 {

src/widgets/settingspages/LookPage.hpp

@@ -23,6 +23,7 @@ private:
     void addMessageTab(LayoutCreator<QVBoxLayout> layout);
     void addEmoteTab(LayoutCreator<QVBoxLayout> layout);
     void addSplitHeaderTab(LayoutCreator<QVBoxLayout> layout);
+    void addBadgesTab(LayoutCreator<QVBoxLayout> layout);
 
     void addLastReadMessageIndicatorPatternSelector(
         LayoutCreator<QVBoxLayout> layout);

src/widgets/settingspages/ModerationPage.cpp

@@ -149,7 +149,7 @@ ModerationPage::ModerationPage()
     auto modMode = tabs.appendTab(new QVBoxLayout, "Moderation buttons");
     {
         // clang-format off
-        auto label = modMode.emplace<QLabel>("Click the moderation mod button (<img width='18' height='18' src=':/images/moderatormode_disabled.png'>) in a channel that you moderate to enable moderator mode.<br>");
+        auto label = modMode.emplace<QLabel>("Click the moderation mod button (<img width='18' height='18' src=':/buttons/modModeDisabled.png'>) in a channel that you moderate to enable moderator mode.<br>");
         label->setWordWrap(true);
         label->setStyleSheet("color: #bbb");
         // clang-format on

src/widgets/settingspages/SettingsPage.cpp

@@ -1,6 +1,7 @@
 #include "SettingsPage.hpp"
 
 #include <QDebug>
+#include <QPainter>
 
 namespace chatterino {