commit b85ff7288f0ed54b74cb07571b641f67b8bdb7d9 Author: Sukhbir Singh <sukhbir@torproject.org> Date: Wed Feb 17 18:59:27 2016 -0500 Bug 17749: Show version information in the "About" window --- ChangeLog | 1 + projects/instantbird/branding/credits.patch | 36 +++++++++++++++++++++++++---- projects/instantbird/build | 2 ++ projects/tor-messenger/config | 2 +- rbm.conf | 1 + 5 files changed, 36 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 37f1c45..1fbadce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ Tor Messenger -- * Bug 18094: Remove references to torbutton from start-tor-messenger script * Bug 18235: Disable Facebook as they no longer support XMPP * Bug 17494: Better error reporting for failed outgoing messages + * Bug 17749: Show version information in the "About" window * Mac * Bug 17896: Add Edit menu to the conversation window on OS X * Windows diff --git a/projects/instantbird/branding/credits.patch b/projects/instantbird/branding/credits.patch index a3e7f4a..7b6f509 100644 --- a/projects/instantbird/branding/credits.patch +++ b/projects/instantbird/branding/credits.patch @@ -58,7 +58,16 @@ diff --git a/im/content/aboutDialog.css b/im/content/aboutDialog.css diff --git a/im/content/aboutDialog.xul b/im/content/aboutDialog.xul --- a/im/content/aboutDialog.xul +++ b/im/content/aboutDialog.xul -@@ -24,8 +24,7 @@ +@@ -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" @@ -67,8 +76,10 @@ diff --git a/im/content/aboutDialog.xul b/im/content/aboutDialog.xul + buttons="accept" title="&aboutDialog.title;" creditslabel="&credits.label;" creditsaccesskey="&credits.accesskey;" aboutlabel="&aboutLink.label;" aboutaccesskey="&aboutLink.accesskey;" versionlabel="&aboutVersion;" - style="width: 299px; height: 330px;"> -@@ -34,95 +33,12 @@ +- style="width: 299px; height: 330px;"> ++ style="width: 310px; height: 330px;"> + + #ifdef XP_MACOSX #include menus.xul.inc #endif @@ -152,6 +163,11 @@ diff --git a/im/content/aboutDialog.xul b/im/content/aboutDialog.xul - <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" @@ -167,9 +183,19 @@ diff --git a/im/content/aboutDialog.xul b/im/content/aboutDialog.xul 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 @@ +@@ -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"> <!-- 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."> ++<!ENTITY tmText "Version &tmVersion;"> ++<!ENTITY imText "(Based on Instantbird IM &ibVersion;)"> ++<!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/build b/projects/instantbird/build index 1828857..01d3ada 100644 --- a/projects/instantbird/build +++ b/projects/instantbird/build @@ -71,6 +71,8 @@ cp $rootdir/branding/instantbird.icns im/branding/messenger/ cp $rootdir/branding/about.png im/branding/messenger/content/ +echo '<!ENTITY tmVersion "[% c('var/tormessenger_version') %]">' >> im/locales/en-US/chrome/instantbird/aboutDialog.dtd + cd mozilla if ls -1 $rootdir/*.mozpatch > /dev/null 2>&1 then diff --git a/projects/tor-messenger/config b/projects/tor-messenger/config index 1a3430f..19e98b6 100644 --- a/projects/tor-messenger/config +++ b/projects/tor-messenger/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.1.0b4 +version: '[% c("var/tormessenger_version") %]' filename: 'tor-messenger-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].[% c("var/filename_ext") %]' input_files: - name: instantbird diff --git a/rbm.conf b/rbm.conf index a842453..a7d1345 100644 --- a/rbm.conf +++ b/rbm.conf @@ -6,6 +6,7 @@ output_dir: "out/[% project %]" pkg_type: build var: + tormessenger_version: '0.1.0b4' build_id: '[% sha256(c("var/build_id_txt")).substr(0, 6) %]' build_id_txt: | [% c("version") %]