morgan pushed to branch tor-browser-128.7.0esr-14.5-1 at The Tor Project / Applications / Tor Browser

Commits: e21ae62e by Henry Wilkes at 2025-02-27T12:24:45+00:00 fixup! TB 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection

TB 43469: Change the quickstart checkbox to a toggle.

We also update the description text to use "connect automatically" rather than "Quickstart".

- - - - - 10c9315c by Henry Wilkes at 2025-02-27T12:24:45+00:00 fixup! Tor Browser strings

TB 43469: Use "Connect automatically" instead of "Quickstart" in the UI.

- - - - -

4 changed files:

- browser/components/torpreferences/content/connectionPane.js - browser/components/torpreferences/content/connectionPane.xhtml - browser/components/torpreferences/content/torPreferences.css - toolkit/locales/en-US/toolkit/global/tor-browser.ftl

Changes:

===================================== browser/components/torpreferences/content/connectionPane.js ===================================== @@ -2486,18 +2486,18 @@ const gConnectionPane = (function () {

const retval = { // cached frequently accessed DOM elements - _enableQuickstartCheckbox: null, + _enableQuickstartToggle: null,

// populate xul with strings and cache the relevant elements _populateXUL() { // Quickstart - this._enableQuickstartCheckbox = document.getElementById( - "torPreferences-quickstart-toggle" + this._enableQuickstartToggle = document.getElementById( + "tor-connection-quickstart-toggle" ); - this._enableQuickstartCheckbox.addEventListener("command", () => { - TorConnect.quickstart = this._enableQuickstartCheckbox.checked; + this._enableQuickstartToggle.addEventListener("toggle", () => { + TorConnect.quickstart = this._enableQuickstartToggle.pressed; }); - this._enableQuickstartCheckbox.checked = TorConnect.quickstart; + this._enableQuickstartToggle.pressed = TorConnect.quickstart; Services.obs.addObserver(this, TorConnectTopics.QuickstartChange);

// Location @@ -2643,7 +2643,7 @@ const gConnectionPane = (function () { observe(subject, topic) { switch (topic) { case TorConnectTopics.QuickstartChange: { - this._enableQuickstartCheckbox.checked = TorConnect.quickstart; + this._enableQuickstartToggle.pressed = TorConnect.quickstart; break; } // triggered when tor connect state changes and we may

===================================== browser/components/torpreferences/content/connectionPane.xhtml ===================================== @@ -69,16 +69,19 @@ <!-- Quickstart --> <groupbox data-category="paneConnection" hidden="true"> <label> - <html:h2 data-l10n-id="tor-connection-quickstart-heading"></html:h2> + <html:h2 data-l10n-id="tor-connection-automatic-heading"></html:h2> </label> <description class="description-deemphasized" flex="1" - data-l10n-id="tor-connection-quickstart-description" + data-l10n-id="tor-connection-automatic-description" /> - <checkbox - id="torPreferences-quickstart-toggle" + <html:moz-toggle + id="tor-connection-quickstart-toggle" + class="tor-toggle" + label-align-after="" data-l10n-id="tor-connection-quickstart-checkbox" + data-l10n-attrs="label" /> </groupbox>

@@ -141,6 +144,7 @@ </hbox> <html:moz-toggle id="tor-bridges-enabled-toggle" + class="tor-toggle" label-align-after="" data-l10n-id="tor-bridges-use-bridges" data-l10n-attrs="label"

===================================== browser/components/torpreferences/content/torPreferences.css ===================================== @@ -34,6 +34,11 @@ button.spoof-button-disabled { } }

+.tor-toggle { + margin-block: 16px; + width: max-content; +} + /* Status */

#network-status-internet-area { @@ -201,11 +206,6 @@ button.spoof-button-disabled { display: none; }

-#tor-bridges-enabled-toggle { - margin-block: 16px; - width: max-content; -} - #tor-bridges-update-area { /* Still accessible to screen reader, but not visual. */ position: absolute;

===================================== toolkit/locales/en-US/toolkit/global/tor-browser.ftl ===================================== @@ -56,9 +56,8 @@ tor-connection-settings-category = # -brand-short-name refers to 'Tor Browser', localized. tor-connection-overview = { -brand-short-name } routes your traffic over the Tor Network, run by thousands of volunteers around the world. tor-connection-browser-learn-more-link = Learn more -tor-connection-quickstart-heading = Quickstart -# -brand-short-name refers to 'Tor Browser', localized. -tor-connection-quickstart-description = Quickstart connects { -brand-short-name } to the Tor Network automatically when launched, based on your last used connection settings. +tor-connection-automatic-heading = Connect automatically +tor-connection-automatic-description = Automatically connect to the Tor network at launch using your current connection settings. tor-connection-quickstart-checkbox = .label = Always connect automatically

View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/85e00bd...