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
-
10c9315c
by Henry Wilkes at 2025-02-27T12:24:45+00:00
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:
| ... | ... | @@ -2486,18 +2486,18 @@ const gConnectionPane = (function () { |
| 2486 | 2486 | |
| 2487 | 2487 | const retval = {
|
| 2488 | 2488 | // cached frequently accessed DOM elements
|
| 2489 | - _enableQuickstartCheckbox: null,
|
|
| 2489 | + _enableQuickstartToggle: null,
|
|
| 2490 | 2490 | |
| 2491 | 2491 | // populate xul with strings and cache the relevant elements
|
| 2492 | 2492 | _populateXUL() {
|
| 2493 | 2493 | // Quickstart
|
| 2494 | - this._enableQuickstartCheckbox = document.getElementById(
|
|
| 2495 | - "torPreferences-quickstart-toggle"
|
|
| 2494 | + this._enableQuickstartToggle = document.getElementById(
|
|
| 2495 | + "tor-connection-quickstart-toggle"
|
|
| 2496 | 2496 | );
|
| 2497 | - this._enableQuickstartCheckbox.addEventListener("command", () => {
|
|
| 2498 | - TorConnect.quickstart = this._enableQuickstartCheckbox.checked;
|
|
| 2497 | + this._enableQuickstartToggle.addEventListener("toggle", () => {
|
|
| 2498 | + TorConnect.quickstart = this._enableQuickstartToggle.pressed;
|
|
| 2499 | 2499 | });
|
| 2500 | - this._enableQuickstartCheckbox.checked = TorConnect.quickstart;
|
|
| 2500 | + this._enableQuickstartToggle.pressed = TorConnect.quickstart;
|
|
| 2501 | 2501 | Services.obs.addObserver(this, TorConnectTopics.QuickstartChange);
|
| 2502 | 2502 | |
| 2503 | 2503 | // Location
|
| ... | ... | @@ -2643,7 +2643,7 @@ const gConnectionPane = (function () { |
| 2643 | 2643 | observe(subject, topic) {
|
| 2644 | 2644 | switch (topic) {
|
| 2645 | 2645 | case TorConnectTopics.QuickstartChange: {
|
| 2646 | - this._enableQuickstartCheckbox.checked = TorConnect.quickstart;
|
|
| 2646 | + this._enableQuickstartToggle.pressed = TorConnect.quickstart;
|
|
| 2647 | 2647 | break;
|
| 2648 | 2648 | }
|
| 2649 | 2649 | // triggered when tor connect state changes and we may
|
| ... | ... | @@ -69,16 +69,19 @@ |
| 69 | 69 | <!-- Quickstart -->
|
| 70 | 70 | <groupbox data-category="paneConnection" hidden="true">
|
| 71 | 71 | <label>
|
| 72 | - <html:h2 data-l10n-id="tor-connection-quickstart-heading"></html:h2>
|
|
| 72 | + <html:h2 data-l10n-id="tor-connection-automatic-heading"></html:h2>
|
|
| 73 | 73 | </label>
|
| 74 | 74 | <description
|
| 75 | 75 | class="description-deemphasized"
|
| 76 | 76 | flex="1"
|
| 77 | - data-l10n-id="tor-connection-quickstart-description"
|
|
| 77 | + data-l10n-id="tor-connection-automatic-description"
|
|
| 78 | 78 | />
|
| 79 | - <checkbox
|
|
| 80 | - id="torPreferences-quickstart-toggle"
|
|
| 79 | + <html:moz-toggle
|
|
| 80 | + id="tor-connection-quickstart-toggle"
|
|
| 81 | + class="tor-toggle"
|
|
| 82 | + label-align-after=""
|
|
| 81 | 83 | data-l10n-id="tor-connection-quickstart-checkbox"
|
| 84 | + data-l10n-attrs="label"
|
|
| 82 | 85 | />
|
| 83 | 86 | </groupbox>
|
| 84 | 87 | |
| ... | ... | @@ -141,6 +144,7 @@ |
| 141 | 144 | </hbox>
|
| 142 | 145 | <html:moz-toggle
|
| 143 | 146 | id="tor-bridges-enabled-toggle"
|
| 147 | + class="tor-toggle"
|
|
| 144 | 148 | label-align-after=""
|
| 145 | 149 | data-l10n-id="tor-bridges-use-bridges"
|
| 146 | 150 | data-l10n-attrs="label"
|
| ... | ... | @@ -34,6 +34,11 @@ button.spoof-button-disabled { |
| 34 | 34 | }
|
| 35 | 35 | }
|
| 36 | 36 | |
| 37 | +.tor-toggle {
|
|
| 38 | + margin-block: 16px;
|
|
| 39 | + width: max-content;
|
|
| 40 | +}
|
|
| 41 | + |
|
| 37 | 42 | /* Status */
|
| 38 | 43 | |
| 39 | 44 | #network-status-internet-area {
|
| ... | ... | @@ -201,11 +206,6 @@ button.spoof-button-disabled { |
| 201 | 206 | display: none;
|
| 202 | 207 | }
|
| 203 | 208 | |
| 204 | -#tor-bridges-enabled-toggle {
|
|
| 205 | - margin-block: 16px;
|
|
| 206 | - width: max-content;
|
|
| 207 | -}
|
|
| 208 | - |
|
| 209 | 209 | #tor-bridges-update-area {
|
| 210 | 210 | /* Still accessible to screen reader, but not visual. */
|
| 211 | 211 | position: absolute;
|
| ... | ... | @@ -56,9 +56,8 @@ tor-connection-settings-category = |
| 56 | 56 | # -brand-short-name refers to 'Tor Browser', localized.
|
| 57 | 57 | tor-connection-overview = { -brand-short-name } routes your traffic over the Tor Network, run by thousands of volunteers around the world.
|
| 58 | 58 | tor-connection-browser-learn-more-link = Learn more
|
| 59 | -tor-connection-quickstart-heading = Quickstart
|
|
| 60 | -# -brand-short-name refers to 'Tor Browser', localized.
|
|
| 61 | -tor-connection-quickstart-description = Quickstart connects { -brand-short-name } to the Tor Network automatically when launched, based on your last used connection settings.
|
|
| 59 | +tor-connection-automatic-heading = Connect automatically
|
|
| 60 | +tor-connection-automatic-description = Automatically connect to the Tor network at launch using your current connection settings.
|
|
| 62 | 61 | tor-connection-quickstart-checkbox =
|
| 63 | 62 | .label = Always connect automatically
|
| 64 | 63 |