[Pkg-mozext-commits] [compactheader] 429/441: Fix header toolbar location code and other action button icon

[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 edb973510e674646b5a3b74838e064e6e6dc09ec
Author: jmozmoz <Joachim.Herb at gmx.de>
Date:   Mon Dec 22 00:09:19 2014 +0100

    Fix header toolbar location code and other action button icon
---
 .gitignore                                         |  2 +
 .../CompactHeader/content/compactHeaderOverlay.js  |  5 ++-
 .../CompactHeader/content/compactHeaderOverlay.xul | 45 ++++++++++++++++++++++
 chrome/CompactHeader/skin/global/CompactHeader.css |  6 +--
 chrome/CompactHeader/skin/gnome/buttonsOverlay.css |  4 +-
 .../CompactHeader/skin/windows/buttonsOverlay.css  |  4 +-
 6 files changed, 58 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..f0cdea5
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+/.project
+/AMO
diff --git a/chrome/CompactHeader/content/compactHeaderOverlay.js b/chrome/CompactHeader/content/compactHeaderOverlay.js
index 789023c..60ccc73 100644
--- a/chrome/CompactHeader/content/compactHeaderOverlay.js
+++ b/chrome/CompactHeader/content/compactHeaderOverlay.js
@@ -564,7 +564,10 @@ org.mozdev.compactHeader.pane = function() {
     if (document.getElementById("CompactHeader_hideDetailsMenu")) {
       document.getElementById("CompactHeader_hideDetailsMenu").setAttribute("label", strLabel);
     }
-
+    
+    document.getElementById("CompactHeader_viewMenuCompactBroadcast")
+            .setAttribute("checked", gCoheCollapsedHeaderViewMode);
+    
     org.mozdev.compactHeader.debug.log("coheToggleHeaderContent stop");
   }
 
diff --git a/chrome/CompactHeader/content/compactHeaderOverlay.xul b/chrome/CompactHeader/content/compactHeaderOverlay.xul
index 5a3c1c3..952a6df 100644
--- a/chrome/CompactHeader/content/compactHeaderOverlay.xul
+++ b/chrome/CompactHeader/content/compactHeaderOverlay.xul
@@ -233,4 +233,49 @@
 
   </deck>
 
+  <broadcasterset>
+    <broadcaster id="CompactHeader_viewMenuCompactBroadcast"
+                 checked="false"/>
+  </broadcasterset>
+
+  <menupopup id="menu_HeadersPopup">
+    <menuseparator id="CompactHeader_viewMenuCompactSeparator"/>
+    <menuitem id="CompactHeader_viewMenuCompact"
+              label="&CompactHeader_compactMenu.label;"
+              type="checkbox"
+              accesskey="&CompactHeader_compactMenu.accesskey;"
+              oncommand="org.mozdev.compactHeader.pane.coheToggleHeaderView();"
+              key="CompactHeader_hideDetailsKey">
+      <observes element="CompactHeader_viewMenuCompactBroadcast"
+                attribute="checked"/>
+    </menuitem>
+  </menupopup>
+
+  <menupopup id="appmenu_HeadersPopup">
+    <menuseparator id="CompactHeader_appmenu_viewMenuCompactSeparator"/>
+    <menuitem id="CompactHeader_appmenu_viewMenuCompact"
+              label="&CompactHeader_compactMenu.label;"
+              type="checkbox"
+              accesskey="&CompactHeader_compactMenu.accesskey;"
+              oncommand="org.mozdev.compactHeader.pane.coheToggleHeaderView();"
+              key="CompactHeader_hideDetailsKey">
+      <observes element="CompactHeader_viewMenuCompactBroadcast"
+                attribute="checked"/>
+    </menuitem>
+  </menupopup>
+
+  <hbox id="messagepaneboxwrapper">
+    <vbox id="CompactHeader_leftSidebar"
+          class="main-header-area"
+          context="header-toolbar-context-menu"
+          insertbefore="messagepanebox">
+      <hbox id="CompactHeader_leftSidebar_dummy" hidden="true"/>
+    </vbox>
+    <vbox id="CompactHeader_rightSidebar"
+          class="main-header-area"
+          context="header-toolbar-context-menu">
+      <hbox id="CompactHeader_rightSidebar_dummy" hidden="true"/>
+    </vbox>
+  </hbox>
+
 </overlay>
diff --git a/chrome/CompactHeader/skin/global/CompactHeader.css b/chrome/CompactHeader/skin/global/CompactHeader.css
index c023e5f..9bc0345 100644
--- a/chrome/CompactHeader/skin/global/CompactHeader.css
+++ b/chrome/CompactHeader/skin/global/CompactHeader.css
@@ -105,18 +105,18 @@
   display: none;
 }
 
-#CompactHeader_otherActionsButton[OnlyIcon="Text"] .button-text,
+#otherActionsButton[OnlyIcon="Text"] .button-text,
 #tagMenuPopup[OnlyIcon="Text"] .button-text {
   -moz-padding-end: 1px;
   -moz-padding-start: 5px;
 }
 
-#CompactHeader_otherActionsButton[OnlyIcon="Icon"] .button-text,
+#otherActionsButton[OnlyIcon="Icon"] .button-text,
 #tagMenuPopup[OnlyIcon="Icon"] .button-text {
 	display: none;
 }
 
-#CompactHeader_otherActionsButton .button-icon,
+#otherActionsButton .button-icon,
 #CompactHeader_tagMenuPopup .button-icon {
   -moz-margin-start: 1px;
   -moz-margin-end: 1px;
diff --git a/chrome/CompactHeader/skin/gnome/buttonsOverlay.css b/chrome/CompactHeader/skin/gnome/buttonsOverlay.css
index fd1f604..7617eb1 100644
--- a/chrome/CompactHeader/skin/gnome/buttonsOverlay.css
+++ b/chrome/CompactHeader/skin/gnome/buttonsOverlay.css
@@ -78,10 +78,10 @@ toolbar[iconsize="small"] #CompactHeader_button-dispMUA .toolbarbutton-icon {
   height:18px;
 }
 
-.hdrOtherActionsButton {
+.customize-header-toolbar-otherActionsButton {
   list-style-image: url("chrome://CompactHeader-os/skin/other-action.png");
 }
 
-toolbar[iconsize="small"] .hdrOtherActionsButton {
+toolbar[iconsize="small"] .customize-header-toolbar-otherActionsButton {
   list-style-image: url("chrome://CompactHeader-os/skin/other-action-small.png");
 }
\ No newline at end of file
diff --git a/chrome/CompactHeader/skin/windows/buttonsOverlay.css b/chrome/CompactHeader/skin/windows/buttonsOverlay.css
index 21d3b62..3c5da1c 100644
--- a/chrome/CompactHeader/skin/windows/buttonsOverlay.css
+++ b/chrome/CompactHeader/skin/windows/buttonsOverlay.css
@@ -68,11 +68,11 @@ toolbar[iconsize="small"] #CompactHeader_button-dispMUA .toolbarbutton-icon {
   height:16px;
 }
 
-.hdrOtherActionsButton {
+.customize-header-toolbar-otherActionsButton {
   list-style-image: url("chrome://CompactHeader-os/skin/other-action.png");
 }
 
-toolbar[iconsize="small"] .hdrOtherActionsButton {
+toolbar[iconsize="small"] .customize-header-toolbar-otherActionsButton {
   list-style-image: url("chrome://CompactHeader-os/skin/other-action-small.png");
 }
 

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