[Pkg-mozext-commits] [compactheader] 34/441: New version 0.5.1: Add option to display full email addresses in compact header view

David Prévot taffit at moszumanska.debian.org
Wed Mar 18 12:28:41 UTC 2015


This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository compactheader.

commit 965106a4537e780f5269241fa77b8090a0fe469c
Author: joachim.herb <none at none>
Date:   Mon Aug 31 23:16:56 2009 +0000

    New version 0.5.1:
    Add option to display full email addresses in compact header view
---
 .../CompactHeader/content/compactHeaderOverlay.js  | 80 ++++++++++++++--------
 chrome/CompactHeader/content/preferences.js        |  5 +-
 chrome/CompactHeader/content/preferences.xul       |  3 +
 chrome/CompactHeader/locale/de-DE/preferences.dtd  |  2 +
 chrome/CompactHeader/locale/en-US/preferences.dtd  |  2 +
 chrome/CompactHeader/skin/global/CompactHeader.css | 15 ++--
 defaults/preferences/prefs.js                      |  1 +
 install.rdf                                        |  2 +-
 8 files changed, 74 insertions(+), 36 deletions(-)

diff --git a/chrome/CompactHeader/content/compactHeaderOverlay.js b/chrome/CompactHeader/content/compactHeaderOverlay.js
index 7926eb0..aef8064 100644
--- a/chrome/CompactHeader/content/compactHeaderOverlay.js
+++ b/chrome/CompactHeader/content/compactHeaderOverlay.js
@@ -60,13 +60,22 @@ var gCoheBuiltCollapsedView = false;
  * The collapsed view: very lightweight. We only show a couple of fields.  See
  * msgHdrViewOverlay.js for details of the field definition semantics.
  */
-var gCoheCollapsedHeaderList = [
+var gCoheCollapsedHeaderListLongAddresses = [
   {name:"subject", outputFunction:coheUpdateHeaderValueInTextNode},
-  {name:"from", useToggle:true, useShortView:true, outputFunction: OutputEmailAddresses},
-  {name:"toCcBcc", useToggle:true, useShortView:true, outputFunction: OutputEmailAddresses},
-  {name:"date", outputFunction:OutputDate}];
+  {name:"from", useToggle:true, outputFunction:OutputEmailAddresses},
+//  {name:"from", useToggle:true, useShortView:true, outputFunction: OutputEmailAddresses},
+  {name:"toCcBcc", useToggle:true, outputFunction: OutputEmailAddresses},
+  {name:"date", outputFunction:OutputDate}
+  ];
 
-	var prefBranch = Components.classes["@mozilla.org/preferences-service;1"]
+var gCoheCollapsedHeaderListShortAddresses = [
+  {name:"subject", outputFunction:coheUpdateHeaderValueInTextNode},
+  {name:"from", useToggle:true, useShortView:true, outputFunction:OutputEmailAddresses},
+  {name:"toCcBcc", useToggle:true, useShortView:true, outputFunction: OutputEmailAddresses},
+  {name:"date", outputFunction:OutputDate}
+  ];
+    
+  var prefBranch = Components.classes["@mozilla.org/preferences-service;1"]
     .getService(Components.interfaces.nsIPrefService)
     .getBranch("extensions.CompactHeader.");
 
@@ -80,7 +89,7 @@ var RSSLinkify = {
 var coheFirstTime = true;
     
 function cleanupHeaderXUL(){
-	var xularray = ["collapsedfromBox", "collapsedtoCcBccBox", 
+	var xularray = ["collapsedfromOutBox", "collapsedtoCcBccOutBox", 
 									"collapsedButtonBox", "collapsedsubjectBox", 
 									"collapseddateBox", "coheBaselineBox"];
 	for (var i=0; i<xularray.length; i++) {
@@ -97,32 +106,32 @@ function create2LHeaderXUL() {
 	var myElement = document.getElementById("collapsedHeaderViewFirstLine");
 
 	var xul1   = document.createElement("hbox");
-	xul1.id    = "collapsedfromBox";
+	xul1.id    = "collapsedfromOutBox";
 	xul1.align = "start";
 	xul1.flex  = "100";
 
 	var xultmp   = document.createElement("mail-multi-emailHeaderField");
-	xultmp.id    = "collapsedfromValue";
+	if (prefBranch.getBoolPref("headersize.showlongaddress")) {
+		xultmp.id    = "collapsedfromBox";
+	} else {
+		xultmp.id    = "collapsedfromValue";
+	}
 	xultmp.setAttribute("class","collapsedHeaderDisplayName");
-	xultmp.label = "&fromField2.label;";
 	xul1.appendChild(xultmp,xul1);
-	
 	myElement.appendChild(xul1, myElement);
 
 	var xul2   = document.createElement("hbox");
-	xul2.id    = "collapsedtoCcBccBox";
+	xul2.id    = "collapsedtoCcBccOutBox";
 	xul2.align = "end";
 	xul2.pack  = "end";
 	xul2.flex  = "1";
 
-	/*
-	var xultmp   = document.createElement("hbox");
-	xultmp.flex  = "100";
-	xultmp.align = "start";
-	xul2.appendChild(xultmp, xul2);
-	*/
 	var xultmp   = document.createElement("mail-multi-emailHeaderField");
-	xultmp.id    = "collapsedtoCcBccValue";
+	if (prefBranch.getBoolPref("headersize.showlongaddress")) {
+		xultmp.id    = "collapsedtoCcBccBox";
+	} else {
+		xultmp.id    = "collapsedtoCcBccValue";		
+	}
 	xultmp.flex  = "1";
 	xultmp.align = "end";
 	xultmp.pack  = "end";
@@ -208,14 +217,18 @@ function create1LHeaderXUL() {
 
 	
 	var xul2   = document.createElement("hbox");
-	xul2.id    = "collapsedtoCcBccBox";
+	xul2.id    = "collapsedtoCcBccOutBox";
 	xul2.align = "end";
 	xul2.pack  = "end";
 	xul2.flex  = "1";
 	xul0.appendChild(xul2, xul0);
 
 	var xultmp   = document.createElement("mail-multi-emailHeaderField");
-	xultmp.id    = "collapsedtoCcBccValue";
+	if (prefBranch.getBoolPref("headersize.showlongaddress")) {
+		xultmp.id    = "collapsedtoCcBccBox";
+	} else {
+		xultmp.id    = "collapsedtoCcBccValue";		
+	}
 	xultmp.flex  = "1";
 	xultmp.align = "end";
 	xultmp.pack  = "end";
@@ -225,14 +238,18 @@ function create1LHeaderXUL() {
 
 	
 	var xul1   = document.createElement("hbox");
-	xul1.id    = "collapsedfromBox";
+	xul1.id    = "collapsedfromOutBox";
 	xul1.align = "end";
 	xul0.appendChild(xul1, xul0);
 
 	var xultmp   = document.createElement("mail-multi-emailHeaderField");
-	xultmp.id    = "collapsedfromValue";
+	if (prefBranch.getBoolPref("headersize.showlongaddress")) {
+		xultmp.id    = "collapsedfromBox";
+	} else {
+		xultmp.id    = "collapsedfromValue";
+	}
 	xultmp.setAttribute("class", "collapsedHeaderDisplayName");
-	xultmp.label = "&fromField2.label;";
+	//xultmp.label = "&fromField2.label;";
 	xul1.appendChild(xultmp,xul1);
 
 	var xul5   = document.createElement("hbox");
@@ -277,11 +294,18 @@ function coheInitializeHeaderViewTables()
 	//var tb = document.getElementById("collapsedsubjectValue");
   gCoheCollapsedHeaderView = {};
   var index;
-  for (index = 0; index < gCoheCollapsedHeaderList.length; index++) {
-    gCoheCollapsedHeaderView[gCoheCollapsedHeaderList[index].name] =
-      new createHeaderEntry('collapsed', gCoheCollapsedHeaderList[index]);
-  }
-	if (prefBranch.getBoolPref("headersize.linkify")) {
+	if (prefBranch.getBoolPref("headersize.showlongaddress")) {
+	  for (index = 0; index < gCoheCollapsedHeaderListLongAddresses.length; index++) {
+	    gCoheCollapsedHeaderView[gCoheCollapsedHeaderListLongAddresses[index].name] =
+	      new createHeaderEntry('collapsed', gCoheCollapsedHeaderListLongAddresses[index]);
+	  }
+	} else {
+	  for (index = 0; index < gCoheCollapsedHeaderListShortAddresses.length; index++) {
+	    gCoheCollapsedHeaderView[gCoheCollapsedHeaderListShortAddresses[index].name] =
+	      new createHeaderEntry('collapsed', gCoheCollapsedHeaderListShortAddresses[index]);
+		}
+	}
+  if (prefBranch.getBoolPref("headersize.linkify")) {
 	  RSSLinkify.newSubject = document.createElement("label");
 	  RSSLinkify.newSubject.setAttribute("id", "collapsedsubjectlinkValue");
 	  RSSLinkify.newSubject.setAttribute("class", "headerValue plain headerValueUrl");
diff --git a/chrome/CompactHeader/content/preferences.js b/chrome/CompactHeader/content/preferences.js
index 3545e10..3b2a043 100644
--- a/chrome/CompactHeader/content/preferences.js
+++ b/chrome/CompactHeader/content/preferences.js
@@ -32,6 +32,7 @@ function onLoad()
 
   loadPrefCheckbox("headersize.twolineview", "checkbox.Compact.TwolineView");
   loadPrefCheckbox("headersize.linkify", "checkbox.Linkify");
+  loadPrefCheckbox("headersize.showlongaddress", "checkbox.ShowFullAddress");
   
   updateTwolineView(prefBranch.getBoolPref("headersize.twolineview")); 
 
@@ -60,9 +61,9 @@ function updateTwolineView(boolTwolineview) {
 function onDialogAccept()
 {
   savePrefCheckbox("headersize.twolineview", "checkbox.Compact.TwolineView");
-
   savePrefCheckbox("headersize.linkify", "checkbox.Linkify");
-
+  savePrefCheckbox("headersize.showlongaddress", "checkbox.ShowFullAddress");  
+  
   savePrefCheckbox("buttons.showonlyicon", "checkbox.IconText");
 
   for(var buttonname in buttonslist) {
diff --git a/chrome/CompactHeader/content/preferences.xul b/chrome/CompactHeader/content/preferences.xul
index e255316..65b2bb9 100644
--- a/chrome/CompactHeader/content/preferences.xul
+++ b/chrome/CompactHeader/content/preferences.xul
@@ -104,4 +104,7 @@
 	<checkbox id="checkbox.Linkify" 
 						label="&menu.Linkify.caption;"/>
 
+	<checkbox id="checkbox.ShowFullAddress" 
+						label="&menu.ShowFullAddress.caption;"/>
+
 </dialog>
diff --git a/chrome/CompactHeader/locale/de-DE/preferences.dtd b/chrome/CompactHeader/locale/de-DE/preferences.dtd
index 0af880f..92ba80d 100644
--- a/chrome/CompactHeader/locale/de-DE/preferences.dtd
+++ b/chrome/CompactHeader/locale/de-DE/preferences.dtd
@@ -15,3 +15,5 @@
 <!ENTITY menu.IconText.caption "Nur Icons in Schaltflächen">
 
 <!ENTITY menu.Linkify.caption "Link in Betreff von RSS Feeds">
+
+<!ENTITY menu.ShowFullAddress.caption "Adresse vollständig anzeigen">
diff --git a/chrome/CompactHeader/locale/en-US/preferences.dtd b/chrome/CompactHeader/locale/en-US/preferences.dtd
index 60e4a6c..fe535bc 100644
--- a/chrome/CompactHeader/locale/en-US/preferences.dtd
+++ b/chrome/CompactHeader/locale/en-US/preferences.dtd
@@ -14,3 +14,5 @@
 <!ENTITY menu.IconText.caption "Show only icons inside buttons">
 
 <!ENTITY menu.Linkify.caption "Link in subjects of RSS feeds">
+
+<!ENTITY menu.ShowFullAddress.caption "Show full email address">
diff --git a/chrome/CompactHeader/skin/global/CompactHeader.css b/chrome/CompactHeader/skin/global/CompactHeader.css
index 40d1ae6..db186c2 100644
--- a/chrome/CompactHeader/skin/global/CompactHeader.css
+++ b/chrome/CompactHeader/skin/global/CompactHeader.css
@@ -46,6 +46,15 @@
   min-width: 1px;
 }
 
+#collapsedtoCcBccBox .headerNameBox,
+#collapsedfromBox .headerNameBox {
+	display: none;
+}
+#collapsedfromValue > .headerNameBox {
+  display: none;
+}
+
+
 #collapsedHeaderDisplayName {
   text-align: left;
 }
@@ -117,7 +126,7 @@
   padding:0px;
 }
 
-#collapsedsubjectBox, collapsedfromBox,collapsedButtonBox,
+#collapsedsubjectBox, collapsedfromOutBox,collapsedButtonBox,
 #collapsedsubjectValue, #collapsedfromValue {
   margin: 0px;
   padding: 0px;
@@ -131,10 +140,6 @@
   -moz-margin-end: 0.5em;
 }
 
-#collapsedfromValue > .headerNameBox {
-  display: none;
-}
-
 /* ::::: Message Header Pane - Button Icons ::::: */
 
 .hdrReplyButton[mode="hdrReplyButton"] {
diff --git a/defaults/preferences/prefs.js b/defaults/preferences/prefs.js
index f268fbf..dc6a3be 100644
--- a/defaults/preferences/prefs.js
+++ b/defaults/preferences/prefs.js
@@ -1,5 +1,6 @@
 pref("extensions.CompactHeader.headersize.twolineview", false);
 pref("extensions.CompactHeader.headersize.linkify", false);
+pref("extensions.CompactHeader.headersize.showlongaddress", false);
 
 pref("extensions.CompactHeader.buttons.showonlyicon", true);
 
diff --git a/install.rdf b/install.rdf
index 9d7cfe7..c356880 100644
--- a/install.rdf
+++ b/install.rdf
@@ -6,7 +6,7 @@
 
 	<RDF:Description about="urn:mozilla:install-manifest">
 		<em:name>CompactHeader</em:name>
-		<em:version>0.5.0</em:version>
+		<em:version>0.5.1</em:version>
 		<em:description>Add ability to reduce header size to one or two lines. Linkify subjects in RSS feeds.</em:description>
 		<em:creator>Joachim Herb</em:creator>
 		<em:contributor>Zamula</em:contributor>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/compactheader.git



More information about the Pkg-mozext-commits mailing list