From 170b82c2e254d3aa9b4e5f31f26dc89283a472a6 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sat, 17 Feb 2018 10:56:35 -0500 Subject: Reduce redundencies in Basilisk branding --- browser/branding/shared/branding.mozbuild | 56 ++++++++++++++++++++++++++++++ browser/branding/shared/dsstore | Bin 0 -> 12292 bytes browser/branding/shared/newtab.ico | Bin 0 -> 6518 bytes browser/branding/shared/newwindow.ico | Bin 0 -> 6518 bytes browser/branding/shared/pbmode.ico | Bin 0 -> 6518 bytes browser/branding/shared/preferences.inc | 33 ++++++++++++++++++ browser/branding/shared/uaoverrides.inc | 38 ++++++++++++++++++++ 7 files changed, 127 insertions(+) create mode 100644 browser/branding/shared/branding.mozbuild create mode 100644 browser/branding/shared/dsstore create mode 100644 browser/branding/shared/newtab.ico create mode 100644 browser/branding/shared/newwindow.ico create mode 100644 browser/branding/shared/pbmode.ico create mode 100644 browser/branding/shared/preferences.inc create mode 100644 browser/branding/shared/uaoverrides.inc (limited to 'browser/branding/shared') diff --git a/browser/branding/shared/branding.mozbuild b/browser/branding/shared/branding.mozbuild new file mode 100644 index 000000000..29d25094f --- /dev/null +++ b/browser/branding/shared/branding.mozbuild @@ -0,0 +1,56 @@ +# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- +# vim: set filetype=python: +# 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/. + +@template +def ApplicationBranding(): + JS_PREFERENCE_PP_FILES += [ + 'pref/firefox-branding.js', + ] + + if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': + FINAL_TARGET_FILES['..'] += [ + 'basilisk.VisualElementsManifest.xml', + ] + FINAL_TARGET_FILES.VisualElements += [ + 'VisualElements_150.png', + 'VisualElements_70.png', + ] + BRANDING_FILES += [ + '../shared/newtab.ico', + '../shared/newwindow.ico', + '../shared/pbmode.ico', + 'appname.bmp', + 'branding.nsi', + 'document.ico', + 'firefox.ico', + 'wizHeader.bmp', + 'wizHeaderRTL.bmp', + 'wizWatermark.bmp', + ] + elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': + BRANDING_FILES += [ + '../shared/dsstore', + 'disk.icns', + 'document.icns', + 'background.png', + 'firefox.icns', + ] + elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']: + BRANDING_FILES += [ + 'default16.png', + 'default32.png', + 'default48.png', + 'mozicon128.png', + ] + FINAL_TARGET_FILES.icons += ['mozicon128.png'] + FINAL_TARGET_FILES.chrome.icons.default += [ + 'default16.png', + 'default32.png', + 'default48.png', + ] + DEFINES['MOZ_APP_VERSION'] = CONFIG['MOZ_APP_VERSION'] + DEFINES['MOZ_BRANDING_DIRECTORY'] = CONFIG['MOZ_BRANDING_DIRECTORY'] + DEFINES['MOZILLA_UAVERSION_U'] = CONFIG['MOZILLA_UAVERSION_U'] \ No newline at end of file diff --git a/browser/branding/shared/dsstore b/browser/branding/shared/dsstore new file mode 100644 index 000000000..8ea703674 Binary files /dev/null and b/browser/branding/shared/dsstore differ diff --git a/browser/branding/shared/newtab.ico b/browser/branding/shared/newtab.ico new file mode 100644 index 000000000..a9b37c08c Binary files /dev/null and b/browser/branding/shared/newtab.ico differ diff --git a/browser/branding/shared/newwindow.ico b/browser/branding/shared/newwindow.ico new file mode 100644 index 000000000..553720771 Binary files /dev/null and b/browser/branding/shared/newwindow.ico differ diff --git a/browser/branding/shared/pbmode.ico b/browser/branding/shared/pbmode.ico new file mode 100644 index 000000000..47677c13f Binary files /dev/null and b/browser/branding/shared/pbmode.ico differ diff --git a/browser/branding/shared/preferences.inc b/browser/branding/shared/preferences.inc new file mode 100644 index 000000000..08f6c950b --- /dev/null +++ b/browser/branding/shared/preferences.inc @@ -0,0 +1,33 @@ +// Interval: Time between checks for a new version (in seconds) +pref("app.update.interval", 86400); // 1 day + +// The time interval between the downloading of mar file chunks in the +// background (in seconds) +// 0 means "download everything at once" +pref("app.update.download.backgroundInterval", 0); + +// Give the user x seconds to react before showing the big UI. default=192 hours +pref("app.update.promptWaitTime", 691200); + +// The number of days a binary is permitted to be old +// without checking for an update. This assumes that +// app.update.checkInstallTime is true. +pref("app.update.checkInstallTime.days", 14); + +// Give the user x seconds to reboot before showing a badge on the hamburger +// button. default=immediately +pref("app.update.badgeWaitTime", 0); + +// Number of usages of the web console or scratchpad. +// If this is less than 5, then pasting code into the web console or scratchpad is disabled +pref("devtools.selfxss.count", 100); + +// Disable Google Safebrowsing by default. Without an API key, this won't work. +pref("browser.safebrowsing.phishing.enabled", false); +pref("browser.safebrowsing.malware.enabled", false); +pref("browser.safebrowsing.downloads.enabled", false); +pref("browser.safebrowsing.downloads.remote.enabled", false); + +// Disable the UI controls for it as well for Basilisk-official. +pref("browser.safebrowsing.UI.enabled", false); + diff --git a/browser/branding/shared/uaoverrides.inc b/browser/branding/shared/uaoverrides.inc new file mode 100644 index 000000000..13a89ed7f --- /dev/null +++ b/browser/branding/shared/uaoverrides.inc @@ -0,0 +1,38 @@ +#define GUAO_PREF general.useragent.override + +#define GRE_VERSION @MOZILLA_UAVERSION_U@ +#define GRE_VERSION_SLICE Goanna/@GRE_VERSION@ +#define GRE_DATE_SLICE Goanna/20170101 +#define APP_SLICE Basilisk/@MOZ_APP_VERSION@ + +#define GK_VERSION 52.0 +#define GK_SLICE Gecko/20100101 +#define FX_SLICE Firefox/@GK_VERSION@ + +#ifdef XP_UNIX +#ifndef XP_MACOSX +#define OS_SLICE X11; Linux x86_64; +#else +#define OS_SLICE Macintosh; Intel Mac OS X 10.11; +#endif +#else +#define OS_SLICE Windows NT 6.1; WOW64; +#endif + +// FxA override +pref("@GUAO_PREF@.accounts.firefox.com", "Mozilla/5.0 (@OS_SLICE@ rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@"); + +// Required for domains that have proven unresponsive to requests from users + +// The never-ending Facebook debacle... + +// UA-Sniffing domains below are pending responses from their operators - temp workaround + +// The following requires native mode. Or it blocks.. "too old firefox", breakage, etc. + +// UA-Sniffing domains below have indicated no interest in supporting Pale Moon (BOO!) + +// UA-sniffing domains that are "app/vendor-specific" and do not like Pale Moon + +// The following domains do not like the Goanna slice + -- cgit v1.2.3