[Pkg-mozext-commits] [compactheader] 64/441: New version 0.8.2: Remove hidden toolbar and handle different operating systems internally.

David Prévot taffit at moszumanska.debian.org
Wed Mar 18 12:28:44 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 8a6c81c2b39aba76eaf6f1c2c7fd2a3b8b23b854
Author: joachim.herb <none at none>
Date:   Fri Sep 25 00:30:13 2009 +0000

    New version 0.8.2:
    Remove hidden toolbar and handle different operating systems internally.
---
 chrome/CompactHeader/content/buttons.js            |  6 ++-
 .../CompactHeader/content/compactHeaderOverlay.js  | 10 ++++-
 .../CompactHeader/content/compactHeaderOverlay.xul | 21 +++++++++--
 chrome/CompactHeader/skin/global/CompactHeader.css |  6 ++-
 chrome/CompactHeader/skin/mac/osdef.css            | 44 +++++++++++++++++++---
 chrome/CompactHeader/skin/windows/osdef.css        | 42 +++++++++++++++++++++
 install.rdf                                        |  2 +-
 7 files changed, 115 insertions(+), 16 deletions(-)

diff --git a/chrome/CompactHeader/content/buttons.js b/chrome/CompactHeader/content/buttons.js
index e225082..47e555f 100644
--- a/chrome/CompactHeader/content/buttons.js
+++ b/chrome/CompactHeader/content/buttons.js
@@ -55,7 +55,9 @@ 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["hdrJunkButton"]      = ["button-isJunk"];
+//buttonicons["hdrTrashButton"]     = ["button-mark-deleted"];
+buttonicons["hdrJunkButton"]      = ["button-junk"];
+buttonicons["hdrTrashButton"]     = ["button-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 af36e5b..3eb08fc 100644
--- a/chrome/CompactHeader/content/compactHeaderOverlay.js
+++ b/chrome/CompactHeader/content/compactHeaderOverlay.js
@@ -651,6 +651,7 @@ function coheUpdateMessageHeaders()
 addEventListener('messagepane-loaded', coheOnLoadMsgHeaderPane, true);
 addEventListener('messagepane-unloaded', coheOnUnloadMsgHeaderPane, true);
 
+/* XXX Remove obsolet function
 function copyButtonIcons(buttonname, element) {
 	var e0 = document.getElementById("mail-bar3");
 	var iconsize;
@@ -682,6 +683,7 @@ function copyButtonIcons(buttonname, element) {
   	removeClass(element, "hdrTrashButton");
   }
 }
+*/
 
 function updateHdrButtons() {
 	
@@ -696,9 +698,15 @@ 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);
+	  	//copyButtonIcons(buttonslist[buttonname][j], myElement);
 	  	if (myElement != null) {
+        addClass(myElement, "cohe-buttons");
+        addClass(myElement, "cohe-" + buttonicons[buttonslist[buttonname][j]]);
 	  		addClass(myElement, "msgHeaderView-flat-button");
+	  		myElement.setAttribute("tooltiptext", document.getElementById("Cohe"+buttonslist[buttonname][j]).value);
+	  		if (buttonslist[buttonname][j] == "hdrTrashButton") {
+	  			removeClass(myElement, "hdrTrashButton");
+	  		}
 	  		if (prefBranch.getBoolPref(strViewMode + ".display" + buttonname)) {
 		  		if (buttonname != "Reply") {
 			  		myElement.hidden =  false; //! prefBranch.getBoolPref("expandedview.display" + buttonname);
diff --git a/chrome/CompactHeader/content/compactHeaderOverlay.xul b/chrome/CompactHeader/content/compactHeaderOverlay.xul
index c25c957..ceaf569 100644
--- a/chrome/CompactHeader/content/compactHeaderOverlay.xul
+++ b/chrome/CompactHeader/content/compactHeaderOverlay.xul
@@ -48,6 +48,7 @@
 
   <deck id="msgHeaderViewDeck">
 
+<!--
   <toolbarbox id="hiddenIconSpaceBox">
     <toolbar id="hiddenIconSpace" mode="icon" iconsize="small">
       <observes element="changeIconSize" attribute="iconsize" onbroadcast="alert('test');"/>
@@ -62,6 +63,7 @@
       <toolbarbutton id="button-other-actions" class="toolbarbutton-1" hidden="true"/>
     </toolbar>
   </toolbarbox>
+-->
 
 	<vbox id="expandedHeaderView" orient="horizontal">
 		<vbox id="hideDetailsButtonBox" insertbefore="expandedHeadersBox">
@@ -105,6 +107,21 @@
 				<toolbarset id="HeaderPaneToolbarSet" context="header-toolbar-contextmenu"/>
 			</toolbarbox>
 -->
+    <hbox id="coheStringTransferBox" hidden="true">
+      <label id="CoheHideDetailsLabel" value="&hideDetailsButton.label;"/>
+      <label id="CoheShowDetailsLabel" value="&showDetailsButton.label;"/>
+      <label id="CohehdrReplyButton" value="&replyButton.label;"/>
+      <label id="CohehdrReplyAllButton" value="&replyAllButton.label;"/>
+      <label id="CohehdrReplyListButton" value="&replyListButton.label;"/>
+      <label id="CohehdrForwardButton" value="&forwardButton.label;"/>
+      <label id="CohearchiveButton" value="&archiveButton.label;"/>
+      <label id="CohehdrJunkButton" value="&junkButton.label;"/>
+      <label id="CohehdrTrashButton" value="&deleteButton.label;"/>
+      <label id="CoheotherActionsButton" value="&otherActionsButton.label;"/>
+      <label id="CohetagMenuPopup" value="&tagButton.label;"/>
+    </hbox>
+
+
 		<vbox id="expandedHeadersBox">	
 			<hbox id="expandedHeadersBottomBox">
 			
@@ -164,10 +181,6 @@
 	</vbox>
 
 	<vbox id="collapsedHeaderView" orient="horizontal" flex="1">
-      <hbox hidden="true">
-        <label id="CoheHideDetailsLabel" value="&hideDetailsButton.label;"/>
-        <label id="CoheShowDetailsLabel" value="&showDetailsButton.label;"/>
-      </hbox>
 		<popup id="CohecopyUrlPopup" popupanchor="bottomleft">
 			<menuitem label="&copyLinkCmd.label;" accesskey="&copyLinkCmd.accesskey;" oncommand="CoheCopyWebsiteAddress(document.popupNode)"/>
 		</popup>
diff --git a/chrome/CompactHeader/skin/global/CompactHeader.css b/chrome/CompactHeader/skin/global/CompactHeader.css
index 298ec38..5622b76 100644
--- a/chrome/CompactHeader/skin/global/CompactHeader.css
+++ b/chrome/CompactHeader/skin/global/CompactHeader.css
@@ -118,17 +118,19 @@
 }
 */
 
-toolbar[iconsize="small"] #button-other-actions,
+/*
+toolbar[iconsize="small"] #button-other-actions,*/
 #otherActionsButton {
 	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");
diff --git a/chrome/CompactHeader/skin/mac/osdef.css b/chrome/CompactHeader/skin/mac/osdef.css
index e498859..8ad5d65 100644
--- a/chrome/CompactHeader/skin/mac/osdef.css
+++ b/chrome/CompactHeader/skin/mac/osdef.css
@@ -41,12 +41,44 @@
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-#button-archive {
-  list-style-image: url("chrome://CompactHeader-os/skin/mail-toolbar.png");
-  -moz-image-region: rect(0px 640px 32px 608px);
+.cohe-buttons {
+  list-style-image: url("chrome://CompactHeader-os/skin/mail-toolbar-small.png");
 }
 
-toolbar[iconsize="small"] #button-archive {
-  list-style-image: url("chrome://CompactHeader-os/skin/mail-toolbar-small.png");
+.cohe-button-other-actions
+{
+  list-style-image: url("chrome://CompactHeader/skin/other-action-small.png");
+  -moz-image-region: rect(0px 16px 16px 0px);
+}
+
+.cohe-button-archive {
   -moz-image-region: rect(0px 480px 24px 456px);
-}
\ No newline at end of file
+}
+
+.cohe-button-reply {
+  -moz-image-region: rect(0px 96px 24px 72px);
+}
+
+.cohe-button-replyall {
+  -moz-image-region: rect(0px 120px 24px 96px);
+}
+
+.cohe-button-replylist {
+  -moz-image-region: rect(0px 144px 24px 120px);
+}
+
+.cohe-button-forward {
+  -moz-image-region: rect(0px 168px 24px 144px);
+}
+
+.cohe-button-deleted {
+  -moz-image-region: rect(0px 192px 24px 168px);
+}
+
+.cohe-button-junk {
+  -moz-image-region: rect(0px 216px 24px 192px);
+}
+
+.cohe-button-tag {
+  -moz-image-region: rect(0px 384px 24px 360px);
+}
diff --git a/chrome/CompactHeader/skin/windows/osdef.css b/chrome/CompactHeader/skin/windows/osdef.css
index a64c2f2..402b5d5 100644
--- a/chrome/CompactHeader/skin/windows/osdef.css
+++ b/chrome/CompactHeader/skin/windows/osdef.css
@@ -41,3 +41,45 @@
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
+
+.cohe-buttons {
+  list-style-image: url("chrome://CompactHeader-os/skin/mail-toolbar-small.png");
+}
+
+.cohe-button-other-actions
+{
+  list-style-image: url("chrome://CompactHeader/skin/other-action-small.png");
+  -moz-image-region: rect(0px 16px 16px 0px);
+}
+
+.cohe-button-archive {
+  -moz-image-region: rect(0px 320px 16px 304px);
+}
+
+.cohe-button-reply {
+  -moz-image-region: rect(0px 64px 16px 48px);
+}
+
+.cohe-button-replyall {
+  -moz-image-region: rect(0px 80px 16px 64px);
+}
+
+.cohe-button-replylist {
+  -moz-image-region: rect(0px 112px 16px 96px);
+}
+
+.cohe-button-forward {
+  -moz-image-region: rect(0px 96px 16px 80px);
+}
+
+.cohe-button-deleted {
+  -moz-image-region: rect(0px 128px 16px 112px);
+}
+
+.cohe-button-junk {
+  -moz-image-region: rect(0px 144px 16px 128px);
+}
+
+.cohe-button-tag {
+  -moz-image-region: rect(0px 256px 16px 240px);
+}
diff --git a/install.rdf b/install.rdf
index 0a39a7e..d909b4f 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.8.1</em:version>
+		<em:version>0.8.2</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