From 50557a44e8257abc03913ed5b0828e9fa509dc85 Mon Sep 17 00:00:00 2001 From: Ruben Rodriguez Date: Thu, 23 Jul 2015 11:57:18 -0500 Subject: Finished v38 initial rebase --- data/branding/icecat/LICENSE | 3 ++ data/branding/icecat/Makefile.in | 9 ---- data/branding/icecat/bgplain.bmp | Bin 682144 -> 0 bytes data/branding/icecat/branding.nsi | 15 +++--- data/branding/icecat/clock.bmp | Bin 124214 -> 8982 bytes data/branding/icecat/content/about-background.png | Bin 122354 -> 0 bytes data/branding/icecat/content/jar.mn | 1 + data/branding/icecat/content/silhouette-40.svg | 58 +++++++++++++++++++++ data/branding/icecat/document-os2.ico | Bin 7824 -> 0 bytes data/branding/icecat/icecat-os2.ico | Bin 7824 -> 0 bytes data/branding/icecat/locales/Makefile.in | 5 -- data/branding/icecat/locales/en-US/brand.dtd | 5 +- .../branding/icecat/locales/en-US/brand.properties | 5 +- data/branding/icecat/locales/jar.mn | 7 ++- data/branding/icecat/locales/moz.build | 2 - data/branding/icecat/moz.build | 5 ++ data/branding/icecat/particles.bmp | Bin 124216 -> 8982 bytes data/branding/icecat/pencil-rtl.bmp | Bin 124214 -> 8982 bytes data/branding/icecat/pencil.bmp | Bin 124214 -> 8982 bytes data/branding/icecat/pref/icecat-branding.js | 5 ++ 20 files changed, 87 insertions(+), 33 deletions(-) delete mode 100644 data/branding/icecat/bgplain.bmp delete mode 100644 data/branding/icecat/content/about-background.png create mode 100644 data/branding/icecat/content/silhouette-40.svg delete mode 100644 data/branding/icecat/document-os2.ico delete mode 100644 data/branding/icecat/icecat-os2.ico delete mode 100644 data/branding/icecat/locales/Makefile.in (limited to 'data/branding/icecat') diff --git a/data/branding/icecat/LICENSE b/data/branding/icecat/LICENSE index e69de29..41dc232 100644 --- a/data/branding/icecat/LICENSE +++ b/data/branding/icecat/LICENSE @@ -0,0 +1,3 @@ +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/. diff --git a/data/branding/icecat/Makefile.in b/data/branding/icecat/Makefile.in index 3b5c4d5..d858c5b 100644 --- a/data/branding/icecat/Makefile.in +++ b/data/branding/icecat/Makefile.in @@ -12,7 +12,6 @@ BRANDING_FILES := \ branding.nsi \ appname.bmp \ bgintro.bmp \ - bgplain.bmp \ clock.bmp \ particles.bmp \ pencil.bmp \ @@ -45,13 +44,6 @@ BRANDING_FILES := \ $(NULL) endif -ifeq ($(OS_ARCH),OS2) -BRANDING_FILES := \ - icecat-os2.ico \ - document-os2.ico \ - $(NULL) -endif - BRANDING_DEST := $(DIST)/branding BRANDING_TARGET := export INSTALL_TARGETS += BRANDING @@ -62,4 +54,3 @@ VISUALMANIFEST_FLAGS := -Fsubstitution -DMOZ_APP_DISPLAYNAME=${MOZ_APP_DISPLAYNA VISUALMANIFEST_PATH := $(DIST)/bin PP_TARGETS += VISUALMANIFEST endif - diff --git a/data/branding/icecat/bgplain.bmp b/data/branding/icecat/bgplain.bmp deleted file mode 100644 index c82f896..0000000 Binary files a/data/branding/icecat/bgplain.bmp and /dev/null differ diff --git a/data/branding/icecat/branding.nsi b/data/branding/icecat/branding.nsi index 9b6ab6a..57a76b2 100644 --- a/data/branding/icecat/branding.nsi +++ b/data/branding/icecat/branding.nsi @@ -8,13 +8,11 @@ # BrandFullNameInternal is used for some registry and file system values # instead of BrandFullName and typically should not be modified. -!define BrandFullNameInternal "IceCat" +!define BrandFullNameInternal "GNU IceCat" !define CompanyName "GNU" !define URLInfoAbout "http://www.gnu.org/software/gnuzilla/" -!define URLUpdateInfo "http://www.gnu.org/software/gnuzilla/" - -!define URLStubDownload "http://www.gnu.org/software/gnuzilla/" -!define URLManualDownload "http://ftp.gnu.org/gnu/gnuzilla/" +!define URLUpdateInfo "https://savannah.gnu.org/projects/gnuzilla/" +!define HelpLink "http://libreplanet.org/wiki/Group:IceCat/ " ; 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 @@ -42,9 +40,8 @@ !define FOOTER_CONTROL_TEXT_COLOR_FADED 0x666666 !define FOOTER_BKGRD_COLOR 0xFFFFFF !define INTRO_BLURB_TEXT_COLOR 0x666666 -!define OPTIONS_TEXT_COLOR_NORMAL 0x000000 -!define OPTIONS_TEXT_COLOR_FADED 0x666666 -!define OPTIONS_BKGRD_COLOR 0xF0F0F0 !define INSTALL_BLURB_TEXT_COLOR 0x666666 !define INSTALL_PROGRESS_TEXT_COLOR_NORMAL 0x666666 -!define INSTALL_PROGRESS_TEXT_COLOR_FADED 0x999999 +!define COMMON_TEXT_COLOR_NORMAL 0x000000 +!define COMMON_TEXT_COLOR_FADED 0x666666 +!define COMMON_BKGRD_COLOR 0xF0F0F0 diff --git a/data/branding/icecat/clock.bmp b/data/branding/icecat/clock.bmp index c74398e..7da034d 100644 Binary files a/data/branding/icecat/clock.bmp and b/data/branding/icecat/clock.bmp differ diff --git a/data/branding/icecat/content/about-background.png b/data/branding/icecat/content/about-background.png deleted file mode 100644 index f626f74..0000000 Binary files a/data/branding/icecat/content/about-background.png and /dev/null differ diff --git a/data/branding/icecat/content/jar.mn b/data/branding/icecat/content/jar.mn index b692816..fec1857 100644 --- a/data/branding/icecat/content/jar.mn +++ b/data/branding/icecat/content/jar.mn @@ -15,6 +15,7 @@ browser.jar: content/branding/icon128.png (../mozicon128.png) content/branding/identity-icons-brand.png (identity-icons-brand.png) content/branding/identity-icons-brand@2x.png (identity-icons-brand@2x.png) + content/branding/silhouette-40.svg (silhouette-40.svg) content/branding/aboutDialog.css (aboutDialog.css) #ifdef MOZ_METRO content/branding/metro-about.css (metro-about.css) diff --git a/data/branding/icecat/content/silhouette-40.svg b/data/branding/icecat/content/silhouette-40.svg new file mode 100644 index 0000000..72d2291 --- /dev/null +++ b/data/branding/icecat/content/silhouette-40.svg @@ -0,0 +1,58 @@ + + + + + + image/svg+xml + + + + + + + + diff --git a/data/branding/icecat/document-os2.ico b/data/branding/icecat/document-os2.ico deleted file mode 100644 index 214e92c..0000000 Binary files a/data/branding/icecat/document-os2.ico and /dev/null differ diff --git a/data/branding/icecat/icecat-os2.ico b/data/branding/icecat/icecat-os2.ico deleted file mode 100644 index 560d198..0000000 Binary files a/data/branding/icecat/icecat-os2.ico and /dev/null differ diff --git a/data/branding/icecat/locales/Makefile.in b/data/branding/icecat/locales/Makefile.in deleted file mode 100644 index 82f614e..0000000 --- a/data/branding/icecat/locales/Makefile.in +++ /dev/null @@ -1,5 +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/. - -DEFINES += -DAB_CD=$(AB_CD) diff --git a/data/branding/icecat/locales/en-US/brand.dtd b/data/branding/icecat/locales/en-US/brand.dtd index 519de9b..3788266 100644 --- a/data/branding/icecat/locales/en-US/brand.dtd +++ b/data/branding/icecat/locales/en-US/brand.dtd @@ -2,7 +2,8 @@ - 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/. --> + - + - + diff --git a/data/branding/icecat/locales/en-US/brand.properties b/data/branding/icecat/locales/en-US/brand.properties index 3120429..73ef208 100644 --- a/data/branding/icecat/locales/en-US/brand.properties +++ b/data/branding/icecat/locales/en-US/brand.properties @@ -2,9 +2,10 @@ # 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/. +brandShorterName=IceCat brandShortName=IceCat -brandFullName=IceCat -vendorShortName=GNU +brandFullName=Mozilla IceCat +vendorShortName=Mozilla homePageSingleStartMain=IceCat Start, a fast home page with built-in search homePageImport=Import your home page from %S diff --git a/data/branding/icecat/locales/jar.mn b/data/branding/icecat/locales/jar.mn index ff4e055..ff8c28c 100644 --- a/data/branding/icecat/locales/jar.mn +++ b/data/branding/icecat/locales/jar.mn @@ -6,7 +6,6 @@ @AB_CD@.jar: % locale branding @AB_CD@ %locale/branding/ -# Unofficial branding only exists in en-US - locale/branding/brand.dtd (en-US/brand.dtd) - locale/branding/brand.properties (en-US/brand.properties) - locale/branding/browserconfig.properties (browserconfig.properties) + locale/branding/brand.dtd (%brand.dtd) +* locale/branding/brand.properties (%brand.properties) +* locale/branding/browserconfig.properties (browserconfig.properties) diff --git a/data/branding/icecat/locales/moz.build b/data/branding/icecat/locales/moz.build index 3a54c0c..c97072b 100644 --- a/data/branding/icecat/locales/moz.build +++ b/data/branding/icecat/locales/moz.build @@ -4,6 +4,4 @@ # 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/. -DEFINES['MOZ_DISTRIBUTION_ID_UNQUOTED'] = CONFIG['MOZ_DISTRIBUTION_ID'] - JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/data/branding/icecat/moz.build b/data/branding/icecat/moz.build index 3e2f88f..408c1f0 100644 --- a/data/branding/icecat/moz.build +++ b/data/branding/icecat/moz.build @@ -8,3 +8,8 @@ DIRS += ['content', 'locales'] DIST_SUBDIR = 'browser' export('DIST_SUBDIR') + +JS_PREFERENCE_FILES += [ + 'pref/icecat-branding.js', +] + diff --git a/data/branding/icecat/particles.bmp b/data/branding/icecat/particles.bmp index ab74ce0..d523606 100644 Binary files a/data/branding/icecat/particles.bmp and b/data/branding/icecat/particles.bmp differ diff --git a/data/branding/icecat/pencil-rtl.bmp b/data/branding/icecat/pencil-rtl.bmp index e50d92d..67d2fe5 100644 Binary files a/data/branding/icecat/pencil-rtl.bmp and b/data/branding/icecat/pencil-rtl.bmp differ diff --git a/data/branding/icecat/pencil.bmp b/data/branding/icecat/pencil.bmp index 252c10f..7dd5574 100644 Binary files a/data/branding/icecat/pencil.bmp and b/data/branding/icecat/pencil.bmp differ diff --git a/data/branding/icecat/pref/icecat-branding.js b/data/branding/icecat/pref/icecat-branding.js index 58a869e..4c0eb17 100644 --- a/data/branding/icecat/pref/icecat-branding.js +++ b/data/branding/icecat/pref/icecat-branding.js @@ -1,3 +1,7 @@ +/* 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/. */ + pref("startup.homepage_override_url","http://www.gnu.org"); pref("startup.homepage_welcome_url","http://www.gnu.org/software/gnuzilla/"); // The time interval between checks for a new version (in seconds) @@ -22,3 +26,4 @@ pref("browser.search.param.yahoo-fr", ""); pref("browser.search.param.yahoo-fr-cjkt", ""); // now unused pref("browser.search.param.yahoo-fr-ja", ""); pref("browser.search.param.yahoo-f-CN", ""); + -- cgit v1.2.3