mirrors/desktop
1
0
Fork 0
mirror of https://github.com/zen-browser/desktop.git synced 2025-09-05 19:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added zen workspaces for syncing

Browse Source
This commit is contained in:
mauro-balades
2024-10-05 23:27:25 +02:00
parent 57f697975e
commit b323a92dbf
6 changed files with 37 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
l10n

Submodule l10n updated: fc5116138c...b5b3055e1e

2
src/browser/base/content/zen-components

Submodule src/browser/base/content/zen-components updated: 9f32f780ca...775b5288fb

12
src/browser/components/preferences/dialogs/syncChooseWhatToSync-js.patch Normal file
View File

@@ -0,0 +1,12 @@
diff --git a/browser/components/preferences/dialogs/syncChooseWhatToSync.js b/browser/components/preferences/dialogs/syncChooseWhatToSync.js
index 2cc965b4e1b20e1ae422bfb5c90a237dcd31fcf6..cfed9dfa67c7c34cd812885a72d66dd37ba414fc 100644
--- a/browser/components/preferences/dialogs/syncChooseWhatToSync.js
+++ b/browser/components/preferences/dialogs/syncChooseWhatToSync.js
@@ -13,6 +13,7 @@ Preferences.addAll([
{ id: "services.sync.engine.passwords", type: "bool" },
{ id: "services.sync.engine.addresses", type: "bool" },
{ id: "services.sync.engine.creditcards", type: "bool" },
+ { id: "services.sync.engine.workspaces", type: "bool" },
]);
let gSyncChooseWhatToSync = {

15
src/browser/components/preferences/dialogs/syncChooseWhatToSync-xhtml.patch
View File

@@ -1,8 +1,19 @@
diff --git a/browser/components/preferences/dialogs/syncChooseWhatToSync.xhtml b/browser/components/preferences/dialogs/syncChooseWhatToSync.xhtml
index 83bd09c0c3f8fd5febf1721e6b462ca90e54327b..71c9e8e4056edaeb354cf7844494bd83c2089561 100644
index 83bd09c0c3f8fd5febf1721e6b462ca90e54327b..5d0ca4265e7b57178f1fe45068449e0355ba80e0 100644
--- a/browser/components/preferences/dialogs/syncChooseWhatToSync.xhtml
+++ b/browser/components/preferences/dialogs/syncChooseWhatToSync.xhtml
@@ -82,6 +82,12 @@
@@ -26,6 +26,10 @@
rel="localization"
href="browser/preferences/preferences.ftl"
/>
+ <html:link
+ rel="localization"
+ href="browser/preferences/zen-preferences.ftl"
+ />
</linkset>
<script src="chrome://global/content/preferencesBindings.js" />
<script src="chrome://browser/content/preferences/dialogs/syncChooseWhatToSync.js" />
@@ -82,6 +86,12 @@
preference="services.sync.engine.prefs"
/>
</html:div>

12
src/browser/components/preferences/preferences-js.patch
View File

@@ -1,8 +1,16 @@
diff --git a/browser/components/preferences/preferences.js b/browser/components/preferences/preferences.js
index 7e21bab426b6eb52fe84876d817fddbdb1a35ffc..39637cc8aea988c77e5a6c66a85ec66acd4ca4bc 100644
index 7e21bab426b6eb52fe84876d817fddbdb1a35ffc..445940903fb28d332e5436634fa9546ec812a130 100644
--- a/browser/components/preferences/preferences.js
+++ b/browser/components/preferences/preferences.js
@@ -196,6 +196,10 @@ function init_all() {
@@ -122,6 +122,7 @@ ChromeUtils.defineLazyGetter(this, "gSubDialog", function () {
styleSheets: [
"chrome://browser/skin/preferences/dialog.css",
"chrome://browser/skin/preferences/preferences.css",
+ "chrome://browser/skin/preferences/zen-preferences.css",
],
resizeCallback: async ({ title, frame }) => {
// Search within main document and highlight matched keyword.
@@ -196,6 +197,10 @@ function init_all() {
// the entire document.
Preferences.queueUpdateOfAllElements();
Services.telemetry.setEventRecordingEnabled("aboutpreferences", true);

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

@@ -996,9 +996,4 @@ Preferences.addAll([
type: 'bool',
default: false,
},
{
id: 'services.sync.engine.workspaces',
type: 'bool',
default: true,
}
]);