[Pkg-mozext-commits] [compactheader] 43/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 793b7d0f852dfacb9e4b3151e0a34482b2fc19c6
Author: joachim.herb <none at none>
Date:   Fri Sep 4 19:08:58 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.
---
 chrome/CompactHeader/content/preferences.xul      | 39 ++++++++++++++++++++---
 chrome/CompactHeader/locale/de-DE/preferences.dtd |  4 ---
 chrome/CompactHeader/locale/en-US/preferences.dtd |  4 ---
 defaults/preferences/prefs.js                     |  4 +++
 4 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/chrome/CompactHeader/content/preferences.xul b/chrome/CompactHeader/content/preferences.xul
index 8a20ebd..09e043e 100644
--- a/chrome/CompactHeader/content/preferences.xul
+++ b/chrome/CompactHeader/content/preferences.xul
@@ -4,7 +4,14 @@
 <?xml-stylesheet type="text/css" href="chrome://communicator/skin/"?>
 <?xml-stylesheet type="text/css" href="chrome://CompactHeader/skin/preferences.css"?>
 
-<!DOCTYPE window SYSTEM "chrome://CompactHeader/locale/preferences.dtd">
+<!DOCTYPE window [
+<!ENTITY % CompactHeaderDTD SYSTEM "chrome://CompactHeader/locale/preferences.dtd">
+%CompactHeaderDTD;
+<!ENTITY % msgHdrDTD SYSTEM "chrome://messenger/locale/msgHdrViewOverlay.dtd">
+%msgHdrDTD;
+<!ENTITY % messengerDTD SYSTEM "chrome://messenger/locale/messenger.dtd">
+%messengerDTD;
+]>
 
 <!--
   void(openDialog("chrome://CompactHeader/content/preferences.xul"))
@@ -44,7 +51,7 @@
 				</row>
     		<row>
     			<hbox pack="end">
-    			<label value="&checkbox.Compact.Reply.caption;"/>
+    			<label value="&replyButton.label;"/>
     			</hbox>
     			<hbox pack="center">
 	    		<checkbox disabled="true" id="checkbox.Compact.Reply"/>
@@ -55,7 +62,7 @@
     		</row>
     		<row>
     			<hbox align="center" pack="end">
-    			<label value="&checkbox.Compact.Forward.caption;"/>
+    			<label value="&forwardButton.label;"/>
     			</hbox>
     			<hbox pack="center">
 	    		<checkbox disabled="true" id="checkbox.Compact.Forward"/>
@@ -66,7 +73,7 @@
     		</row>
     		<row>
     			<hbox align="center" pack="end">
-    			<label value="&checkbox.Compact.Archive.caption;"/>
+    			<label value="&archiveMsgCmd.label;"/>
     			</hbox>
     			<hbox pack="center">
 	    		<checkbox disabled="true" id="checkbox.Compact.Archive"/>
@@ -77,7 +84,7 @@
     		</row>
     		<row>
     			<hbox align="center" pack="end">
-    			<label value="&checkbox.Compact.Junk.caption;"/>
+    			<label value="&junkButton.label;"/>
     			</hbox>
     			<hbox pack="center">
 	    		<checkbox disabled="true" id="checkbox.Compact.Junk"/>
@@ -97,6 +104,28 @@
   	    	<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>
diff --git a/chrome/CompactHeader/locale/de-DE/preferences.dtd b/chrome/CompactHeader/locale/de-DE/preferences.dtd
index 51aec22..a3ad2ec 100644
--- a/chrome/CompactHeader/locale/de-DE/preferences.dtd
+++ b/chrome/CompactHeader/locale/de-DE/preferences.dtd
@@ -5,10 +5,6 @@
 <!ENTITY groupbox.Column.Expanded "Erweitert">
 
 <!ENTITY checkbox.Compact.TwolineView.caption "Kompakte Headeranzeige mit zwei Zeilen">
-<!ENTITY checkbox.Compact.Reply.caption "Antworten">
-<!ENTITY checkbox.Compact.Forward.caption "Weiterleiten">
-<!ENTITY checkbox.Compact.Archive.caption "Archivieren">
-<!ENTITY checkbox.Compact.Junk.caption "Junk">
 <!ENTITY checkbox.Compact.Trash.caption "Löschen">
 
 
diff --git a/chrome/CompactHeader/locale/en-US/preferences.dtd b/chrome/CompactHeader/locale/en-US/preferences.dtd
index 463e49e..ece2970 100644
--- a/chrome/CompactHeader/locale/en-US/preferences.dtd
+++ b/chrome/CompactHeader/locale/en-US/preferences.dtd
@@ -5,10 +5,6 @@
 <!ENTITY groupbox.Column.Expanded "Expanded">
 
 <!ENTITY checkbox.Compact.TwolineView.caption "Display two lines in compact view">
-<!ENTITY checkbox.Compact.Reply.caption "Reply">
-<!ENTITY checkbox.Compact.Forward.caption "Forward">
-<!ENTITY checkbox.Compact.Archive.caption "Archive">
-<!ENTITY checkbox.Compact.Junk.caption "Junk">
 <!ENTITY checkbox.Compact.Trash.caption "Trash">
 
 <!ENTITY menu.IconText.caption "Show only icons inside buttons">
diff --git a/defaults/preferences/prefs.js b/defaults/preferences/prefs.js
index 9ae75f8..3bb0427 100644
--- a/defaults/preferences/prefs.js
+++ b/defaults/preferences/prefs.js
@@ -10,9 +10,13 @@ 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