[tor-commits] [tor-messenger-build/updater] Remove redundant Instantbird about dialog
sukhbir at torproject.org
sukhbir at torproject.org
Fri Jul 29 17:20:47 UTC 2016
commit db5e0c0e6e0a179d4e5a9922e2b1d9d280d91a97
Author: Sukhbir Singh <sukhbir at torproject.org>
Date: Thu Jul 14 10:46:39 2016 -0400
Remove redundant Instantbird about dialog
---
projects/instantbird/branding/credits.patch | 201 ----------------------------
projects/instantbird/config | 1 -
2 files changed, 202 deletions(-)
diff --git a/projects/instantbird/branding/credits.patch b/projects/instantbird/branding/credits.patch
deleted file mode 100644
index 1eb297f..0000000
--- a/projects/instantbird/branding/credits.patch
+++ /dev/null
@@ -1,201 +0,0 @@
-diff --git a/im/content/aboutDialog.css b/im/content/aboutDialog.css
---- a/im/content/aboutDialog.css
-+++ b/im/content/aboutDialog.css
-@@ -3,7 +3,7 @@
- }
-
- #modes {
-- min-height: 380px;
-+ min-height: 300px;
- }
-
- #clientBox {
-@@ -18,44 +18,14 @@
- margin: 0px 0px 3px 20px;
- }
-
--#versionField {
-- background-color: #FFFFFF;
-- -moz-appearance: none;
-- border: none;
-- font-weight: bold;
-- color: #909090;
--}
--
--#geckoVersionField,
--#libpurpleVersionField {
-- background-color: #FFFFFF;
-- -moz-appearance: none;
-- border: none;
-- color: #909090;
-- padding-top: 3px !important;
-- padding-left: 10px !important;
--}
--
- #copyright {
- margin: 10px 20px 3px 20px;
- }
-
--#userAgentField {
-- margin: 0px 0px 3px 20px !important;
-- background-color: #FFFFFF;
-- -moz-appearance: none;
-- border: none;
--}
--
- #groove {
- margin-top: 0px;
- }
-
--#creditsIframe {
-- cursor: default;
-- -moz-user-select: none;
--}
--
- button[dlgtype="extra2"] {
- margin-left: 13px;
- }
-diff --git a/im/content/aboutDialog.xul b/im/content/aboutDialog.xul
---- a/im/content/aboutDialog.xul
-+++ b/im/content/aboutDialog.xul
-@@ -14,7 +14,7 @@
- %brandDTD;
- <!ENTITY % aboutDialogDTD SYSTEM "chrome://instantbird/locale/aboutDialog.dtd" >
- %aboutDialogDTD;
--<!ENTITY copyrightYear "2015">
-+<!ENTITY copyrightYear "2016">
- #ifdef XP_MACOSX
- <!ENTITY % instantbirdDTD SYSTEM "chrome://instantbird/locale/instantbird.dtd">
- %instantbirdDTD;
-@@ -24,105 +24,26 @@
- <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
- id="aboutDialog"
- windowtype="Messenger:About"
-- buttons="accept,extra2"
-- onload="onLoad();"
-+ buttons="accept"
- title="&aboutDialog.title;" creditslabel="&credits.label;" creditsaccesskey="&credits.accesskey;"
- aboutlabel="&aboutLink.label;" aboutaccesskey="&aboutLink.accesskey;" versionlabel="&aboutVersion;"
-- style="width: 299px; height: 330px;">
-+ style="width: 310px; height: 330px;">
-
- #ifdef XP_MACOSX
- #include menus.xul.inc
- #endif
-
-- <script type="application/x-javascript">
-- <![CDATA[
-- 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)
-- {
-- if (aEvent.target != document)
-- return;
-- var iframe = document.getElementById("creditsIframe");
-- iframe.setAttribute("src", "");
-- }
--
-- function switchPage(aEvent)
-- {
-- var button = aEvent.target;
-- if (button.localName != "button")
-- return;
--
-- var iframe = document.getElementById("creditsIframe");
-- if (gSelectedPage == 0) {
-- iframe.setAttribute("src", "chrome://instantbird/content/credits.xhtml");
-- button.setAttribute("label", document.documentElement.getAttribute("aboutlabel"));
-- button.setAttribute("accesskey", document.documentElement.getAttribute("aboutaccesskey"));
-- gSelectedPage = 1;
-- }
-- else {
-- iframe.setAttribute("src", "");
-- button.setAttribute("label", document.documentElement.getAttribute("creditslabel"));
-- button.setAttribute("accesskey", document.documentElement.getAttribute("creditsaccesskey"));
-- gSelectedPage = 0;
-- }
-- var modes = document.getElementById("modes");
-- modes.setAttribute("selectedIndex", gSelectedPage);
-- }
-- ]]>
-- </script>
--
- <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>
-+ <vbox id="versionWrapper" align="center" flex="1">
-+ <separator/>
-+ <label id="tmLabel" value="&tmText;" />
-+ <label id="imLabel" value="&imText;" />
-+ </vbox>
- <description id="copyright" flex="1">©rightText2;</description>
- <separator/>
-- <textbox id="userAgentField" readonly="true" class="plain"
-- tabindex="5" multiline="true"/>
- </vbox>
-
-- <vbox flex="1" id="creditsBox">
-- <iframe id="creditsIframe" flex="1"/>
-- </vbox>
- </deck>
-
- <separator class="groove" id="groove"/>
-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
-@@ -1,4 +1,4 @@
--<!ENTITY aboutDialog.title "About &brandFullName;">
-+<!ENTITY aboutDialog.title "About &brandShortName;">
- <!ENTITY credits.label "Credits">
- <!ENTITY credits.accesskey "C">
- <!ENTITY aboutLink.label "< About &brandShortName;">
-@@ -6,5 +6,8 @@
- <!ENTITY aboutVersion "version">
- <!ENTITY geckoVersion "Gecko">
- <!ENTITY libpurpleVersion "libpurple">
-+<!ENTITY ibVersion "Nightly">
-+<!ENTITY tmText "Version &tmVersion;">
-+<!ENTITY imText "(Based on Instantbird IM &ibVersion;)">
- <!-- 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; The Tor Project, Inc. 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/config b/projects/instantbird/config
index b3623d6..27f9d6f 100644
--- a/projects/instantbird/config
+++ b/projects/instantbird/config
@@ -93,7 +93,6 @@ input_files:
- filename: branding/instantbird.ico
- filename: branding/name.patch
- filename: branding/instantbird.icns
- - filename: branding/credits.patch
- filename: branding/jar.patch
- filename: branding/about.png
- filename: aboutDialog.xul
More information about the tor-commits
mailing list