mirrors/desktop
1
0
Fork 0
mirror of https://github.com/zen-browser/desktop.git synced 2026-02-07 04:17:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1899 from kristijanribaric/feature(workspace-sync)-load-workspace-sync-script

Browse Source 
Feature: Add Zen Workspaces synchronization
This commit is contained in:
mauro 🤙
2024-10-05 22:53:49 +02:00
committed by GitHub
parent 90683aa637 9a9171055c
commit 57f697975e
7 changed files with 45 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/browser/app/profile/zen-browser.js
View File

@@ -131,6 +131,7 @@ pref('zen.workspaces.hide-default-container-indicator', true);
pref('zen.workspaces.individual-pinned-tabs', true);
pref('zen.workspaces.show-icon-strip', true);
pref('zen.workspaces.icons', '["🌐", "📁", "💼", "📝", "📅", "📊","🧠"]');
pref('services.sync.engine.workspaces', false);
// Zen Watermark
pref('zen.watermark.enabled', true, sticky);

1
src/browser/base/content/zen-assets.inc.xhtml
View File

@@ -32,6 +32,7 @@
<script src="chrome://browser/content/zen-components/ZenTabUnloader.mjs" />
<script src="chrome://browser/content/zen-components/ZenWorkspaces.mjs" />
<script src="chrome://browser/content/zen-components/ZenWorkspacesStorage.mjs" />
<script src="chrome://browser/content/zen-components/ZenWorkspacesSync.mjs" />
<script src="chrome://browser/content/zen-components/ZenViewSplitter.mjs"/>
<script src="chrome://browser/content/zen-components/ZenProfileDialogUI.mjs" />
<script src="chrome://browser/content/zen-components/ZenKeyboardShortcuts.mjs" />

1
src/browser/base/content/zen-assets.jar.inc.mn
View File

@@ -9,6 +9,7 @@
content/browser/zen-components/ZenThemesCommon.mjs (content/zen-components/src/ZenThemesCommon.mjs)
content/browser/zen-components/ZenWorkspaces.mjs (content/zen-components/src/ZenWorkspaces.mjs)
content/browser/zen-components/ZenWorkspacesStorage.mjs (content/zen-components/src/ZenWorkspacesStorage.mjs)
content/browser/zen-components/ZenWorkspacesSync.mjs (content/zen-components/src/ZenWorkspacesSync.mjs)
content/browser/zen-components/ZenSidebarManager.mjs (content/zen-components/src/ZenSidebarManager.mjs)
content/browser/zen-components/ZenProfileDialogUI.mjs (content/zen-components/src/ZenProfileDialogUI.mjs)
content/browser/zen-components/ZenKeyboardShortcuts.mjs (content/zen-components/src/ZenKeyboardShortcuts.mjs)

17
src/browser/components/preferences/dialogs/syncChooseWhatToSync-xhtml.patch Normal file
View File

@@ -0,0 +1,17 @@
diff --git a/browser/components/preferences/dialogs/syncChooseWhatToSync.xhtml b/browser/components/preferences/dialogs/syncChooseWhatToSync.xhtml
index 83bd09c0c3f8fd5febf1721e6b462ca90e54327b..71c9e8e4056edaeb354cf7844494bd83c2089561 100644
--- a/browser/components/preferences/dialogs/syncChooseWhatToSync.xhtml
+++ b/browser/components/preferences/dialogs/syncChooseWhatToSync.xhtml
@@ -82,6 +82,12 @@
preference="services.sync.engine.prefs"
/>
</html:div>
+ <html:div class="sync-engine-workspaces">
+ <checkbox
+ data-l10n-id="sync-engine-workspaces"
+ preference="services.sync.engine.workspaces"
+ />
+ </html:div>
</html:div>
</dialog>
</window>

15
src/browser/components/preferences/sync-inc-xhtml.patch Normal file
View File

@@ -0,0 +1,15 @@
diff --git a/browser/components/preferences/sync.inc.xhtml b/browser/components/preferences/sync.inc.xhtml
index 492491a369b53797aded1d3e4cf24d6f11394267..b294aa3005b11276ba8f1c58730b85043a19bf3f 100644
--- a/browser/components/preferences/sync.inc.xhtml
+++ b/browser/components/preferences/sync.inc.xhtml
@@ -229,6 +229,10 @@
<image class="sync-engine-image sync-engine-prefs" alt=""/>
<label data-l10n-id="sync-currently-syncing-settings"/>
</html:div>
+ <html:div engine_preference="services.sync.engine.workspaces">
+ <image class="sync-engine-image sync-engine-workspaces" alt=""/>
+ <label data-l10n-id="sync-currently-syncing-workspaces"/>
+ </html:div>
</html:div>
<hbox>
<button id="syncChangeOptions"

5
src/browser/components/preferences/zen-settings.js
View File

@@ -995,5 +995,10 @@ Preferences.addAll([
id: 'zen.view.show-bottom-border',
type: 'bool',
default: false,
},
{
id: 'services.sync.engine.workspaces',
type: 'bool',
default: true,
}
]);

5
src/browser/themes/shared/preferences/zen-preferences.css
View File

@@ -584,3 +584,8 @@ groupbox h2 {
#websiteAdvertisingGroup {
display: none !important;
}
.sync-engine-workspaces .checkbox-icon,
.sync-engine-workspaces.sync-engine-image {
list-style-image: url("chrome://devtools/skin/images/tool-storage.svg");
}