From e906ffafbb0da30f22e0949017f4142f00362180 Mon Sep 17 00:00:00 2001 From: janekptacijarabaci Date: Tue, 26 Jun 2018 19:43:21 +0200 Subject: "about:profiles" and "about:support" - use "Restart in Safe Mode" instead of "Restart with Add-ons Disabled" https://github.com/MoonchildProductions/Pale-Moon/issues/1563 --- toolkit/locales/en-US/chrome/global/aboutProfiles.dtd | 2 +- toolkit/locales/en-US/chrome/global/aboutSupport.dtd | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/toolkit/locales/en-US/chrome/global/aboutProfiles.dtd b/toolkit/locales/en-US/chrome/global/aboutProfiles.dtd index 48e24923e..5091517b2 100644 --- a/toolkit/locales/en-US/chrome/global/aboutProfiles.dtd +++ b/toolkit/locales/en-US/chrome/global/aboutProfiles.dtd @@ -6,5 +6,5 @@ - + diff --git a/toolkit/locales/en-US/chrome/global/aboutSupport.dtd b/toolkit/locales/en-US/chrome/global/aboutSupport.dtd index 8459300c5..780b513f6 100644 --- a/toolkit/locales/en-US/chrome/global/aboutSupport.dtd +++ b/toolkit/locales/en-US/chrome/global/aboutSupport.dtd @@ -110,7 +110,7 @@ variant of aboutSupport.showDir.label. --> - + -- cgit v1.2.3 From 8207d755f1299032d9102182993d390a62dad7e0 Mon Sep 17 00:00:00 2001 From: janekptacijarabaci Date: Tue, 26 Jun 2018 19:50:48 +0200 Subject: [BASILISK] Unify strings for "Restart in Safe Mode" (with toolkit - "about:profiles" and "about:support") https://github.com/MoonchildProductions/Pale-Moon/issues/1563 --- application/basilisk/locales/en-US/chrome/browser/baseMenuOverlay.dtd | 2 +- application/basilisk/locales/en-US/chrome/browser/browser.properties | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/application/basilisk/locales/en-US/chrome/browser/baseMenuOverlay.dtd b/application/basilisk/locales/en-US/chrome/browser/baseMenuOverlay.dtd index 1079c3cef..0fbd9cc35 100644 --- a/application/basilisk/locales/en-US/chrome/browser/baseMenuOverlay.dtd +++ b/application/basilisk/locales/en-US/chrome/browser/baseMenuOverlay.dtd @@ -23,7 +23,7 @@ - + diff --git a/application/basilisk/locales/en-US/chrome/browser/browser.properties b/application/basilisk/locales/en-US/chrome/browser/browser.properties index 8f4036dcd..aa7a82e4f 100644 --- a/application/basilisk/locales/en-US/chrome/browser/browser.properties +++ b/application/basilisk/locales/en-US/chrome/browser/browser.properties @@ -413,8 +413,8 @@ extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.name=Default extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.description=The default theme. # safeModeRestart -safeModeRestartPromptTitle=Restart with Add-ons Disabled -safeModeRestartPromptMessage=Are you sure you want to disable all add-ons and restart? +safeModeRestartPromptTitle=Restart in Safe Mode +safeModeRestartPromptMessage=Are you sure you want to restart in Safe Mode? safeModeRestartButton=Restart # LOCALIZATION NOTE (browser.menu.showCharacterEncoding): Set to the string -- cgit v1.2.3 From e240469e7241fece5c00b398007b6c529301de6d Mon Sep 17 00:00:00 2001 From: janekptacijarabaci Date: Tue, 26 Jun 2018 20:20:43 +0200 Subject: "about:support" - added support for "Restart normally" https://github.com/MoonchildProductions/Pale-Moon/pull/1093 (partially) --- toolkit/content/aboutSupport.js | 22 +++++++++++++++++----- toolkit/content/aboutSupport.xhtml | 6 ++++++ .../locales/en-US/chrome/global/aboutSupport.dtd | 3 +++ toolkit/themes/shared/aboutSupport.css | 4 ++++ 4 files changed, 30 insertions(+), 5 deletions(-) diff --git a/toolkit/content/aboutSupport.js b/toolkit/content/aboutSupport.js index 016549f43..4e42a5687 100644 --- a/toolkit/content/aboutSupport.js +++ b/toolkit/content/aboutSupport.js @@ -879,16 +879,25 @@ function populateActionBox() { } } -// Prompt user to restart the browser in safe mode -function safeModeRestart() { +// Prompt user to restart the browser +function restart(safeMode) { let cancelQuit = Cc["@mozilla.org/supports-PRBool;1"] .createInstance(Ci.nsISupportsPRBool); Services.obs.notifyObservers(cancelQuit, "quit-application-requested", "restart"); - if (!cancelQuit.data) { - Services.startup.restartInSafeMode(Ci.nsIAppStartup.eAttemptQuit); + if (cancelQuit.data) { + return; + } + + let flags = Ci.nsIAppStartup.eAttemptQuit; + + if (safeMode) { + Services.startup.restartInSafeMode(flags); + } else { + Services.startup.quit(flags | Ci.nsIAppStartup.eRestart); } } + /** * Set up event listeners for buttons. */ @@ -915,9 +924,12 @@ function setupEventListeners() { if (Services.obs.enumerateObservers("restart-in-safe-mode").hasMoreElements()) { Services.obs.notifyObservers(null, "restart-in-safe-mode", ""); } else { - safeModeRestart(); + restart(true); } }); + $("restart-button").addEventListener("click", function(event) { + restart(false); + }); $("verify-place-integrity-button").addEventListener("click", function(event) { PlacesDBUtils.checkAndFixDatabase(function(aLog) { let msg = aLog.join("\n"); diff --git a/toolkit/content/aboutSupport.xhtml b/toolkit/content/aboutSupport.xhtml index a92dcfb4a..5eb64d437 100644 --- a/toolkit/content/aboutSupport.xhtml +++ b/toolkit/content/aboutSupport.xhtml @@ -44,6 +44,12 @@ &aboutSupport.restartInSafeMode.label; +
+

&aboutSupport.restartTitle;

+ +

diff --git a/toolkit/locales/en-US/chrome/global/aboutSupport.dtd b/toolkit/locales/en-US/chrome/global/aboutSupport.dtd index 780b513f6..a0dd3531b 100644 --- a/toolkit/locales/en-US/chrome/global/aboutSupport.dtd +++ b/toolkit/locales/en-US/chrome/global/aboutSupport.dtd @@ -112,6 +112,9 @@ variant of aboutSupport.showDir.label. --> + + + diff --git a/toolkit/themes/shared/aboutSupport.css b/toolkit/themes/shared/aboutSupport.css index d26cd3cbd..69e6a95b4 100644 --- a/toolkit/themes/shared/aboutSupport.css +++ b/toolkit/themes/shared/aboutSupport.css @@ -99,6 +99,10 @@ td { width: 30%; } +#contents { + clear: right; +} + #action-box, #reset-box, #safe-mode-box { -- cgit v1.2.3 From a05046a4d26d9b743b7f2333e9584a147623ca2b Mon Sep 17 00:00:00 2001 From: janekptacijarabaci Date: Tue, 26 Jun 2018 21:10:31 +0200 Subject: Fix throws an error if "winUtils.supportsHardwareH264Decoding" not available After "Restart normally" - throws an error: Troubleshoot data provider failed: graphics [Exception... "Component returned failure code: 0x8000ffff (NS_ERROR_UNEXPECTED) [nsIDOMWindowUtils.supportsHardwareH264Decoding]" nsresult: "0x8000ffff (NS_ERROR_UNEXPECTED)" location: "JS frame :: resource://gre/modules/Troubleshoot.jsm :: graphics :: line 348" data: no] Troubleshoot.jsm:155 TypeError: invalid 'in' operand data aboutSupport.js:204:1 --- toolkit/modules/Troubleshoot.jsm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/toolkit/modules/Troubleshoot.jsm b/toolkit/modules/Troubleshoot.jsm index 20aad6770..4c6ac558d 100644 --- a/toolkit/modules/Troubleshoot.jsm +++ b/toolkit/modules/Troubleshoot.jsm @@ -347,11 +347,14 @@ var dataProviders = { QueryInterface(Ci.nsIInterfaceRequestor). getInterface(Ci.nsIDOMWindowUtils) data.supportsHardwareH264 = "Unknown"; - let promise = winUtils.supportsHardwareH264Decoding; - promise.then(function(v) { - data.supportsHardwareH264 = v; - }); - promises.push(promise); + try { + // After restart - data may not be available + let promise = winUtils.supportsHardwareH264Decoding; + promise.then(function(v) { + data.supportsHardwareH264 = v; + }); + promises.push(promise); + } catch (e) {} data.currentAudioBackend = winUtils.currentAudioBackend; -- cgit v1.2.3