[Pkg-mozext-commits] [compactheader] 369/441: Version 2.0.6beta5: Enable/disable menu items in other actions toolbar button.

[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 886fd9c0790a2f959e18f92e4bb3fa2c513e8479
Author: Joachim Herb <Joachim.Herb at gmx.de>
Date:   Sat Jun 23 00:35:05 2012 +0200

    Version 2.0.6beta5: Enable/disable menu items in other actions toolbar button.
    
    --HG--
    branch : more_button_tooltip_update
---
 .../content/compactHeaderOverlay-9.xul             |  4 +--
 .../CompactHeader/content/compactHeaderOverlay.xul |  4 +--
 chrome/CompactHeader/content/toolbar.js            | 31 ++++++++++++++++++++--
 install.rdf                                        |  2 +-
 4 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/chrome/CompactHeader/content/compactHeaderOverlay-9.xul b/chrome/CompactHeader/content/compactHeaderOverlay-9.xul
index a479afd..7365cf0 100644
--- a/chrome/CompactHeader/content/compactHeaderOverlay-9.xul
+++ b/chrome/CompactHeader/content/compactHeaderOverlay-9.xul
@@ -85,7 +85,7 @@
           <button type="menu" id="otherActionsButton" collapsed="true"
                   label="&otherActionsButton1.label;"
                   class="msgHeaderView-button msgHeaderView-flat-button">
-            <menupopup id="otherActionsPopup" onpopupshowing="InitMessageMark()">
+            <menupopup id="otherActionsPopup" onpopupshowing="org.mozdev.compactHeader.toolbar.showOtherActionButtonMenu();">
               <menuitem id="CompactHeader_hdrPane-markFlagged"
                         type="checkbox"
                         label="&markStarredCmd.label;"
@@ -94,7 +94,7 @@
                         insertbefore="viewSourceMenuItem"
                         key="key_toggleFlagged"/>
               <menu id="CompactHeader_hdrPane-HeadersPopupMenu" label="&headersMenu.label;" accesskey="&headersMenu.accesskey;">
-                <menupopup id="menu_HeadersPopup" onpopupshowing="InitViewHeadersMenu();">
+                <menupopup id="CompactHeader_menu_HeadersPopup" onpopupshowing="InitViewHeadersMenu();">
                   <menuitem id="CompactHeader_hdrPane-viewallheaders"
                    type="radio"
                    name="viewheadergroup"
diff --git a/chrome/CompactHeader/content/compactHeaderOverlay.xul b/chrome/CompactHeader/content/compactHeaderOverlay.xul
index 0444738..2ecd215 100644
--- a/chrome/CompactHeader/content/compactHeaderOverlay.xul
+++ b/chrome/CompactHeader/content/compactHeaderOverlay.xul
@@ -82,7 +82,7 @@
           <button type="menu" id="otherActionsButton" collapsed="true"
                   label="&otherActionsButton.label;"
                   class="msgHeaderView-button msgHeaderView-flat-button">
-            <menupopup id="otherActionsPopup" onpopupshowing="InitMessageMark()">
+            <menupopup id="otherActionsPopup" onpopupshowing="org.mozdev.compactHeader.toolbar.showOtherActionButtonMenu();">
               <menuitem id="CompactHeader_hdrPane-markFlagged"
                         type="checkbox"
                         label="&markStarredCmd.label;"
@@ -91,7 +91,7 @@
                         insertbefore="viewSourceMenuItem"
                         key="key_toggleFlagged"/>
               <menu id="CompactHeader_hdrPane-HeadersPopupMenu" label="&headersMenu.label;" accesskey="&headersMenu.accesskey;">
-                <menupopup id="menu_HeadersPopup" onpopupshowing="InitViewHeadersMenu();">
+                <menupopup id="CompactHeader_menu_HeadersPopup" onpopupshowing="InitViewHeadersMenu();">
                   <menuitem id="CompactHeader_hdrPane-viewallheaders"
                    type="radio"
                    name="viewheadergroup"
diff --git a/chrome/CompactHeader/content/toolbar.js b/chrome/CompactHeader/content/toolbar.js
index 0e528ec..9ee90ae 100644
--- a/chrome/CompactHeader/content/toolbar.js
+++ b/chrome/CompactHeader/content/toolbar.js
@@ -60,6 +60,17 @@ org.mozdev.compactHeader.toolbar = function() {
     {pos:"none",  id:"",                                   orient:""},
   ];
 
+  let gOtherMenuCommands = {
+      otherActionsOpenConversation: "cmd_openConversation",
+      otherActionsOpenInNewWindow:  "cmd_openConversation",
+      otherActionsOpenInNewTab:     "cmd_openMessage",
+      viewSourceMenuItem:           "cmd_viewPageSource",
+      markAsReadMenuItem:           "cmd_markAsRead",
+      markAsUnreadMenuItem:         "cmd_markAsUnread",
+      saveAsMenuItem:               "cmd_saveAsFile",
+      otherActionsPrint:            "cmd_print"
+    };
+
   pub.cannotMoveToolbox = function() {
     var appInfo = Components.classes["@mozilla.org/xre/app-info;1"]
       .getService(Components.interfaces.nsIXULAppInfo);
@@ -169,11 +180,27 @@ org.mozdev.compactHeader.toolbar = function() {
       myElement= document.getElementById("otherActionsPopup");
       if (myElement) {
         newParent.appendChild(myElement);
+        for (let menu in gOtherMenuCommands) {
+          let menuEl = document.getElementById(menu);
+          if (menuEl) {
+            menuEl.setAttribute("command", gOtherMenuCommands[menu]);
+          }
+        }
       }
     }
     org.mozdev.compactHeader.debug.log("fillToolboxPalette stop");
   };
 
+  pub.showOtherActionButtonMenu = function() {
+    org.mozdev.compactHeader.debug.log("showOtherActionButtonMenu start");
+    onShowOtherActionsPopup();
+    InitMessageMark();
+    for (let menu in gOtherMenuCommands) {
+      goUpdateCommand(gOtherMenuCommands[menu]);
+    }
+    org.mozdev.compactHeader.debug.log("showOtherActionButtonMenu stop");
+  }
+
   pub.setButtonStyle = function() {
     org.mozdev.compactHeader.debug.log("setButtonStyle start");
     var hdrToolbar = document.getElementById("header-view-toolbar");
@@ -535,7 +562,7 @@ org.mozdev.compactHeader.toolbar = function() {
 
     if ((currentToolboxPosition == targetPos) &&
         (currentToolboxType == targetType) &&
-        (currentHeaderViewMode == aHeaderViewMode) && 
+        (currentHeaderViewMode == aHeaderViewMode) &&
         (targetType == "single")) {
       org.mozdev.compactHeader.debug.log("curPos: " + currentToolboxPosition + " targetPos: " + targetPos);
       org.mozdev.compactHeader.debug.log("curType: " + currentToolboxType + " targetType: " + targetType);
@@ -551,7 +578,7 @@ org.mozdev.compactHeader.toolbar = function() {
     currentHeaderViewMode = aHeaderViewMode;
 
     org.mozdev.compactHeader.debug.log("setCurrentToolboxPosition 3");
-    
+
     if (multiMessage){
       org.mozdev.compactHeader.debug.log("multiMessage " + multiMessage);
       try {
diff --git a/install.rdf b/install.rdf
index 0344b2d..163d079 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>2.0.6beta4</em:version>
+		<em:version>2.0.6beta5</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