From e5443bf8edb805be6c92982fff536dc5f7e4e0cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 18 Jan 2017 23:46:40 -0300 Subject: Import modifications from the 45.5.0 version that is the latest branding one --- icedove-branding/Makefile.in | 48 +++---------------------------- icedove-branding/branding.nsi | 39 +++---------------------- icedove-branding/configure.sh | 4 +++ icedove-branding/content/about.png | Bin 40468 -> 40474 bytes icedove-branding/content/aboutDialog.css | 4 +++ icedove-branding/jar.mn | 8 +++++- icedove-branding/thunderbird-branding.js | 4 +++ 7 files changed, 27 insertions(+), 80 deletions(-) (limited to 'icedove-branding') diff --git a/icedove-branding/Makefile.in b/icedove-branding/Makefile.in index f307264..456df11 100644 --- a/icedove-branding/Makefile.in +++ b/icedove-branding/Makefile.in @@ -1,54 +1,14 @@ -# ***** BEGIN LICENSE BLOCK ***** -# Version: MPL 1.1/GPL 2.0/LGPL 2.1 -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# The Original Code is Thunderbird unofficial branding. -# -# The Initial Developer of the Original Code is -# Mozilla Messaging -# Portions created by the Initial Developer are Copyright (C) 2008 -# the Initial Developer. All Rights Reserved. -# -# Contributor(s): -# Mark Banner -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 2 or later (the "GPL"), or -# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -# in which case the provisions of the GPL or the LGPL are applicable instead -# of those above. If you wish to allow use of your version of this file only -# under the terms of either the GPL or the LGPL, and not to allow others to -# use your version of this file under the terms of the MPL, indicate your -# decision by deleting the provisions above and replace them with the notice -# and other provisions required by the GPL or the LGPL. If you do not delete -# the provisions above, a recipient may use your version of this file under -# the terms of any one of the MPL, the GPL or the LGPL. -# -# ***** END LICENSE BLOCK ***** +# 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/. # Branding Makefile for Icedove branding -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk export:: $(NSINSTALL) -D $(DIST)/branding -ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) +ifdef MOZ_WIDGET_TOOLKIT cp $(srcdir)/mailicon16.png $(DIST)/branding/default16.png cp $(srcdir)/mailicon22.png $(DIST)/branding/default22.png cp $(srcdir)/mailicon24.png $(DIST)/branding/default24.png diff --git a/icedove-branding/branding.nsi b/icedove-branding/branding.nsi index 9d72455..89e1acf 100644 --- a/icedove-branding/branding.nsi +++ b/icedove-branding/branding.nsi @@ -1,42 +1,11 @@ -# ***** BEGIN LICENSE BLOCK ***** -# Version: MPL 1.1/GPL 2.0/LGPL 2.1 -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# The Original Code is the Mozilla Installer code. -# -# The Initial Developer of the Original Code is Mozilla Foundation -# Portions created by the Initial Developer are Copyright (C) 2006 -# the Initial Developer. All Rights Reserved. -# -# Contributor(s): -# Robert Strong -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 2 or later (the "GPL"), or -# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -# in which case the provisions of the GPL or the LGPL are applicable instead -# of those above. If you wish to allow use of your version of this file only -# under the terms of either the GPL or the LGPL, and not to allow others to -# use your version of this file under the terms of the MPL, indicate your -# decision by deleting the provisions above and replace them with the notice -# and other provisions required by the GPL or the LGPL. If you do not delete -# the provisions above, a recipient may use your version of this file under -# the terms of any one of the MPL, the GPL or the LGPL. -# -# ***** END LICENSE BLOCK ***** +# 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/. # NSIS defines for nightly builds. # The release build branding.nsi is located in other-license/branding/thunderbird/ !define BrandShortName "Icedove" + # BrandFullNameInternal is used for some registry and file system values # instead of BrandFullName and typically should not be modified. !define BrandFullNameInternal "Icedove Mail/News" diff --git a/icedove-branding/configure.sh b/icedove-branding/configure.sh index d8c4968..7d16233 100644 --- a/icedove-branding/configure.sh +++ b/icedove-branding/configure.sh @@ -1 +1,5 @@ +# 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/. + MOZ_APP_DISPLAYNAME=Icedove diff --git a/icedove-branding/content/about.png b/icedove-branding/content/about.png index 86d8502..c7f68be 100644 Binary files a/icedove-branding/content/about.png and b/icedove-branding/content/about.png differ diff --git a/icedove-branding/content/aboutDialog.css b/icedove-branding/content/aboutDialog.css index c83aec0..5a4da33 100644 --- a/icedove-branding/content/aboutDialog.css +++ b/icedove-branding/content/aboutDialog.css @@ -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/. */ + #clientBox { background-color: #F7F7F7; color: #222222; diff --git a/icedove-branding/jar.mn b/icedove-branding/jar.mn index 2545a21..d3ceefb 100644 --- a/icedove-branding/jar.mn +++ b/icedove-branding/jar.mn @@ -1,3 +1,8 @@ +#filter substitution +# 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/. + messenger.jar: % content branding %content/branding/ content/branding/about-logo.png (content/about-logo.png) @@ -6,4 +11,5 @@ messenger.jar: content/branding/icon48.png (content/icon48.png) content/branding/icon64.png (content/icon64.png) content/branding/featureConfigurator.jpg (content/featureConfigurator.jpg) -* content/branding/aboutDialog.css (content/aboutDialog.css) + content/branding/aboutDialog.css (content/aboutDialog.css) + ../classic/skin/classic/messenger/icons/new-mail-alert.png (content/icon48.png) diff --git a/icedove-branding/thunderbird-branding.js b/icedove-branding/thunderbird-branding.js index 7caf6b6..cf45edb 100644 --- a/icedove-branding/thunderbird-branding.js +++ b/icedove-branding/thunderbird-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/. */ + // Default start page //pref("mailnews.start_page.url", "chrome://messenger/content/start.xhtml"); pref("mailnews.start_page.url", "about:"); -- cgit v1.2.3