chatterino2
Code Issues

Enable browser integration settings on all platforms (#6509)

Browse Source 
* Enable browser integration settings on all platforms

* nit: document /watching for Windows too

* nit: only show "attach" setting on Windows

* chore: add changelog entry

* another changelog update

---------

Co-authored-by: smc <crazysmc@users.noreply.github.com>
Co-authored-by: Rasmus Karlsson <rasmus.karlsson@pajlada.com>
This commit is contained in:
smc
2025-10-04 15:26:42 +02:00
committed by GitHub
parent c5b0669812
commit 3f68170a49
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+1
View File
@@ -6,6 +6,7 @@
- Minor: Fixed usercard resizing improperly without recent messages. (#6496) - Minor: Fixed usercard resizing improperly without recent messages. (#6496)
- Minor: Added setting for character limit of deleted messages. (#6491) - Minor: Added setting for character limit of deleted messages. (#6491)
- Minor: Added link support to plugin message API. (#6386) - Minor: Added link support to plugin message API. (#6386)
- Bugfix: Expose the "Extra extension IDs" setting on non-Windows systems too. (#6509)
- Dev: Update release documentation. (#6498) - Dev: Update release documentation. (#6498)
- Dev: Make code sanitizers opt in with the `CHATTERINO_SANITIZER_SUPPORT` CMake option. After that's enabled, use the `SANITIZE_*` flag to enable individual sanitizers. (#6493) - Dev: Make code sanitizers opt in with the `CHATTERINO_SANITIZER_SUPPORT` CMake option. After that's enabled, use the `SANITIZE_*` flag to enable individual sanitizers. (#6493)
- Dev: Remove unused QTextCodec includes. (#6487) - Dev: Remove unused QTextCodec includes. (#6487)
src/widgets/settingspages/GeneralPage.cpp
+11 -4
View File
@@ -889,10 +889,16 @@ void GeneralPage::initLayout(GeneralPageView &layout)
"issues <a href='https://chatterino.com/link/issues'>here</a>."); "issues <a href='https://chatterino.com/link/issues'>here</a>.");
} }
#ifdef Q_OS_WIN
layout.addTitle("Browser Integration"); layout.addTitle("Browser Integration");
layout.addDescription("The browser extension replaces the default " #ifdef Q_OS_WIN
"Twitch.tv chat with Chatterino."); layout.addDescription(
"The browser extension replaces the default "
"Twitch.tv chat with Chatterino, and updates the /watching split on "
"Chatterino when Twitch.tv is open.");
#else
layout.addDescription("The browser extension updates the /watching "
"split on Chatterino when Twitch.tv is open.");
#endif
{ {
if (auto err = nmIpcError().get()) if (auto err = nmIpcError().get())
@@ -910,6 +916,7 @@ void GeneralPage::initLayout(GeneralPageView &layout)
layout.addDescription( layout.addDescription(
formatRichNamedLink(FIREFOX_EXTENSION_LINK, "Download for Firefox")); formatRichNamedLink(FIREFOX_EXTENSION_LINK, "Download for Firefox"));
#ifdef Q_OS_WIN
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.");
SettingWidget::checkbox("Attach to any browser (may cause issues)", SettingWidget::checkbox("Attach to any browser (may cause issues)",
@@ -918,6 +925,7 @@ void GeneralPage::initLayout(GeneralPageView &layout)
"Attempt to force the Chatterino Browser Extension to work in " "Attempt to force the Chatterino Browser Extension to work in "
"certain browsers that do not work automatically.\ne.g. Librewolf") "certain browsers that do not work automatically.\ne.g. Librewolf")
->addTo(layout); ->addTo(layout);
#endif
{ {
auto *note = layout.addDescription( auto *note = layout.addDescription(
@@ -938,7 +946,6 @@ void GeneralPage::initLayout(GeneralPageView &layout)
"Extension;IDs;separated;by;semicolons") "Extension;IDs;separated;by;semicolons")
->addTo(layout, form); ->addTo(layout, form);
} }
#endif
layout.addTitle("AppData & Cache"); layout.addTitle("AppData & Cache");