chatterino2
Code Issues

refactor: remove GeneralPageView.addCheckbox (#6305)

Browse Source
This commit is contained in:
pajlada
2025-06-29 15:16:20 +02:00
committed by GitHub
parent 03845bfbc6
commit 9e4a4bcf45
5 changed files with 378 additions and 279 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+1
View File
@@ -55,6 +55,7 @@
- Dev: Refactored `Notebook`-related enums into their own file. (#6220) - Dev: Refactored `Notebook`-related enums into their own file. (#6220)
- Dev: Refactored `SettingWidget::dropdown` for string enums to the source file. (#6293) - Dev: Refactored `SettingWidget::dropdown` for string enums to the source file. (#6293)
- Dev: Don't try to save emote popup bounds if we're quitting. (#6292) - Dev: Don't try to save emote popup bounds if we're quitting. (#6292)
- Dev: Remove `ChannelPageView::addCheckbox`. (#6305)
- Dev: Implemented customizable display names for enums. (#6238) - Dev: Implemented customizable display names for enums. (#6238)
- Dev: Refactored event API initialization away from Application and into TwitchIrcServer. (#6198) - Dev: Refactored event API initialization away from Application and into TwitchIrcServer. (#6198)
- Dev: Updated GoogleTest to v1.17.0. (#6180) - Dev: Updated GoogleTest to v1.17.0. (#6180)
src/widgets/settingspages/GeneralPage.cpp
+346 -217
View File
@@ -1,13 +1,10 @@
#include "widgets/settingspages/GeneralPage.hpp" #include "widgets/settingspages/GeneralPage.hpp"
#include "Application.hpp" #include "Application.hpp"
#include "common/Literals.hpp" #include "common/Literals.hpp" // IWYU pragma: keep
#include "common/QLogging.hpp"
#include "common/ThumbnailPreviewMode.hpp"
#include "common/Version.hpp" #include "common/Version.hpp"
#include "controllers/hotkeys/HotkeyCategory.hpp" #include "controllers/hotkeys/HotkeyCategory.hpp"
#include "controllers/hotkeys/HotkeyController.hpp" #include "controllers/hotkeys/HotkeyController.hpp"
#include "controllers/sound/ISoundController.hpp"
#include "providers/twitch/TwitchChannel.hpp" #include "providers/twitch/TwitchChannel.hpp"
#include "providers/twitch/TwitchIrcServer.hpp" #include "providers/twitch/TwitchIrcServer.hpp"
#include "singletons/CrashHandler.hpp" #include "singletons/CrashHandler.hpp"
@@ -23,19 +20,17 @@
#include "widgets/settingspages/GeneralPageView.hpp" #include "widgets/settingspages/GeneralPageView.hpp"
#include "widgets/settingspages/SettingWidget.hpp" #include "widgets/settingspages/SettingWidget.hpp"
#include <magic_enum/magic_enum.hpp>
#include <QDesktopServices> #include <QDesktopServices>
#include <QFileDialog> #include <QFileDialog>
#include <QFontDialog> #include <QFontDialog>
#include <QFormLayout> #include <QFormLayout>
#include <QLabel> #include <QLabel>
#include <QMessageBox> #include <QMessageBox>
#include <QScrollArea>
namespace { namespace {
using namespace chatterino; using namespace chatterino;
using namespace literals; using namespace chatterino::literals;
const QString CHROME_EXTENSION_LINK = const QString CHROME_EXTENSION_LINK =
u"https://chrome.google.com/webstore/detail/chatterino-native-host/glknmaideaikkmemifbfkhnomoknepka"_s; u"https://chrome.google.com/webstore/detail/chatterino-native-host/glknmaideaikkmemifbfkhnomoknepka"_s;
@@ -302,16 +297,22 @@ void GeneralPage::initLayout(GeneralPageView &layout)
removeTabShortcut = removeTabShortcut =
removeTabSeq.toString(QKeySequence::SequenceFormat::NativeText); removeTabSeq.toString(QKeySequence::SequenceFormat::NativeText);
} }
layout.addCheckbox(
"Show tab close button", s.showTabCloseButton, false, SettingWidget::checkbox("Show tab close button", s.showTabCloseButton)
"When disabled, the x to close a tab will be hidden.\nTabs can still " ->setTooltip(
"be closed by right-clicking or pressing " + "When disabled, the x to close a tab will be hidden.\nTabs can "
removeTabShortcut + "."); "still be closed by right-clicking or pressing " +
layout.addCheckbox("Always on top", s.windowTopMost, false, removeTabShortcut + ".")
"Always keep Chatterino as the top window."); ->addTo(layout);
SettingWidget::checkbox("Always on top", s.windowTopMost)
->setTooltip("Always keep Chatterino as the top window.")
->addTo(layout);
#ifdef USEWINSDK #ifdef USEWINSDK
layout.addCheckbox("Start with Windows", s.autorun, false, SettingWidget::checkbox("Start with Windows", s.autorun)
"Start Chatterino when your computer starts."); ->setTooltip("Start Chatterino when your computer starts.")
->addTo(layout);
#endif #endif
if (!BaseWindow::supportsCustomWindowFrame()) if (!BaseWindow::supportsCustomWindowFrame())
{ {
@@ -333,9 +334,11 @@ void GeneralPage::initLayout(GeneralPageView &layout)
SettingWidget::inverseCheckbox("Show user button", s.hideUserButton) SettingWidget::inverseCheckbox("Show user button", s.hideUserButton)
->addTo(layout); ->addTo(layout);
} }
layout.addCheckbox("Mark tabs with live channels", s.showTabLive, false,
"Shows a red dot in the top right corner of a tab to " SettingWidget::checkbox("Mark tabs with live channels", s.showTabLive)
"indicate one of the channels in the tab is live."); ->setTooltip("Shows a red dot in the top right corner of a tab to "
"indicate one of the channels in the tab is live.")
->addTo(layout);
layout.addTitle("Chat"); layout.addTitle("Chat");
@@ -390,19 +393,32 @@ void GeneralPage::initLayout(GeneralPageView &layout)
[](auto args) { [](auto args) {
return fuzzyToFloat(args.value, 1.f); return fuzzyToFloat(args.value, 1.f);
}); });
layout.addCheckbox("Smooth scrolling", s.enableSmoothScrolling);
layout.addCheckbox("Smooth scrolling on new messages", SettingWidget::checkbox("Smooth scrolling", s.enableSmoothScrolling)
s.enableSmoothScrollingNewMessages); ->addTo(layout);
layout.addCheckbox("Show input when it's empty", s.showEmptyInput, false,
"Show the chat box even when there is nothing typed."); SettingWidget::checkbox("Smooth scrolling on new messages",
layout.addCheckbox( s.enableSmoothScrollingNewMessages)
"Show message length while typing", s.showMessageLength, false, ->addTo(layout);
"Show how many characters are currently in your input box.\n"
"Useful for making sure you don't go past the 500 character Twitch " SettingWidget::checkbox("Show input when it's empty", s.showEmptyInput)
"limit, or a lower limit enforced by a moderation bot"); ->setTooltip("Show the chat box even when there is nothing typed.")
layout.addCheckbox( ->addTo(layout);
"Allow sending duplicate messages", s.allowDuplicateMessages, false,
"Allow a single message to be repeatedly sent without any changes."); SettingWidget::checkbox("Show message length while typing",
s.showMessageLength)
->setTooltip(
"Show how many characters are currently in your input box.\n"
"Useful for making sure you don't go past the 500 character Twitch "
"limit, or a lower limit enforced by a moderation bot")
->addTo(layout);
SettingWidget::checkbox("Allow sending duplicate messages",
s.allowDuplicateMessages)
->setTooltip(
"Allow a single message to be repeatedly sent without any changes.")
->addTo(layout);
layout.addDropdown<std::underlying_type_t<MessageOverflow>>( layout.addDropdown<std::underlying_type_t<MessageOverflow>>(
"Message overflow", {"Highlight", "Prevent", "Allow"}, "Message overflow", {"Highlight", "Prevent", "Allow"},
s.messageOverflow, s.messageOverflow,
@@ -548,29 +564,42 @@ void GeneralPage::initLayout(GeneralPageView &layout)
return fuzzyToInt(args.value, 0); return fuzzyToInt(args.value, 0);
}); });
layout.addSeparator(); layout.addSeparator();
layout.addCheckbox("Draw a line below the most recent message before "
"switching applications.", SettingWidget::checkbox("Draw a line below the most recent message before "
s.showLastMessageIndicator, false, "switching applications.",
"Adds an underline below the most recent message " s.showLastMessageIndicator)
"sent before you tabbed out of Chatterino."); ->setTooltip("Adds an underline below the most recent message "
"sent before you tabbed out of Chatterino.")
->addTo(layout);
SettingWidget::dropdown("Line style", s.lastMessagePattern)->addTo(layout); SettingWidget::dropdown("Line style", s.lastMessagePattern)->addTo(layout);
SettingWidget::colorButton("Line color", s.lastMessageColor)->addTo(layout); SettingWidget::colorButton("Line color", s.lastMessageColor)->addTo(layout);
layout.addTitle("Emotes"); layout.addTitle("Emotes");
layout.addCheckbox("Enable", s.enableEmoteImages);
layout.addCheckbox("Animate", s.animateEmotes); SettingWidget::checkbox("Enable", s.enableEmoteImages)->addTo(layout);
layout.addCheckbox("Animate only when Chatterino is focused",
s.animationsWhenFocused); SettingWidget::checkbox("Animate", s.animateEmotes)->addTo(layout);
layout.addCheckbox(
"Enable zero-width emotes", s.enableZeroWidthEmotes, false, SettingWidget::checkbox("Animate only when Chatterino is focused",
"When disabled, emotes that overlap other emotes, such as BTTV's " s.animationsWhenFocused)
"cvMask and 7TV's RainTime, will appear as normal emotes."); ->addTo(layout);
layout.addCheckbox("Enable emote auto-completion by typing :",
s.emoteCompletionWithColon); SettingWidget::checkbox("Enable zero-width emotes", s.enableZeroWidthEmotes)
layout.addCheckbox("Use experimental smarter emote completion.", ->setTooltip(
s.useSmartEmoteCompletion); "When disabled, emotes that overlap other emotes, such as BTTV's "
"cvMask and 7TV's RainTime, will appear as normal emotes.")
->addTo(layout);
SettingWidget::checkbox("Enable emote auto-completion by typing :",
s.emoteCompletionWithColon)
->addTo(layout);
SettingWidget::checkbox("Use experimental smarter emote completion.",
s.useSmartEmoteCompletion)
->addTo(layout);
layout.addDropdown<float>( layout.addDropdown<float>(
"Size", {"0.5x", "0.75x", "Default", "1.25x", "1.5x", "2x"}, "Size", {"0.5x", "0.75x", "Default", "1.25x", "1.5x", "2x"},
s.emoteScale, s.emoteScale,
@@ -588,10 +617,12 @@ void GeneralPage::initLayout(GeneralPageView &layout)
return fuzzyToFloat(args.value, 1.f); return fuzzyToFloat(args.value, 1.f);
}); });
layout.addCheckbox("Remove spaces between emotes", SettingWidget::checkbox("Remove spaces between emotes",
s.removeSpacesBetweenEmotes, false, s.removeSpacesBetweenEmotes)
"When enabled, adjacent emotes will no longer have an " ->setTooltip("When enabled, adjacent emotes will no longer have an "
"added space separating them."); "added space separating them.")
->addTo(layout);
SettingWidget::checkbox("Show unlisted 7TV emotes", SettingWidget::checkbox("Show unlisted 7TV emotes",
s.showUnlistedSevenTVEmotes) s.showUnlistedSevenTVEmotes)
->addKeywords({"seventv"}) ->addKeywords({"seventv"})
@@ -688,19 +719,27 @@ void GeneralPage::initLayout(GeneralPageView &layout)
false); false);
dankDropdown->setMinimumWidth(dankDropdown->minimumSizeHint().width() + 30); dankDropdown->setMinimumWidth(dankDropdown->minimumSizeHint().width() + 30);
layout.addCheckbox("Hide usercard avatars", SettingWidget::checkbox("Hide usercard avatars",
s.streamerModeHideUsercardAvatars, false, s.streamerModeHideUsercardAvatars)
"Prevent potentially explicit avatars from showing."); ->setTooltip("Prevent potentially explicit avatars from showing.")
layout.addCheckbox("Hide link thumbnails", s.streamerModeHideLinkThumbnails, ->addTo(layout);
false,
"Prevent potentially explicit thumbnails from showing " SettingWidget::checkbox("Hide link thumbnails",
"when hovering links."); s.streamerModeHideLinkThumbnails)
layout.addCheckbox( ->setTooltip("Prevent potentially explicit thumbnails from showing "
"when hovering links.")
->addTo(layout);
SettingWidget::checkbox(
"Hide viewer count and stream length while hovering over split header", "Hide viewer count and stream length while hovering over split header",
s.streamerModeHideViewerCountAndDuration); s.streamerModeHideViewerCountAndDuration)
layout.addCheckbox( ->addTo(layout);
"Hide moderation actions", s.streamerModeHideModActions, false,
"Hide bans, timeouts, and automod messages from appearing in chat."); SettingWidget::checkbox("Hide moderation actions",
s.streamerModeHideModActions)
->setTooltip(
"Hide bans, timeouts, and automod messages from appearing in chat.")
->addTo(layout);
SettingWidget::checkbox("Hide messages from restricted users", SettingWidget::checkbox("Hide messages from restricted users",
s.streamerModeHideRestrictedUsers) s.streamerModeHideRestrictedUsers)
@@ -708,19 +747,28 @@ void GeneralPage::initLayout(GeneralPageView &layout)
"or Twitch's AutoMod") "or Twitch's AutoMod")
->addTo(layout); ->addTo(layout);
layout.addCheckbox( SettingWidget::checkbox("Hide blocked terms",
"Hide blocked terms", s.streamerModeHideBlockedTermText, false, s.streamerModeHideBlockedTermText)
"Hide blocked terms from showing up in places like AutoMod messages. " ->setTooltip(
"This can be useful in case you have some blocked terms that you don't " "Hide blocked terms from showing up in places like AutoMod "
"want to show on stream."); "messages. This can be useful in case you have some blocked terms "
layout.addCheckbox("Mute mention sounds", s.streamerModeMuteMentions, false, "that you don't want to show on stream.")
"Mute your ping sound from playing."); ->addTo(layout);
layout.addCheckbox(
"Suppress Live Notifications", s.streamerModeSuppressLiveNotifications, SettingWidget::checkbox("Mute mention sounds", s.streamerModeMuteMentions)
false, "Hide Live notification popups from appearing. (Windows Only)"); ->setTooltip("Mute your ping sound from playing.")
layout.addCheckbox("Suppress Inline Whispers", ->addTo(layout);
s.streamerModeSuppressInlineWhispers, false,
"Hide whispers sent to you from appearing in chat."); SettingWidget::checkbox("Suppress Live Notifications",
s.streamerModeSuppressLiveNotifications)
->setTooltip(
"Hide Live notification popups from appearing. (Windows Only)")
->addTo(layout);
SettingWidget::checkbox("Suppress Inline Whispers",
s.streamerModeSuppressInlineWhispers)
->setTooltip("Hide whispers sent to you from appearing in chat.")
->addTo(layout);
layout.addTitle("Link Previews"); layout.addTitle("Link Previews");
layout.addDescription( layout.addDescription(
@@ -734,7 +782,9 @@ void GeneralPage::initLayout(GeneralPageView &layout)
"terms-of-service\">Terms of Services</a> and <a " "terms-of-service\">Terms of Services</a> and <a "
"href=\"https://braize.pajlada.com/chatterino/legal/" "href=\"https://braize.pajlada.com/chatterino/legal/"
"privacy-policy\">Privacy Policy</a>."); "privacy-policy\">Privacy Policy</a>.");
layout.addCheckbox("Enable", s.linkInfoTooltip);
SettingWidget::checkbox("Enable", s.linkInfoTooltip)->addTo(layout);
layout.addDropdown<int>( layout.addDropdown<int>(
"Also show thumbnails if available", "Also show thumbnails if available",
{"Off", "Small", "Medium", "Large"}, s.thumbnailSize, {"Off", "Small", "Medium", "Large"}, s.thumbnailSize,
@@ -825,7 +875,9 @@ void GeneralPage::initLayout(GeneralPageView &layout)
layout.addDescription( layout.addDescription(
"You can receive updates earlier by ticking the box below. Report " "You can receive updates earlier by ticking the box below. Report "
"issues <a href='https://chatterino.com/link/issues'>here</a>."); "issues <a href='https://chatterino.com/link/issues'>here</a>.");
layout.addCheckbox("Receive beta updates", s.betaUpdates);
SettingWidget::checkbox("Receive beta updates", s.betaUpdates)
->addTo(layout);
} }
else else
{ {
@@ -858,11 +910,12 @@ void GeneralPage::initLayout(GeneralPageView &layout)
layout.addDescription("Chatterino only attaches to known browsers to avoid " layout.addDescription("Chatterino only attaches to known browsers to avoid "
"attaching to other windows by accident."); "attaching to other windows by accident.");
layout.addCheckbox( SettingWidget::checkbox("Attach to any browser (may cause issues)",
"Attach to any browser (may cause issues)", s.attachExtensionToAnyProcess)
s.attachExtensionToAnyProcess, false, ->setTooltip(
"Attempt to force the Chatterino Browser Extension to work in certain " "Attempt to force the Chatterino Browser Extension to work in "
"browsers that do not work automatically.\ne.g. Librewolf"); "certain browsers that do not work automatically.\ne.g. Librewolf")
->addTo(layout);
{ {
auto *note = new QLabel( auto *note = new QLabel(
@@ -949,14 +1002,18 @@ void GeneralPage::initLayout(GeneralPageView &layout)
layout.addSubtitle("Chat title"); layout.addSubtitle("Chat title");
layout.addDescription("In live channels show:"); layout.addDescription("In live channels show:");
layout.addCheckbox("Uptime", s.headerUptime, false, SettingWidget::checkbox("Uptime", s.headerUptime)
"Show how long the channel has been live"); ->setTooltip("Show how long the channel has been live")
layout.addCheckbox("Viewer count", s.headerViewerCount, false, ->addTo(layout);
"Show how many users are watching"); SettingWidget::checkbox("Viewer count", s.headerViewerCount)
layout.addCheckbox("Category", s.headerGame, false, ->setTooltip("Show how many users are watching")
"Show what Category the stream is listed under"); ->addTo(layout);
layout.addCheckbox("Title", s.headerStreamTitle, false, SettingWidget::checkbox("Category", s.headerGame)
"Show the stream title"); ->setTooltip("Show what Category the stream is listed under")
->addTo(layout);
SettingWidget::checkbox("Title", s.headerStreamTitle)
->setTooltip("Show the stream title")
->addTo(layout);
layout.addSubtitle("R9K"); layout.addSubtitle("R9K");
auto toggleLocalr9kSeq = getApp()->getHotkeys()->getDisplaySequence( auto toggleLocalr9kSeq = getApp()->getHotkeys()->getDisplaySequence(
@@ -968,19 +1025,28 @@ void GeneralPage::initLayout(GeneralPageView &layout)
toggleLocalr9kShortcut = toggleLocalr9kSeq.toString( toggleLocalr9kShortcut = toggleLocalr9kSeq.toString(
QKeySequence::SequenceFormat::NativeText); QKeySequence::SequenceFormat::NativeText);
} }
layout.addDescription( layout.addDescription("Hide similar messages to those previously seen. "
"Hide similar messages to those previously seen. Toggle hidden " "Toggle hidden messages by pressing " +
"messages by pressing " + toggleLocalr9kShortcut + ".");
toggleLocalr9kShortcut + ".");
layout.addCheckbox("Enable similarity checks", s.similarityEnabled); SettingWidget::checkbox("Enable similarity checks", s.similarityEnabled)
//layout.addCheckbox("Gray out matches", s.colorSimilarDisabled); ->addTo(layout);
layout.addCheckbox(
"Only if by the same user", s.hideSimilarBySameUser, false, // SettingWidget::checkbox("Gray out matches", s.colorSimilarDisabled)->addTo(layout);
"When checked, messages that are very similar to each other can still "
"be shown as long as they're sent by different users."); SettingWidget::checkbox("Only if by the same user", s.hideSimilarBySameUser)
layout.addCheckbox("Hide my own messages", s.hideSimilarMyself); ->setTooltip(
layout.addCheckbox("Receive notification sounds from hidden messages", "When checked, messages that are very similar to each other can "
s.shownSimilarTriggerHighlights); "still be shown as long as they're sent by different users.")
->addTo(layout);
SettingWidget::checkbox("Hide my own messages", s.hideSimilarMyself)
->addTo(layout);
SettingWidget::checkbox("Receive notification sounds from hidden messages",
s.shownSimilarTriggerHighlights)
->addTo(layout);
s.hideSimilar.connect( s.hideSimilar.connect(
[]() { []() {
getApp()->getWindows()->forceLayoutChannelViews(); getApp()->getWindows()->forceLayoutChannelViews();
@@ -1024,16 +1090,28 @@ void GeneralPage::initLayout(GeneralPageView &layout)
"compared to only if they are new enough."); "compared to only if they are new enough.");
layout.addSubtitle("Visible badges"); layout.addSubtitle("Visible badges");
layout.addCheckbox("Authority", s.showBadgesGlobalAuthority, false, SettingWidget::checkbox("Authority", s.showBadgesGlobalAuthority)
"e.g. staff, admin"); ->setTooltip("e.g. staff, admin")
layout.addCheckbox("Predictions", s.showBadgesPredictions); ->addTo(layout);
layout.addCheckbox("Channel", s.showBadgesChannelAuthority, false,
"e.g. broadcaster, moderator"); SettingWidget::checkbox("Predictions", s.showBadgesPredictions)
layout.addCheckbox("Subscriber ", s.showBadgesSubscription); ->addTo(layout);
layout.addCheckbox("Vanity", s.showBadgesVanity, false,
"e.g. prime, bits, sub gifter"); SettingWidget::checkbox("Channel", s.showBadgesChannelAuthority)
layout.addCheckbox("Chatterino", s.showBadgesChatterino, false, ->setTooltip("e.g. broadcaster, moderator")
"e.g. Chatterino Supporter/Contributor/Developer"); ->addTo(layout);
SettingWidget::checkbox("Subscriber ", s.showBadgesSubscription)
->addTo(layout);
SettingWidget::checkbox("Vanity", s.showBadgesVanity)
->setTooltip("e.g. prime, bits, sub gifter")
->addTo(layout);
SettingWidget::checkbox("Chatterino", s.showBadgesChatterino)
->setTooltip("e.g. Chatterino Supporter/Contributor/Developer")
->addTo(layout);
SettingWidget::checkbox("FrankerFaceZ", s.showBadgesFfz) SettingWidget::checkbox("FrankerFaceZ", s.showBadgesFfz)
->addKeywords({"ffz"}) ->addKeywords({"ffz"})
->setTooltip("e.g. Bot, FrankerFaceZ supporter, FrankerFaceZ developer") ->setTooltip("e.g. Bot, FrankerFaceZ supporter, FrankerFaceZ developer")
@@ -1082,9 +1160,11 @@ void GeneralPage::initLayout(GeneralPageView &layout)
"corresponds to a fully opaque background.") "corresponds to a fully opaque background.")
->addTo(layout); ->addTo(layout);
layout.addCheckbox("Enable Shadow", s.enableOverlayShadow, false, SettingWidget::checkbox("Enable Shadow", s.enableOverlayShadow)
"Enables a drop shadow on the overlay. This will use " ->setTooltip("Enables a drop shadow on the overlay. This will use more "
"more processing power."); "processing power.")
->addTo(layout);
layout.addIntInput("Shadow opacity (0-255)", s.overlayShadowOpacity, 0, 255, layout.addIntInput("Shadow opacity (0-255)", s.overlayShadowOpacity, 0, 255,
1, 1,
"Controls the opacity of the added drop shadow. 255 " "Controls the opacity of the added drop shadow. 255 "
@@ -1115,8 +1195,9 @@ void GeneralPage::initLayout(GeneralPageView &layout)
if (supportsIncognitoLinks()) if (supportsIncognitoLinks())
{ {
layout.addCheckbox("Open links in incognito/private mode", SettingWidget::checkbox("Open links in incognito/private mode",
s.openLinksIncognito); s.openLinksIncognito)
->addTo(layout);
} }
SettingWidget::customCheckbox( SettingWidget::customCheckbox(
@@ -1131,9 +1212,10 @@ void GeneralPage::initLayout(GeneralPageView &layout)
#if defined(Q_OS_LINUX) && !defined(NO_QTKEYCHAIN) #if defined(Q_OS_LINUX) && !defined(NO_QTKEYCHAIN)
if (!getApp()->getPaths().isPortable()) if (!getApp()->getPaths().isPortable())
{ {
layout.addCheckbox( SettingWidget::checkbox(
"Use libsecret/KWallet/Gnome keychain to secure passwords", "Use libsecret/KWallet/Gnome keychain to secure passwords",
s.useKeyring); s.useKeyring)
->addTo(layout);
} }
#endif #endif
@@ -1149,52 +1231,77 @@ void GeneralPage::initLayout(GeneralPageView &layout)
"from TreuKS was deleted: abc") "from TreuKS was deleted: abc")
->addTo(layout); ->addTo(layout);
layout.addCheckbox( SettingWidget::checkbox("Colorize users without color set (gray names)",
"Colorize users without color set (gray names)", s.colorizeNicknames, s.colorizeNicknames)
false, ->setTooltip("Grant a random color to users who never set a color for "
"Grant a random color to users who never set a color for themselves"); "themselves")
layout.addCheckbox("Mention users with a comma", s.mentionUsersWithComma, ->addTo(layout);
false,
"When using tab-completon, if the username is at the " SettingWidget::checkbox("Mention users with a comma",
"start of the message, include a comma at the end of " s.mentionUsersWithComma)
"the name.\ne.g. pajl -> pajlada,"); ->setTooltip("When using tab-completon, if the username is at the "
layout.addCheckbox( "start of the message, include a comma at the end of the "
"Show joined users (< 1000 chatters)", s.showJoins, false, "name.\ne.g. pajl -> pajlada,")
"Show a Twitch system message stating what users have joined the chat, " ->addTo(layout);
"only available when the chat has less than 1000 users");
layout.addCheckbox( SettingWidget::checkbox("Show joined users (< 1000 chatters)", s.showJoins)
"Show parted users (< 1000 chatters)", s.showParts, false, ->setTooltip(
"Show a Twitch system message stating what users have left the chat, " "Show a Twitch system message stating what users have joined the "
"only available when chat has less than 1000 users"); "chat, only available when the chat has less than 1000 users")
layout.addCheckbox("Automatically close user popup when it loses focus", ->addTo(layout);
s.autoCloseUserPopup);
layout.addCheckbox( SettingWidget::checkbox("Show parted users (< 1000 chatters)", s.showParts)
->setTooltip(
"Show a Twitch system message stating what users have left the "
"chat, only available when chat has less than 1000 users")
->addTo(layout);
SettingWidget::checkbox(
"Automatically close user popup when it loses focus",
s.autoCloseUserPopup)
->addTo(layout);
SettingWidget::checkbox(
"Automatically close reply thread popup when it loses focus", "Automatically close reply thread popup when it loses focus",
s.autoCloseThreadPopup); s.autoCloseThreadPopup)
layout.addCheckbox("Lowercase domains (anti-phishing)", s.lowercaseDomains, ->addTo(layout);
false,
"Make all clickable links lowercase to deter " SettingWidget::checkbox("Lowercase domains (anti-phishing)",
"phishing attempts."); s.lowercaseDomains)
->setTooltip(
"Make all clickable links lowercase to deter phishing attempts.")
->addTo(layout);
SettingWidget::checkbox("Show user's pronouns in user card", s.showPronouns) SettingWidget::checkbox("Show user's pronouns in user card", s.showPronouns)
->setDescription( ->setDescription(
R"(Pronouns are retrieved from <a href="https://pr.alejo.io">pr.alejo.io</a> when a user card is opened.)") R"(Pronouns are retrieved from <a href="https://pr.alejo.io">pr.alejo.io</a> when a user card is opened.)")
->addTo(layout); ->addTo(layout);
layout.addCheckbox("Bold @usernames", s.boldUsernames, false, SettingWidget::checkbox("Bold @usernames", s.boldUsernames)
"Bold @mentions to make them more noticeable."); ->setTooltip("Bold @mentions to make them more noticeable.")
layout.addCheckbox("Color @usernames", s.colorUsernames, false, ->addTo(layout);
"If Chatterino has seen a user, highlight @mention's of "
"them with their Twitch color."); SettingWidget::checkbox("Color @usernames", s.colorUsernames)
layout.addCheckbox("Try to find usernames without @ prefix", ->setTooltip("If Chatterino has seen a user, highlight @mention's of "
s.findAllUsernames, false, "them with their Twitch color.")
"Find mentions of users in chat without the @ prefix."); ->addTo(layout);
layout.addCheckbox("Show username autocompletion popup menu",
s.showUsernameCompletionMenu); SettingWidget::checkbox("Try to find usernames without @ prefix",
layout.addCheckbox( s.findAllUsernames)
"Always include broadcaster in user completions", ->setTooltip("Find mentions of users in chat without the @ prefix.")
s.alwaysIncludeBroadcasterInUserCompletions, false, ->addTo(layout);
"This will ensure a broadcaster is always easy to ping, even if they "
"don't have chat open or have typed recently."); SettingWidget::checkbox("Show username autocompletion popup menu",
s.showUsernameCompletionMenu)
->addTo(layout);
SettingWidget::checkbox("Always include broadcaster in user completions",
s.alwaysIncludeBroadcasterInUserCompletions)
->setTooltip(
"This will ensure a broadcaster is always easy to ping, even if "
"they don't have chat open or have typed recently.")
->addTo(layout);
const QStringList usernameDisplayModes = {"Username", "Localized name", const QStringList usernameDisplayModes = {"Username", "Localized name",
"Username and localized name"}; "Username and localized name"};
@@ -1232,45 +1339,59 @@ void GeneralPage::initLayout(GeneralPageView &layout)
[](auto args) { [](auto args) {
return fuzzyToFloat(args.value, 63.f); return fuzzyToFloat(args.value, 63.f);
}); });
layout.addCheckbox("Double click to open links and other elements in chat",
s.linksDoubleClickOnly, false,
"When enabled, opening links/usercards requires "
"double-clicking.\nUseful making sure you don't "
"accidentally click on suspicious links.");
layout.addCheckbox(
"Unshorten links", s.unshortLinks, false,
"When enabled, \"right-click + copy link\" will copy the unshortened "
"version of the link.\ne.g. https://bit.ly/mrfors -> "
"https://forsen.tv/");
layout.addCheckbox( SettingWidget::checkbox(
"Double click to open links and other elements in chat",
s.linksDoubleClickOnly)
->setTooltip("When enabled, opening links/usercards requires "
"double-clicking.\nUseful making sure you don't "
"accidentally click on suspicious links.")
->addTo(layout);
SettingWidget::checkbox("Unshorten links", s.unshortLinks)
->setTooltip("When enabled, \"right-click + copy link\" will copy the "
"unshortened version of the link.\ne.g. "
"https://bit.ly/mrfors -> https://forsen.tv/")
->addTo(layout);
SettingWidget::checkbox(
"Only search for emote autocompletion at the start of emote names", "Only search for emote autocompletion at the start of emote names",
s.prefixOnlyEmoteCompletion, false, s.prefixOnlyEmoteCompletion)
"When disabled, emote tab-completion will complete based on any part " ->setTooltip("When disabled, emote tab-completion will complete based "
"of the name." "on any part of the name.\ne.g. sheffy -> DatSheffy")
"\ne.g. sheffy -> DatSheffy"); ->addTo(layout);
layout.addCheckbox(
"Only search for username autocompletion with an @",
s.userCompletionOnlyWithAt, false,
"When enabled, username tab-completion will only complete when using @"
"\ne.g. pajl -> pajl | @pajl -> @pajlada");
layout.addCheckbox("Show Twitch whispers inline", s.inlineWhispers, false, SettingWidget::checkbox("Only search for username autocompletion with an @",
"Show whispers as messages in all splits instead " s.userCompletionOnlyWithAt)
"of just /whispers."); ->setTooltip("When enabled, username tab-completion will only complete "
layout.addCheckbox( "when using @\ne.g. pajl -> pajl | @pajl -> @pajlada")
"Highlight received inline whispers", s.highlightInlineWhispers, false, ->addTo(layout);
"Highlight the whispers shown in all splits.\nIf \"Show Twitch "
"whispers inline\" is disabled, this setting will do nothing."); SettingWidget::checkbox("Show Twitch whispers inline", s.inlineWhispers)
layout.addCheckbox( ->setTooltip("Show whispers as messages in all splits instead of just "
"/whispers.")
->addTo(layout);
SettingWidget::checkbox("Highlight received inline whispers",
s.highlightInlineWhispers)
->setTooltip(
"Highlight the whispers shown in all splits.\nIf \"Show Twitch "
"whispers inline\" is disabled, this setting will do nothing.")
->addTo(layout);
SettingWidget::checkbox(
"Automatically subscribe to participated reply threads", "Automatically subscribe to participated reply threads",
s.autoSubToParticipatedThreads, false, s.autoSubToParticipatedThreads)
"When enabled, you will automatically subscribe to reply threads you " ->setTooltip(
"participate in.\n" "When enabled, you will automatically subscribe to reply threads "
"This means reply threads you participate in will use your " "you participate in.\nThis means reply threads you participate in "
"\"Subscribed Reply Threads\" highlight settings."); "will use your \"Subscribed Reply Threads\" highlight settings.")
layout.addCheckbox("Load message history on connect", ->addTo(layout);
s.loadTwitchMessageHistoryOnConnect);
SettingWidget::checkbox("Load message history on connect",
s.loadTwitchMessageHistoryOnConnect)
->addTo(layout);
// TODO: Change phrasing to use better english once we can tag settings, right now it's kept as history instead of historical so that the setting shows up when the user searches for history // TODO: Change phrasing to use better english once we can tag settings, right now it's kept as history instead of historical so that the setting shows up when the user searches for history
layout.addIntInput("Max number of history messages to load on connect", layout.addIntInput("Max number of history messages to load on connect",
s.twitchMessageHistoryLimit, 10, 800, 10); s.twitchMessageHistoryLimit, 10, 800, 10);
@@ -1296,19 +1417,26 @@ void GeneralPage::initLayout(GeneralPageView &layout)
return args.index; return args.index;
}, },
false, "Combine consecutive timeout messages into a single message."); false, "Combine consecutive timeout messages into a single message.");
layout.addCheckbox("Combine multiple bit tips into one", s.stackBits, false,
"Combine consecutive cheermotes (sent in a single " SettingWidget::checkbox("Combine multiple bit tips into one", s.stackBits)
"message) into one cheermote."); ->setTooltip("Combine consecutive cheermotes (sent in a single "
layout.addCheckbox( "message) into one cheermote.")
"Messages in /mentions highlights tab", s.highlightMentions, false, ->addTo(layout);
// update this tooltip if https://github.com/Chatterino/chatterino2/pull/1557 is ever merged
"When disabled, the /mentions tab will not highlight in " // update this tooltip if https://github.com/Chatterino/chatterino2/pull/1557 is ever merged
"red when you are mentioned."); SettingWidget::checkbox("Messages in /mentions highlights tab",
layout.addCheckbox( s.highlightMentions)
"Strip leading mention in replies", s.stripReplyMention, false, ->setTooltip("When disabled, the /mentions tab will not highlight in "
"When disabled, messages sent in reply threads will include the " "red when you are mentioned.")
"@mention for the related thread. If the reply context is hidden, " ->addTo(layout);
"these mentions will never be stripped.");
SettingWidget::checkbox("Strip leading mention in replies",
s.stripReplyMention)
->setTooltip(
"When disabled, messages sent in reply threads will include the "
"@mention for the related thread. If the reply context is hidden, "
"these mentions will never be stripped.")
->addTo(layout);
SettingWidget::dropdown("Chat send protocol", s.chatSendProtocol) SettingWidget::dropdown("Chat send protocol", s.chatSendProtocol)
->setTooltip("'Helix' will use Twitch's Helix API to send message. " ->setTooltip("'Helix' will use Twitch's Helix API to send message. "
@@ -1321,18 +1449,19 @@ void GeneralPage::initLayout(GeneralPageView &layout)
->addTo(layout); ->addTo(layout);
SettingWidget::dropdown("Sound backend (requires restart)", s.soundBackend) SettingWidget::dropdown("Sound backend (requires restart)", s.soundBackend)
->setTooltip("Change this only if you're noticing issues " ->setTooltip("Change this only if you're noticing issues with sound "
"with sound playback on your system") "playback on your system")
->addTo(layout); ->addTo(layout);
layout.addCheckbox( SettingWidget::checkbox(
"Enable experimental Twitch EventSub support (requires restart)", "Enable experimental Twitch EventSub support (requires restart)",
s.enableExperimentalEventSub); s.enableExperimentalEventSub)
->addTo(layout);
SettingWidget::checkbox("Disable renaming of tabs on double-click", SettingWidget::checkbox("Disable renaming of tabs on double-click",
s.disableTabRenamingOnClick) s.disableTabRenamingOnClick)
->setTooltip("Prevents the rename dialog from opening when a " ->setTooltip("Prevents the rename dialog from opening when a tab is "
"tab is double-clicked") "double-clicked")
->addTo(layout); ->addTo(layout);
layout.addStretch(); layout.addStretch();
src/widgets/settingspages/GeneralPageView.cpp
-34
View File
@@ -159,40 +159,6 @@ SubtitleLabel *GeneralPageView::addSubtitle(const QString &title)
return label; return label;
} }
QCheckBox *GeneralPageView::addCheckbox(const QString &text,
BoolSetting &setting, bool inverse,
QString toolTipText)
{
if (inverse)
{
qCWarning(chatterinoWidget)
<< "use SettingWidget::inverseCheckbox instead";
}
auto *check = new QCheckBox(text);
this->addToolTip(*check, toolTipText);
// update when setting changes
setting.connect(
[inverse, check](const bool &value, auto) {
check->setChecked(inverse ^ value);
},
this->managedConnections_);
// update setting on toggle
QObject::connect(check, &QCheckBox::toggled, this,
[&setting, inverse](bool state) {
setting = inverse ^ state;
});
this->addWidget(check);
// groups
this->groups_.back().widgets.push_back({check, {text}});
return check;
}
ComboBox *GeneralPageView::addDropdown(const QString &text, ComboBox *GeneralPageView::addDropdown(const QString &text,
const QStringList &list, const QStringList &list,
QString toolTipText) QString toolTipText)
src/widgets/settingspages/GeneralPageView.hpp
-3
View File
@@ -132,9 +132,6 @@ public:
TitleLabel *addTitle(const QString &text); TitleLabel *addTitle(const QString &text);
SubtitleLabel *addSubtitle(const QString &text); SubtitleLabel *addSubtitle(const QString &text);
/// @param inverse Inverses true to false and vice versa
QCheckBox *addCheckbox(const QString &text, BoolSetting &setting,
bool inverse = false, QString toolTipText = {});
ComboBox *addDropdown(const QString &text, const QStringList &items, ComboBox *addDropdown(const QString &text, const QStringList &items,
QString toolTipText = {}); QString toolTipText = {});
src/widgets/settingspages/SettingWidget.hpp
+31 -25
View File
@@ -42,44 +42,50 @@ public:
SettingWidget(const SettingWidget &other) = delete; SettingWidget(const SettingWidget &other) = delete;
SettingWidget(SettingWidget &&other) = delete; SettingWidget(SettingWidget &&other) = delete;
static SettingWidget *checkbox(const QString &label, BoolSetting &setting); [[nodiscard("Must use created setting widget")]] static SettingWidget *
static SettingWidget *inverseCheckbox(const QString &label, checkbox(const QString &label, BoolSetting &setting);
BoolSetting &setting); [[nodiscard("Must use created setting widget")]] static SettingWidget *
static SettingWidget *customCheckbox(const QString &label, inverseCheckbox(const QString &label, BoolSetting &setting);
bool initialValue, [[nodiscard("Must use created setting widget")]] static SettingWidget *
const std::function<void(bool)> &save); customCheckbox(const QString &label, bool initialValue,
const std::function<void(bool)> &save);
static SettingWidget *intInput(const QString &label, IntSetting &setting, [[nodiscard("Must use created setting widget")]] static SettingWidget *
IntInputParams params); intInput(const QString &label, IntSetting &setting,
IntInputParams params);
template <typename T> template <typename T>
static SettingWidget *dropdown(const QString &label, [[nodiscard("Must use created setting widget")]] static SettingWidget *
EnumStringSetting<T> &setting); dropdown(const QString &label, EnumStringSetting<T> &setting);
template <typename T> template <typename T>
static SettingWidget *dropdown(const QString &label, [[nodiscard("Must use created setting widget")]] static SettingWidget *
EnumSetting<T> &setting); dropdown(const QString &label, EnumSetting<T> &setting);
static SettingWidget *colorButton(const QString &label, [[nodiscard("Must use created setting widget")]] static SettingWidget *
QStringSetting &setting); colorButton(const QString &label, QStringSetting &setting);
static SettingWidget *lineEdit(const QString &label, [[nodiscard("Must use created setting widget")]] static SettingWidget *
QStringSetting &setting, lineEdit(const QString &label, QStringSetting &setting,
const QString &placeholderText = {}); const QString &placeholderText = {});
static SettingWidget *fontButton(const QString &label, [[nodiscard("Must use created setting widget")]] static SettingWidget *
QStringSetting &familySetting, fontButton(const QString &label, QStringSetting &familySetting,
std::function<QFont()> currentFont, std::function<QFont()> currentFont,
std::function<void(QFont)> onChange); std::function<void(QFont)> onChange);
SettingWidget *setTooltip(QString tooltip); [[nodiscard("Must use created setting widget")]] SettingWidget *setTooltip(
SettingWidget *setDescription(const QString &text); QString tooltip);
[[nodiscard("Must use created setting widget")]] SettingWidget *
setDescription(const QString &text);
/// Add extra keywords to the widget /// Add extra keywords to the widget
/// ///
/// All text from the tooltip, description, and label are already keywords /// All text from the tooltip, description, and label are already keywords
SettingWidget *addKeywords(const QStringList &newKeywords); [[nodiscard("Must use created setting widget")]] SettingWidget *addKeywords(
const QStringList &newKeywords);
SettingWidget *conditionallyEnabledBy(BoolSetting &setting); [[nodiscard("Must use created setting widget")]] SettingWidget *
conditionallyEnabledBy(BoolSetting &setting);
void addTo(GeneralPageView &view); void addTo(GeneralPageView &view);
void addTo(GeneralPageView &view, QFormLayout *formLayout); void addTo(GeneralPageView &view, QFormLayout *formLayout);