[Pkg-mozext-commits] [compactheader] 18/441: Prepare for Icon/Text Preferences

[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 9a2155710144fc808a58cd0add9754ae9ec6f102
Author: joachim.herb <none at none>
Date:   Tue Aug 18 22:09:33 2009 +0000

    Prepare for Icon/Text Preferences
---
 chrome/CompactHeader/content/compactHeaderOverlay.js |  5 +++--
 chrome/CompactHeader/content/preferences.js          |  5 ++++-
 chrome/CompactHeader/content/preferences.xul         | 17 ++++++++++++++++-
 chrome/CompactHeader/locale/de-DE/preferences.dtd    |  6 ++++++
 chrome/CompactHeader/locale/en-US/preferences.dtd    |  5 +++++
 defaults/preferences/prefs.js                        |  1 +
 6 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/chrome/CompactHeader/content/compactHeaderOverlay.js b/chrome/CompactHeader/content/compactHeaderOverlay.js
index 5c5fb53..30cb85f 100644
--- a/chrome/CompactHeader/content/compactHeaderOverlay.js
+++ b/chrome/CompactHeader/content/compactHeaderOverlay.js
@@ -91,7 +91,7 @@ function create2LHeaderXUL() {
 	var xul1   = document.createElement("hbox");
 	xul1.id    = "collapsedfromBox";
 	xul1.align = "start";
-	xul1.flex  = "0";
+	xul1.flex  = "100";
 
 	var xultmp   = document.createElement("mail-multi-emailHeaderField");
 	xultmp.id    = "collapsedfromValue";
@@ -107,11 +107,12 @@ function create2LHeaderXUL() {
 	xul2.pack  = "end";
 	xul2.flex  = "1";
 
+	/*
 	var xultmp   = document.createElement("hbox");
 	xultmp.flex  = "100";
 	xultmp.align = "start";
 	xul2.appendChild(xultmp, xul2);
-	
+	*/
 	var xultmp   = document.createElement("mail-multi-emailHeaderField");
 	xultmp.id    = "collapsedtoCcBccValue";
 	xultmp.flex  = "1";
diff --git a/chrome/CompactHeader/content/preferences.js b/chrome/CompactHeader/content/preferences.js
index dde35df..c573669 100644
--- a/chrome/CompactHeader/content/preferences.js
+++ b/chrome/CompactHeader/content/preferences.js
@@ -32,6 +32,8 @@ function onLoad()
 
   loadPrefCheckbox("headersize.twolineview", "checkbox.Compact.TwolineView");
   updateTwolineView(prefBranch.getBoolPref("headersize.twolineview")); 
+
+  //document.getElementById("prefIconText").value = prefBranch.getIntPref("buttons.showicontext");
   
   for(var buttonname in buttonslist) {
 	  loadPrefCheckbox("view.compact.display" + buttonname,  "checkbox.Compact." + buttonname);
@@ -56,7 +58,8 @@ function updateTwolineView(boolTwolineview) {
 function onDialogAccept()
 {
   savePrefCheckbox("headersize.twolineview", "checkbox.Compact.TwolineView");
-	
+
+  //prefBranch.setIntPref("buttons.showicontext", document.getElementById("prefIconText").value);
   for(var buttonname in buttonslist) {
 	  savePrefCheckbox("view.compact.display" + buttonname,  "checkbox.Compact." + buttonname);
 	  savePrefCheckbox("view.expanded.display" + buttonname, "checkbox.Expanded." + buttonname);
diff --git a/chrome/CompactHeader/content/preferences.xul b/chrome/CompactHeader/content/preferences.xul
index 8d146e0..97f7468 100644
--- a/chrome/CompactHeader/content/preferences.xul
+++ b/chrome/CompactHeader/content/preferences.xul
@@ -22,7 +22,22 @@
  		<checkbox id="checkbox.Compact.TwolineView" 
  							label="&checkbox.Compact.TwolineView.caption;"
  							oncommand="updateTwolineView(this.checked);"/>
-
+		<!--
+		<hbox>
+	    <vbox flex="2" align="center" pack="center">
+	 	  	<label value="&menu.IconText.caption;" control="prefIconText"/>
+	 	  </vbox>
+			<vbox flex="1">
+		    <menulist id="prefIconText">
+		      <menupopup>
+		        <menuitem value="0" label="&menu.IconText.IconText;"/>
+		        <menuitem value="1" label="&menu.IconText.Icon;"/>
+		        <menuitem value="2" label="&menu.IconText.Text;"/>
+		      </menupopup>
+		    </menulist>
+	    </vbox>
+		</hbox>
+		-->
     <grid>
     	<columns>
     		<column flex="0"/>
diff --git a/chrome/CompactHeader/locale/de-DE/preferences.dtd b/chrome/CompactHeader/locale/de-DE/preferences.dtd
index c03ffb8..e72bb64 100644
--- a/chrome/CompactHeader/locale/de-DE/preferences.dtd
+++ b/chrome/CompactHeader/locale/de-DE/preferences.dtd
@@ -7,3 +7,9 @@
 <!ENTITY checkbox.Compact.Archive.caption "Archivieren">
 <!ENTITY checkbox.Compact.Junk.caption "Junk">
 <!ENTITY checkbox.Compact.Trash.caption "Löschen">
+
+
+<!ENTITY menu.IconText.caption "Schaltflächenlayout">
+<!ENTITY menu.IconText.IconText "Icon & Text">
+<!ENTITY menu.IconText.Icon "Icon">
+<!ENTITY menu.IconText.Text "Text">
diff --git a/chrome/CompactHeader/locale/en-US/preferences.dtd b/chrome/CompactHeader/locale/en-US/preferences.dtd
index de92080..d8d88a0 100644
--- a/chrome/CompactHeader/locale/en-US/preferences.dtd
+++ b/chrome/CompactHeader/locale/en-US/preferences.dtd
@@ -7,3 +7,8 @@
 <!ENTITY checkbox.Compact.Archive.caption "Archive">
 <!ENTITY checkbox.Compact.Junk.caption "Junk">
 <!ENTITY checkbox.Compact.Trash.caption "Trash">
+
+<!ENTITY menu.IconText.caption "Button Style">
+<!ENTITY menu.IconText.IconText "Icon & Text">
+<!ENTITY menu.IconText.Icon "Icon">
+<!ENTITY menu.IconText.Text "Text">
diff --git a/defaults/preferences/prefs.js b/defaults/preferences/prefs.js
index 4628d30..3bae841 100644
--- a/defaults/preferences/prefs.js
+++ b/defaults/preferences/prefs.js
@@ -1,4 +1,5 @@
 pref("extensions.CompactHeader.headersize.twolineview", false);
+pref("extensions.CompactHeader.buttons.showicontext", 0);
 
 pref("extensions.CompactHeader.view.compact.displayReply", false);
 pref("extensions.CompactHeader.view.compact.displayForward",  false);

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