1
0
Fork 1
mirror of https://github.com/zen-browser/desktop.git synced 2025-07-08 00:10:00 +02:00
This commit is contained in:
mr. m 2025-06-26 21:03:53 +02:00
commit 48df87da98
No known key found for this signature in database
GPG key ID: 928E01ED4C97749F
11 changed files with 21 additions and 20 deletions

View file

@ -29,8 +29,8 @@ Zen is a firefox-based browser with the aim of pushing your productivity to a ne
### Firefox Versions ### Firefox Versions
- [`Release`](https://zen-browser.app/download) - Is currently built using Firefox version `139.0.4`! 🚀 - [`Release`](https://zen-browser.app/download) - Is currently built using Firefox version `140.0.1`! 🚀
- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 140.0`! - [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 140.0.1`!
### Contributing ### Contributing

View file

@ -1 +1 @@
667950575bde54b8d83db2a25ccf468522d4e0c9 d5e5ed08dac5a263dbc7784dff272198b17bbc4f

View file

@ -11,7 +11,7 @@ pref('zen.workspaces.wrap-around-navigation', true);
pref('zen.workspaces.natural-scroll', false); pref('zen.workspaces.natural-scroll', false);
pref('zen.workspaces.scroll-modifier-key','ctrl'); // can be ctrl, alt, shift, or a meta key pref('zen.workspaces.scroll-modifier-key','ctrl'); // can be ctrl, alt, shift, or a meta key
pref('services.sync.engine.workspaces', false); pref('services.sync.engine.workspaces', false);
pref('zen.workspaces.container-specific-essentials-enabled', false); pref('zen.workspaces.separate-essentials', true);
#ifdef MOZILLA_OFFICIAL #ifdef MOZILLA_OFFICIAL
pref('zen.workspaces.debug', false); pref('zen.workspaces.debug', false);

View file

@ -742,19 +742,13 @@ var gZenWorkspacesSettings = {
}; };
Services.prefs.addObserver('zen.tab-unloader.enabled', tabsUnloaderPrefListener); Services.prefs.addObserver('zen.tab-unloader.enabled', tabsUnloaderPrefListener);
Services.prefs.addObserver('zen.glance.enabled', tabsUnloaderPrefListener); // We can use the same listener for both prefs Services.prefs.addObserver('zen.glance.enabled', tabsUnloaderPrefListener); // We can use the same listener for both prefs
Services.prefs.addObserver( Services.prefs.addObserver('zen.workspaces.separate-essentials', tabsUnloaderPrefListener);
'zen.workspaces.container-specific-essentials-enabled',
tabsUnloaderPrefListener
);
Services.prefs.addObserver('zen.glance.activation-method', tabsUnloaderPrefListener); Services.prefs.addObserver('zen.glance.activation-method', tabsUnloaderPrefListener);
window.addEventListener('unload', () => { window.addEventListener('unload', () => {
Services.prefs.removeObserver('zen.tab-unloader.enabled', tabsUnloaderPrefListener); Services.prefs.removeObserver('zen.tab-unloader.enabled', tabsUnloaderPrefListener);
Services.prefs.removeObserver('zen.glance.enabled', tabsUnloaderPrefListener); Services.prefs.removeObserver('zen.glance.enabled', tabsUnloaderPrefListener);
Services.prefs.removeObserver('zen.glance.activation-method', tabsUnloaderPrefListener); Services.prefs.removeObserver('zen.glance.activation-method', tabsUnloaderPrefListener);
Services.prefs.removeObserver( Services.prefs.removeObserver('zen.workspaces.separate-essentials', tabsUnloaderPrefListener);
'zen.workspaces.container-specific-essentials-enabled',
tabsUnloaderPrefListener
);
}); });
}, },
}; };
@ -1153,7 +1147,7 @@ Preferences.addAll([
default: true, default: true,
}, },
{ {
id: 'zen.workspaces.container-specific-essentials-enabled', id: 'zen.workspaces.separate-essentials',
type: 'bool', type: 'bool',
default: false, default: false,
}, },

View file

@ -47,7 +47,7 @@
preference="zen.pinned-tab-manager.restore-pinned-tabs-to-pinned-url"/> preference="zen.pinned-tab-manager.restore-pinned-tabs-to-pinned-url"/>
<checkbox id="zenPinnedTabContainerSpecificEssentials" <checkbox id="zenPinnedTabContainerSpecificEssentials"
data-l10n-id="zen-pinned-tab-manager-container-specific-essentials-enabled" data-l10n-id="zen-pinned-tab-manager-container-specific-essentials-enabled"
preference="zen.workspaces.container-specific-essentials-enabled"/> preference="zen.workspaces.separate-essentials"/>
<hbox align="center"> <hbox align="center">
<label id="zenPinnedTabCloseShortcutBehaviorLabel" data-l10n-id="zen-pinned-tab-manager-close-shortcut-behavior-label"/> <label id="zenPinnedTabCloseShortcutBehaviorLabel" data-l10n-id="zen-pinned-tab-manager-close-shortcut-behavior-label"/>

View file

@ -51,6 +51,10 @@ class nsZenUIMigration {
if (userChromeFile.exists() || userContentFile.exists()) { if (userChromeFile.exists() || userContentFile.exists()) {
Services.prefs.setBoolPref('toolkit.legacyUserProfileCustomizations.stylesheets', true); Services.prefs.setBoolPref('toolkit.legacyUserProfileCustomizations.stylesheets', true);
} }
Services.prefs.setBoolPref(
'zen.workspaces.separate-essentials',
Services.prefs.getBoolPref('zen.workspaces.container-specific-essentials-enabled', false)
);
} }
} }

View file

@ -1,5 +1,5 @@
[DEFAULT] [DEFAULT]
prefs = ["zen.workspaces.container-specific-essentials-enabled=true"] prefs = ["zen.workspaces.separate-essentials=true"]
["browser_container_auto_switch.js"] ["browser_container_auto_switch.js"]
["browser_container_specific_essentials.js"] ["browser_container_specific_essentials.js"]

View file

@ -1,3 +1,5 @@
[DEFAULT]
prefs = ["zen.workspaces.separate-essentials=false"]
["browser_pinned_unload_changed.js"] ["browser_pinned_unload_changed.js"]
["browser_pinned_unload_noreset.js"] ["browser_pinned_unload_noreset.js"]

View file

@ -1,4 +1,5 @@
[DEFAULT] [DEFAULT]
prefs = ["zen.workspaces.separate-essentials=false"]
support-files = [ support-files = [
"head.js", "head.js",
] ]

View file

@ -100,7 +100,7 @@ var gZenWorkspaces = new (class extends ZenMultiWindowFeature {
false false
); );
this.containerSpecificEssentials = Services.prefs.getBoolPref( this.containerSpecificEssentials = Services.prefs.getBoolPref(
'zen.workspaces.container-specific-essentials-enabled', 'zen.workspaces.separate-essentials',
false false
); );
ChromeUtils.defineLazyGetter(this, 'tabContainer', () => ChromeUtils.defineLazyGetter(this, 'tabContainer', () =>

View file

@ -5,8 +5,8 @@
"binaryName": "zen", "binaryName": "zen",
"version": { "version": {
"product": "firefox", "product": "firefox",
"version": "139.0.4", "version": "140.0.1",
"candidate": "140.0" "candidate": "140.0.1"
}, },
"buildOptions": { "buildOptions": {
"generateBranding": true "generateBranding": true
@ -19,7 +19,7 @@
"brandShortName": "Zen", "brandShortName": "Zen",
"brandFullName": "Zen Browser", "brandFullName": "Zen Browser",
"release": { "release": {
"displayVersion": "1.13.2b", "displayVersion": "1.14b",
"github": { "github": {
"repo": "zen-browser/desktop" "repo": "zen-browser/desktop"
}, },
@ -39,7 +39,7 @@
"brandShortName": "Twilight", "brandShortName": "Twilight",
"brandFullName": "Zen Twilight", "brandFullName": "Zen Twilight",
"release": { "release": {
"displayVersion": "1.14t", "displayVersion": "1.15t",
"github": { "github": {
"repo": "zen-browser/desktop" "repo": "zen-browser/desktop"
} }