[Pkg-mozext-commits] [compactheader] 42/441: New version 0.6.1: Move menu buttons to header pane button box in compact header view. Clean up of option dialog box: Use standard labels.

[David Prévot]

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

taffit pushed a commit to branch master
in repository compactheader.

commit bfc4663b966bf22e78a5cba87e932cd7919106ba
Author: joachim.herb <none at none>
Date:   Fri Sep 4 19:08:57 2009 +0000

    New version 0.6.1:
    Move menu buttons to header pane button box in compact header view. Clean up of option dialog box: Use standard labels.
---
 .../CompactHeader/content/compactHeaderOverlay.js  | 30 ++++++++++++++++++++--
 .../CompactHeader/content/compactHeaderOverlay.xul |  3 +--
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/chrome/CompactHeader/content/compactHeaderOverlay.js b/chrome/CompactHeader/content/compactHeaderOverlay.js
index 290bd9f..48ad892 100644
--- a/chrome/CompactHeader/content/compactHeaderOverlay.js
+++ b/chrome/CompactHeader/content/compactHeaderOverlay.js
@@ -319,6 +319,8 @@ function coheInitializeHeaderViewTables()
 	  RSSLinkify.oldSubject = document.getElementById("collapsedsubjectValue");
 	  RSSLinkify.oldSubject.parentNode.insertBefore(RSSLinkify.newSubject, RSSLinkify.oldSubject);
 	}
+
+//	moveMenusToButtonBox();
 	
   updateHdrButtons();
   updateHdrIconText();
@@ -353,6 +355,8 @@ function coheOnLoadMsgHeaderPane()
   	gMessageListeners.push(coheMessageListener);
   	coheFirstTime = false;
 	}
+	
+	moveMenusToButtonBox();
 }
 
 var coheMessageListener = 
@@ -442,12 +446,33 @@ function coheUpdateHeaderView()
   	selectEmailDisplayed();
   }
   
-	//moveOtherActionBox();
 	UpdateJunkButton();
 	updateMyReplyButtons();
 	updateHdrButtons();
 }
 
+
+function moveMenusToButtonBox() {
+	var target;
+	
+	if (gCoheCollapsedHeaderViewMode)
+		target = "collapsedButtonBox";
+	else
+		target = "otherActionsBox";
+
+	
+	var newParent = document.getElementById(target);
+	if (newParent != null) {
+		var myElement = document.getElementById("otherActionsButton");
+		newParent.appendChild(myElement);
+		myElement = document.getElementById("tagMenuPopup");
+		newParent.appendChild(myElement);
+	} else {
+		alert ("null");
+	}
+}
+
+
 function coheToggleHeaderView ()
 {
   gCoheCollapsedHeaderViewMode = !gCoheCollapsedHeaderViewMode;
@@ -468,6 +493,7 @@ function coheToggleHeaderView ()
 	  updateHdrButtons();
   }
 
+	moveMenusToButtonBox();
   
   // Work around a xul deck bug where the height of the deck is determined
 	// by the tallest panel in the deck even if that panel is not selected...
@@ -533,7 +559,7 @@ function updateHdrButtons() {
 		else
 		  strViewMode = "view.expanded";
 		for (var j=0; j<buttonslist[buttonname].length; j++){
-	  	var myElement = buttonBox.getButton(buttonslist[buttonname][j]);
+	  	var myElement = buttonBox.getButton(buttonslist[buttonname][j]) || document.getElementById(buttonslist[buttonname][j]);
 	  	if (myElement != null) {
 	  		addClass(myElement, "msgHeaderView-flat-button");
 	  		if (prefBranch.getBoolPref(strViewMode + ".display" + buttonname)) {
diff --git a/chrome/CompactHeader/content/compactHeaderOverlay.xul b/chrome/CompactHeader/content/compactHeaderOverlay.xul
index 5737f10..375a8ad 100644
--- a/chrome/CompactHeader/content/compactHeaderOverlay.xul
+++ b/chrome/CompactHeader/content/compactHeaderOverlay.xul
@@ -109,8 +109,7 @@
 							          oncommand="openDialog('chrome://CompactHeader/content/preferences.xul', 'prefs', 'chrome,resizable=no');"/>
 						</menupopup>
 					</button>
-					<button type="menu" 
-									id="tagMenuPopup"
+					<button type="menu" id="tagMenuPopup"
 									label="&tagMenu.label;"
 	  		          class="msgHeaderView-button msgHeaderView-flat-button">
 	          <menupopup id="tagMenuPopup-tagpopup" onpopupshowing="InitMessageTags(this)">

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