From 08d83f35677da4dcca86d36a06e5bcc0eb68c3db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Mon, 14 Mar 2016 09:17:28 -0300 Subject: Initial import --- branding/Makefile.in | 85 ++ branding/aboutIce.js | 71 + branding/configure.sh | 4 + branding/ice.dtd | 13 + branding/ice.xhtml | 98 ++ branding/iceape_icon_plain.svg | 2118 ++++++++++++++++++++++++++++++ branding/iceape_logo_plain.svg | 2204 ++++++++++++++++++++++++++++++++ branding/jar.mn | 11 + extras/Throbber-small.gif | Bin 0 -> 825 bytes extras/Throbber-small.png | Bin 0 -> 214 bytes extras/preview.png | Bin 0 -> 9474 bytes patches/iceape-branding/Branding.patch | 113 ++ patches/series | 1 + 13 files changed, 4718 insertions(+) create mode 100644 branding/Makefile.in create mode 100644 branding/aboutIce.js create mode 100644 branding/configure.sh create mode 100644 branding/ice.dtd create mode 100644 branding/ice.xhtml create mode 100644 branding/iceape_icon_plain.svg create mode 100644 branding/iceape_logo_plain.svg create mode 100644 branding/jar.mn create mode 100644 extras/Throbber-small.gif create mode 100755 extras/Throbber-small.png create mode 100644 extras/preview.png create mode 100644 patches/iceape-branding/Branding.patch create mode 100644 patches/series diff --git a/branding/Makefile.in b/branding/Makefile.in new file mode 100644 index 0000000..80c199e --- /dev/null +++ b/branding/Makefile.in @@ -0,0 +1,85 @@ +# Loosely based on suite/branding/Makefile.in + +DEPTH = ../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(DEPTH)/config/autoconf.mk + +ICON_SUFFIX=.png + +DESKTOP_ICONS = \ + abcardWindow \ + ablistWindow \ + addressbookWindow \ + bmPropsWindow \ + bookmark-window \ + default \ + downloadManager \ + editorWindow \ + findBookmarkWindow \ + findHistoryWindow \ + history-window \ + JSConsoleWindow \ + main-window \ + messengerWindow \ + msgcomposeWindow \ + $(NULL) + +GARBAGE += $(DIST)/bin/chrome/icons/default/iceape.png + +DESKTOP_ICONS_SMALL = $(patsubst %,%16,$(DESKTOP_ICONS)) +DESKTOP_ICONS_LARGE = $(patsubst %,%48,$(DESKTOP_ICONS)) + +DESKTOP_ICON_FILES = $(addsuffix $(ICON_SUFFIX), $(DESKTOP_ICONS) $(DESKTOP_ICONS_SMALL) $(DESKTOP_ICONS_LARGE)) iceape.png + +CHROME_DEPS = content/aboutRights.xhtml content/about.png content/icon64.png + +ALL_FILES = $(addprefix icons/gtk/,$(DESKTOP_ICON_FILES)) $(CHROME_DEPS) + +$(ALL_FILES):: + [ -d $(dir $@) ] || mkdir -p $(dir $@) + +content/about.png:: $(srcdir)/iceape_logo_plain.svg + rsvg-convert -w 300 -h 280 -o $@ $^ + +content/icon64.png:: $(srcdir)/iceape_icon_plain.svg + rsvg-convert -w 64 -h 64 -o $@ $^ + +icons/gtk/iceape.png icons/gtk/default.png icons/gtk/main-window.png:: $(srcdir)/iceape_icon_plain.svg + rsvg-convert -w 32 -h 32 -o $@ $^ + +icons/gtk/default16.png icons/gtk/main-window16.png:: $(srcdir)/iceape_icon_plain.svg + rsvg-convert -w 16 -h 16 -o $@ $^ + +icons/gtk/default48.png icons/gtk/main-window48.png:: $(srcdir)/iceape_icon_plain.svg + rsvg-convert -w 48 -h 48 -o $@ $^ + +$(foreach file,$(ALL_FILES),$(if $(wildcard $(topsrcdir)/suite/branding/$(file)),$(file))):: %: $(topsrcdir)/suite/branding/% + $(INSTALL) $^ $(dir $@) + +libs:: $(addprefix icons/gtk/,$(DESKTOP_ICON_FILES)) + $(INSTALL) $^ $(DIST)/bin/chrome/icons/default + +GARBAGE += $(addprefix $(DIST)/bin/chrome/icons/default/,$(DESKTOP_ICON_FILES)) + +GARBAGE_DIRS += content icons locales # The latter is created by the build system with no reason + +ICONS = $(foreach size,16 32 48 64 128,iceape$(size).png) +$(ICONS):: $(srcdir)/iceape_icon_plain.svg + rsvg-convert -w $(@:iceape%.png=%) -h $(@:iceape%.png=%) -o $@ $^ + +$(addprefix install-, $(ICONS)): install-%: % + [ -d $(DESTDIR)/usr/share/icons/hicolor/$(@:install-iceape%.png=%)x$(@:install-iceape%.png=%)/apps ] || mkdir -p $(DESTDIR)/usr/share/icons/hicolor/$(@:install-iceape%.png=%)x$(@:install-iceape%.png=%)/apps + install $(IFLAGS1) $^ $(DESTDIR)/usr/share/icons/hicolor/$(@:install-iceape%.png=%)x$(@:install-iceape%.png=%)/apps/iceape.png + +install:: $(addprefix install-, $(ICONS)) + [ -d $(DESTDIR)/usr/share/icons/hicolor/scalable/apps ] || mkdir -p $(DESTDIR)/usr/share/icons/hicolor/scalable/apps + install $(IFLAGS1) $(srcdir)/iceape_icon_plain.svg $(DESTDIR)/usr/share/icons/hicolor/scalable/apps/iceape.svg + +GARBAGE += $(ICONS) + +EXTRA_COMPONENTS := aboutIce.js + +include $(topsrcdir)/config/rules.mk diff --git a/branding/aboutIce.js b/branding/aboutIce.js new file mode 100644 index 0000000..e671bb2 --- /dev/null +++ b/branding/aboutIce.js @@ -0,0 +1,71 @@ +/* ***** 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 debAbout. + * + * The Initial Developer of the Original Code is + * Mike Hommey. + * Portions created by the Initial Developer are Copyright (C) 2007 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * 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 ***** */ + +const Cc = Components.classes; +const Ci = Components.interfaces; +const Cr = Components.results; +Components.utils.import("resource://gre/modules/XPCOMUtils.jsm"); + +var ice = Cc["@mozilla.org/xre/app-info;1"] + .getService(Ci.nsIXULAppInfo) + .QueryInterface(Ci.nsIXULRuntime).name.toLowerCase(); + +function AboutIce() {} + +AboutIce.prototype = { + QueryInterface: XPCOMUtils.generateQI([Ci.nsIAboutModule]), + classDescription: "about:" + ice, + classID: Components.ID("{5df05c89-5e9a-41f4-bd6a-700e4aa305fc}"), + contractID: "@mozilla.org/network/protocol/about;1?what=" + ice, + + newChannel: function(uri) + { + var ioService = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService); + var channel = ioService.newChannel("chrome://ice/content/ice.xhtml", null, null); + var securityManager = Cc["@mozilla.org/scriptsecuritymanager;1"].getService(Ci.nsIScriptSecurityManager); + var principal = securityManager.getCodebasePrincipal(uri); + channel.originalURI = uri; + channel.owner = principal; + return channel; + }, + + getURIFlags: function(uri) + { + return Ci.nsIAboutModule.URI_SAFE_FOR_UNTRUSTED_CONTENT; + } +} + +var NSGetModule = XPCOMUtils.generateNSGetModule([AboutIce]); diff --git a/branding/configure.sh b/branding/configure.sh new file mode 100644 index 0000000..ede62d0 --- /dev/null +++ b/branding/configure.sh @@ -0,0 +1,4 @@ +MOZ_APP_NAME=iceape +MOZ_APP_BASENAME=Iceape +MOZ_APP_DISPLAYNAME=Iceape +MOZ_APP_PROFILE=mozilla/seamonkey diff --git a/branding/ice.dtd b/branding/ice.dtd new file mode 100644 index 0000000..2ae5b86 --- /dev/null +++ b/branding/ice.dtd @@ -0,0 +1,13 @@ + + +fire and thunder +swept the land. But Mammon stirred in their hearts, and the beast +Foundered, and its Corpse arose, and commanded "thou shalt +not fly in my name." And the blazes shall freeze cold, and the souls +of the followers of Mammon shall learn to tremble in the +face of ice as they did before the fire.'> + +The Book of Ice, 10:13'> diff --git a/branding/ice.xhtml b/branding/ice.xhtml new file mode 100644 index 0000000..abba41a --- /dev/null +++ b/branding/ice.xhtml @@ -0,0 +1,98 @@ + + + %iceDTD; + + %directionDTD; +]> + + + + + +&ice.title; + + + + +

+&ice.quote; +

+ +

+&ice.from; +

+ + + diff --git a/branding/iceape_icon_plain.svg b/branding/iceape_icon_plain.svg new file mode 100644 index 0000000..2500ef5 --- /dev/null +++ b/branding/iceape_icon_plain.svg @@ -0,0 +1,2118 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/branding/iceape_logo_plain.svg b/branding/iceape_logo_plain.svg new file mode 100644 index 0000000..c73efd2 --- /dev/null +++ b/branding/iceape_logo_plain.svg @@ -0,0 +1,2204 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/branding/jar.mn b/branding/jar.mn new file mode 100644 index 0000000..5201d00 --- /dev/null +++ b/branding/jar.mn @@ -0,0 +1,11 @@ +comm.jar: +% content branding %content/branding/ + content/branding/about.png (content/about.png) + content/branding/icon64.png (content/icon64.png) + content/branding/aboutRights.xhtml (content/aboutRights.xhtml) + +ice.jar: +% content ice %content/ice/ +% locale ice en-US %locale/en-US/ice/ + content/ice/ice.xhtml (ice.xhtml) + locale/en-US/ice/ice.dtd (ice.dtd) diff --git a/extras/Throbber-small.gif b/extras/Throbber-small.gif new file mode 100644 index 0000000..cce32f2 Binary files /dev/null and b/extras/Throbber-small.gif differ diff --git a/extras/Throbber-small.png b/extras/Throbber-small.png new file mode 100755 index 0000000..891574e Binary files /dev/null and b/extras/Throbber-small.png differ diff --git a/extras/preview.png b/extras/preview.png new file mode 100644 index 0000000..9444979 Binary files /dev/null and b/extras/preview.png differ diff --git a/patches/iceape-branding/Branding.patch b/patches/iceape-branding/Branding.patch new file mode 100644 index 0000000..97d2258 --- /dev/null +++ b/patches/iceape-branding/Branding.patch @@ -0,0 +1,113 @@ +diff --git a/suite/browser/browser-prefs.js b/suite/browser/browser-prefs.js +index ee2803b..acc19a1 100644 +--- a/suite/browser/browser-prefs.js ++++ b/suite/browser/browser-prefs.js +@@ -92,7 +92,7 @@ pref("browser.findbar.enabled", true); + pref("browser.doorhanger.enabled", true); + + // search engines URL +-pref("browser.search.searchEnginesURL", "https://addons.mozilla.org/%LOCALE%/%APP%/search/?atype=4"); ++pref("browser.search.searchEnginesURL", "https://addons.mozilla.org/%LOCALE%/seamonkey/search/?atype=4"); + + // pointer to the default engine name + pref("browser.search.defaultenginename", "chrome://communicator-region/locale/region.properties"); +@@ -615,7 +615,7 @@ pref("extensions.blocklist.interval", 86400); + pref("extensions.blocklist.level", 2); + pref("extensions.blocklist.url", "https://blocklist.addons.mozilla.org/blocklist/3/%APP_ID%/%APP_VERSION%/%PRODUCT%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/%PING_COUNT%/%TOTAL_PING_COUNT%/%DAYS_SINCE_LAST_PING%/"); + pref("extensions.blocklist.detailsURL", "https://www.mozilla.com/%LOCALE%/blocklist/"); +-pref("extensions.blocklist.itemURL", "https://blocklist.addons.mozilla.org/%LOCALE%/%APP%/blocked/%blockID%"); ++pref("extensions.blocklist.itemURL", "https://blocklist.addons.mozilla.org/%LOCALE%/seamonkey/blocked/%blockID%"); + + // Update preferences for installed Extensions and Themes. + // Symmetric (can be overridden by individual extensions), +@@ -639,13 +639,13 @@ pref("extensions.autoDisableScopes", 15); + // Preferences for AMO integration + pref("extensions.getAddons.cache.enabled", true); // also toggles personalized recommendations + pref("extensions.getAddons.maxResults", 15); +-pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/guid:%IDS%?src=seamonkey&appOS=%OS%&appVersion=%VERSION%"); +-pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/guid:%IDS%?src=seamonkey&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%"); +-pref("extensions.getAddons.link.url", "https://addons.mozilla.org/%LOCALE%/%APP%/"); +-pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/list/recommended/all/%MAX_RESULTS%/%OS%/%VERSION%?src=seamonkey"); +-pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/%APP%/search?q=%TERMS%"); +-pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=seamonkey"); +-pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/%APP%/discovery/pane/%VERSION%/%OS%"); ++pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/seamonkey/api/%API_VERSION%/search/guid:%IDS%?src=seamonkey&appOS=%OS%&appVersion=%VERSION%"); ++pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/seamonkey/api/%API_VERSION%/search/guid:%IDS%?src=seamonkey&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%"); ++pref("extensions.getAddons.link.url", "https://addons.mozilla.org/%LOCALE%/seamonkey/"); ++pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/seamonkey/api/%API_VERSION%/list/recommended/all/%MAX_RESULTS%/%OS%/%VERSION%?src=seamonkey"); ++pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/seamonkey/search?q=%TERMS%"); ++pref("extensions.getAddons.search.url", "https://directory.fsf.org/wiki/GNU_IceCat"); ++pref("extensions.webservice.discoverURL", "https://directory.fsf.org/wiki/GNU_IceCat"); + + // getMoreThemes is used by our UI under our switch theme menu + pref("extensions.getMoreThemesURL", "chrome://branding/locale/brand.properties"); +diff --git a/suite/locales/en-US/chrome/branding/brand.dtd b/suite/locales/en-US/chrome/branding/brand.dtd +index f9cd0b1..061e3f4 100644 +--- a/suite/locales/en-US/chrome/branding/brand.dtd ++++ b/suite/locales/en-US/chrome/branding/brand.dtd +@@ -2,7 +2,7 @@ + - 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/suite/locales/en-US/chrome/branding/brand.properties b/suite/locales/en-US/chrome/branding/brand.properties +index 3263135..1db1e12 100644 +--- a/suite/locales/en-US/chrome/branding/brand.properties ++++ b/suite/locales/en-US/chrome/branding/brand.properties +@@ -2,9 +2,9 @@ + # 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/. + +-brandFullName=SeaMonkey +-brandShortName=SeaMonkey +-vendorShortName=SeaMonkey ++brandFullName=Iceape ++brandShortName=Iceape ++vendorShortName=SeaMonkey Council + sidebarName=Sidebar + extensions.getMoreThemesURL=https://addons.mozilla.org/%LOCALE%/%APP%/complete-themes/ + extensions.getPersonasURL=https://addons.mozilla.org/%LOCALE%/%APP%/themes/?sort=up-and-coming +diff --git a/suite/moz.build b/suite/moz.build +index 6d69b00..93ed038 100644 +--- a/suite/moz.build ++++ b/suite/moz.build +@@ -10,6 +10,7 @@ if 'pre' in CONFIG['MOZ_APP_VERSION'] or 'a' in CONFIG['MOZ_APP_VERSION']: + DIRS += ['debugQA'] + + DIRS += [ ++ 'branding' , + 'browser', + 'common', + 'feeds/public', +diff --git a/suite/themes/classic/install.rdf b/suite/themes/classic/install.rdf +index 58d0ecc..95f4c86 100644 +--- a/suite/themes/classic/install.rdf ++++ b/suite/themes/classic/install.rdf +@@ -25,7 +25,7 @@ + + + +- SeaMonkey Default Theme ++ Iceape Default Theme + This theme uses styles and colors from the system to fit in with other applications. + + +- SeaMonkey Modern ++ Iceape Modern + A contemporary theme for all components. + +