From f6d46e3212c4b5b2ca3dcb2d4e83c38e5d344c8b Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Fri, 28 Sep 2018 23:02:21 +0200 Subject: Rename "Cookies" to "Cookies and Site Data" in preferences where applicable. Tag Issue #765 --- .../en-US/chrome/browser/preferences/preferences.properties | 6 +++--- .../locales/en-US/chrome/browser/preferences/privacy.dtd | 6 +++--- .../en-US/chrome/browser/preferences/preferences.properties | 4 ++-- .../locales/en-US/chrome/browser/preferences/privacy.dtd | 10 +++++----- 4 files changed, 13 insertions(+), 13 deletions(-) (limited to 'application') diff --git a/application/basilisk/locales/en-US/chrome/browser/preferences/preferences.properties b/application/basilisk/locales/en-US/chrome/browser/preferences/preferences.properties index da40f40a9..84fac427d 100644 --- a/application/basilisk/locales/en-US/chrome/browser/preferences/preferences.properties +++ b/application/basilisk/locales/en-US/chrome/browser/preferences/preferences.properties @@ -21,8 +21,8 @@ acceptVeryLargeMinimumFont=Keep my changes anyway trackingprotectionpermissionstext=You have disabled Tracking Protection on these sites. trackingprotectionpermissionstitle=Exceptions - Tracking Protection -cookiepermissionstext=You can specify which websites are always or never allowed to use cookies. Type the exact address of the site you want to manage and then click Block, Allow for Session, or Allow. -cookiepermissionstitle=Exceptions - Cookies +cookiepermissionstext=You can specify which websites are always or never allowed to store cookies and site data. Type the exact address of the site you want to manage and then click Block, Allow for Session, or Allow. +cookiepermissionstitle=Exceptions - Cookies and Site Data addonspermissionstext=You can specify which websites are allowed to install add-ons. Type the exact address of the site you want to allow and then click Allow. addons_permissions_title=Allowed Sites - Add-ons Installation popuppermissionstext=You can specify which websites are allowed to open pop-up windows. Type the exact address of the site you want to allow and then click Allow. @@ -36,7 +36,7 @@ savedLoginsExceptions_desc=Logins for the following sites will not be saved: #### Block List Manager -blockliststext=You can choose which list Firefox will use to block Web elements that may track your browsing activity. +blockliststext=You can choose which list the browser will use to block Web elements that may track your browsing activity. blockliststitle=Block Lists # LOCALIZATION NOTE (mozNameTemplate): This template constructs the name of the # block list in the block lists dialog. It combines the list name and diff --git a/application/basilisk/locales/en-US/chrome/browser/preferences/privacy.dtd b/application/basilisk/locales/en-US/chrome/browser/preferences/privacy.dtd index e6a7955fb..f743c4040 100644 --- a/application/basilisk/locales/en-US/chrome/browser/preferences/privacy.dtd +++ b/application/basilisk/locales/en-US/chrome/browser/preferences/privacy.dtd @@ -49,10 +49,10 @@ - + - + @@ -77,7 +77,7 @@ - + diff --git a/application/palemoon/locales/en-US/chrome/browser/preferences/preferences.properties b/application/palemoon/locales/en-US/chrome/browser/preferences/preferences.properties index b262eebf5..34f167586 100644 --- a/application/palemoon/locales/en-US/chrome/browser/preferences/preferences.properties +++ b/application/palemoon/locales/en-US/chrome/browser/preferences/preferences.properties @@ -8,8 +8,8 @@ labelDefaultFont=Default (%S) #### Permissions Manager -cookiepermissionstext=You can specify which websites are always or never allowed to use cookies. Type the exact address of the site you want to manage and then click Block, Allow for Session, or Allow. -cookiepermissionstitle=Exceptions - Cookies +cookiepermissionstext=You can specify which websites are always or never allowed to use cookies or store site data. Type the exact address of the site you want to manage and then click Block, Allow for Session, or Allow. +cookiepermissionstitle=Exceptions - Cookies and Site Data addonspermissionstext=You can specify which websites are allowed to install add-ons. Type the exact address of the site you want to allow and then click Allow. addons_permissions_title=Allowed Sites - Add-ons Installation popuppermissionstext=You can specify which websites are allowed to open pop-up windows. Type the exact address of the site you want to allow and then click Allow. diff --git a/application/palemoon/locales/en-US/chrome/browser/preferences/privacy.dtd b/application/palemoon/locales/en-US/chrome/browser/preferences/privacy.dtd index ef3303b94..89550104c 100644 --- a/application/palemoon/locales/en-US/chrome/browser/preferences/privacy.dtd +++ b/application/palemoon/locales/en-US/chrome/browser/preferences/privacy.dtd @@ -10,9 +10,9 @@ - + - + @@ -20,10 +20,10 @@ - + - + @@ -48,7 +48,7 @@ - + -- cgit v1.2.3 From bb68f6a4378c930b1a02c6a8f1fa9a9dff2251b0 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Fri, 28 Sep 2018 23:59:19 +0200 Subject: Update permissions manager strings. Tag Issue #765 --- .../locales/en-US/chrome/browser/permissions/aboutPermissions.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'application') diff --git a/application/palemoon/locales/en-US/chrome/browser/permissions/aboutPermissions.dtd b/application/palemoon/locales/en-US/chrome/browser/permissions/aboutPermissions.dtd index 2030d4f59..5b220a7f0 100644 --- a/application/palemoon/locales/en-US/chrome/browser/permissions/aboutPermissions.dtd +++ b/application/palemoon/locales/en-US/chrome/browser/permissions/aboutPermissions.dtd @@ -32,7 +32,7 @@ - + -- cgit v1.2.3 From 57a7d3e35bea51a8905ea1aeedc095ce2734f0f2 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Sat, 29 Sep 2018 00:49:33 +0200 Subject: Rename address bar back to location bar Tag Issue #765 --- .../palemoon/locales/en-US/chrome/browser/preferences/privacy.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'application') diff --git a/application/palemoon/locales/en-US/chrome/browser/preferences/privacy.dtd b/application/palemoon/locales/en-US/chrome/browser/preferences/privacy.dtd index 89550104c..37f8b78c0 100644 --- a/application/palemoon/locales/en-US/chrome/browser/preferences/privacy.dtd +++ b/application/palemoon/locales/en-US/chrome/browser/preferences/privacy.dtd @@ -10,9 +10,9 @@ - + - + -- cgit v1.2.3 From 35a1adb07652813c886413e7c0eccda7c81d01d0 Mon Sep 17 00:00:00 2001 From: JustOff Date: Mon, 1 Oct 2018 15:02:11 +0300 Subject: [PALEMOON] Use message manager to detect full-screen HTML5 video in S4E module --- .../palemoon/components/statusbar/Status.jsm | 20 +++------- .../palemoon/components/statusbar/Status4Evar.jsm | 45 +++++++++++++++++++--- .../palemoon/components/statusbar/content-thunk.js | 23 +++++++++++ .../palemoon/components/statusbar/moz.build | 1 + 4 files changed, 69 insertions(+), 20 deletions(-) create mode 100644 application/palemoon/components/statusbar/content-thunk.js (limited to 'application') diff --git a/application/palemoon/components/statusbar/Status.jsm b/application/palemoon/components/statusbar/Status.jsm index d888c7d94..19e12ddfd 100644 --- a/application/palemoon/components/statusbar/Status.jsm +++ b/application/palemoon/components/statusbar/Status.jsm @@ -35,7 +35,7 @@ S4EStatusService.prototype = _defaultStatus: { val: "", type: "" }, _isFullScreen: false, - _isFullScreenVideo: false, + _isVideo: false, _statusText: { val: "", type: "" }, _noUpdate: false, @@ -222,18 +222,10 @@ S4EStatusService.prototype = } }, - updateFullScreen: function() + setFullScreenState: function(isFullScreen, isVideo) { - this._isFullScreen = this._window.fullScreen; - this._isFullScreenVideo = false; - if(this._isFullScreen) - { - let fsEl = this._window.content.document.mozFullScreenElement; - if(fsEl && (fsEl.nodeName == "VIDEO" || fsEl.getElementsByTagName("VIDEO").length > 0)) - { - this._isFullScreenVideo = true; - } - } + this._isFullScreen = isFullScreen; + this._isVideo = isFullScreen && isVideo; this.clearStatusField(); this.updateStatusField(true); @@ -305,7 +297,7 @@ S4EStatusService.prototype = let label = null; - if(this._isFullScreen && this._service.advancedStatusDetectFullScreen) + if(this._isFullScreen) { switch(location) { @@ -330,7 +322,7 @@ S4EStatusService.prototype = break; case 3: // Popup default: - if(this._isFullScreenVideo && this._service.advancedStatusDetectVideo) + if(this._isVideo) { return; } diff --git a/application/palemoon/components/statusbar/Status4Evar.jsm b/application/palemoon/components/statusbar/Status4Evar.jsm index 055306a88..6400f2e2a 100644 --- a/application/palemoon/components/statusbar/Status4Evar.jsm +++ b/application/palemoon/components/statusbar/Status4Evar.jsm @@ -31,7 +31,7 @@ function Status4Evar(window, gBrowser, toolbox) this.statusService = new S4EStatusService(this._window, s4e_service, this.getters); this.progressMeter = new S4EProgressService(gBrowser, s4e_service, this.getters, this.statusService); this.downloadStatus = new S4EDownloadService(this._window, gBrowser, s4e_service, this.getters); - this.sizeModeService = new SizeModeService(this._window, this); + this.sizeModeService = new SizeModeService(this._window, gBrowser, this); this._window.addEventListener("unload", this, false); } @@ -232,20 +232,31 @@ S4EWindowGetters.prototype = } }; -function SizeModeService(window, s4e) +function SizeModeService(window, gBrowser, s4e) { this._window = window; + this._gBrowser = gBrowser; this._s4e = s4e; + this._mm = this._window.messageManager; this.lastFullScreen = this._window.fullScreen; this.lastwindowState = this._window.windowState; + + if(s4e_service.advancedStatusDetectFullScreen) + { + this._mm.addMessageListener("status4evar@caligonstudios.com:video-detect-answer", this) + this._mm.loadFrameScript("resource:///modules/statusbar/content-thunk.js", true); + } + this._window.addEventListener("sizemodechange", this, false); } SizeModeService.prototype = { _window: null, + _gBrowser: null, _s4e: null, + _mm: null, lastFullScreen: null, lastwindowState: null, @@ -254,7 +265,13 @@ SizeModeService.prototype = { this._window.removeEventListener("sizemodechange", this, false); - ["_window", "_s4e"].forEach(function(prop) + if(s4e_service.advancedStatusDetectFullScreen) + { + this._mm.removeDelayedFrameScript("resource:///modules/statusbar/content-thunk.js"); + this._mm.removeMessageListener("status4evar@caligonstudios.com:video-detect-answer", this); + } + + ["_window", "_gBrowser", "_s4e", "_mm"].forEach(function(prop) { delete this[prop]; }, this); @@ -262,10 +279,18 @@ SizeModeService.prototype = handleEvent: function(e) { - if(this._window.fullScreen != this.lastFullScreen) + if(this._window.fullScreen != this.lastFullScreen && s4e_service.advancedStatusDetectFullScreen) { this.lastFullScreen = this._window.fullScreen; - this._s4e.statusService.updateFullScreen(); + + if(this.lastFullScreen && s4e_service.advancedStatusDetectVideo) + { + this._gBrowser.selectedBrowser.messageManager.sendAsyncMessage("status4evar@caligonstudios.com:video-detect"); + } + else + { + this._s4e.statusService.setFullScreenState(this.lastFullScreen, false); + } } if(this._window.windowState != this.lastwindowState) @@ -275,5 +300,13 @@ SizeModeService.prototype = } }, - QueryInterface: XPCOMUtils.generateQI([ CI.nsIDOMEventListener ]) + receiveMessage: function(message) + { + if(message.name == "status4evar@caligonstudios.com:video-detect-answer") + { + this._s4e.statusService.setFullScreenState(this.lastFullScreen, message.data.isVideo); + } + }, + + QueryInterface: XPCOMUtils.generateQI([ CI.nsIDOMEventListener, CI.nsIMessageListener ]) }; diff --git a/application/palemoon/components/statusbar/content-thunk.js b/application/palemoon/components/statusbar/content-thunk.js new file mode 100644 index 000000000..fe1fbabad --- /dev/null +++ b/application/palemoon/components/statusbar/content-thunk.js @@ -0,0 +1,23 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +function handleVideoDetect(message) +{ + let isVideo = false; + + let fsEl = content.document.mozFullScreenElement; + if(fsEl) + { + isVideo = ( + fsEl.nodeName == "VIDEO" + || (fsEl.nodeName == "IFRAME" && fsEl.contentDocument && fsEl.contentDocument.getElementsByTagName("VIDEO").length > 0) + || fsEl.getElementsByTagName("VIDEO").length > 0 + ); + } + + sendAsyncMessage("status4evar@caligonstudios.com:video-detect-answer", {isVideo: isVideo}); +} + +addMessageListener("status4evar@caligonstudios.com:video-detect", handleVideoDetect); + diff --git a/application/palemoon/components/statusbar/moz.build b/application/palemoon/components/statusbar/moz.build index ba8cfef86..0f7f597a5 100644 --- a/application/palemoon/components/statusbar/moz.build +++ b/application/palemoon/components/statusbar/moz.build @@ -16,6 +16,7 @@ EXTRA_COMPONENTS += [ ] EXTRA_JS_MODULES.statusbar = [ + 'content-thunk.js', 'Downloads.jsm', 'Progress.jsm', 'Status.jsm', -- cgit v1.2.3 From d745193724a0340f8437a5a9774500fda3e41a30 Mon Sep 17 00:00:00 2001 From: MaxKoll <39014485+MaxKoll@users.noreply.github.com> Date: Thu, 4 Oct 2018 22:36:30 +0200 Subject: Fix in-tab close button behavior (#775) - Fixes #775. - Coincidentally also fixes a regression that prevented opening new tabs via double click on an empty space in the tab bar. --- application/palemoon/base/content/tabbrowser.xml | 142 +++++++++++++---------- 1 file changed, 81 insertions(+), 61 deletions(-) (limited to 'application') diff --git a/application/palemoon/base/content/tabbrowser.xml b/application/palemoon/base/content/tabbrowser.xml index 93818e290..d9cff276a 100644 --- a/application/palemoon/base/content/tabbrowser.xml +++ b/application/palemoon/base/content/tabbrowser.xml @@ -4296,17 +4296,94 @@ event.originalTarget.localName != "box") return; - // See hack note in the tabbrowser-close-tab-button binding + // See comments in the "mousedown" and "click" event handlers of the + // "tabbrowser-tabs" binding. if (!this._blockDblClick) BrowserOpenTab(); + else + this.flagBlockedOpenTabAfterDblClick = true; event.preventDefault(); ]]> - + + + + + 1 || !this._closeWindowWithLastTab) this.tabbrowser.removeTab(event.target, {animate: true, byMouse: true}); @@ -4679,63 +4756,6 @@ - 1 && !this._ignoredClick) { - this._ignoredClick = true; - return; - } - - // Reset the "ignored click" flag - this._ignoredClick = false; - - tabContainer.tabbrowser.removeTab(bindingParent, {animate: true, byMouse: true}); - tabContainer._blockDblClick = true; - - /* XXXmano hack (see bug 343628): - * Since we're removing the event target, if the user - * double-clicks this button, the dblclick event will be dispatched - * with the tabbar as its event target (and explicit/originalTarget), - * which treats that as a mouse gesture for opening a new tab. - * In this context, we're manually blocking the dblclick event - * (see dblclick handler). - */ - var clickedOnce = false; - function enableDblClick(event) { - var target = event.originalTarget; - if (target.className == 'tab-close-button') - target._ignoredClick = true; - if (!clickedOnce) { - clickedOnce = true; - return; - } - tabContainer._blockDblClick = false; - tabContainer.removeEventListener("click", enableDblClick, true); - } - tabContainer.addEventListener("click", enableDblClick, true); - ]]> - - - // for the one-close-button case - event.stopPropagation(); - - event.stopPropagation(); -- cgit v1.2.3 From 0c3479b8ba7efe02d8ad2827c51c0dcb1f67698c Mon Sep 17 00:00:00 2001 From: JustOff Date: Sat, 6 Oct 2018 15:05:00 +0300 Subject: [BASILISK] Protect against nsIPrincipal.origin throwing for about:blank iframes and custom protocols --- application/basilisk/components/sessionstore/SessionStorage.jsm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'application') diff --git a/application/basilisk/components/sessionstore/SessionStorage.jsm b/application/basilisk/components/sessionstore/SessionStorage.jsm index 705139ebf..7499f95e9 100644 --- a/application/basilisk/components/sessionstore/SessionStorage.jsm +++ b/application/basilisk/components/sessionstore/SessionStorage.jsm @@ -74,7 +74,14 @@ var SessionStorageInternal = { // Get the origin of the current history entry // and use that as a key for the per-principal storage data. - let origin = principal.origin; + let origin; + try { + // The origin getter may throw for about:blank iframes as of bug 1340710, + // but we should ignore them anyway. The same goes for custom protocols. + origin = principal.origin; + } catch (e) { + return; + } if (visitedOrigins.has(origin)) { // Don't read a host twice. return; -- cgit v1.2.3 From b3b06d0ffd2cb50d6d0cd49484b0987750e0b86f Mon Sep 17 00:00:00 2001 From: Ascrod <32915892+Ascrod@users.noreply.github.com> Date: Sat, 6 Oct 2018 11:10:54 -0400 Subject: Pale Moon Installer: Update Windows ARP URLs. --- application/palemoon/branding/official/branding.nsi | 4 +++- application/palemoon/branding/unofficial/branding.nsi | 2 ++ application/palemoon/branding/unstable/branding.nsi | 4 +++- 3 files changed, 8 insertions(+), 2 deletions(-) (limited to 'application') diff --git a/application/palemoon/branding/official/branding.nsi b/application/palemoon/branding/official/branding.nsi index 2b6dbe7bd..7278e8d6c 100644 --- a/application/palemoon/branding/official/branding.nsi +++ b/application/palemoon/branding/official/branding.nsi @@ -11,7 +11,9 @@ !define BrandFullNameInternal "Pale Moon" !define CompanyName "Moonchild Productions" !define URLInfoAbout "http://www.palemoon.org/" -!define URLUpdateInfo "http://www.palemoon.org/releasenotes-ng.shtml" +!define URLUpdateInfo "http://www.palemoon.org/releasenotes.shtml" +!define HelpLink "http://www.palemoon.org/troubleshooting.shtml" +!define URLSystemRequirements "http://www.palemoon.org/download.shtml" ; The OFFICIAL define is a workaround to support different urls for Release and ; Beta since they share the same branding when building with other branches that diff --git a/application/palemoon/branding/unofficial/branding.nsi b/application/palemoon/branding/unofficial/branding.nsi index cf1642eaf..bcd4acab2 100644 --- a/application/palemoon/branding/unofficial/branding.nsi +++ b/application/palemoon/branding/unofficial/branding.nsi @@ -12,6 +12,8 @@ !define CompanyName "Moonchild Productions" !define URLInfoAbout "http://www.palemoon.org" !define URLUpdateInfo "http://www.palemoon.org" +!define HelpLink "http://www.palemoon.org" +!define URLSystemRequirements "http://www.palemoon.org/download.shtml" !define URLManualDownload "http://www.palemoon.org/download-ng.shtml" !define Channel "unofficial" diff --git a/application/palemoon/branding/unstable/branding.nsi b/application/palemoon/branding/unstable/branding.nsi index 4a9199b22..b9c8e5906 100644 --- a/application/palemoon/branding/unstable/branding.nsi +++ b/application/palemoon/branding/unstable/branding.nsi @@ -11,7 +11,9 @@ !define BrandFullNameInternal "Pale Moon" !define CompanyName "Moonchild Productions" !define URLInfoAbout "http://www.palemoon.org/" -!define URLUpdateInfo "http://www.palemoon.org/unstable.shtml" +!define URLUpdateInfo "http://www.palemoon.org/unstable/" +!define HelpLink "http://www.palemoon.org/unstable/" +!define URLSystemRequirements "http://www.palemoon.org/download.shtml" ; The OFFICIAL define is a workaround to support different urls for Release and ; Beta since they share the same branding when building with other branches that -- cgit v1.2.3 From 727ed27f0854ec748f96d9fa23892d67569a8761 Mon Sep 17 00:00:00 2001 From: Ascrod <32915892+Ascrod@users.noreply.github.com> Date: Sat, 6 Oct 2018 12:47:25 -0400 Subject: Basilisk Installer: Update Windows ARP URLs. --- application/basilisk/branding/official/branding.nsi | 4 ++-- application/basilisk/branding/unofficial/branding.nsi | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'application') diff --git a/application/basilisk/branding/official/branding.nsi b/application/basilisk/branding/official/branding.nsi index 58d7554df..f550c3e43 100644 --- a/application/basilisk/branding/official/branding.nsi +++ b/application/basilisk/branding/official/branding.nsi @@ -12,7 +12,7 @@ !define CompanyName "Moonchild Productions" !define URLInfoAbout "https://www.basilisk-browser.org" !define URLUpdateInfo "https://www.basilisk-browser.org/releasenotes.shtml" -!define HelpLink "https://www.basilisk-browser.org" +!define HelpLink "https://www.basilisk-browser.org/contact.shtml" ; The OFFICIAL define is a workaround to support different urls for Release and ; Beta since they share the same branding when building with other branches that @@ -20,7 +20,7 @@ !define OFFICIAL !define URLStubDownload "" !define URLManualDownload "" -!define URLSystemRequirements "http://www.basilisk-browser.org/requirements.shtml" +!define URLSystemRequirements "https://www.basilisk-browser.org/requirements.shtml" !define Channel "release" # The installer's certificate name and issuer expected by the stub installer diff --git a/application/basilisk/branding/unofficial/branding.nsi b/application/basilisk/branding/unofficial/branding.nsi index 77f08a4cb..179ce76f9 100644 --- a/application/basilisk/branding/unofficial/branding.nsi +++ b/application/basilisk/branding/unofficial/branding.nsi @@ -10,12 +10,13 @@ # instead of BrandFullName and typically should not be modified. !define BrandFullNameInternal "Serpent" !define CompanyName "Moonchild Productions" -!define URLInfoAbout "http://www.basilisk-browser.org" +!define URLInfoAbout "https://www.basilisk-browser.org" +!define URLUpdateInfo "https://www.basilisk-browser.org" !define HelpLink "https://forum.palemoon.org" !define URLStubDownload "" !define URLManualDownload "" -!define URLSystemRequirements "" +!define URLSystemRequirements "https://www.basilisk-browser.org" !define Channel "unofficial" # The installer's certificate name and issuer expected by the stub installer -- cgit v1.2.3 From 5e954837164e1747f52d23100b6399cf85295968 Mon Sep 17 00:00:00 2001 From: Ascrod <32915892+Ascrod@users.noreply.github.com> Date: Sat, 6 Oct 2018 18:19:27 -0400 Subject: Pale Moon Installer: Remove unused stub defines and strings. --- .../palemoon/branding/official/branding.nsi | 35 ----------- .../palemoon/branding/unofficial/branding.nsi | 26 --------- .../palemoon/branding/unstable/branding.nsi | 32 ----------- application/palemoon/installer/windows/Makefile.in | 4 -- .../palemoon/installer/windows/nsis/defines.nsi.in | 27 --------- .../locales/en-US/installer/nsisstrings.properties | 67 ---------------------- 6 files changed, 191 deletions(-) delete mode 100644 application/palemoon/locales/en-US/installer/nsisstrings.properties (limited to 'application') diff --git a/application/palemoon/branding/official/branding.nsi b/application/palemoon/branding/official/branding.nsi index 7278e8d6c..3bceda900 100644 --- a/application/palemoon/branding/official/branding.nsi +++ b/application/palemoon/branding/official/branding.nsi @@ -14,38 +14,3 @@ !define URLUpdateInfo "http://www.palemoon.org/releasenotes.shtml" !define HelpLink "http://www.palemoon.org/troubleshooting.shtml" !define URLSystemRequirements "http://www.palemoon.org/download.shtml" - -; The OFFICIAL define is a workaround to support different urls for Release and -; Beta since they share the same branding when building with other branches that -; set the update channel to beta. -!define OFFICIAL -!define URLStubDownload "" -!define URLManualDownload "http://www.palemoon.org/download-ng.shtml" -!define Channel "release" - -# The installer's certificate name and issuer expected by the stub installer -# !define CertNameDownload "Mozilla Corporation" -# !define CertIssuerDownload "Thawte Code Signing CA - G2" - -# Dialog units are used so the UI displays correctly with the system's DPI -# settings. -# The dialog units for the bitmap's dimensions should match exactly with the -# bitmap's width and height in pixels. -!define APPNAME_BMP_WIDTH_DU "134u" -!define APPNAME_BMP_HEIGHT_DU "36u" -!define INTRO_BLURB_WIDTH_DU "258u" -!define INTRO_BLURB_EDGE_DU "170u" -!define INTRO_BLURB_LTR_TOP_DU "20u" -!define INTRO_BLURB_RTL_TOP_DU "12u" - -# UI Colors that can be customized for each channel -!define FOOTER_CONTROL_TEXT_COLOR_NORMAL 0x000033 -!define FOOTER_CONTROL_TEXT_COLOR_FADED 0x666699 -!define FOOTER_BKGRD_COLOR 0xFFFFFF -!define INTRO_BLURB_TEXT_COLOR 0x666699 -!define OPTIONS_TEXT_COLOR_NORMAL 0x000000 -!define OPTIONS_TEXT_COLOR_FADED 0x666699 -!define OPTIONS_BKGRD_COLOR 0xF0F0F0 -!define INSTALL_BLURB_TEXT_COLOR 0x666699 -!define INSTALL_PROGRESS_TEXT_COLOR_NORMAL 0x666699 -!define INSTALL_PROGRESS_TEXT_COLOR_FADED 0x9999C0 diff --git a/application/palemoon/branding/unofficial/branding.nsi b/application/palemoon/branding/unofficial/branding.nsi index bcd4acab2..62ed242a2 100644 --- a/application/palemoon/branding/unofficial/branding.nsi +++ b/application/palemoon/branding/unofficial/branding.nsi @@ -14,29 +14,3 @@ !define URLUpdateInfo "http://www.palemoon.org" !define HelpLink "http://www.palemoon.org" !define URLSystemRequirements "http://www.palemoon.org/download.shtml" - -!define URLManualDownload "http://www.palemoon.org/download-ng.shtml" -!define Channel "unofficial" - -# Dialog units are used so the UI displays correctly with the system's DPI -# settings. -# The dialog units for the bitmap's dimensions should match exactly with the -# bitmap's width and height in pixels. -!define APPNAME_BMP_WIDTH_DU 159u -!define APPNAME_BMP_HEIGHT_DU 26u -!define INTRO_BLURB_WIDTH_DU "230u" -!define INTRO_BLURB_EDGE_DU "198u" -!define INTRO_BLURB_LTR_TOP_DU "16u" -!define INTRO_BLURB_RTL_TOP_DU "11u" - -# UI Colors that can be customized for each channel -!define FOOTER_CONTROL_TEXT_COLOR_NORMAL 0x000000 -!define FOOTER_CONTROL_TEXT_COLOR_FADED 0x999999 -!define FOOTER_BKGRD_COLOR 0xFFFFFF -!define INTRO_BLURB_TEXT_COLOR 0xFFFFFF -!define OPTIONS_TEXT_COLOR_NORMAL 0xFFFFFF -!define OPTIONS_TEXT_COLOR_FADED 0xA1AAB3 -!define OPTIONS_BKGRD_COLOR 0x0F1B26 -!define INSTALL_BLURB_TEXT_COLOR 0xFFFFFF -!define INSTALL_PROGRESS_TEXT_COLOR_NORMAL 0xFFFFFF -!define INSTALL_PROGRESS_TEXT_COLOR_FADED 0xA1AAB3 diff --git a/application/palemoon/branding/unstable/branding.nsi b/application/palemoon/branding/unstable/branding.nsi index b9c8e5906..535cfde33 100644 --- a/application/palemoon/branding/unstable/branding.nsi +++ b/application/palemoon/branding/unstable/branding.nsi @@ -14,35 +14,3 @@ !define URLUpdateInfo "http://www.palemoon.org/unstable/" !define HelpLink "http://www.palemoon.org/unstable/" !define URLSystemRequirements "http://www.palemoon.org/download.shtml" - -; The OFFICIAL define is a workaround to support different urls for Release and -; Beta since they share the same branding when building with other branches that -; set the update channel to beta. -!define OFFICIAL -!define URLStubDownload "" -!define URLManualDownload "http://www.palemoon.org/unstable.shtml" -!define Channel "unstable" - - -# Dialog units are used so the UI displays correctly with the system's DPI -# settings. -# The dialog units for the bitmap's dimensions should match exactly with the -# bitmap's width and height in pixels. -!define APPNAME_BMP_WIDTH_DU "134u" -!define APPNAME_BMP_HEIGHT_DU "36u" -!define INTRO_BLURB_WIDTH_DU "258u" -!define INTRO_BLURB_EDGE_DU "170u" -!define INTRO_BLURB_LTR_TOP_DU "20u" -!define INTRO_BLURB_RTL_TOP_DU "12u" - -# UI Colors that can be customized for each channel -!define FOOTER_CONTROL_TEXT_COLOR_NORMAL 0x000033 -!define FOOTER_CONTROL_TEXT_COLOR_FADED 0x666699 -!define FOOTER_BKGRD_COLOR 0xFFFFFF -!define INTRO_BLURB_TEXT_COLOR 0x666699 -!define OPTIONS_TEXT_COLOR_NORMAL 0x000000 -!define OPTIONS_TEXT_COLOR_FADED 0x666699 -!define OPTIONS_BKGRD_COLOR 0xF0F0F0 -!define INSTALL_BLURB_TEXT_COLOR 0x666699 -!define INSTALL_PROGRESS_TEXT_COLOR_NORMAL 0x666699 -!define INSTALL_PROGRESS_TEXT_COLOR_FADED 0x9999C0 diff --git a/application/palemoon/installer/windows/Makefile.in b/application/palemoon/installer/windows/Makefile.in index 7ba70d912..9b0f697c8 100644 --- a/application/palemoon/installer/windows/Makefile.in +++ b/application/palemoon/installer/windows/Makefile.in @@ -79,10 +79,6 @@ $(CONFIG_DIR)/setup.exe:: $(PYTHON) $(topsrcdir)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \ --preprocess-locale $(topsrcdir) \ $(PPL_LOCALE_ARGS) $(AB_CD) $(CONFIG_DIR) - $(PYTHON) $(topsrcdir)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \ - --preprocess-single-file $(topsrcdir) \ - $(PPL_LOCALE_ARGS) $(CONFIG_DIR) \ - nsisstrings.properties nsisstrings.nlf GARBARGE_DIRS += instgen diff --git a/application/palemoon/installer/windows/nsis/defines.nsi.in b/application/palemoon/installer/windows/nsis/defines.nsi.in index 97422c4f6..edef802a9 100644 --- a/application/palemoon/installer/windows/nsis/defines.nsi.in +++ b/application/palemoon/installer/windows/nsis/defines.nsi.in @@ -3,23 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -# Defining FunnelcakeVersion will append the value of StubURLVersionAppend to -# StubURLVersion, append the value of URLManualDownloadAppend to -# URLManualDownload, and append the value of URLStubDownloadAppend to -# URLStubDownload. The value of FunnelcakeVersion should not be defined when it -# is not used and when it is defined its value should never be empty. -# !define FunnelcakeVersion "999" - -!ifdef FunnelcakeVersion -!define URLManualDownloadAppend "&f=${FunnelcakeVersion}" -!define URLStubDownloadAppend "-f${FunnelcakeVersion}" -!define StubURLVersionAppend "-${FunnelcakeVersion}" -!else -!define URLManualDownloadAppend "" -!define URLStubDownloadAppend "" -!define StubURLVersionAppend "" -!endif - # These defines should match application.ini settings !define AppName "Pale Moon" !define AppVersion "@APP_VERSION@" @@ -84,13 +67,3 @@ VIAddVersionKey "FileVersion" "${AppVersion}" VIAddVersionKey "ProductVersion" "${AppVersion}" # Comments is not used but left below commented out for future reference # VIAddVersionKey "Comments" "Comments" - -# Control positions in Dialog Units so they are placed correctly with -# non-default DPI settings -!define OPTIONS_ITEM_EDGE_DU 90u -!define OPTIONS_ITEM_WIDTH_DU 356u -!define OPTIONS_SUBITEM_EDGE_DU 119u -!define OPTIONS_SUBITEM_WIDTH_DU 327u -!define INSTALL_BLURB_TOP_DU 78u -!define APPNAME_BMP_EDGE_DU 19u -!define APPNAME_BMP_TOP_DU 12u diff --git a/application/palemoon/locales/en-US/installer/nsisstrings.properties b/application/palemoon/locales/en-US/installer/nsisstrings.properties deleted file mode 100644 index fc2898860..000000000 --- a/application/palemoon/locales/en-US/installer/nsisstrings.properties +++ /dev/null @@ -1,67 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -# LOCALIZATION NOTE: - -# This file must be saved as UTF8 - -# Accesskeys are defined by prefixing the letter that is to be used for the -# accesskey with an ampersand (e.g. &). - -# Do not replace $BrandShortName, $BrandFullName, or $BrandFullNameDA with a -# custom string and always use the same one as used by the en-US files. -# $BrandFullNameDA allows the string to contain an ampersand (e.g. DA stands -# for double ampersand) and prevents the letter following the ampersand from -# being used as an accesskey. - -# You can use \n to create a newline in the string but only when the string -# from en-US contains a \n. - -WIN_CAPTION=$BrandShortName Setup - -INTRO_BLURB1=Thanks for choosing $BrandFullName, the browser that chooses you above everything else. -INSTALL_BLURB1=You're about to enjoy the very latest in speed, flexibility and security so you're always in control. -INSTALL_BLURB2=That's because $BrandShortName is made by a non-profit to make browsing and the Web better for you. -INSTALL_BLURB3=You're also joining a global community of users, contributors and developers working to make the best browser in the world. - -WARN_MIN_SUPPORTED_OSVER_MSG=Sorry, $BrandShortName can't be installed. This version of $BrandShortName requires ${MinSupportedVer} or newer. -WARN_MIN_SUPPORTED_CPU_MSG=Sorry, $BrandShortName can't be installed. This version of $BrandShortName requires a processor with ${MinSupportedCPU} support. -WARN_MIN_SUPPORTED_OSVER_CPU_MSG=Sorry, $BrandShortName can't be installed. This version of $BrandShortName requires ${MinSupportedVer} or newer and a processor with ${MinSupportedCPU} support. -WARN_WRITE_ACCESS=You don't have access to write to the installation directory.\n\nClick OK to select a different directory. -WARN_DISK_SPACE=You don't have sufficient disk space to install to this location.\n\nClick OK to select a different location. -WARN_ROOT_INSTALL=Unable to install to the root of your disk.\n\nClick OK to select a different location. -WARN_MANUALLY_CLOSE_APP_LAUNCH=$BrandShortName is already running.\n\nPlease close $BrandShortName prior to launching the version you have just installed. - -ERROR_DOWNLOAD=Your download was interrupted.\n\nPlease click the OK button to continue. - -INSTALL_BUTTON=&Install -UPGRADE_BUTTON=&Upgrade -CANCEL_BUTTON=Cancel -OPTIONS_BUTTON=&Options - -MAKE_DEFAULT=&Make $BrandShortName my default browser -CREATE_SHORTCUTS=Create Shortcuts for $BrandShortName: -ADD_SC_TASKBAR=On my &Task bar -ADD_SC_QUICKLAUNCHBAR=On my &Quick Launch bar -ADD_CheckboxShortcutInStartMenu=In my &Start Menu Programs Folder -ADD_CheckboxShortcutOnDesktop=On my &Desktop -SPACE_REQUIRED=Space Required: -SPACE_AVAILABLE=Space Available: -ONE_MOMENT_INSTALL=One moment, $BrandShortName will launch as soon as the install is complete… -ONE_MOMENT_UPGRADE=One moment, $BrandShortName will launch as soon as the upgrade is complete… -INSTALL_MAINT_SERVICE=&Install the $BrandShortName background update service -SEND_PING=S&end information about this installation to Mozilla -BROWSE_BUTTON=B&rowse… -DEST_FOLDER=Destination Folder - -DOWNLOADING_LABEL=Downloading $BrandShortName… -INSTALLING_LABEL=Installing $BrandShortName… -UPGRADING_LABEL=Upgrading $BrandShortName… - -SELECT_FOLDER_TEXT=Select the folder to install $BrandShortName in. - -BYTE=B -KILO=K -MEGA=M -GIGA=G -- cgit v1.2.3 From 312b0e42cfb3982b8e2f62ba17052dfe1a616b7e Mon Sep 17 00:00:00 2001 From: Ascrod <32915892+Ascrod@users.noreply.github.com> Date: Sat, 6 Oct 2018 18:23:07 -0400 Subject: Basilisk Installer: Remove unused stub defines and strings. --- .../basilisk/branding/official/branding.nsi | 34 ----------- .../basilisk/branding/unofficial/branding.nsi | 30 ---------- application/basilisk/installer/windows/Makefile.in | 4 -- .../basilisk/installer/windows/nsis/defines.nsi.in | 27 --------- .../locales/en-US/installer/nsisstrings.properties | 67 ---------------------- 5 files changed, 162 deletions(-) delete mode 100644 application/basilisk/locales/en-US/installer/nsisstrings.properties (limited to 'application') diff --git a/application/basilisk/branding/official/branding.nsi b/application/basilisk/branding/official/branding.nsi index f550c3e43..250abd84d 100644 --- a/application/basilisk/branding/official/branding.nsi +++ b/application/basilisk/branding/official/branding.nsi @@ -13,38 +13,4 @@ !define URLInfoAbout "https://www.basilisk-browser.org" !define URLUpdateInfo "https://www.basilisk-browser.org/releasenotes.shtml" !define HelpLink "https://www.basilisk-browser.org/contact.shtml" - -; The OFFICIAL define is a workaround to support different urls for Release and -; Beta since they share the same branding when building with other branches that -; set the update channel to beta. -!define OFFICIAL -!define URLStubDownload "" -!define URLManualDownload "" !define URLSystemRequirements "https://www.basilisk-browser.org/requirements.shtml" -!define Channel "release" - -# The installer's certificate name and issuer expected by the stub installer -!define CertNameDownload "" -!define CertIssuerDownload "" - -# Dialog units are used so the UI displays correctly with the system's DPI -# settings. -# The dialog units for the bitmap's dimensions should match exactly with the -# bitmap's width and height in pixels. -!define APPNAME_BMP_WIDTH_DU "134u" -!define APPNAME_BMP_HEIGHT_DU "36u" -!define INTRO_BLURB_WIDTH_DU "258u" -!define INTRO_BLURB_EDGE_DU "170u" -!define INTRO_BLURB_LTR_TOP_DU "20u" -!define INTRO_BLURB_RTL_TOP_DU "12u" - -# UI Colors that can be customized for each channel -!define FOOTER_CONTROL_TEXT_COLOR_NORMAL 0x000000 -!define FOOTER_CONTROL_TEXT_COLOR_FADED 0x666666 -!define FOOTER_BKGRD_COLOR 0xFFFFFF -!define INTRO_BLURB_TEXT_COLOR 0x666666 -!define INSTALL_BLURB_TEXT_COLOR 0x666666 -!define INSTALL_PROGRESS_TEXT_COLOR_NORMAL 0x666666 -!define COMMON_TEXT_COLOR_NORMAL 0x000000 -!define COMMON_TEXT_COLOR_FADED 0x666666 -!define COMMON_BKGRD_COLOR 0xF0F0F0 diff --git a/application/basilisk/branding/unofficial/branding.nsi b/application/basilisk/branding/unofficial/branding.nsi index 179ce76f9..586dd0074 100644 --- a/application/basilisk/branding/unofficial/branding.nsi +++ b/application/basilisk/branding/unofficial/branding.nsi @@ -13,34 +13,4 @@ !define URLInfoAbout "https://www.basilisk-browser.org" !define URLUpdateInfo "https://www.basilisk-browser.org" !define HelpLink "https://forum.palemoon.org" - -!define URLStubDownload "" -!define URLManualDownload "" !define URLSystemRequirements "https://www.basilisk-browser.org" -!define Channel "unofficial" - -# The installer's certificate name and issuer expected by the stub installer -!define CertNameDownload "" -!define CertIssuerDownload "" - -# Dialog units are used so the UI displays correctly with the system's DPI -# settings. -# The dialog units for the bitmap's dimensions should match exactly with the -# bitmap's width and height in pixels. -!define APPNAME_BMP_WIDTH_DU 159u -!define APPNAME_BMP_HEIGHT_DU 50u -!define INTRO_BLURB_WIDTH_DU "230u" -!define INTRO_BLURB_EDGE_DU "198u" -!define INTRO_BLURB_LTR_TOP_DU "16u" -!define INTRO_BLURB_RTL_TOP_DU "11u" - -# UI Colors that can be customized for each channel -!define FOOTER_CONTROL_TEXT_COLOR_NORMAL 0x000000 -!define FOOTER_CONTROL_TEXT_COLOR_FADED 0x999999 -!define FOOTER_BKGRD_COLOR 0xFFFFFF -!define INTRO_BLURB_TEXT_COLOR 0xFFFFFF -!define INSTALL_BLURB_TEXT_COLOR 0xFFFFFF -!define INSTALL_PROGRESS_TEXT_COLOR_NORMAL 0xFFFFFF -!define COMMON_TEXT_COLOR_NORMAL 0xFFFFFF -!define COMMON_TEXT_COLOR_FADED 0xA1AAB3 -!define COMMON_BKGRD_COLOR 0x0F1B26 diff --git a/application/basilisk/installer/windows/Makefile.in b/application/basilisk/installer/windows/Makefile.in index d5580b53d..bab6ded1a 100644 --- a/application/basilisk/installer/windows/Makefile.in +++ b/application/basilisk/installer/windows/Makefile.in @@ -79,10 +79,6 @@ $(CONFIG_DIR)/setup.exe:: $(PYTHON) $(topsrcdir)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \ --preprocess-locale $(topsrcdir) \ $(PPL_LOCALE_ARGS) $(AB_CD) $(CONFIG_DIR) - $(PYTHON) $(topsrcdir)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \ - --preprocess-single-file $(topsrcdir) \ - $(PPL_LOCALE_ARGS) $(CONFIG_DIR) \ - nsisstrings.properties nsisstrings.nlf GARBARGE_DIRS += instgen diff --git a/application/basilisk/installer/windows/nsis/defines.nsi.in b/application/basilisk/installer/windows/nsis/defines.nsi.in index 5ad9b7966..dbb58ca33 100644 --- a/application/basilisk/installer/windows/nsis/defines.nsi.in +++ b/application/basilisk/installer/windows/nsis/defines.nsi.in @@ -3,23 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -# Defining FunnelcakeVersion will append the value of StubURLVersionAppend to -# StubURLVersion, append the value of URLManualDownloadAppend to -# URLManualDownload, and append the value of URLStubDownloadAppend to -# URLStubDownload. The value of FunnelcakeVersion should not be defined when it -# is not used and when it is defined its value should never be empty. -# !define FunnelcakeVersion "999" - -!ifdef FunnelcakeVersion -!define URLManualDownloadAppend "&f=${FunnelcakeVersion}" -!define URLStubDownloadAppend "-f${FunnelcakeVersion}" -!define StubURLVersionAppend "-${FunnelcakeVersion}" -!else -!define URLManualDownloadAppend "" -!define URLStubDownloadAppend "" -!define StubURLVersionAppend "" -!endif - # These defines should match application.ini settings !define AppName "Basilisk" !define AppVersion "@APP_VERSION@" @@ -84,13 +67,3 @@ VIAddVersionKey "FileVersion" "${AppVersion}" VIAddVersionKey "ProductVersion" "${AppVersion}" # Comments is not used but left below commented out for future reference # VIAddVersionKey "Comments" "Comments" - -# Control positions in Dialog Units so they are placed correctly with -# non-default DPI settings -!define OPTIONS_ITEM_EDGE_DU 90u -!define OPTIONS_ITEM_WIDTH_DU 356u -!define OPTIONS_SUBITEM_EDGE_DU 119u -!define OPTIONS_SUBITEM_WIDTH_DU 327u -!define INSTALL_BLURB_TOP_DU 78u -!define APPNAME_BMP_EDGE_DU 19u -!define APPNAME_BMP_TOP_DU 12u diff --git a/application/basilisk/locales/en-US/installer/nsisstrings.properties b/application/basilisk/locales/en-US/installer/nsisstrings.properties deleted file mode 100644 index 389405696..000000000 --- a/application/basilisk/locales/en-US/installer/nsisstrings.properties +++ /dev/null @@ -1,67 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -# LOCALIZATION NOTE: - -# This file must be saved as UTF8 - -# Accesskeys are defined by prefixing the letter that is to be used for the -# accesskey with an ampersand (e.g. &). - -# Do not replace $BrandShortName, $BrandFullName, or $BrandFullNameDA with a -# custom string and always use the same one as used by the en-US files. -# $BrandFullNameDA allows the string to contain an ampersand (e.g. DA stands -# for double ampersand) and prevents the letter following the ampersand from -# being used as an accesskey. - -# You can use \n to create a newline in the string but only when the string -# from en-US contains a \n. - -WIN_CAPTION=$BrandShortName Setup - -INTRO_BLURB1=Thanks for choosing $BrandFullName, the browser that chooses you above everything else. -INSTALL_BLURB1=You're about to enjoy the very latest in speed, flexibility and security so you're always in control. -INSTALL_BLURB2=That's because $BrandShortName is made by a non-profit to make browsing and the Web better for you. -INSTALL_BLURB3=You're also joining a global community of users, contributors and developers working to make the best browser in the world. - -WARN_MIN_SUPPORTED_OSVER_MSG=Sorry, $BrandShortName can't be installed. This version of $BrandShortName requires ${MinSupportedVer} or newer. Please click the OK button for additional information. -WARN_MIN_SUPPORTED_CPU_MSG=Sorry, $BrandShortName can't be installed. This version of $BrandShortName requires a processor with ${MinSupportedCPU} support. Please click the OK button for additional information. -WARN_MIN_SUPPORTED_OSVER_CPU_MSG=Sorry, $BrandShortName can't be installed. This version of $BrandShortName requires ${MinSupportedVer} or newer and a processor with ${MinSupportedCPU} support. Please click the OK button for additional information. -WARN_WRITE_ACCESS=You don't have access to write to the installation directory.\n\nClick OK to select a different directory. -WARN_DISK_SPACE=You don't have sufficient disk space to install to this location.\n\nClick OK to select a different location. -WARN_ROOT_INSTALL=Unable to install to the root of your disk.\n\nClick OK to select a different location. -WARN_MANUALLY_CLOSE_APP_LAUNCH=$BrandShortName is already running.\n\nPlease close $BrandShortName prior to launching the version you have just installed. - -ERROR_DOWNLOAD=Your download was interrupted.\n\nPlease click the OK button to continue. - -INSTALL_BUTTON=&Install -UPGRADE_BUTTON=&Upgrade -CANCEL_BUTTON=Cancel -OPTIONS_BUTTON=&Options - -MAKE_DEFAULT=&Make $BrandShortName my default browser -CREATE_SHORTCUTS=Create Shortcuts for $BrandShortName: -ADD_SC_TASKBAR=On my &Task bar -ADD_SC_QUICKLAUNCHBAR=On my &Quick Launch bar -ADD_CheckboxShortcutInStartMenu=In my &Start Menu Programs Folder -ADD_CheckboxShortcutOnDesktop=On my &Desktop -SPACE_REQUIRED=Space Required: -SPACE_AVAILABLE=Space Available: -ONE_MOMENT_INSTALL=One moment, $BrandShortName will launch as soon as the install is complete… -ONE_MOMENT_UPGRADE=One moment, $BrandShortName will launch as soon as the upgrade is complete… -INSTALL_MAINT_SERVICE=&Install the $BrandShortName background update service -SEND_PING=S&end information about this installation to Mozilla -BROWSE_BUTTON=B&rowse… -DEST_FOLDER=Destination Folder - -DOWNLOADING_LABEL=Downloading $BrandShortName… -INSTALLING_LABEL=Installing $BrandShortName… -UPGRADING_LABEL=Upgrading $BrandShortName… - -SELECT_FOLDER_TEXT=Select the folder to install $BrandShortName in. - -BYTE=B -KILO=K -MEGA=M -GIGA=G -- cgit v1.2.3 From c602588f1100f358cff28a822c4136e3e38f3dda Mon Sep 17 00:00:00 2001 From: MaxKoll <39014485+MaxKoll@users.noreply.github.com> Date: Mon, 8 Oct 2018 14:01:46 +0200 Subject: Revert "Fix in-tab close button behavior" --- application/palemoon/base/content/tabbrowser.xml | 142 ++++++++++------------- 1 file changed, 61 insertions(+), 81 deletions(-) (limited to 'application') diff --git a/application/palemoon/base/content/tabbrowser.xml b/application/palemoon/base/content/tabbrowser.xml index d9cff276a..93818e290 100644 --- a/application/palemoon/base/content/tabbrowser.xml +++ b/application/palemoon/base/content/tabbrowser.xml @@ -4296,94 +4296,17 @@ event.originalTarget.localName != "box") return; - // See comments in the "mousedown" and "click" event handlers of the - // "tabbrowser-tabs" binding. + // See hack note in the tabbrowser-close-tab-button binding if (!this._blockDblClick) BrowserOpenTab(); - else - this.flagBlockedOpenTabAfterDblClick = true; event.preventDefault(); ]]> - - - - + 1 || !this._closeWindowWithLastTab) this.tabbrowser.removeTab(event.target, {animate: true, byMouse: true}); @@ -4756,6 +4679,63 @@ + 1 && !this._ignoredClick) { + this._ignoredClick = true; + return; + } + + // Reset the "ignored click" flag + this._ignoredClick = false; + + tabContainer.tabbrowser.removeTab(bindingParent, {animate: true, byMouse: true}); + tabContainer._blockDblClick = true; + + /* XXXmano hack (see bug 343628): + * Since we're removing the event target, if the user + * double-clicks this button, the dblclick event will be dispatched + * with the tabbar as its event target (and explicit/originalTarget), + * which treats that as a mouse gesture for opening a new tab. + * In this context, we're manually blocking the dblclick event + * (see dblclick handler). + */ + var clickedOnce = false; + function enableDblClick(event) { + var target = event.originalTarget; + if (target.className == 'tab-close-button') + target._ignoredClick = true; + if (!clickedOnce) { + clickedOnce = true; + return; + } + tabContainer._blockDblClick = false; + tabContainer.removeEventListener("click", enableDblClick, true); + } + tabContainer.addEventListener("click", enableDblClick, true); + ]]> + + + // for the one-close-button case + event.stopPropagation(); + + event.stopPropagation(); -- cgit v1.2.3 From 94757e275a79dad7d9fdc083ad94e84710261c32 Mon Sep 17 00:00:00 2001 From: MaxKoll <39014485+MaxKoll@users.noreply.github.com> Date: Mon, 8 Oct 2018 14:29:20 +0200 Subject: Fix in-tab close button behavior Fixes #775 (non-responsiveness when closing multiple tabs by rapidly clicking in-tab close buttons). --- application/palemoon/base/content/tabbrowser.xml | 124 ++++++++++++----------- 1 file changed, 63 insertions(+), 61 deletions(-) (limited to 'application') diff --git a/application/palemoon/base/content/tabbrowser.xml b/application/palemoon/base/content/tabbrowser.xml index 93818e290..19e1d4659 100644 --- a/application/palemoon/base/content/tabbrowser.xml +++ b/application/palemoon/base/content/tabbrowser.xml @@ -4296,17 +4296,76 @@ event.originalTarget.localName != "box") return; - // See hack note in the tabbrowser-close-tab-button binding + // See comments in the "mousedown" and "click" event handlers of the + // tabbrowser-tabs binding. if (!this._blockDblClick) BrowserOpenTab(); event.preventDefault(); ]]> - + + + + 1 || !this._closeWindowWithLastTab) this.tabbrowser.removeTab(event.target, {animate: true, byMouse: true}); @@ -4679,63 +4738,6 @@ - 1 && !this._ignoredClick) { - this._ignoredClick = true; - return; - } - - // Reset the "ignored click" flag - this._ignoredClick = false; - - tabContainer.tabbrowser.removeTab(bindingParent, {animate: true, byMouse: true}); - tabContainer._blockDblClick = true; - - /* XXXmano hack (see bug 343628): - * Since we're removing the event target, if the user - * double-clicks this button, the dblclick event will be dispatched - * with the tabbar as its event target (and explicit/originalTarget), - * which treats that as a mouse gesture for opening a new tab. - * In this context, we're manually blocking the dblclick event - * (see dblclick handler). - */ - var clickedOnce = false; - function enableDblClick(event) { - var target = event.originalTarget; - if (target.className == 'tab-close-button') - target._ignoredClick = true; - if (!clickedOnce) { - clickedOnce = true; - return; - } - tabContainer._blockDblClick = false; - tabContainer.removeEventListener("click", enableDblClick, true); - } - tabContainer.addEventListener("click", enableDblClick, true); - ]]> - - - // for the one-close-button case - event.stopPropagation(); - - event.stopPropagation(); -- cgit v1.2.3 From 98bf922150a1ba5fe248735b377deca3dbb62043 Mon Sep 17 00:00:00 2001 From: Ascrod <32915892+Ascrod@users.noreply.github.com> Date: Thu, 11 Oct 2018 23:34:52 -0400 Subject: Issue #832 Part 1: Remove modules, chrome, and preferences. --- application/basilisk/app/profile/basilisk.js | 7 - application/basilisk/base/content/browser.css | 5 - application/basilisk/base/content/browser.js | 12 - application/basilisk/base/content/browser.xul | 4 - application/basilisk/base/content/tab-content.js | 7 - .../components/preferences/in-content/content.js | 31 - .../components/preferences/in-content/content.xul | 24 - application/basilisk/components/preferences/jar.mn | 2 - .../basilisk/components/preferences/translation.js | 255 -------- .../components/preferences/translation.xul | 88 --- .../components/translation/BingTranslator.jsm | 449 -------------- .../components/translation/Translation.jsm | 446 -------------- .../translation/TranslationContentHandler.jsm | 181 ------ .../components/translation/TranslationDocument.jsm | 683 --------------------- .../components/translation/YandexTranslator.jsm | 343 ----------- application/basilisk/components/translation/jar.mn | 6 - .../microsoft-translator-attribution.png | Bin 3422 -> 0 bytes .../basilisk/components/translation/moz.build | 7 - .../components/translation/translation-infobar.xml | 441 ------------- 19 files changed, 2991 deletions(-) delete mode 100644 application/basilisk/components/preferences/translation.js delete mode 100644 application/basilisk/components/preferences/translation.xul delete mode 100644 application/basilisk/components/translation/BingTranslator.jsm delete mode 100644 application/basilisk/components/translation/Translation.jsm delete mode 100644 application/basilisk/components/translation/TranslationContentHandler.jsm delete mode 100644 application/basilisk/components/translation/TranslationDocument.jsm delete mode 100644 application/basilisk/components/translation/YandexTranslator.jsm delete mode 100644 application/basilisk/components/translation/jar.mn delete mode 100644 application/basilisk/components/translation/microsoft-translator-attribution.png delete mode 100644 application/basilisk/components/translation/translation-infobar.xml (limited to 'application') diff --git a/application/basilisk/app/profile/basilisk.js b/application/basilisk/app/profile/basilisk.js index fd81e8204..eeec29eb9 100644 --- a/application/basilisk/app/profile/basilisk.js +++ b/application/basilisk/app/profile/basilisk.js @@ -1266,13 +1266,6 @@ pref("media.gmp-widevinecdm.enabled", true); // -1 means no experiment is run and we use the preferred value for frecency (6h) pref("browser.cache.frecency_experiment", 0); -pref("browser.translation.detectLanguage", false); -pref("browser.translation.neverForLanguages", ""); -// Show the translation UI bits, like the info bar, notification icon and preferences. -pref("browser.translation.ui.show", false); -// Allows to define the translation engine. Bing is default, Yandex may optionally switched on. -pref("browser.translation.engine", "bing"); - // Telemetry settings. // Determines if Telemetry pings can be archived locally. pref("toolkit.telemetry.archive.enabled", true); diff --git a/application/basilisk/base/content/browser.css b/application/basilisk/base/content/browser.css index e951985dc..517c1c5eb 100644 --- a/application/basilisk/base/content/browser.css +++ b/application/basilisk/base/content/browser.css @@ -933,11 +933,6 @@ html|*#gcli-output-frame, transition: none; } -/* Translation */ -notification[value="translation"] { - -moz-binding: url("chrome://browser/content/translation-infobar.xml#translationbar"); -} - /** See bug 872317 for why the following rule is necessary. */ #downloads-button { diff --git a/application/basilisk/base/content/browser.js b/application/basilisk/base/content/browser.js index 4f4ebb08f..d45956191 100644 --- a/application/basilisk/base/content/browser.js +++ b/application/basilisk/base/content/browser.js @@ -45,7 +45,6 @@ Cu.import("resource://gre/modules/NotificationDB.jsm"); ["SitePermissions", "resource:///modules/SitePermissions.jsm"], ["TabCrashHandler", "resource:///modules/ContentCrashHandlers.jsm"], ["Task", "resource://gre/modules/Task.jsm"], - ["Translation", "resource:///modules/translation/Translation.jsm"], ["UpdateUtils", "resource://gre/modules/UpdateUtils.jsm"], ["Weave", "resource://services-sync/main.js"], ["fxAccounts", "resource://gre/modules/FxAccounts.jsm"], @@ -969,7 +968,6 @@ var gBrowserInit = { // the listener is registered. DOMLinkHandler.init(); gPageStyleMenu.init(); - LanguageDetectionListener.init(); BrowserOnClick.init(); FeedHandler.init(); DevEdition.init(); @@ -5680,16 +5678,6 @@ function setStyleDisabled(disabled) { gPageStyleMenu.disableStyle(); } - -var LanguageDetectionListener = { - init: function() { - window.messageManager.addMessageListener("Translation:DocumentState", msg => { - Translation.documentStateReceived(msg.target, msg.data); - }); - } -}; - - var BrowserOffline = { _inited: false, diff --git a/application/basilisk/base/content/browser.xul b/application/basilisk/base/content/browser.xul index 74a90f5e0..3208538c1 100644 --- a/application/basilisk/base/content/browser.xul +++ b/application/basilisk/base/content/browser.xul @@ -675,10 +675,6 @@ tooltiptext="&urlbar.webRTCShareScreenNotificationAnchor.tooltip;"/> - - diff --git a/application/basilisk/base/content/tab-content.js b/application/basilisk/base/content/tab-content.js index 11a9fabce..6d053dd2b 100644 --- a/application/basilisk/base/content/tab-content.js +++ b/application/basilisk/base/content/tab-content.js @@ -558,13 +558,6 @@ var PageStyleHandler = { }; PageStyleHandler.init(); -// Keep a reference to the translation content handler to avoid it it being GC'ed. -var trHandler = null; -if (Services.prefs.getBoolPref("browser.translation.detectLanguage")) { - Cu.import("resource:///modules/translation/TranslationContentHandler.jsm"); - trHandler = new TranslationContentHandler(global, docShell); -} - function gKeywordURIFixup(fixupInfo) { fixupInfo.QueryInterface(Ci.nsIURIFixupInfo); if (!fixupInfo.consumer) { diff --git a/application/basilisk/components/preferences/in-content/content.js b/application/basilisk/components/preferences/in-content/content.js index a957b1dd5..2eac10ca4 100644 --- a/application/basilisk/components/preferences/in-content/content.js +++ b/application/basilisk/components/preferences/in-content/content.js @@ -31,18 +31,6 @@ var gContentPane = { menulist.value = FontBuilder.readFontSelection(menulist); } - // Show translation preferences if we may: - const prefName = "browser.translation.ui.show"; - if (Services.prefs.getBoolPref(prefName)) { - let row = document.getElementById("translationBox"); - row.removeAttribute("hidden"); - // Showing attribution only for Bing Translator. - Components.utils.import("resource:///modules/translation/Translation.jsm"); - if (Translation.translationEngine == "bing") { - document.getElementById("bingAttribution").removeAttribute("hidden"); - } - } - if (AlertsServiceDND) { let notificationsDoNotDisturbRow = document.getElementById("notificationsDoNotDisturbRow"); @@ -66,10 +54,6 @@ var gContentPane = { gContentPane.configureColors); setEventListener("chooseLanguage", "command", gContentPane.showLanguages); - setEventListener("translationAttributionImage", "click", - gContentPane.openTranslationProviderAttribution); - setEventListener("translateButton", "command", - gContentPane.showTranslationExceptions); setEventListener("notificationsDoNotDisturb", "command", gContentPane.toggleDoNotDisturbNotifications); @@ -274,21 +258,6 @@ var gContentPane = { gSubDialog.open("chrome://browser/content/preferences/languages.xul"); }, - /** - * Displays the translation exceptions dialog where specific site and language - * translation preferences can be set. - */ - showTranslationExceptions: function () - { - gSubDialog.open("chrome://browser/content/preferences/translation.xul"); - }, - - openTranslationProviderAttribution: function () - { - Components.utils.import("resource:///modules/translation/Translation.jsm"); - Translation.openProviderAttribution(); - }, - toggleDoNotDisturbNotifications: function (event) { AlertsServiceDND.manualDoNotDisturb = event.target.checked; diff --git a/application/basilisk/components/preferences/in-content/content.xul b/application/basilisk/components/preferences/in-content/content.xul index 9434cba62..fac864411 100644 --- a/application/basilisk/components/preferences/in-content/content.xul +++ b/application/basilisk/components/preferences/in-content/content.xul @@ -22,11 +22,6 @@ - - -