commit 2a49c9daf476b33c3fa6e2bc51ebc82dbf4abf16 Author: Sukhbir Singh <sukhbir@torproject.org> Date: Sun Jun 28 07:15:35 2015 -0400 Trim the about dialog to reflect custom branding --- projects/instantbird/branding/about.png | Bin 0 -> 9880 bytes projects/instantbird/branding/credits.patch | 73 +++++++++++++++++++++++++++ projects/instantbird/build | 2 + projects/instantbird/config | 2 + 4 files changed, 77 insertions(+) diff --git a/projects/instantbird/branding/about.png b/projects/instantbird/branding/about.png new file mode 100644 index 0000000..5d7f579 Binary files /dev/null and b/projects/instantbird/branding/about.png differ diff --git a/projects/instantbird/branding/credits.patch b/projects/instantbird/branding/credits.patch new file mode 100644 index 0000000..26d09a4 --- /dev/null +++ b/projects/instantbird/branding/credits.patch @@ -0,0 +1,73 @@ +diff --git a/im/content/aboutDialog.xul b/im/content/aboutDialog.xul +--- a/im/content/aboutDialog.xul ++++ b/im/content/aboutDialog.xul +@@ -24,7 +24,7 @@ + <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" + id="aboutDialog" + windowtype="Messenger:About" +- buttons="accept,extra2" ++ buttons="accept" + onload="onLoad();" + title="&aboutDialog.title;" creditslabel="&credits.label;" creditsaccesskey="&credits.accesskey;" + aboutlabel="&aboutLink.label;" aboutaccesskey="&aboutLink.accesskey;" versionlabel="&aboutVersion;" +@@ -39,36 +39,8 @@ + var gSelectedPage; + + function onLoad() { +- var xai = Components.classes["@mozilla.org/xre/app-info;1"] +- .getService(Components.interfaces.nsIXULAppInfo); +- +- var versionField = document.getElementById("versionField"); +- versionField.value = versionField.value + xai.version +- + ' (' + xai.appBuildID + ')'; +- +- versionField = document.getElementById("geckoVersionField"); +- versionField.value = versionField.value + xai.platformVersion +- + ' (' + xai.platformBuildID + ')'; +- +- versionField = document.getElementById("libpurpleVersionField"); +- if ("@instantbird.org/libpurple/core;1" in Components.classes) { +- var pcs = Components.classes["@instantbird.org/libpurple/core;1"] +- .getService(Components.interfaces.purpleICoreService); +- versionField.value = versionField.value + pcs.version; +- } +- else { +- versionField.hidden = true; +- } +- + versionField = document.getElementById("userAgentField"); + versionField.value = navigator.userAgent; +- +- var button = document.documentElement.getButton("extra2"); +- button.setAttribute("label", document.documentElement.getAttribute("creditslabel")); +- button.setAttribute("accesskey", document.documentElement.getAttribute("creditsaccesskey")); +- gSelectedPage = 0; +- button.addEventListener("command", switchPage); +- document.documentElement.getButton("accept").focus(); + } + + function uninit(aEvent) +@@ -106,14 +78,6 @@ + + <deck id="modes" flex="1"> + <vbox flex="1" id="clientBox"> +- <vbox id="versionWrapper" flex="1"> +- <textbox id="versionField" readonly="true" class="plain" tabindex="2" +- value="&aboutVersion; "/> +- <textbox id="geckoVersionField" readonly="true" class="plain" +- tabindex="3" value="&geckoVersion; "/> +- <textbox id="libpurpleVersionField" readonly="true" class="plain" +- tabindex="4" value="&libpurpleVersion; "/> +- </vbox> + <description id="copyright" flex="1">©rightText2;</description> + <separator/> + <textbox id="userAgentField" readonly="true" class="plain" +diff --git a/im/locales/en-US/chrome/instantbird/aboutDialog.dtd b/im/locales/en-US/chrome/instantbird/aboutDialog.dtd +--- a/im/locales/en-US/chrome/instantbird/aboutDialog.dtd ++++ b/im/locales/en-US/chrome/instantbird/aboutDialog.dtd +@@ -7,4 +7,4 @@ + <!ENTITY geckoVersion "Gecko"> + <!ENTITY libpurpleVersion "libpurple"> + <!-- Use the ©rightYear; entity to place the current year. --> +-<!ENTITY copyrightText2 "©2007-©rightYear; Contributors. This program is free software; you can redistribute it and/or modify it under the terms of the GNU GPL license version 2.0 or later."> ++<!ENTITY copyrightText2 "©©rightYear; Contributors. This program is free software; you can redistribute it and/or modify it under the terms of the GNU GPL license version 2.0 or later."> diff --git a/projects/instantbird/build b/projects/instantbird/build index 15659ec..a7f9b4a 100644 --- a/projects/instantbird/build +++ b/projects/instantbird/build @@ -62,6 +62,8 @@ cp ../branding/default.ico im/branding/messenger/windows/ cp ../branding/instantbird.ico im/branding/messenger/ cp ../branding/instantbird.icns im/branding/messenger/ +cp ../branding/about.png im/branding/messenger/content/ + cd mozilla if ls -1 $rootdir/*.mozpatch > /dev/null 2>&1 then diff --git a/projects/instantbird/config b/projects/instantbird/config index 5f321d9..1608248 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -101,6 +101,8 @@ input_files: - filename: branding/instantbird.ico - filename: branding/name.patch - filename: branding/instantbird.icns + - filename: branding/credits.patch + - filename: branding/about.png - filename: fix-mingw-build.patch enable: '[% c("var/windows") %]' - filename: f2e7cea9bc6a-bug-1150967.patch