[Pkg-mozext-commits] [compactheader] 50/441: Version 0.7.0: Works with Thunderbird 3.0 b4pre starting with version from 09/09/12.

David Prévot taffit at moszumanska.debian.org
Wed Mar 18 12:28:43 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 8b6aa2322cefa772448f2ea4f3b5591483edf90e
Author: joachim.herb <none at none>
Date:   Sun Sep 13 22:25:52 2009 +0000

    Version 0.7.0:
    Works with Thunderbird 3.0 b4pre starting with version from 09/09/12.
---
 chrome/CompactHeader/content/buttons.js            |  13 +-
 .../CompactHeader/content/compactHeaderOverlay.js  | 473 ++++++++++++---------
 .../CompactHeader/content/compactHeaderOverlay.xul | 176 +++++---
 chrome/CompactHeader/content/preferences.js        |   6 +-
 chrome/CompactHeader/content/preferences.xul       |   9 +-
 chrome/CompactHeader/locale/de-DE/preferences.dtd  |   6 +-
 chrome/CompactHeader/locale/en-US/preferences.dtd  |   5 +-
 chrome/CompactHeader/skin/global/CompactHeader.css |  66 ++-
 .../{other-action.png => other-action-small.png}   | Bin
 chrome/CompactHeader/skin/global/other-action.png  | Bin 957 -> 1469 bytes
 defaults/preferences/prefs.js                      |   2 +-
 install.rdf                                        |   4 +-
 12 files changed, 488 insertions(+), 272 deletions(-)

diff --git a/chrome/CompactHeader/content/buttons.js b/chrome/CompactHeader/content/buttons.js
index c40aeda..e225082 100644
--- a/chrome/CompactHeader/content/buttons.js
+++ b/chrome/CompactHeader/content/buttons.js
@@ -47,4 +47,15 @@ buttonslist["Archive"] = ["archiveButton"];
 buttonslist["Junk"]    = ["hdrJunkButton"];
 buttonslist["Trash"]   = ["hdrTrashButton"];
 buttonslist["OtherAction"] = ["otherActionsButton"];
-buttonslist["Tag"] = ["tagMenuPopup"];
\ No newline at end of file
+buttonslist["Tag"] = ["tagMenuPopup"];
+
+var buttonicons = new Array;
+buttonicons["hdrReplyButton"]     = ["button-reply"];
+buttonicons["hdrReplyAllButton"]  = ["button-replyall"];
+buttonicons["hdrReplyListButton"] = ["button-replylist"];
+buttonicons["hdrForwardButton"]   = ["button-forward"];
+buttonicons["archiveButton"]      = ["button-archive"];
+buttonicons["hdrJunkButton"]      = ["button-isJunk"];
+buttonicons["hdrTrashButton"]     = ["button-mark-deleted"];
+buttonicons["otherActionsButton"] = ["button-other-actions"];
+buttonicons["tagMenuPopup"]       = ["button-tag"];
\ No newline at end of file
diff --git a/chrome/CompactHeader/content/compactHeaderOverlay.js b/chrome/CompactHeader/content/compactHeaderOverlay.js
index 5802f8e..0f59ad9 100644
--- a/chrome/CompactHeader/content/compactHeaderOverlay.js
+++ b/chrome/CompactHeader/content/compactHeaderOverlay.js
@@ -61,23 +61,22 @@ var gCoheBuiltCollapsedView = false;
  * msgHdrViewOverlay.js for details of the field definition semantics.
  */
 var gCoheCollapsedHeaderListLongAddresses = [
-  {name:"subject", outputFunction:coheUpdateHeaderValueInTextNode},
+  {name:"subject"},
   {name:"from", useToggle:true, outputFunction:OutputEmailAddresses},
-//  {name:"from", useToggle:true, useShortView:true, outputFunction: OutputEmailAddresses},
   {name:"toCcBcc", useToggle:true, outputFunction: OutputEmailAddresses},
-  {name:"date", outputFunction:OutputDate}
+  {name:"date", outputFunction:coheUpdateDateValue}
   ];
 
 var gCoheCollapsedHeaderListShortAddresses = [
-  {name:"subject", outputFunction:coheUpdateHeaderValueInTextNode},
+  {name:"subject"},
   {name:"from", useToggle:true, useShortView:true, outputFunction:OutputEmailAddresses},
   {name:"toCcBcc", useToggle:true, useShortView:true, outputFunction: OutputEmailAddresses},
-  {name:"date", outputFunction:OutputDate}
+  {name:"date", outputFunction:coheUpdateDateValue}
   ];
     
-  var prefBranch = Components.classes["@mozilla.org/preferences-service;1"]
-    .getService(Components.interfaces.nsIPrefService)
-    .getBranch("extensions.CompactHeader.");
+var prefBranch = Components.classes["@mozilla.org/preferences-service;1"]
+  .getService(Components.interfaces.nsIPrefService)
+  .getBranch("extensions.CompactHeader.");
 
 var coheIntegrateRSSLinkify = false;
 
@@ -89,9 +88,9 @@ var RSSLinkify = {
 var coheFirstTime = true;
     
 function cleanupHeaderXUL(){
-	var xularray = ["collapsedfromOutBox", "collapsedtoCcBccOutBox", 
-									"collapsedButtonBox", "collapsedsubjectBox", 
-									"collapseddateBox", "coheBaselineBox"];
+	var xularray = ["collapsedfromOutBox", "collapsedtoCcBccOutBox",
+									"collapsedButtonBox", "collapsedsubjectOutBox", 
+									"collapseddateOutBox", "coheBaselineBox"];
 									
 	/* rescue otheraction and tagpopup */
 	moveMenusToButtonBox(false);
@@ -107,90 +106,116 @@ function create2LHeaderXUL() {
 	cleanupHeaderXUL();
 	
 	var myElement = document.getElementById("collapsedHeaderViewFirstLine");
-	
+		
 	var xul1   = document.createElement("hbox");
 	xul1.id    = "collapsedfromOutBox";
 	xul1.align = "start";
-	xul1.flex  = "100";
+	xul1.flex  = "0";
+  myElement.appendChild(xul1,myElement);  
 
-	var xultmp   = document.createElement("mail-multi-emailHeaderField");
-	if (prefBranch.getIntPref("headersize.addressstyle") != 1) {
-		xultmp.id    = "collapsedfromBox";
-	} else {
-		xultmp.id    = "collapsedfromValue";
-	}
-	xultmp.setAttribute("class","collapsedHeaderDisplayName");
-	xul1.appendChild(xultmp,xul1);
-	myElement.appendChild(xul1, myElement);
-
-	var xul2   = document.createElement("hbox");
-	xul2.id    = "collapsedtoCcBccOutBox";
-	xul2.align = "end";
-	xul2.pack  = "end";
-	xul2.flex  = "1";
-
-	var xultmp   = document.createElement("mail-multi-emailHeaderField");
-	if (prefBranch.getIntPref("headersize.addressstyle") != 1) {
-		xultmp.id    = "collapsedtoCcBccBox";
-	} else {
-		xultmp.id    = "collapsedtoCcBccValue";		
-	}
-	xultmp.flex  = "1";
-	xultmp.align = "end";
-	xultmp.pack  = "end";
-	xultmp.setAttribute("class","collapsedHeaderDisplayName");
-	xul2.appendChild(xultmp, xul2);
-
-	myElement.appendChild(xul2, myElement);
+	var xultmp1   = document.createElement("grid");
+  xultmp1.flex  = "1";
+  xul1.appendChild(xultmp1,xul1);  
+  
+  var xultmp2   = document.createElement("columns");
+  xultmp1.appendChild(xultmp2,xultmp1);  
 
-	var xul3   = document.createElement("header-view-button-box");
-	xul3.id    = "collapsedButtonBox";
+  var xultmp3   = document.createElement("column");
+  xultmp3.flex  = "0";
+  xultmp2.appendChild(xultmp3,xultmp2);
+  
+  var xultmp2   = document.createElement("rows");
+  xultmp1.appendChild(xultmp2,xultmp1);  
 
-	myElement.appendChild(xul3, myElement);
+  var xultmp3   = document.createElement("row");
+  xultmp3.id    = "collapsedfromRow";
+  xultmp2.appendChild(xultmp3,xultmp2);
+    
+  var xultmp4   = document.createElement("mail-multi-emailHeaderField");   
+	xultmp4.id    = "collapsedfromBox";
+	xultmp4.flex  = "0";
+  xultmp3.appendChild(xultmp4,xultmp3);
 	
-	//				<hbox id="collapsedsubjectBox" align="start" flex="1" style="padding-left: 10px; padding-top: 1.6px">
-	//				<textbox id="collapsedsubjectValue" flex="1" readonly="true" class="collapsedHeaderValue plain"/>
-	//			</hbox>
-
-	var myElement = document.getElementById("collapsedHeaderViewSecondLine");
-				
-	var xul4   = document.createElement("hbox");
-	xul4.id    = "collapsedsubjectBox";
-	xul4.align = "start";
-	xul4.flex  = "1";
-
-	var xultmp   = document.createElement("textbox");
-	xultmp.id    = "collapsedsubjectValue";
-	xultmp.flex  = "1";
-	xultmp.setAttribute("class", "collapsedHeaderValue plain");
-	xultmp.setAttribute("readonly", "true");
-
-	xul4.appendChild(xultmp, xul4);
-
-	myElement.appendChild(xul4, myElement);
-
-//				<hbox id="collapseddateBox" align="end" flex="0" style="padding-bottom: 2px">
-//					<textbox id="collapseddateValue" class="plain collapsedHeaderValue" flex="0" readonly="true"/>
-//				</hbox>
-	var xul5   = document.createElement("hbox");
-	xul5.id    = "collapseddateBox";
-	xul5.align = "end";
-	xul5.pack  = "end";
-	xul5.flex  = "0";
-
-	var xultmp   = document.createElement("textbox");
-	xultmp.id    = "collapseddateValue";
-	xultmp.flex  = "0";
-	xultmp.pack  = "end";
-	xultmp.setAttribute("class", "collapsedHeaderValue plain");
-	xultmp.setAttribute("readonly", "true");
-	xul5.appendChild(xultmp, xul5);
-
-	myElement.appendChild(xul5, myElement);
-
-	document.getElementById("collapsedsubjectBox").setAttribute("twolineview", "true");
-	document.getElementById("collapseddateBox").setAttribute("twolineview", "true");
+  var xultmp1   = document.createElement("grid");
+  xultmp1.id    = "collapsedtoCcBccOutBox";
+  xultmp1.flex  = "1";
+  myElement.appendChild(xultmp1,myElement);  
+  
+  var xultmp2   = document.createElement("columns");
+  xultmp1.appendChild(xultmp2,xultmp1);  
 
+  var xultmp3   = document.createElement("column");
+  xultmp3.flex  = "0";
+  xultmp2.appendChild(xultmp3,xultmp2);
+
+  var xultmp3   = document.createElement("column");
+  xultmp3.flex  = "1";
+  xultmp2.appendChild(xultmp3,xultmp2);
+  
+  var xultmp2   = document.createElement("rows");
+  xultmp1.appendChild(xultmp2,xultmp1);  
+
+  var xultmp3   = document.createElement("row");
+  xultmp3.id    = "collapsedtoCcBccRow";
+  xultmp3.align = "baseline";
+  xultmp2.appendChild(xultmp3,xultmp2);
+    
+  var xultmp4   = document.createElement("label");   
+  xultmp4.id    = "collapsedtoCcBccLabel";
+  xultmp4.setAttribute("class","headerName");
+  xultmp4.setAttribute("value","to");
+  xultmp4.setAttribute("control","collapsedtoCcBccBox");
+  xultmp3.appendChild(xultmp4,xultmp3);
+
+  var xultmp4   = document.createElement("mail-multi-emailHeaderField");   
+  xultmp4.id    = "collapsedtoCcBccBox";
+  xultmp4.flex  = "1";
+  xultmp3.appendChild(xultmp4,xultmp3);
+  
+  var xultmp1   = document.createElement("header-view-button-box");
+  xultmp1.id    = "collapsedButtonBox";
+  xultmp1.flex  = "0";
+  xultmp1.align = "start";
+  myElement.appendChild(xultmp1,myElement);  
+  
+  
+  var myElement = document.getElementById("collapsedHeaderViewSecondLine");
+    
+  var xul1   = document.createElement("hbox");
+  xul1.id    = "collapsedsubjectOutBox";
+  xul1.align = "start";
+  xul1.flex  = "99";
+  myElement.appendChild(xul1,myElement);  
+	
+  var xultmp2   = document.createElement("row");
+  xultmp2.id    = "collapsedsubjectRow";
+  xultmp2.flex  = "99";
+  xul1.appendChild(xultmp2,xul1);
+
+  var xultmp3   = document.createElement("mail-headerfield");
+  xultmp3.id    = "collapsedsubjectBox";
+  xultmp3.flex  = "99";
+  xultmp2.appendChild(xultmp3,xultmp2);
+  
+  var xul1   = document.createElement("hbox");
+  xul1.id    = "collapseddateOutBox";
+  xul1.align = "end";
+  xul1.flex  = "0";
+  myElement.appendChild(xul1,myElement);  
+  
+  var xultmp2   = document.createElement("row");
+  xultmp2.id    = "collapseddateRow";
+  xultmp2.align = "end";
+  xultmp2.pack  = "end";
+  xul1.appendChild(xultmp2,xul1);
+
+  var xultmp3   = document.createElement("label");
+  xultmp3.id    = "collapseddateBox";
+  xultmp3.flex  = "1";
+  xultmp3.setAttribute("class","dateLabel");
+  xultmp2.appendChild(xultmp3,xultmp2);
+
+  document.getElementById("collapsedHeaderView").setAttribute("twolineview", "true");
 }
 
 function create1LHeaderXUL() {
@@ -198,85 +223,122 @@ function create1LHeaderXUL() {
 	
 	var myElement = document.getElementById("collapsedHeaderViewFirstLine");
 
-	var xul0   = document.createElement("hbox");
-	xul0.id    = "coheBaselineBox";
-	xul0.align = "baseline";
-	xul0.flex  = "2";
-
-	myElement.appendChild(xul0, myElement);
-
-	var xul4   = document.createElement("hbox");
-	xul4.id    = "collapsedsubjectBox";
-	xul4.align = "start";
-	xul4.flex  = "99";
-	xul0.appendChild(xul4, xul0);
+  var xul1   = document.createElement("hbox");
+  xul1.id    = "collapsedsubjectOutBox";
+  xul1.align = "start";
+  xul1.flex  = "99";
+  myElement.appendChild(xul1,myElement);  
+  
+  var xultmp2   = document.createElement("row");
+  xultmp2.id    = "collapsedsubjectRow";
+  xultmp2.flex  = "99";
+  xul1.appendChild(xultmp2,xul1);
+
+  var xultmp3   = document.createElement("mail-headerfield");
+  xultmp3.id    = "collapsedsubjectBox";
+  xultmp3.flex  = "99";
+  xultmp2.appendChild(xultmp3,xultmp2);
+
+  var xul1   = document.createElement("hbox");
+  xul1.id    = "collapsedfromOutBox";
+  xul1.align = "start";
+  xul1.flex  = "0";
+  myElement.appendChild(xul1,myElement);  
+
+  var xultmp1   = document.createElement("grid");
+  xultmp1.flex  = "1";
+  xul1.appendChild(xultmp1,xul1);  
+  
+  var xultmp2   = document.createElement("columns");
+  xultmp1.appendChild(xultmp2,xultmp1);  
 
-	var xultmp   = document.createElement("textbox");
-	xultmp.id    = "collapsedsubjectValue";
-	xultmp.flex  = "99";
-	xultmp.setAttribute("class", "collapsedHeaderValue plain");
-	xultmp.setAttribute("readonly", "true");
-	xul4.appendChild(xultmp, xul4);
+  var xultmp3   = document.createElement("column");
+  xultmp3.flex  = "0";
+  xultmp2.appendChild(xultmp3,xultmp2);
+  
+  var xultmp2   = document.createElement("rows");
+  xultmp1.appendChild(xultmp2,xultmp1);  
 
+  var xultmp3   = document.createElement("row");
+  xultmp3.id    = "collapsedfromRow";
+  xultmp2.appendChild(xultmp3,xultmp2);
+    
+  var xultmp4   = document.createElement("mail-multi-emailHeaderField");   
+  xultmp4.id    = "collapsedfromBox";
+  xultmp4.flex  = "0";
+  xultmp3.appendChild(xultmp4,xultmp3);
 	
-	var xul2   = document.createElement("hbox");
-	xul2.id    = "collapsedtoCcBccOutBox";
-	xul2.align = "end";
-	xul2.pack  = "end";
-	xul2.flex  = "1";
-	xul0.appendChild(xul2, xul0);
-
-	var xultmp   = document.createElement("mail-multi-emailHeaderField");
-	if (prefBranch.getIntPref("headersize.addressstyle") != 1) {
-		xultmp.id    = "collapsedtoCcBccBox";
-	} else {
-		xultmp.id    = "collapsedtoCcBccValue";		
-	}
-	xultmp.flex  = "1";
-	xultmp.align = "end";
-	xultmp.pack  = "end";
-	xultmp.setAttribute("class", "collapsedHeaderDisplayName");
-	xultmp.hidden = "true";
-	xul2.appendChild(xultmp, xul2);
+  var xultmp1   = document.createElement("grid");
+  xultmp1.id    = "collapsedtoCcBccOutBox";
+  xultmp1.flex  = "1";
+  myElement.appendChild(xultmp1,myElement);  
+    
+  var xultmp2   = document.createElement("rows");
+  xultmp1.appendChild(xultmp2,xultmp1);  
 
+  var xultmp3   = document.createElement("row");
+  xultmp3.id    = "collapsedtoCcBccRow";
+  xultmp3.align = "baseline";
+  xultmp2.appendChild(xultmp3,xultmp2);
+    
+  var xultmp4   = document.createElement("mail-multi-emailHeaderField");   
+  xultmp4.id    = "collapsedtoCcBccBox";
+  xultmp4.flex  = "1";
+  xultmp4.hidden = "true";
+  xultmp3.appendChild(xultmp4,xultmp3);
+  
+  var xul1   = document.createElement("hbox");
+  xul1.id    = "collapseddateOutBox";
+  xul1.align = "end";
+  xul1.flex  = "0";
+  myElement.appendChild(xul1,myElement);  
+  
+  var xultmp2   = document.createElement("row");
+  xultmp2.id    = "collapseddateRow";
+  xultmp2.align = "start";
+  xultmp2.pack  = "end";
+  xul1.appendChild(xultmp2,xul1);
+
+  var xultmp3   = document.createElement("label");
+  xultmp3.id    = "collapseddateBox";
+  xultmp3.flex  = "1";
+  xultmp3.setAttribute("class","dateLabel");
+  xultmp2.appendChild(xultmp3,xultmp2);
 	
-	var xul1   = document.createElement("hbox");
-	xul1.id    = "collapsedfromOutBox";
-	xul1.align = "end";
-	xul0.appendChild(xul1, xul0);
-
-	var xultmp   = document.createElement("mail-multi-emailHeaderField");
-	if (prefBranch.getIntPref("headersize.addressstyle") != 1) {
-		xultmp.id    = "collapsedfromBox";
-	} else {
-		xultmp.id    = "collapsedfromValue";
-	}
-	xultmp.setAttribute("class", "collapsedHeaderDisplayName");
-	//xultmp.label = "&fromField2.label;";
-	xul1.appendChild(xultmp,xul1);
-
-	var xul5   = document.createElement("hbox");
-	xul5.id    = "collapseddateBox";
-	xul5.align = "end";
-	xul0.appendChild(xul5, xul0);
-
-	var xultmp   = document.createElement("textbox");
-	xultmp.id    = "collapseddateValue";
-	xultmp.setAttribute("readonly", "true");
-
-	xultmp.setAttribute("class", "collapsedHeaderValue plain");
-	xul5.appendChild(xultmp, xul5);
-
-
 	var xul3   = document.createElement("header-view-button-box");
 	xul3.id    = "collapsedButtonBox";
 	xul3.hidden = "true";
 
 	myElement.appendChild(xul3, myElement);
-	document.getElementById("collapsedsubjectBox").removeAttribute("twolineview");
-	document.getElementById("collapseddateBox").removeAttribute("twolineview");
+
+	document.getElementById("collapsedHeaderView").removeAttribute("twolineview");
 }
 
+function createExpandedHeaderXUL() {
+	return;
+	
+  var myElement = document.getElementById("expandedHeaderView");
+
+	var xul0   = document.createElement("vbox");
+	xul0.id    = "expandedHeadersBox";
+	xul0.flex  = "1";
+	xul0.setAttribute("insertafter", "hideDetailsButtonBox");
+
+	myElement.appendChild(xul0, myElement);
+	//myElement.insertBefore(xul0, "expandedHeadersTopBox")
+	
+	var newParent = document.getElementById("expandedHeadersBox");
+	if (newParent != null) {
+		var myElement = document.getElementById("expandedHeadersTopBox");
+		newParent.appendChild(myElement);
+		myElement = document.getElementById("expandedHeadersBottomBox");
+		newParent.appendChild(myElement);
+	} else {
+		alert ("null");
+	}
+	
+	
+}
 // Now, for each view the message pane can generate, we need a global table
 // of headerEntries. These header entry objects are generated dynamically
 // based on the static data in the header lists (see above) and elements
@@ -285,6 +347,7 @@ var gCoheCollapsedHeaderView = {};
 
 function coheInitializeHeaderViewTables()
 {
+	
 /*  coheReInitializeHeaderViewTables(); */
   // iterate over each header in our header list array, create a header entry
 	// for it, and store it in our header table
@@ -293,11 +356,19 @@ function coheInitializeHeaderViewTables()
 	} else {
   	create1LHeaderXUL();
 	}
-  
+  //document.getElementById("collapsedHeaderView").removeAttribute("twolineview");
+	
 	//var tb = document.getElementById("collapsedsubjectValue");
   gCoheCollapsedHeaderView = {};
   var index;
-	if (prefBranch.getIntPref("headersize.addressstyle") != 1) {
+
+  for (index = 0; index < gCoheCollapsedHeaderListLongAddresses.length; index++) {
+    gCoheCollapsedHeaderView[gCoheCollapsedHeaderListLongAddresses[index].name] =
+      new createHeaderEntry('collapsed', gCoheCollapsedHeaderListLongAddresses[index]);
+  }
+
+  /*
+  if (prefBranch.getBoolPref("headersize.addressstyle") != 1) {
 	  for (index = 0; index < gCoheCollapsedHeaderListLongAddresses.length; index++) {
 	    gCoheCollapsedHeaderView[gCoheCollapsedHeaderListLongAddresses[index].name] =
 	      new createHeaderEntry('collapsed', gCoheCollapsedHeaderListLongAddresses[index]);
@@ -308,9 +379,11 @@ function coheInitializeHeaderViewTables()
 	      new createHeaderEntry('collapsed', gCoheCollapsedHeaderListShortAddresses[index]);
 		}
 	}
-  if (prefBranch.getBoolPref("headersize.linkify")) {
+  */
+  
+	if (prefBranch.getBoolPref("headersize.linkify")) {
 	  RSSLinkify.newSubject = document.createElement("label");
-	  RSSLinkify.newSubject.setAttribute("id", "collapsedsubjectlinkValue");
+	  RSSLinkify.newSubject.setAttribute("id", "collapsedsubjectlinkBox");
 	  RSSLinkify.newSubject.setAttribute("class", "headerValue plain headerValueUrl");
 	  RSSLinkify.newSubject.setAttribute("originalclass", "headerValue plain headerValueUrl");
 	  RSSLinkify.newSubject.setAttribute("context", "CohecopyUrlPopup");
@@ -318,8 +391,7 @@ function coheInitializeHeaderViewTables()
 	  RSSLinkify.newSubject.setAttribute("readonly", "true");
 	  RSSLinkify.newSubject.setAttribute("appendoriginalclass", "true");
 	  RSSLinkify.newSubject.setAttribute("flex", "1");
-	
-	  RSSLinkify.oldSubject = document.getElementById("collapsedsubjectValue");
+	  RSSLinkify.oldSubject = document.getElementById("collapsedsubjectBox");
 	  RSSLinkify.oldSubject.parentNode.insertBefore(RSSLinkify.newSubject, RSSLinkify.oldSubject);
 	}
 
@@ -327,6 +399,7 @@ function coheInitializeHeaderViewTables()
 	
   updateHdrButtons();
   updateHdrIconText();
+  
 }
 
 function coheOnLoadMsgHeaderPane()
@@ -444,8 +517,7 @@ function coheUpdateHeaderView()
 		    RSSLinkify.oldSubject.setAttribute("collapsed", "false");
 		}
   }
-
-  if (prefBranch.getIntPref("headersize.addressstyle") == 2) {
+  if (prefBranch.getBoolPref("headersize.addressstyle")) {
   	selectEmailDisplayed();
   }
   
@@ -462,7 +534,6 @@ function moveMenusToButtonBox(viewMode) {
 		target = "collapsedButtonBox";
 	else
 		target = "otherActionsBox";
-
 	
 	var newParent = document.getElementById(target);
 	if (newParent != null) {
@@ -492,9 +563,10 @@ function coheToggleHeaderView ()
     deck.selectedPanel = document.getElementById("expandedHeaderView");
     ClearHeaderView(gExpandedHeaderView);
     UpdateExpandedMessageHeaders();
+    gDBView.reloadMessage();
 	 	updateMyReplyButtons();
 	  updateHdrButtons();
-  }
+	}
 
 	moveMenusToButtonBox(gCoheCollapsedHeaderViewMode);
   
@@ -509,6 +581,13 @@ function coheUpdateHeaderValueInTextNode(headerEntry, headerValue)
   headerEntry.textNode.value = headerValue;
 }
 
+function coheUpdateDateValue(headerEntry, headerValue) {
+  //var t = currentHeaderData.date.headerValue;
+	var d = document.getElementById("collapseddateBox");
+	d.textContent = headerValue;
+}
+
+
 // coheUpdateMessageHeaders: Iterate through all the current header data we received from mime for this message
 // for each header entry table, see if we have a corresponding entry for that header. i.e. does the particular
 // view care about this header value. if it does then call updateHeaderEntry
@@ -550,6 +629,38 @@ function coheUpdateMessageHeaders()
 addEventListener('messagepane-loaded', coheOnLoadMsgHeaderPane, true);
 addEventListener('messagepane-unloaded', coheOnUnloadMsgHeaderPane, true);
 
+function copyButtonIcons(buttonname, element) {
+	var e0 = document.getElementById("mail-bar3");
+	var iconsize;
+	
+	if (e0) {
+	  iconsize = e0.getAttribute("iconsize");	
+	} else {
+		iconsize = "small";
+	}
+	
+	var e01 = document.getElementById("hiddenIconSpace");
+  if (e01) {
+    e01.setAttribute("iconsize", iconsize); 
+  }	
+	
+  var e1 = document.getElementById(buttonicons[buttonname]);
+  if (!e1) return;
+  
+  var s1 = window.getComputedStyle(e1, null);
+  if (!s1) return;
+  
+  var imageregion = s1.getPropertyValue("-moz-image-region");
+  var imagefile = s1.getPropertyValue("list-style-image");
+
+  if (imagefile && imagefile != "") element.style.listStyleImage = imagefile;
+  if (imageregion && imageregion != "") element.style.MozImageRegion = imageregion;
+  
+  if (buttonname == "hdrTrashButton") {
+  	removeClass(element, "hdrTrashButton");
+  }
+}
+
 function updateHdrButtons() {
 	
 	var buttonBox = document.getElementById('msgHeaderViewDeck').selectedPanel
@@ -563,6 +674,7 @@ function updateHdrButtons() {
 		  strViewMode = "view.expanded";
 		for (var j=0; j<buttonslist[buttonname].length; j++){
 	  	var myElement = buttonBox.getButton(buttonslist[buttonname][j]) || document.getElementById(buttonslist[buttonname][j]);
+	  	copyButtonIcons(buttonslist[buttonname][j], myElement);
 	  	if (myElement != null) {
 	  		addClass(myElement, "msgHeaderView-flat-button");
 	  		if (prefBranch.getBoolPref(strViewMode + ".display" + buttonname)) {
@@ -619,35 +731,11 @@ function addClass(el, strClass) {
 	}
 }
 
-function MyInitViewHeadersMenu()
-{
-  var headerchoice = 1;
-  try
-  {
-    headerchoice = pref.getIntPref("mail.show_headers");
-  }
-  catch (ex)
-  {
-    dump("failed to get the header pref\n");
-  }
-
-  var id = null;
-  switch (headerchoice)
-  {
-    case 2:
-      id = "my_viewallheaders";
-      break;
-    case 1:
-    default:
-      id = "my_viewnormalheaders";
-      break;
-  }
-
-  var menuitem = document.getElementById(id);
-  if (menuitem)
-    menuitem.setAttribute("checked", "true");
+function removeClass(el, strClass) {
+  el.className = el.className.replace(strClass, '');
 }
 
+
 function CoheCopyWebsiteAddress(websiteAddressNode)
 {
   if (websiteAddressNode)
@@ -767,9 +855,6 @@ var myPrefObserverHeaderSize =
     // aSubject is the nsIPrefBranch we're observing (after appropriate QI)
     // aData is the name of the pref that's been changed (relative to aSubject)
 
-/*		coheOnLoadMsgHeaderPane();
-		coheInitializeHeaderViewTables(); */  
-
 		var event = document.createEvent('Events');
  		event.initEvent('messagepane-loaded', false, true);
 		var headerViewElement = document.getElementById("msgHeaderView");
diff --git a/chrome/CompactHeader/content/compactHeaderOverlay.xul b/chrome/CompactHeader/content/compactHeaderOverlay.xul
index 6c68d76..f770d4b 100644
--- a/chrome/CompactHeader/content/compactHeaderOverlay.xul
+++ b/chrome/CompactHeader/content/compactHeaderOverlay.xul
@@ -24,6 +24,7 @@
   <script type="application/javascript" src="chrome://CompactHeader/content/buttons.js"/>
   <script type="application/javascript" src="chrome://CompactHeader/content/compactHeaderOverlay.js"/>
 
+<!--
 	<commandset id="mailViewHeaderCommands"
 	              commandupdater="true"
 	              events="create-menu-view-header"
@@ -32,6 +33,7 @@
 	    <command id="cmd_viewAllHeader" oncommand="alert('test2');goDoCommand('cmd_viewAllHeader'); event.stopPropagation()"/>
 	    <command id="cmd_viewNormalHeader" oncommand="alert('test2');goDoCommand('cmd_viewNormalHeader'); event.stopPropagation()"/>
 	</commandset>
+-->
 
 	<keyset>
 		<key id="hideDetailsKey" 
@@ -40,19 +42,33 @@
 				 oncommand="coheToggleHeaderView();"/>
 	</keyset>
 
-  <deck id="msgHeaderViewDeck">
+  <broadcasterset>
+  	<broadcaster id="changeIconSize" iconsize="small"/>
+  </broadcasterset>
 
+  <deck id="msgHeaderViewDeck">
 
-	<!-- YYY namespace ids added here? -->
-	<hbox id="expandedHeaderView">
-		<vbox id="hideDetailsButtonBox" insertbefore="expandedHeaders">
+	<vbox id="expandedHeaderView" orient="horizontal">
+		<vbox id="hideDetailsButtonBox" insertbefore="expandedHeadersBox">
 			<button id="hideDetailsButton"  
 							tooltiptext="&hideDetailsButton.label;"
 							onclick="coheToggleHeaderView();" 
 							class="msgHeaderView-button msgHeaderView-flat-button"/>
 	  </vbox>
-	  
-		<hbox id="expandedHeaders" flex="1">
+    <toolbarbox id="hiddenIconSpaceBox">
+      <toolbar id="hiddenIconSpace" mode="icon" iconsize="small">
+      	<observes element="changeIconSize" attribute="iconsize" onbroadcast="alert('test');"/>
+        <toolbarbutton id="button-reply" class="toolbarbutton-1" hidden="true"/>
+        <toolbarbutton id="button-replyall" class="toolbarbutton-1" hidden="true"/>
+        <toolbarbutton id="button-replylist" class="toolbarbutton-1" hidden="true"/>
+        <toolbarbutton id="button-forward" class="toolbarbutton-1" hidden="true"/>
+        <toolbarbutton id="button-archive" class="toolbarbutton-1" hidden="true"/>
+        <toolbarbutton id="button-isJunk" class="toolbarbutton-1" hidden="true"/>
+        <toolbarbutton id="button-mark-deleted" class="toolbarbutton-1 delete-button" hidden="true"/>
+        <toolbarbutton id="button-tag" class="toolbarbutton-1" hidden="true"/>
+        <toolbarbutton id="button-other-actions" class="toolbarbutton-1" hidden="true"/>
+      </toolbar>
+    </toolbarbox>
 <!--
 			<popup id="header-toolbar-contextmenu">
 				<menuitem id="CoHe-customize-mitem" label="TEST" oncommand="CoHe_customizeToolbar(this);" />
@@ -88,8 +104,11 @@
 				<toolbarset id="HeaderPaneToolbarSet" context="header-toolbar-contextmenu"/>
 			</toolbarbox>
 -->
-			<vbox id="otherHeadersAndButtonsBox" flex="1">
-				<vbox id="otherActionsBox">
+		<vbox id="expandedHeadersBox">	
+			<hbox id="expandedHeadersBottomBox">
+			
+				<vbox id="otherActionsBox" flex="0">
+					<hbox id="dateValueBox" flex="0"/>
 					<button type="menu" id="otherActionsButton"
 									label="&otherActionsButton.label;"
 	                class="msgHeaderView-button msgHeaderView-flat-button">
@@ -102,7 +121,6 @@
 			                  insertbefore="viewSourceMenuItem"
 			                  key="key_toggleFlagged"/>
 			        <menu id="hdrPlane-HeadersPopupMenu" label="&headersMenu.label;" accesskey="&headersMenu.accesskey;">
-<!--
 		            <menupopup id="menu_HeadersPopup" onpopupshowing="InitViewHeadersMenu();">
 		              <menuitem id="hdrPlane-viewallheaders"
 		               type="radio"
@@ -117,21 +135,6 @@
 		               accesskey="&headersNormalCmd.accesskey;"
 		               command="cmd_viewNormalHeader"/>
 		            </menupopup>
--->
-	            <menupopup id="hdrPlane-HeadersPopup" onpopupshowing="MyInitViewHeadersMenu();">
-	              <menuitem id="my_viewallheaders"
-	               type="radio"
-	               name="viewheadergroup"
-	               label="&headersAllCmd.label;"
-	               accesskey="&headersAllCmd.accesskey;"
-		               oncommand="MsgViewAllHeaders();"/>
-		              <menuitem id="my_viewnormalheaders"
-	               type="radio"
-	               name="viewheadergroup"
-	               label="&headersNormalCmd.label;"
-	               accesskey="&headersNormalCmd.accesskey;"
-		               oncommand="MsgViewNormalHeaders();"/>
-	            </menupopup>
 	            </menu>
 							<menuseparator id="otherActionPopupAfterViewSource"/>
 							<menuitem id="hideDetailsMenu" 
@@ -154,11 +157,11 @@
 	          </menupopup>
 					</button>
 				</vbox>
-			</vbox>
-		</hbox>
-	</hbox>
+			</hbox>
+		</vbox>
+	</vbox>
 
-	<hbox id="collapsedHeaderView" flex="2" pack="start" class="header-part1 headerContainer">
+	<vbox id="collapsedHeaderView" orient="horizontal" flex="1">
 		<popup id="CohecopyUrlPopup" popupanchor="bottomleft">
 			<menuitem label="&copyLinkCmd.label;" accesskey="&copyLinkCmd.accesskey;" oncommand="CoheCopyWebsiteAddress(document.popupNode)"/>
 		</popup>
@@ -168,38 +171,101 @@
 		          onclick="coheToggleHeaderView();"
 		          class="msgHeaderView-button msgHeaderView-flat-button"/>
     </vbox>
-		<vbox id="collapsedHeaderElementBox" flex="1">
-			<hbox align="start" flex="1" id="collapsedHeaderViewFirstLine">
-	<!--
-				<hbox id="collapsedfromBox" align="start" flex="100">
-					<mail-multi-emailHeaderField id="collapsedfromValue"
-																			 class="collapsedHeaderDisplayName"
-																			 label="&fromField2.label;"/>
-				</hbox>
-				<hbox id="collapsedtoCcBccBox" align="end" pack="end" flex="1">
-					<hbox align="start" flex="100">
-					</hbox>
-					<mail-multi-emailHeaderField id="collapsedtoCcBccValue"
-																			 flex="1"
-																			 pack="end"
-																			 class="collapsedHeaderDisplayName"/>
-				</hbox>
-				<header-view-button-box id="collapsedButtonBox"/>
-	-->	
-			</hbox>
-			<hbox align="start" flex="1" id="collapsedHeaderViewSecondLine">
-	<!--
-				<hbox id="collapsedsubjectBox" align="start" flex="99">
-					<textbox id="collapsedsubjectValue" flex="99" readonly="true" class="collapsedHeaderValue plain"/>
+		<vbox id="collapsedHeadersBox" flex="1">
+			<hbox id="collapsedHeaderViewFirstLine" flex="0">
+<!--
+        <hbox id="collapsedsubjectOutBox" align="start" flex="99">
+          <row id="collapsedsubjectRow" flex="99">
+            <mail-headerfield id="collapsedsubjectBox" flex="99"/>
+          </row>
+        </hbox>
+				<hbox id="collapsedfromOutBox" align="start" flex="0">
+					<grid flex="1">
+						<columns>
+							<column flex="0"/>
+						</columns>
+            <rows>
+              <row id="collapsedfromRow">
+  					    <mail-multi-emailHeaderField id="collapsedfromBox" flex="0"/>
+              </row>
+            </rows>
+          </grid>
 				</hbox>
-				<hbox id="collapseddateBox" align="end" flex="0">
-					<textbox id="collapseddateValue" class="plain collapsedHeaderValue" flex="0" readonly="true"/>
+        <grid id="collapsedtoCcBccOutBox" flex="1" hidden="true">
+          <row id="collapsedtoCcBccRow" align="baseline">
+   		  		<mail-multi-emailHeaderField id="collapsedtoCcBccBox" flex="1"/>
+          </row>
+        </grid>
+        <hbox id="collapseddateOutBox" align="start" pack="end" flex="0">
+          <row id="collapseddateRow">
+            <label id="collapseddateBox" class="dateLabel" flex="1"/>
+          </row>
+        </hbox>        
+        <header-view-button-box id="collapsedButtonBox" flex="0" align="start" hidden="true"/>
+      -->
+	    </hbox>
+			<hbox id="collapsedHeaderViewSecondLine" align="start" flex="1">
+<!--
+				<hbox id="collapsedsubjectOutBox" align="start" flex="99">
+  				<row id="collapsedsubjectRow" flex="99">
+            <mail-headerfield id="collapsedsubjectBox" flex="99"/>
+          </row>
+ 				</hbox>
+				<hbox id="collapseddateOutBox" align="end" pack="end" flex="0">
+					<row id="collapseddateRow" align="end" pack="end">
+            <label id="collapseddateBox" class="dateLabel" flex="1"/>
+				  </row>
 				</hbox>
-	-->
+-->
 			</hbox>
 		</vbox>
-	</hbox>
+	</vbox>
 
 	</deck>
 
 </overlay>
+
+<!-- 
+    <vbox id="collapsedHeadersBox" flex="1">
+      <hbox id="collapsedHeaderViewFirstLine" flex="0">
+        <hbox id="collapsedfromOutBox" align="start" flex="0">
+          <grid flex="1">
+            <columns>
+              <column flex="0"/>
+            </columns>
+            <rows>
+              <row id="collapsedfromRow">
+                <mail-multi-emailHeaderField id="collapsedfromBox" flex="0"/>
+              </row>
+            </rows>
+          </grid>
+        </hbox>
+        <grid id="collapsedtoCcBccOutBox" flex="1">
+          <columns>
+            <column flex="0"/>
+            <column flex="1"/>
+          </columns>
+          <rows>
+            <row id="collapsedtoCcBccRow" align="baseline">
+              <label id="collapsedtoCcBccLabel" class="headerName" 
+                     value="&toField2.label;" control="collapsedtoCcBccBox"/>
+              <mail-multi-emailHeaderField id="collapsedtoCcBccBox" flex="1"/>
+            </row>
+          </rows>
+        </grid>
+        <header-view-button-box id="collapsedButtonBox" flex="0" align="start"/>
+      </hbox>
+      <hbox id="collapsedHeaderViewSecondLine" align="start" flex="1">
+        <hbox id="collapsedsubjectOutBox" align="start" flex="99">
+          <row id="collapsedsubjectRow" flex="99">
+            <mail-headerfield id="collapsedsubjectBox" flex="99"/>
+          </row>
+        </hbox>
+        <hbox id="collapseddateOutBox" align="end" pack="end" flex="0">
+          <row id="collapseddateRow" align="end" pack="end">
+            <label id="collapseddateBox" class="dateLabel" flex="1"/>
+          </row>
+        </hbox>
+      </hbox>
+    </vbox>
+-->
\ No newline at end of file
diff --git a/chrome/CompactHeader/content/preferences.js b/chrome/CompactHeader/content/preferences.js
index 61e8358..98b9eda 100644
--- a/chrome/CompactHeader/content/preferences.js
+++ b/chrome/CompactHeader/content/preferences.js
@@ -32,7 +32,8 @@ function onLoad()
 
   loadPrefCheckbox("headersize.twolineview", "checkbox.Compact.TwolineView");
   loadPrefCheckbox("headersize.linkify", "checkbox.Linkify");
-  loadPrefInt("headersize.addressstyle", "AddressStyle");  
+  //loadPrefInt("headersize.addressstyle", "AddressStyle");  
+  loadPrefCheckbox("headersize.addressstyle", "checkbox.ShowOnlyAddress");
   
   updateTwolineView(prefBranch.getBoolPref("headersize.twolineview")); 
 
@@ -62,7 +63,8 @@ function onDialogAccept()
 {
   savePrefCheckbox("headersize.twolineview", "checkbox.Compact.TwolineView");
   savePrefCheckbox("headersize.linkify", "checkbox.Linkify");
-  savePrefInt("headersize.addressstyle", "AddressStyle");  
+  //savePrefInt("headersize.addressstyle", "AddressStyle");  
+  savePrefCheckbox("headersize.addressstyle", "checkbox.ShowOnlyAddress");
   
   savePrefCheckbox("buttons.showonlyicon", "checkbox.IconText");
 
diff --git a/chrome/CompactHeader/content/preferences.xul b/chrome/CompactHeader/content/preferences.xul
index 09e043e..2c25475 100644
--- a/chrome/CompactHeader/content/preferences.xul
+++ b/chrome/CompactHeader/content/preferences.xul
@@ -133,6 +133,7 @@
 	<checkbox id="checkbox.Linkify" 
 						label="&menu.Linkify.caption;"/>
 
+<!--
 	<hbox align="center" flex="0">
 		<label control="AddressStyle" flex="0">&AddressStyle.label;:</label>
 		<menulist id="AddressStyle" flex="0">
@@ -142,10 +143,10 @@
 				<menuitem value="2" label="&AddressStyle.OnlyEmail.label;"/>
 			</menupopup>
 		</menulist>
-
 	</hbox>
-<!--
-	<checkbox id="checkbox.ShowFullAddress" 
-						label="&menu.ShowFullAddress.caption;"/>
 -->
+
+	<checkbox id="checkbox.ShowOnlyAddress" 
+						label="&menu.ShowOnlyAddress.caption;"/>
+
 </dialog>
diff --git a/chrome/CompactHeader/locale/de-DE/preferences.dtd b/chrome/CompactHeader/locale/de-DE/preferences.dtd
index a3ad2ec..d536d11 100644
--- a/chrome/CompactHeader/locale/de-DE/preferences.dtd
+++ b/chrome/CompactHeader/locale/de-DE/preferences.dtd
@@ -14,7 +14,9 @@
 
 <!ENTITY menu.ShowFullAddress.caption "Adresse vollständig anzeigen">
 
-<!ENTITY AddressStyle.label "Adressstil">
+<!ENTITY menu.ShowOnlyAddress.caption "Nur Adresse anzeigen">
+
+<!--
 <!ENTITY AddressStyle.Full.label "Name und Adresse">
 <!ENTITY AddressStyle.Short.label "Nur Name">
-<!ENTITY AddressStyle.OnlyEmail.label "Nur Adresse">
\ No newline at end of file
+<!ENTITY AddressStyle.OnlyEmail.label "Nur Adresse"> -->
\ No newline at end of file
diff --git a/chrome/CompactHeader/locale/en-US/preferences.dtd b/chrome/CompactHeader/locale/en-US/preferences.dtd
index ece2970..24a4143 100644
--- a/chrome/CompactHeader/locale/en-US/preferences.dtd
+++ b/chrome/CompactHeader/locale/en-US/preferences.dtd
@@ -13,7 +13,10 @@
 
 <!ENTITY menu.ShowFullAddress.caption "Show full email address">
 
+<!ENTITY menu.ShowOnlyAddress.caption "Display only address">
+
+<!--
 <!ENTITY AddressStyle.label "Email address style">
 <!ENTITY AddressStyle.Full.label "Name and address">
 <!ENTITY AddressStyle.Short.label "Only Name">
-<!ENTITY AddressStyle.OnlyEmail.label "Only Address">
\ No newline at end of file
+<!ENTITY AddressStyle.OnlyEmail.label "Only Address"> -->
\ No newline at end of file
diff --git a/chrome/CompactHeader/skin/global/CompactHeader.css b/chrome/CompactHeader/skin/global/CompactHeader.css
index 17a5975..6d071fe 100644
--- a/chrome/CompactHeader/skin/global/CompactHeader.css
+++ b/chrome/CompactHeader/skin/global/CompactHeader.css
@@ -56,6 +56,36 @@
 }
 */
 
+#collapsedHeaderView {
+  overflow-y: auto;
+  overflow-x: hidden;
+  max-height: 30em;
+}
+
+#collapsedHeaderRows > row,
+#collapsedHeader2Rows > row {
+  /* Ensure that the header names and values are aligned with each other. */
+  -moz-box-align: baseline;
+}
+
+#collapsedHeadersTopBox {
+  /* Ensure that the space between the from row and the one after is
+     identical to the spacing between the subsequent header lines. */
+  -moz-box-align: end;
+}
+
+#collapsedHeaderViewFirstLine {
+  -moz-box-align: baseline;
+}
+
+#collapsedHeaderView[twolineview="true"] #collapsedHeaderViewFirstLine {
+  -moz-box-align: start;
+}
+
+#collapsedsubjectBox > .headerValue {
+  font-weight: bold;
+}
+
 #expandedButtonBox .button-menubutton-button,
 #collapsedButtonBox .button-menubutton-button {
   background-color: transparent;
@@ -72,7 +102,7 @@
 #collapsedfromBox .headerNameBox {
 	display: none;
 }
-#collapsedfromValue > .headerNameBox {
+#collapsedfromBox > .headerNameBox {
   display: none;
 }
 
@@ -81,15 +111,23 @@
   -moz-box-direction: reverse;
 }
 
+toolbar[iconsize="small"] #button-other-actions,
 #otherActionsButton {
-	list-style-image: url("chrome://CompactHeader/skin/other-action.png");
+	list-style-image: url("chrome://CompactHeader/skin/other-action-small.png");
 	-moz-image-region: rect(0px 16px 16px 0px);
 }
 
+#button-other-actions {
+  list-style-image: url("chrome://CompactHeader/skin/other-action.png");
+  -moz-image-region: rect(0px 24px 24px 0px);
+}
+
+/*
 #tagMenuPopup {
   list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-small.png");
 	-moz-image-region: rect(0px 240px 16px 224px);
 }
+*/
 
 #otherActionsButton[OnlyIcon="Text"] .button-text,
 #tagMenuPopup[OnlyIcon="Text"] .button-text {
@@ -112,7 +150,7 @@
   text-align: left;
 }
 
-#collapsedsubjectValue {
+#collapsedsubjectBox {
 	font-weight: bold;
 }
 
@@ -131,7 +169,7 @@
 	border: 0px;
 }
 
-#collapseddateValue {
+#collapseddateBox {
   -moz-box-align: stretch;
   text-align: right;
   -moz-padding-end: 0.5em;
@@ -183,22 +221,29 @@
   margin-top: 2px;
 }
 
-#collapsedsubjectBox, collapsedfromOutBox,collapsedButtonBox,
-#collapsedsubjectValue, #collapsedfromValue {
+#collapsedtoCcBccRow, #collapsedtoCcBccLabel, 
+#collapsedsubjectOutBox, collapsedfromOutBox,collapsedButtonBox,
+#collapsedsubjectBox, #collapsedfromBox {
   margin: 0px;
   padding: 0px;
 }
 
-#collapsedsubjectBox[twolineview="true"] {
-  -moz-margin-start: .2em;
+#collapsedHeaderView[twolineview="true"] #collapsedfromOutBox,  
+#collapsedHeaderView[twolineview="true"] #collapsedtoCcBccOutBox { 
+  margin-top: 2px;
 }
 
-#collapseddateBox[twolineview="true"] {
-  -moz-margin-end: 0.5em;
+#collapsedHeaderView[twolineview="true"] #collapsedsubjectBox {
+  -moz-margin-start: 0px;
+}
+
+#collapsedHeaderView[twolineview="true"] #collapseddateBox {
+  -moz-margin-end: 2px;
 }
 
 /* ::::: Message Header Pane - Button Icons ::::: */
 
+/*
 .hdrReplyButton[mode="hdrReplyButton"] {
   list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-small.png");
   -moz-image-region: rect(0px 64px 16px 48px);
@@ -228,6 +273,7 @@
   list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-small.png");
   -moz-image-region: rect(0px 128px 16px 112px);
 }
+*/
 
 #collapsedButtonBox[OnlyIcon="Icon"] .msgHeaderView-button .button-text,
 #expandedButtonBox[OnlyIcon="Icon"] .msgHeaderView-button .button-text {
diff --git a/chrome/CompactHeader/skin/global/other-action.png b/chrome/CompactHeader/skin/global/other-action-small.png
similarity index 100%
copy from chrome/CompactHeader/skin/global/other-action.png
copy to chrome/CompactHeader/skin/global/other-action-small.png
diff --git a/chrome/CompactHeader/skin/global/other-action.png b/chrome/CompactHeader/skin/global/other-action.png
index 23293a0..8b9b005 100644
Binary files a/chrome/CompactHeader/skin/global/other-action.png and b/chrome/CompactHeader/skin/global/other-action.png differ
diff --git a/defaults/preferences/prefs.js b/defaults/preferences/prefs.js
index 3bb0427..37336e8 100644
--- a/defaults/preferences/prefs.js
+++ b/defaults/preferences/prefs.js
@@ -1,7 +1,7 @@
 pref("extensions.CompactHeader.headersize.twolineview", false);
 pref("extensions.CompactHeader.headersize.linkify", false);
 
-pref("extensions.CompactHeader.headersize.addressstyle", 1);
+pref("extensions.CompactHeader.headersize.addressstyle", false);
 
 pref("extensions.CompactHeader.buttons.showonlyicon", true);
 
diff --git a/install.rdf b/install.rdf
index 69b760b..c8b9f3a 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.6.2</em:version>
+		<em:version>0.7.0</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>
@@ -19,7 +19,7 @@
 		<em:targetApplication>
 			<RDF:Description>
 				<em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
-				<em:minVersion>3.0b3</em:minVersion>
+				<em:minVersion>3.0b4pre</em:minVersion>
 				<em:maxVersion>3.1a1pre</em:maxVersion>
 			</RDF:Description>
 		</em:targetApplication>

-- 
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