From c0d101aef01eeeca3c61abc498b4574ceb9bc83c Mon Sep 17 00:00:00 2001 From: Gunir <134402102+gunir@users.noreply.github.com> Date: Sun, 25 Aug 2024 06:32:59 +0700 Subject: [PATCH 001/265] Exposes Letterboxing https://github.com/zen-browser/desktop/issues/475 Exposes Letterboxing https://github.com/zen-browser/desktop/issues/475 --- src/browser/app/profile/zen-browser.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/browser/app/profile/zen-browser.js b/src/browser/app/profile/zen-browser.js index 9846e2dbcf..2228603f4a 100644 --- a/src/browser/app/profile/zen-browser.js +++ b/src/browser/app/profile/zen-browser.js @@ -172,3 +172,7 @@ pref("sidebar.verticalTabs", false, locked); // Better Windows theming pref("widget.non-native-theme.scrollbar.style", 2); pref("widget.non-native-theme.use-theme-accent", true); + +// Expose Letterboxing https://github.com/zen-browser/desktop/issues/475 +pref("privacy.resistFingerprinting.letterboxing", false); +pref("privacy.resistFingerprinting.letterboxing.dimensions", ""); From 3def55d48b554fe88b17d84e598dcf6d0de074cf Mon Sep 17 00:00:00 2001 From: Mauro Balades Date: Sun, 25 Aug 2024 11:27:27 +0200 Subject: [PATCH 002/265] Started checking for themes updates --- l10n | 2 +- scripts/copy-language-pack.sh | 17 ++++++++++++++++ scripts/download-language-packs.sh | 18 ++++------------- scripts/update-en-US-packs.sh | 2 ++ src/browser/base/content/zen-components | 2 +- .../preferences/preferences-js.patch | 5 +++-- .../preferences/preferences-xhtml.patch | 20 +++++++++++++++---- .../components/preferences/zen-settings.js | 12 ++++++++++- .../preferences/zenLooksAndFeel.inc.xhtml | 8 -------- .../preferences/zenMarketplace.inc.xhtml | 20 +++++++++++++++++++ .../shared/preferences/zen-preferences.css | 8 ++++++++ .../modules/ActorManagerParent-sys-mjs.patch | 4 ++-- 12 files changed, 85 insertions(+), 33 deletions(-) create mode 100644 scripts/copy-language-pack.sh create mode 100644 scripts/update-en-US-packs.sh create mode 100644 src/browser/components/preferences/zenMarketplace.inc.xhtml diff --git a/l10n b/l10n index c92099b2d1..bfcfcf1aab 160000 --- a/l10n +++ b/l10n @@ -1 +1 @@ -Subproject commit c92099b2d1be7184f3a187f7f2fa7da6622f10fe +Subproject commit bfcfcf1aab410bbf67a7dfac412487b7138b957b diff --git a/scripts/copy-language-pack.sh b/scripts/copy-language-pack.sh new file mode 100644 index 0000000000..1c7a15f745 --- /dev/null +++ b/scripts/copy-language-pack.sh @@ -0,0 +1,17 @@ +browser_locales=engine/browser/locales + +copy_browser_locales() { + langId=$1 + mkdir -p $browser_locales/$langId + if [ "$langId" = "en-US" ]; then + find $browser_locales/$langId -type f -name "zen*" -delete + rsync -av --exclude=.git ./l10n/en-US/browser/ $browser_locales/$langId/ + return + fi + rm -rf $browser_locales/$langId/ + rsync -av --exclude=.git ./l10n/$langId/ $browser_locales/$langId/ +} + +LANG=$1 +echo "Copying language pack for $LANG" +copy_browser_locales $LANG diff --git a/scripts/download-language-packs.sh b/scripts/download-language-packs.sh index 9c6eeeb1dc..60e396a69d 100644 --- a/scripts/download-language-packs.sh +++ b/scripts/download-language-packs.sh @@ -39,24 +39,14 @@ done cd $CURRENT_DIR # Move all the files to the correct location -browser_locales=engine/browser/locales -copy_browser_locales() { - langId=$1 - only_en=$2 - mkdir -p $browser_locales/$langId - if [ "$only_en" = true ]; then - rsync -av --exclude=.git ./l10n/en-US/browser/ $browser_locales/$langId/ - return - fi - rm -rf $browser_locales/$langId/ - rsync -av --exclude=.git ./l10n/$langId/ $browser_locales/$langId/ -} -copy_browser_locales en-US true +sh scripts/copy-language-pack.sh en-US for lang in $(cat ./l10n/supported-languages); do - copy_browser_locales $lang false + sh scripts/copy-language-pack.sh $lang done +wait + echo "Cleaning up" rm -rf ~/tools rm -rf ~/.git-cinnabar diff --git a/scripts/update-en-US-packs.sh b/scripts/update-en-US-packs.sh new file mode 100644 index 0000000000..9593127531 --- /dev/null +++ b/scripts/update-en-US-packs.sh @@ -0,0 +1,2 @@ + +sh ./scripts/copy-language-pack.sh en-US diff --git a/src/browser/base/content/zen-components b/src/browser/base/content/zen-components index 6bd08b136f..36306fd148 160000 --- a/src/browser/base/content/zen-components +++ b/src/browser/base/content/zen-components @@ -1 +1 @@ -Subproject commit 6bd08b136f0189c312dd3ca5b45a0f5e074557e3 +Subproject commit 36306fd148143a4a2c502b56e7d5f21b61996545 diff --git a/src/browser/components/preferences/preferences-js.patch b/src/browser/components/preferences/preferences-js.patch index 499fce7fb2..e7d59450c0 100644 --- a/src/browser/components/preferences/preferences-js.patch +++ b/src/browser/components/preferences/preferences-js.patch @@ -1,14 +1,15 @@ diff --git a/browser/components/preferences/preferences.js b/browser/components/preferences/preferences.js -index 7e21bab426b6eb52fe84876d817fddbdb1a35ffc..fb7c6f419c02701aecd148ef2fe271ed6f1a73c1 100644 +index 7e21bab426b6eb52fe84876d817fddbdb1a35ffc..56b42e2d025e4a47ea0983cf33ae69ffafa0d576 100644 --- a/browser/components/preferences/preferences.js +++ b/browser/components/preferences/preferences.js -@@ -196,6 +196,9 @@ function init_all() { +@@ -196,6 +196,10 @@ function init_all() { // the entire document. Preferences.queueUpdateOfAllElements(); Services.telemetry.setEventRecordingEnabled("aboutpreferences", true); + register_module("paneZenLooks", gZenLooksAndFeel); + register_module("paneZenWorkspaces", gZenWorkspacesSettings); + register_module("paneZenCKS", gZenCKSSettings); ++ register_module("paneZenMarketplace", gZenMarketplaceManager); register_module("paneGeneral", gMainPane); register_module("paneHome", gHomePane); diff --git a/src/browser/components/preferences/preferences-xhtml.patch b/src/browser/components/preferences/preferences-xhtml.patch index 45c2105a43..9166900ee0 100644 --- a/src/browser/components/preferences/preferences-xhtml.patch +++ b/src/browser/components/preferences/preferences-xhtml.patch @@ -1,5 +1,5 @@ diff --git a/browser/components/preferences/preferences.xhtml b/browser/components/preferences/preferences.xhtml -index 3affb19d1a243da4a5782c9a4a5588d165b4119f..6fdc0c4447d2d43ee5f4563c725b6eca1cf7acc5 100644 +index 3affb19d1a243da4a5782c9a4a5588d165b4119f..837f078ff1f3a65a40877c1380c6d050a8415bab 100644 --- a/browser/components/preferences/preferences.xhtml +++ b/browser/components/preferences/preferences.xhtml @@ -43,6 +43,8 @@ @@ -24,7 +24,7 @@ index 3affb19d1a243da4a5782c9a4a5588d165b4119f..6fdc0c4447d2d43ee5f4563c725b6eca @@ -60,11 +60,22 @@ index 3affb19d1a243da4a5782c9a4a5588d165b4119f..6fdc0c4447d2d43ee5f4563c725b6eca + + + ++ ++ ++ ++ ++ + @@ -78,13 +89,14 @@ index 3affb19d1a243da4a5782c9a4a5588d165b4119f..6fdc0c4447d2d43ee5f4563c725b6eca -@@ -246,6 +289,9 @@ +@@ -246,6 +300,10 @@ #include sync.inc.xhtml #include experimental.inc.xhtml #include moreFromMozilla.inc.xhtml +#include zenLooksAndFeel.inc.xhtml +#include zenKeyboardShortcuts.inc.xhtml +#include zenWorkspaces.inc.xhtml ++#include zenMarketplace.inc.xhtml diff --git a/src/browser/components/preferences/zen-settings.js b/src/browser/components/preferences/zen-settings.js index 3b588ae607..383c10956b 100644 --- a/src/browser/components/preferences/zen-settings.js +++ b/src/browser/components/preferences/zen-settings.js @@ -23,8 +23,18 @@ const kZenOSToSmallName = { var gZenMarketplaceManager = { init() { - this._buildThemesList(); Services.prefs.addObserver(this.updatePref, this._buildThemesList.bind(this)); + this._buildThemesList(); + document.getElementById("zenThemeMarketplaceCheckForUpdates").addEventListener("click", (event) => { + this._checkForThemeUpdates(event); + }); + }, + + _checkForThemeUpdates(event) { + // Send a message to the child to check for theme updates. + event.target.disabled = true; + // send an event that will be listened by the child process. + document.dispatchEvent(new CustomEvent("ZenCheckForThemeUpdates")); }, get updatePref() { diff --git a/src/browser/components/preferences/zenLooksAndFeel.inc.xhtml b/src/browser/components/preferences/zenLooksAndFeel.inc.xhtml index 02dda0754f..537724b3b8 100644 --- a/src/browser/components/preferences/zenLooksAndFeel.inc.xhtml +++ b/src/browser/components/preferences/zenLooksAndFeel.inc.xhtml @@ -42,14 +42,6 @@