[Pkg-mozext-commits] [compactheader] 79/441: New version: 0.99.0 Adds customization dialog for header pane toolbar Toolbar in 2 line header mode

David Prévot taffit at moszumanska.debian.org
Wed Mar 18 12:28:46 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 b9b8e04200e982a00e9318eb2882ebee506ae7bc
Author: joachim.herb <none at none>
Date:   Sun Oct 25 00:05:19 2009 +0000

    New version: 0.99.0
    Adds customization dialog for header pane toolbar
    Toolbar in 2 line header mode
---
 chrome/CompactHeader/content/preferences.js        |   8 --
 chrome/CompactHeader/content/preferences.xul       | 104 ---------------------
 chrome/CompactHeader/skin/global/CompactHeader.css |  63 +++----------
 chrome/CompactHeader/skin/windows/osdef.css        |  74 ++-------------
 defaults/preferences/prefs.js                      |  17 ----
 5 files changed, 22 insertions(+), 244 deletions(-)

diff --git a/chrome/CompactHeader/content/preferences.js b/chrome/CompactHeader/content/preferences.js
index c00da6a..368ace4 100644
--- a/chrome/CompactHeader/content/preferences.js
+++ b/chrome/CompactHeader/content/preferences.js
@@ -105,14 +105,6 @@ function onDialogAccept()
   savePrefCheckbox("headersize.linkify", "checkbox.Linkify");
   //savePrefInt("headersize.addressstyle", "AddressStyle");  
   savePrefCheckbox("headersize.addressstyle", "checkbox.ShowOnlyAddress");
-  
-  savePrefCheckbox("buttons.showonlyicon", "checkbox.IconText");
-
-  for(var buttonname in buttonslist) {
-	  savePrefCheckbox("view.compact.display" + buttonname,  "checkbox.Compact." + buttonname);
-	  savePrefCheckbox("view.expanded.display" + buttonname, "checkbox.Expanded." + buttonname);
-  }
-
   return true;
 }
 
diff --git a/chrome/CompactHeader/content/preferences.xul b/chrome/CompactHeader/content/preferences.xul
index f157eee..1dd5ca6 100644
--- a/chrome/CompactHeader/content/preferences.xul
+++ b/chrome/CompactHeader/content/preferences.xul
@@ -21,115 +21,11 @@
   onload="onLoad()" ondialogaccept="return onDialogAccept()" persist="screenX screenY">
 
   <script type="application/x-javascript" src="chrome://CompactHeader/content/preferences.js"/>
-  <script type="application/x-javascript" src="chrome://CompactHeader/content/buttons.js"/>
 
 	<checkbox id="checkbox.Compact.TwolineView" 
 						label="&checkbox.Compact.TwolineView.caption;"
 						oncommand="updateTwolineView(this.checked);"/>
 						
-	<checkbox id="checkbox.IconText" 
-						label="&menu.IconText.caption;"/>
-
-  <groupbox>
-    <caption label="&groupbox.Buttons.caption;"/>
- 							
-    <grid>
-    	<columns>
-    		<column flex="0"/>
-    		<column flex="1"/>
-    		<column flex="1"/>
-    	</columns>
-    	<rows>
-    		<row>
-    			<label value=""/>    			
-    			<hbox pack="center">
-    			<label value="&groupbox.Column.Compact;"/>
-    			</hbox>
-    			<hbox pack="center">
-    			<label value="&groupbox.Column.Expanded;"/>
-    			</hbox>
-				</row>
-    		<row>
-    			<hbox pack="end">
-    			<label value="&replyButton.label;"/>
-    			</hbox>
-    			<hbox pack="center">
-	    		<checkbox disabled="true" id="checkbox.Compact.Reply"/>
-    			</hbox>
-    			<hbox pack="center">
-  	    	<checkbox id="checkbox.Expanded.Reply"/>    			
-    			</hbox>
-    		</row>
-    		<row>
-    			<hbox align="center" pack="end">
-    			<label value="&forwardButton.label;"/>
-    			</hbox>
-    			<hbox pack="center">
-	    		<checkbox disabled="true" id="checkbox.Compact.Forward"/>
-    			</hbox>
-    			<hbox pack="center">
-  	    	<checkbox id="checkbox.Expanded.Forward"/>    			
-    			</hbox>
-    		</row>
-    		<row>
-    			<hbox align="center" pack="end">
-    			<label value="&archiveMsgCmd.label;"/>
-    			</hbox>
-    			<hbox pack="center">
-	    		<checkbox disabled="true" id="checkbox.Compact.Archive"/>
-    			</hbox>
-    			<hbox pack="center">
-  	    	<checkbox id="checkbox.Expanded.Archive"/>    			
-    			</hbox>
-    		</row>
-    		<row>
-    			<hbox align="center" pack="end">
-    			<label value="&junkButton.label;"/>
-    			</hbox>
-    			<hbox pack="center">
-	    		<checkbox disabled="true" id="checkbox.Compact.Junk"/>
-    			</hbox>
-    			<hbox pack="center">
-  	    	<checkbox id="checkbox.Expanded.Junk"/>    			
-    			</hbox>
-    		</row>
-    		<row>
-    			<hbox align="center" pack="end">
-    			<label value="&checkbox.Compact.Trash.caption;"/>
-    			</hbox>
-    			<hbox pack="center">
-	    		<checkbox disabled="true" id="checkbox.Compact.Trash"/>
-    			</hbox>
-    			<hbox pack="center">
-  	    	<checkbox id="checkbox.Expanded.Trash"/>    			
-    			</hbox>
-    		</row>
-    		<row>
-    			<hbox align="center" pack="end">
-    			<label value="&otherActionsButton.label;"/>
-    			</hbox>
-    			<hbox pack="center">
-	    		<checkbox disabled="true" id="checkbox.Compact.OtherAction"/>
-    			</hbox>
-    			<hbox pack="center">
-  	    	<checkbox id="checkbox.Expanded.OtherAction"/>    			
-    			</hbox>
-    		</row>
-    		<row>
-    			<hbox align="center" pack="end">
-    			<label value="&tagButton.label;"/>
-    			</hbox>
-    			<hbox pack="center">
-	    		<checkbox disabled="true" id="checkbox.Compact.Tag"/>
-    			</hbox>
-    			<hbox pack="center">
-  	    	<checkbox id="checkbox.Expanded.Tag"/>    			
-    			</hbox>
-    		</row>
-    	</rows>
-    </grid>
-  </groupbox>
-
 	<checkbox id="checkbox.Linkify" 
 						label="&menu.Linkify.caption;"/>
   <checkbox id="checkbox.ShowOnlyAddress"
diff --git a/chrome/CompactHeader/skin/global/CompactHeader.css b/chrome/CompactHeader/skin/global/CompactHeader.css
index 6d204e0..8b2160c 100644
--- a/chrome/CompactHeader/skin/global/CompactHeader.css
+++ b/chrome/CompactHeader/skin/global/CompactHeader.css
@@ -46,23 +46,6 @@
   min-width: 1px;
 }
 
-/*
-#HeaderPaneToolbarBox {
-	-moz-binding: url(chrome://CompactHeader/content/cohe.xml#CoHeToolbox);
-}
-
-#HeaderPaneToolbar{
-	-moz-binding: url(chrome://CompactHeader/content/cohe.xml#CoHeToolbar);
-}
-*/
-
-toolbar[mode="full"] > .msgHeaderView-button,
-toolbar[mode="full"] > .msgHeaderView-button > .toolbarbutton-menubutton-button
-{
-  -moz-box-orient: horizontal !important;
-}
-
-
 
 #collapsed1LtoCcBccLabel {
   -moz-padding-start: 2px;
@@ -119,20 +102,6 @@ toolbar[mode="full"] > .msgHeaderView-button > .toolbarbutton-menubutton-button
   display: none;
 }
 
-/*
-#otherActionsButton .button-box .box-inherit,
-#tagMenuPopup .button-box .box-inherit {
-  -moz-box-direction: reverse;
-}
-*/
-
-/*
-#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 {
   -moz-padding-end: 1px;
@@ -154,27 +123,12 @@ toolbar[mode="full"] > .msgHeaderView-button > .toolbarbutton-menubutton-button
   text-align: left;
 }
 
-#collapsed1LsubjectBox {
+#collapsedsubjectlinkBox,
+#collapsed1LsubjectBox,
+#collapsed2LsubjectBox {
 	font-weight: bold;
 }
 
-/*
-#tagMenuPopup,
-#otherActionsButton {
-  margin: 0px;
-  padding: 0px;
-}
-*/
-/*
-#tagMenuPopup .button-box,
-#otherActionsButton .button-box {
-  -moz-margin-start: 0px;
-  -moz-margin-end: 0px;
-  -moz-padding-start: 0px;
-  -moz-padding-end: 0px;
-	border: 0px;
-}
-*/
 #collapsed1LdateBox {
   -moz-box-align: stretch;
   text-align: right;
@@ -275,3 +229,14 @@ toolbar[mode="full"] > .msgHeaderView-button > .toolbarbutton-menubutton-button
 #otherActionsTopSpacer {
   display: none;
 }
+
+toolbox[labelalign="end"] toolbar[mode="full"] .hdrArchiveButton .toolbarbutton-icon,
+toolbox[labelalign="end"] toolbar[mode="full"] .hdrJunkButton .toolbarbutton-icon {
+  display: -moz-box;
+  -moz-padding-start: 4px !important;
+}
+
+toolbar[mode="full"] .hdrJunkButton,
+toolbar[mode="full"] toolbarpaletteitem .hdrJunkButton {
+  padding-top: 3px !important;
+}
diff --git a/chrome/CompactHeader/skin/windows/osdef.css b/chrome/CompactHeader/skin/windows/osdef.css
index 270442e..37da1f1 100644
--- a/chrome/CompactHeader/skin/windows/osdef.css
+++ b/chrome/CompactHeader/skin/windows/osdef.css
@@ -41,78 +41,20 @@
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-.hdrOtherActionsButton,
-toolbar[iconsize="small"] #button-other-actions,
-#otherActionsButton {
-  list-style-image: url("chrome://CompactHeader-os/skin/other-action-small.png");
-  -moz-image-region: rect(0px 16px 16px 0px);
-}
-
-toolbar[mode="full"] > .hdrArchiveButton {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-small.png");
-  -moz-image-region: rect(0px 320px 16px 304px);
-  padding-top: 3px !important;
-  padding-bottom: 2px !important;
-}
-
-toolbar[mode="full"] > .hdrJunkButton {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-small.png");
-  -moz-image-region: rect(0px 142px 16px 130px);
-  padding-top: 3px !important;
-  padding-bottom: 2px !important;
-}
-
-#button-other-actions {
+.hdrOtherActionsButton {
   list-style-image: url("chrome://CompactHeader-os/skin/other-action.png");
-  -moz-image-region: rect(0px 24px 24px 0px);
-}
-
-.hdrTagButton {
-	list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-small.png");
-  -moz-image-region: rect(0px 256px 16px 240px);
-}
-
-
-/*
-.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);
+toolbar[iconsize="small"] .hdrOtherActionsButton {
+  list-style-image: url("chrome://CompactHeader-os/skin/other-action-small.png");
 }
 
-.cohe-button-junk {
-  -moz-image-region: rect(0px 144px 16px 128px);
+.hdrTagButton {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
+  -moz-image-region: rect(0px 384px 24px 360px);
 }
 
-.cohe-button-tag {
+toolbar[iconsize="small"] .hdrTagButton {
+  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-small.png");
   -moz-image-region: rect(0px 256px 16px 240px);
 }
-*/
\ No newline at end of file
diff --git a/defaults/preferences/prefs.js b/defaults/preferences/prefs.js
index 37336e8..1a7d094 100644
--- a/defaults/preferences/prefs.js
+++ b/defaults/preferences/prefs.js
@@ -3,20 +3,3 @@ pref("extensions.CompactHeader.headersize.linkify", false);
 
 pref("extensions.CompactHeader.headersize.addressstyle", false);
 
-pref("extensions.CompactHeader.buttons.showonlyicon", true);
-
-pref("extensions.CompactHeader.view.compact.displayReply", true);
-pref("extensions.CompactHeader.view.compact.displayForward",  true);
-pref("extensions.CompactHeader.view.compact.displayArchive", true);
-pref("extensions.CompactHeader.view.compact.displayJunk", true);
-pref("extensions.CompactHeader.view.compact.displayTrash", true);
-pref("extensions.CompactHeader.view.compact.displayOtherAction", true);
-pref("extensions.CompactHeader.view.compact.displayTag", true);
-
-pref("extensions.CompactHeader.view.expanded.displayReply", true);
-pref("extensions.CompactHeader.view.expanded.displayForward",  true);
-pref("extensions.CompactHeader.view.expanded.displayArchive", true);
-pref("extensions.CompactHeader.view.expanded.displayJunk", true);
-pref("extensions.CompactHeader.view.expanded.displayTrash", true);
-pref("extensions.CompactHeader.view.expanded.displayOtherAction", true);
-pref("extensions.CompactHeader.view.expanded.displayTag", true);

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