new settings page

src/widgets/settingspages/FeelPage.cpp

@@ -44,18 +44,17 @@ FeelPage::FeelPage()
 
         form->addRow("Pause chat:",
                      this->createCheckBox(PAUSE_HOVERING,
-                                          getSettings()->pauseChatHover));
+                                          getSettings()->pauseChatOnHover));
 
         form->addRow("Mouse scroll speed:", this->createMouseScrollSlider());
         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("Show link info in tooltips",
+                                              getSettings()->linkInfoTooltip));
         form->addRow(
             "", this->createCheckBox("Auto unshort links (requires restart)",
-                                     getSettings()->enableUnshortLinks));
+                                     getSettings()->unshortLinks));
     }
 
     layout->addSpacing(16);

src/widgets/settingspages/GeneralPage.cpp

@@ -0,0 +1,327 @@
+#include "GeneralPage.hpp"
+
+#include <QFontDialog>
+#include <QLabel>
+#include <QScrollArea>
+
+#include "Application.hpp"
+#include "singletons/Fonts.hpp"
+#include "singletons/Theme.hpp"
+#include "singletons/WindowManager.hpp"
+#include "util/FuzzyConvert.hpp"
+#include "util/Helpers.hpp"
+#include "widgets/helper/Line.hpp"
+
+#define CHROME_EXTENSION_LINK                                           \
+    "https://chrome.google.com/webstore/detail/chatterino-native-host/" \
+    "glknmaideaikkmemifbfkhnomoknepka"
+#define FIREFOX_EXTENSION_LINK \
+    "https://addons.mozilla.org/en-US/firefox/addon/chatterino-native-host/"
+
+namespace chatterino {
+
+TitleLabel *SettingsLayout::addTitle(const QString &title)
+{
+    auto label = new TitleLabel(title + ":");
+
+    if (this->count() != 0)
+        this->addSpacing(16);
+
+    this->addWidget(label);
+    return label;
+}
+
+TitleLabel2 *SettingsLayout::addTitle2(const QString &title)
+{
+    auto label = new TitleLabel2(title);
+
+    this->addSpacing(16);
+
+    this->addWidget(label);
+    return label;
+}
+
+QCheckBox *SettingsLayout::addCheckbox(const QString &text,
+                                       BoolSetting &setting)
+{
+    auto check = new QCheckBox(text);
+
+    // update when setting changes
+    setting.connect(
+        [check](const bool &value, auto) { check->setChecked(value); },
+        this->managedConnections_);
+
+    // update setting on toggle
+    QObject::connect(check, &QCheckBox::toggled, this,
+                     [&setting](bool state) { setting = state; });
+
+    this->addWidget(check);
+    return check;
+}
+
+QComboBox *SettingsLayout::addDropdown(const QString &text,
+                                       const QStringList &list)
+{
+    auto layout = new QHBoxLayout;
+    auto combo = new QComboBox;
+    combo->addItems(list);
+
+    layout->addWidget(new QLabel(text + ":"));
+    layout->addStretch(1);
+    layout->addWidget(combo);
+
+    this->addLayout(layout);
+    return combo;
+}
+
+QComboBox *SettingsLayout::addDropdown(
+    const QString &text, const QStringList &items,
+    pajlada::Settings::Setting<QString> &setting)
+{
+    auto combo = this->addDropdown(text, items);
+
+    // update when setting changes
+    setting.connect(
+        [combo](const QString &value, auto) { combo->setCurrentText(value); },
+        this->managedConnections_);
+
+    QObject::connect(combo, &QComboBox::currentTextChanged,
+                     [&setting](const QString &newValue) {
+                         setting = newValue;
+                         getApp()->windows->forceLayoutChannelViews();
+                     });
+
+    return combo;
+}
+
+DescriptionLabel *SettingsLayout::addDescription(const QString &text)
+{
+    auto label = new DescriptionLabel(text);
+
+    label->setTextInteractionFlags(Qt::TextBrowserInteraction |
+                                   Qt::LinksAccessibleByKeyboard);
+    label->setOpenExternalLinks(true);
+    label->setWordWrap(true);
+
+    this->addWidget(label);
+
+    return label;
+}
+
+void SettingsLayout::addSeperator()
+{
+    this->addWidget(new Line(false));
+}
+
+GeneralPage::GeneralPage()
+    : SettingsPage("General", ":/settings/about.svg")
+{
+    auto y = new QVBoxLayout;
+    auto scroll = new QScrollArea;
+    scroll->setWidgetResizable(true);
+    y->addWidget(scroll);
+    auto x = new QHBoxLayout;
+    auto layout = new SettingsLayout;
+    x->addStretch(1);
+    x->addLayout(layout, 0);
+    x->addStretch(1);
+    auto z = new QFrame;
+    z->setLayout(x);
+    scroll->setWidget(z);
+    this->setLayout(y);
+
+    this->initLayout(*layout);
+
+    layout->addStretch(1);
+
+    this->initExtra();
+}
+
+void GeneralPage::initLayout(SettingsLayout &layout)
+{
+    auto &s = *getSettings();
+
+    layout.addTitle("Appearance");
+    layout.addDropdown("Theme", {"White", "Light", "Dark", "Black"},
+                       getApp()->themes->themeName);
+    layout.addDropdown<std::string>(
+        "Font", {"Segoe UI", "Arial", "Choose..."},
+        getApp()->fonts->chatFontFamily,
+        [](auto val) { return QString::fromStdString(val); },
+        [this](auto args) { return this->getFont(args); });
+    layout.addDropdown<int>(
+        "Font size", {"9pt", "10pt", "12pt", "14pt", "16pt", "20pt"},
+        getApp()->fonts->chatFontSize,
+        [](auto val) { return QString::number(val) + "pt"; },
+        [](auto args) { return fuzzyToInt(args.value, 10); });
+    layout.addDropdown<int>(
+        "UI Scale",
+        {"0.5x", "0.6x", "0.7x", "0.8x", "0.9x", "Default", "1.2x", "1.4x",
+         "1.6x", "1.8x", "2x", "2.33x", "2.66x", "3x", "3.5x", "4x"},
+        s.uiScale, [](auto val) { return val + 5; },
+        [](auto args) { return args.index - 5; }, false);
+    layout.addCheckbox("Always on top", s.windowTopMost);
+
+    layout.addTitle("Interface");
+    layout.addDropdown<float>(
+        "Mouse scroll speed", {"0.5x", "0.75x", "Default", "1.5x", "2x"},
+        s.mouseScrollMultiplier,
+        [](auto val) {
+            if (val == 1)
+                return QString("Default");
+            else
+                return QString::number(val) + "x";
+        },
+        [](auto args) { return fuzzyToFloat(args.value, 1.f); });
+    layout.addCheckbox("Smooth scrolling", s.enableSmoothScrolling);
+    layout.addCheckbox("Smooth scrolling on new messages.",
+                       s.enableSmoothScrollingNewMessages);
+    layout.addCheckbox("Pause chat while hovering", s.pauseChatOnHover);
+    layout.addCheckbox("Show tab close button", s.showTabCloseButton);
+    layout.addCheckbox("Show input when empty", s.showEmptyInput);
+    layout.addCheckbox("Show input message length", s.showMessageLength);
+
+    layout.addTitle("Messages");
+    layout.addCheckbox("Timestamps", s.showTimestamps);
+    layout.addDropdown("Timestamp format",
+                       {"hh:mm", "h:mm", "hh:mm a", "h:mm a"},
+                       s.timestampFormat);
+    layout.addDropdown<int>(
+        "Collapse messages",
+        {"Never", "Longer than 2 lines", "Longer than 3 lines",
+         "Longer than 4 lines", "Longer than 5 lines"},
+        s.collpseMessagesMinLines,
+        [](auto val) {
+            return val ? QString("After ") + QString::number(val) + " lines"
+                       : QString("Never");
+        },
+        [](auto args) { return fuzzyToInt(args.value, 0); });
+    layout.addCheckbox("Seperate with lines", s.separateMessages);
+    layout.addCheckbox("Alternate background color", s.alternateMessages);
+    // layout.addCheckbox("Mark last message you read");
+    // layout.addDropdown("Last read message style", {"Default"});
+
+    layout.addTitle("Emotes");
+    layout.addDropdown<float>(
+        "Emote size", {"0.5x", "0.75x", "Default", "1.25", "1.5x", "2x"},
+        s.emoteScale,
+        [](auto val) {
+            if (val == 1)
+                return QString("Default");
+            else
+                return QString::number(val) + "x";
+        },
+        [](auto args) { return fuzzyToFloat(args.value, 1.f); });
+    layout.addCheckbox("Gif animations", s.animateEmotes);
+    layout.addCheckbox("Animate only when focused", s.animationsWhenFocused);
+    layout.addDropdown("Emoji set",
+                       {"EmojiOne 2", "EmojiOne 3", "Twitter", "Facebook",
+                        "Apple", "Google", "Messenger"});
+
+    layout.addTitle("Badges");
+    layout.addCheckbox("Show authority badges (staff, admin, turbo, etc)",
+                       getSettings()->showBadgesGlobalAuthority);
+    layout.addCheckbox("Show channel badges (broadcaster, moderator)",
+                       getSettings()->showBadgesChannelAuthority);
+    layout.addCheckbox("Show subscriber badges ",
+                       getSettings()->showBadgesSubscription);
+    layout.addCheckbox("Show vanity badges (prime, bits, subgifter)",
+                       getSettings()->showBadgesVanity);
+    layout.addCheckbox("Show chatterino badges",
+                       getSettings()->showBadgesChatterino);
+
+    layout.addTitle("Header");
+    layout.addCheckbox("Show stream uptime", s.headerUptime);
+    layout.addCheckbox("Show stream viewer count", s.headerViewerCount);
+    layout.addCheckbox("Show stream category", s.headerGame);
+    layout.addCheckbox("Show stream title", s.headerStreamTitle);
+
+    layout.addTitle("Miscellaneous");
+    layout.addCheckbox("Show joined users (< 1000 chatters)", s.showJoins);
+    layout.addCheckbox("Show parted users (< 1000 chatters)", s.showParts);
+    layout.addDropdown("Boldness", {"Not implemented"});
+    layout.addCheckbox("Lowercase domains", s.lowercaseDomains);
+    layout.addCheckbox("Bold @usernames", s.boldUsernames);
+    layout.addCheckbox("Show link info when hovering", s.linkInfoTooltip);
+    layout.addCheckbox("Double click links to open", s.linksDoubleClickOnly);
+    layout.addCheckbox("Unshorten links", s.unshortLinks);
+    layout.addCheckbox("Show live indicator in tabs", s.showTabLive);
+
+    layout.addSpacing(16);
+    layout.addSeperator();
+
+    /*
+    layout.addTitle2("Cache");
+    layout.addDescription("Chatterino saves files on disk to speed up loading "
+                          "times and reduce network usage.");
+    this->cachePath = layout.addDescription("%cachePath%");
+    layout.addDropdown("Cache directory", {"Automatic"});
+    */
+
+    layout.addTitle2("Browser Integration");
+    layout.addDescription("The browser extension replaces the default "
+                          "Twitch.tv chat with chatterino.");
+
+    layout.addDescription(
+        createNamedLink(CHROME_EXTENSION_LINK, "Download for Google Chrome"));
+    layout.addDescription(
+        createNamedLink(FIREFOX_EXTENSION_LINK, "Download for Firefox"));
+
+    /*
+    layout.addTitle2("Streamlink");
+    layout.addDescription("Streamlinks allows you to watch streams with "
+                          "desktop media players like VLC.");
+    layout.addDescription(
+        createNamedLink("https://streamlink.github.io/", "Website") + " " +
+        createNamedLink("https://github.com/streamlink/streamlink/"
+                        "releases/latest",
+                        "Download"));
+
+    layout.addDropdown("Executable path", {"Automatic"});
+    layout.addDropdown("Preferred quality", {"Choose", "Source", "High",
+                                             "Medium", "Low", "Audio only"});
+    layout.addDropdown("Command line arguments", {"..."});
+    */
+}
+
+void GeneralPage::initExtra()
+{
+    /// update cache path
+    if (this->cachePath)
+    {
+        getSettings()->cachePath.connect(
+            [cachePath = this->cachePath](const auto &, auto) mutable {
+                QString newPath = getPaths()->cacheDirectory();
+
+                QString pathShortened = "Current location: <a href=\"file:///" +
+                                        newPath + "\">" +
+                                        shortenString(newPath, 50) + "</a>";
+
+                cachePath->setText(pathShortened);
+                cachePath->setToolTip(newPath);
+            });
+    }
+}
+
+std::string GeneralPage::getFont(const DropdownArgs &args) const
+{
+    if (args.combobox->currentIndex() == args.combobox->count() - 1)
+    {
+        args.combobox->setCurrentIndex(0);
+        args.combobox->setEditText("Choosing...");
+        QFontDialog dialog(getApp()->fonts->getFont(FontStyle::ChatMedium, 1.));
+
+        dialog.setWindowFlag(Qt::WindowStaysOnTopHint);
+
+        auto ok = bool();
+        auto font = dialog.getFont(&ok);
+
+        if (ok)
+            return font.family().toStdString();
+        else
+            return args.combobox->itemText(0).toStdString();
+    }
+    return args.value.toStdString();
+}
+
+}  // namespace chatterino

src/widgets/settingspages/GeneralPage.hpp

@@ -0,0 +1,152 @@
+#pragma once
+
+#include <QDebug>
+#include <QLabel>
+#include <QVBoxLayout>
+
+#include "boost/variant.hpp"
+#include "pajlada/signals/signal.hpp"
+#include "singletons/Settings.hpp"
+#include "widgets/settingspages/SettingsPage.hpp"
+
+class QLabel;
+class QCheckBox;
+class QComboBox;
+
+namespace chatterino {
+
+class TitleLabel : public QLabel
+{
+    Q_OBJECT
+
+public:
+    TitleLabel(const QString &text)
+        : QLabel(text)
+    {
+    }
+};
+
+class TitleLabel2 : public QLabel
+{
+    Q_OBJECT
+
+public:
+    TitleLabel2(const QString &text)
+        : QLabel(text)
+    {
+    }
+};
+
+class DescriptionLabel : public QLabel
+{
+    Q_OBJECT
+
+public:
+    DescriptionLabel(const QString &text)
+        : QLabel(text)
+    {
+    }
+};
+
+struct DropdownArgs {
+    QString value;
+    int index;
+    QComboBox *combobox;
+};
+
+class SettingsLayout : public QVBoxLayout
+{
+    Q_OBJECT
+
+public:
+    TitleLabel *addTitle(const QString &text);
+    TitleLabel2 *addTitle2(const QString &text);
+    QCheckBox *addCheckbox(const QString &text, BoolSetting &setting);
+    QComboBox *addDropdown(const QString &text, const QStringList &items);
+    QComboBox *addDropdown(const QString &text, const QStringList &items,
+                           pajlada::Settings::Setting<QString> &setting);
+
+    template <typename T>
+    QComboBox *addDropdown(
+        const QString &text, const QStringList &items,
+        pajlada::Settings::Setting<T> &setting,
+        std::function<boost::variant<int, QString>(T)> getValue,
+        std::function<T(DropdownArgs)> setValue, bool editable = true)
+    {
+        auto items2 = items;
+        auto selected = getValue(setting.getValue());
+
+        if (selected.which() == 1)
+        {
+            // QString
+            if (!editable && !items2.contains(boost::get<QString>(selected)))
+                items2.insert(0, boost::get<QString>(selected));
+        }
+
+        auto combo = this->addDropdown(text, items2);
+        if (editable)
+            combo->setEditable(true);
+
+        if (selected.which() == 0)
+        {
+            // int
+            auto value = boost::get<int>(selected);
+            if (value >= 0 && value < items2.size())
+                combo->setCurrentIndex(value);
+        }
+        else if (selected.which() == 1)
+        {
+            // QString
+            combo->setEditText(boost::get<QString>(selected));
+        }
+
+        setting.connect(
+            [getValue = std::move(getValue), combo](const T &value, auto) {
+                auto var = getValue(value);
+                if (var.which() == 0)
+                    combo->setCurrentIndex(boost::get<int>(var));
+                else
+                {
+                    combo->setCurrentText(boost::get<QString>(var));
+                    combo->setEditText(boost::get<QString>(var));
+                }
+            },
+            this->managedConnections_);
+
+        QObject::connect(
+            combo,
+            QOverload<const QString &>::of(&QComboBox::currentIndexChanged),
+            //            &QComboBox::editTextChanged,
+            [combo, &setting,
+             setValue = std::move(setValue)](const QString &newValue) {
+                setting = setValue(
+                    DropdownArgs{newValue, combo->currentIndex(), combo});
+                getApp()->windows->forceLayoutChannelViews();
+            });
+
+        return combo;
+    }
+    DescriptionLabel *addDescription(const QString &text);
+    void addSeperator();
+
+private:
+    std::vector<pajlada::Signals::ScopedConnection> managedConnections_;
+};
+
+class GeneralPage : public SettingsPage
+{
+    Q_OBJECT
+
+public:
+    GeneralPage();
+
+private:
+    void initLayout(SettingsLayout &layout);
+    void initExtra();
+
+    std::string getFont(const DropdownArgs &args) const;
+
+    DescriptionLabel *cachePath{};
+};
+
+}  // namespace chatterino

src/widgets/settingspages/LookPage.cpp

@@ -184,8 +184,8 @@ void LookPage::addMessageTab(LayoutCreator<QVBoxLayout> layout)
                                        getSettings()->separateMessages));
 
     // alternate
-    layout.append(this->createCheckBox(
-        "Alternate background", getSettings()->alternateMessageBackground));
+    layout.append(this->createCheckBox("Alternate background",
+                                       getSettings()->alternateMessages));
 
     layout.append(
         this->createCheckBox("Compact emotes", getSettings()->compactEmotes));
@@ -204,14 +204,14 @@ void LookPage::addMessageTab(LayoutCreator<QVBoxLayout> layout)
 
     // bold usernames
     layout.append(this->createCheckBox("Bold mentions (@username)",
-                                       getSettings()->enableUsernameBold));
+                                       getSettings()->boldUsernames));
 
     // --
     layout.emplace<Line>(false);
 
     // lowercase links
     layout.append(this->createCheckBox("Lowercase domains",
-                                       getSettings()->enableLowercaseLink));
+                                       getSettings()->lowercaseDomains));
 
     // collapsing
     {
@@ -249,22 +249,11 @@ void LookPage::addMessageTab(LayoutCreator<QVBoxLayout> layout)
 
 void LookPage::addEmoteTab(LayoutCreator<QVBoxLayout> layout)
 {
-    /*
-    emotes.append(
-        this->createCheckBox("Enable Twitch emotes",
-    getSettings()->enableTwitchEmotes));
-    emotes.append(this->createCheckBox("Enable BetterTTV emotes for Twitch",
-                                       getSettings()->enableBttvEmotes));
-    emotes.append(this->createCheckBox("Enable FrankerFaceZ emotes for Twitch",
-                                       getSettings()->enableFfzEmotes));
-    emotes.append(this->createCheckBox("Enable emojis",
-    getSettings()->enableEmojis));
-    */
     layout.append(
-        this->createCheckBox("Animations", getSettings()->enableGifAnimations));
+        this->createCheckBox("Animations", getSettings()->animateEmotes));
     layout.append(
         this->createCheckBox("Animations only when chatterino has focus",
-                             getSettings()->enableAnimationsWhenFocused));
+                             getSettings()->animationsWhenFocused));
 
     auto scaleBox = layout.emplace<QHBoxLayout>().withoutMargin();
     {
@@ -315,11 +304,12 @@ void LookPage::addEmoteTab(LayoutCreator<QVBoxLayout> layout)
 void LookPage::addSplitHeaderTab(LayoutCreator<QVBoxLayout> layout)
 {
     layout.append(
-        this->createCheckBox("Show uptime", getSettings()->showUptime));
+        this->createCheckBox("Show uptime", getSettings()->headerUptime));
     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));
+                                       getSettings()->headerViewerCount));
+    layout.append(this->createCheckBox("Show game", getSettings()->headerGame));
+    layout.append(
+        this->createCheckBox("Show title", getSettings()->headerStreamTitle));
 
     layout->addStretch(1);
 }

src/widgets/settingspages/SettingsPage.hpp

@@ -12,8 +12,10 @@ namespace chatterino {
 
 class SettingsDialogTab;
 
-class SettingsPage : public QWidget
+class SettingsPage : public QFrame
 {
+    Q_OBJECT
+
 public:
     SettingsPage(const QString &name, const QString &iconResource);