From 1a418cf476709cc49a4b7dcf4aef64c5100ddaf9 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Sun, 31 Dec 2017 13:45:14 +0100 Subject: Rename Options to Preferences and unify location. This also removes OS-specific naming/handling for separate locations. Fixes #270. --- browser/components/customizableui/CustomizableWidgets.jsm | 5 +---- browser/components/preferences/in-content/preferences.xul | 8 -------- 2 files changed, 1 insertion(+), 12 deletions(-) (limited to 'browser/components') diff --git a/browser/components/customizableui/CustomizableWidgets.jsm b/browser/components/customizableui/CustomizableWidgets.jsm index 907e2e0f7..1e68b01c1 100644 --- a/browser/components/customizableui/CustomizableWidgets.jsm +++ b/browser/components/customizableui/CustomizableWidgets.jsm @@ -1187,10 +1187,7 @@ let preferencesButton = { win.openPreferences(); } }; -if (AppConstants.platform == "win") { - preferencesButton.label = "preferences-button.labelWin"; - preferencesButton.tooltiptext = "preferences-button.tooltipWin2"; -} else if (AppConstants.platform == "macosx") { +if (AppConstants.platform == "macosx") { preferencesButton.tooltiptext = "preferences-button.tooltiptext.withshortcut"; preferencesButton.shortcutId = "key_preferencesCmdMac"; } else { diff --git a/browser/components/preferences/in-content/preferences.xul b/browser/components/preferences/in-content/preferences.xul index e9664eaf4..7ec7ef119 100644 --- a/browser/components/preferences/in-content/preferences.xul +++ b/browser/components/preferences/in-content/preferences.xul @@ -55,18 +55,10 @@ %advancedDTD; ]> -#ifdef XP_WIN -#define USE_WIN_TITLE_STYLE -#endif - -#else title="&prefWindow.title;"> -#endif -- cgit v1.2.3 From 3cdef72da397f3878dfb24a91281ddeaf0eece37 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Mon, 1 Jan 2018 05:33:04 +0100 Subject: Chase the fox out of the shell service. "Welcome to branding hell, boys!" Part 2 for #271. --- browser/components/shell/ShellService.jsm | 4 ++-- browser/components/shell/nsGNOMEShellService.cpp | 2 +- browser/components/shell/nsWindowsShellService.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'browser/components') diff --git a/browser/components/shell/ShellService.jsm b/browser/components/shell/ShellService.jsm index 2a3400b60..cc225eae0 100644 --- a/browser/components/shell/ShellService.jsm +++ b/browser/components/shell/ShellService.jsm @@ -62,10 +62,10 @@ let ShellServiceInternal = { if (AppConstants.platform == "win") { let optOutValue = WindowsRegistry.readRegKey(Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER, - "Software\\Mozilla\\Firefox", + "Software\\Mozilla\\Basilisk", "DefaultBrowserOptOut"); WindowsRegistry.removeRegKey(Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER, - "Software\\Mozilla\\Firefox", + "Software\\Mozilla\\Basilisk", "DefaultBrowserOptOut"); if (optOutValue == "True") { Services.prefs.setBoolPref("browser.shell.checkDefaultBrowser", false); diff --git a/browser/components/shell/nsGNOMEShellService.cpp b/browser/components/shell/nsGNOMEShellService.cpp index 1001a52ae..613b5bffc 100644 --- a/browser/components/shell/nsGNOMEShellService.cpp +++ b/browser/components/shell/nsGNOMEShellService.cpp @@ -451,7 +451,7 @@ nsGNOMEShellService::SetDesktopBackground(nsIDOMElement* aElement, // Set the image to an empty string first to force a refresh // (since we could be writing a new image on top of an existing - // Firefox_wallpaper.png and nautilus doesn't monitor the file for changes) + // Basilisk_wallpaper.png and nautilus doesn't monitor the file for changes) gconf->SetString(NS_LITERAL_CSTRING(kDesktopImageKey), EmptyCString()); diff --git a/browser/components/shell/nsWindowsShellService.cpp b/browser/components/shell/nsWindowsShellService.cpp index 6c43d95db..cb13c0910 100644 --- a/browser/components/shell/nsWindowsShellService.cpp +++ b/browser/components/shell/nsWindowsShellService.cpp @@ -135,7 +135,7 @@ OpenKeyForReading(HKEY aKeyRoot, const nsAString& aKeyName, HKEY* aKey) // The following keys are set to make Basilisk appear in the Start Menu as the // browser: // -// HKCU\SOFTWARE\Clients\StartMenuInternet\FIREFOX.EXE\ +// HKCU\SOFTWARE\Clients\StartMenuInternet\BASILISK.EXE\ // (default) REG_SZ // DefaultIcon (default) REG_SZ ,0 // InstallInfo HideIconsCommand REG_SZ /HideShortcuts -- cgit v1.2.3 From 20b6d5e9c0582fadeb8fa76d46cda14a190ca1a1 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Mon, 1 Jan 2018 15:27:57 +0100 Subject: Add an option to control automatic filling in of login credentials and switch this off by default. This resolves #272. --- browser/components/preferences/in-content/security.xul | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'browser/components') diff --git a/browser/components/preferences/in-content/security.xul b/browser/components/preferences/in-content/security.xul index a10576c25..b7bdb9361 100644 --- a/browser/components/preferences/in-content/security.xul +++ b/browser/components/preferences/in-content/security.xul @@ -45,6 +45,7 @@ + @@ -103,6 +104,9 @@ accesskey="&passwordExceptions.accesskey;" preference="pref.privacy.disable_button.view_passwords_exceptions"/> + -- cgit v1.2.3 From 4f82d71df070e813927893fc20aa7954fbae997d Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Mon, 19 Feb 2018 16:28:18 +0100 Subject: Remove Windows shell integration checks for Windows Vista. Tag #22. --- browser/components/shell/nsWindowsShellService.cpp | 5 ----- 1 file changed, 5 deletions(-) (limited to 'browser/components') diff --git a/browser/components/shell/nsWindowsShellService.cpp b/browser/components/shell/nsWindowsShellService.cpp index cb13c0910..879b0c7f0 100644 --- a/browser/components/shell/nsWindowsShellService.cpp +++ b/browser/components/shell/nsWindowsShellService.cpp @@ -648,11 +648,6 @@ nsWindowsShellService::LaunchControlPanelDefaultsSelectionUI() nsresult nsWindowsShellService::LaunchControlPanelDefaultPrograms() { - // This Default Programs feature is Win7+ only. - if (!IsWin7OrLater()) { - return NS_ERROR_FAILURE; - } - // Build the path control.exe path safely WCHAR controlEXEPath[MAX_PATH + 1] = { '\0' }; if (!GetSystemDirectoryW(controlEXEPath, MAX_PATH)) { -- cgit v1.2.3 From da8f20a3b05387aaa1c7c81543f1aae6dd1ca99d Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Mon, 19 Feb 2018 20:04:11 +0100 Subject: Remove some obsolete front-end code in Basilisk. --- browser/components/customizableui/CustomizableUI.jsm | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'browser/components') diff --git a/browser/components/customizableui/CustomizableUI.jsm b/browser/components/customizableui/CustomizableUI.jsm index 86ff2708b..01389108d 100644 --- a/browser/components/customizableui/CustomizableUI.jsm +++ b/browser/components/customizableui/CustomizableUI.jsm @@ -262,24 +262,14 @@ var CustomizableUIInternal = { defaultCollapsed: false, }, true); - if (AppConstants.platform != "macosx") { + if (AppConstants.MENUBAR_CAN_AUTOHIDE) { this.registerArea(CustomizableUI.AREA_MENUBAR, { legacy: true, type: CustomizableUI.TYPE_TOOLBAR, defaultPlacements: [ "menubar-items", ], - get defaultCollapsed() { - if (AppConstants.MENUBAR_CAN_AUTOHIDE) { - if (AppConstants.platform == "linux") { - return true; - } - // This is duplicated logic from /browser/base/jar.mn - // for win6BrowserOverlay.xul. - return AppConstants.isPlatformAndVersionAtLeast("win", 6); - } - return false; - } + defaultCollapsed: true, }, true); } -- cgit v1.2.3 From 4c697043da9fe3f58a7e070dad74eab6972695a0 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Tue, 20 Feb 2018 14:01:05 +0100 Subject: Remove windows-xp and windows-vista from @media(-moz-os-version) --- browser/components/webextensions/extension-win-panel.css | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'browser/components') diff --git a/browser/components/webextensions/extension-win-panel.css b/browser/components/webextensions/extension-win-panel.css index ddafe3ea5..9da6da14c 100644 --- a/browser/components/webextensions/extension-win-panel.css +++ b/browser/components/webextensions/extension-win-panel.css @@ -1,6 +1,4 @@ -@media (-moz-os-version: windows-xp), - (-moz-os-version: windows-vista), - (-moz-os-version: windows-win7) { +@media (-moz-os-version: windows-win7) { body { border-radius: 4px; } -- cgit v1.2.3 From 3458dde44f5693ef2c1c2ff8b056fc1f4022701d Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Sat, 26 Aug 2017 15:04:25 +0200 Subject: Add site-specific overrides and remove the overruling global. --- browser/components/nsBrowserGlue.js | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'browser/components') diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js index d69a11f6b..f97c173a0 100644 --- a/browser/components/nsBrowserGlue.js +++ b/browser/components/nsBrowserGlue.js @@ -64,6 +64,7 @@ XPCOMUtils.defineLazyServiceGetter(this, "AlertsService", "@mozilla.org/alerts-s ["Task", "resource://gre/modules/Task.jsm"], ["UITour", "resource:///modules/UITour.jsm"], ["URLBarZoom", "resource:///modules/URLBarZoom.jsm"], + ["UserAgentOverrides", "resource://gre/modules/UserAgentOverrides.jsm"], ["WebChannel", "resource://gre/modules/WebChannel.jsm"], ["WindowsRegistry", "resource://gre/modules/WindowsRegistry.jsm"], ["webrtcUI", "resource:///modules/webrtcUI.jsm"], @@ -662,6 +663,8 @@ BrowserGlue.prototype = { } } catch (ex) { /* missing any of the prefs is not critical */ } + UserAgentOverrides.init(); + PageThumbs.init(); webrtcUI.init(); AboutHome.init(); @@ -1042,6 +1045,7 @@ BrowserGlue.prototype = { BrowserUsageTelemetry.uninit(); SelfSupportBackend.uninit(); + UserAgentOverrides.uninit(); PageThumbs.uninit(); NewTabMessages.uninit(); AboutNewTab.uninit(); -- cgit v1.2.3 From c88c161875beca091fe183a3b04480422b3d3885 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Wed, 13 Dec 2017 17:47:44 +0100 Subject: Remove unnecessary front-end features and pres when not building EME. Tag #26. --- browser/components/preferences/in-content/content.js | 2 ++ browser/components/preferences/in-content/content.xul | 4 ++++ browser/components/preferences/in-content/jar.mn | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) (limited to 'browser/components') diff --git a/browser/components/preferences/in-content/content.js b/browser/components/preferences/in-content/content.js index 5ba334b02..a957b1dd5 100644 --- a/browser/components/preferences/in-content/content.js +++ b/browser/components/preferences/in-content/content.js @@ -78,6 +78,7 @@ var gContentPane = { document.getElementById("notificationsPolicyLearnMore").setAttribute("href", notificationInfoURL); +#ifdef MOZ_EME let drmInfoURL = Services.urlFormatter.formatURLPref("app.support.baseURL") + "drm-content"; document.getElementById("playDRMContentLink").setAttribute("href", drmInfoURL); @@ -91,6 +92,7 @@ var gContentPane = { // of the pane hiding/showing code potentially interfering: document.getElementById("drmGroup").setAttribute("style", "display: none !important"); } +#endif }, // UTILITY FUNCTIONS diff --git a/browser/components/preferences/in-content/content.xul b/browser/components/preferences/in-content/content.xul index c646c16a2..9434cba62 100644 --- a/browser/components/preferences/in-content/content.xul +++ b/browser/components/preferences/in-content/content.xul @@ -6,10 +6,12 @@