[Pkg-mozext-commits] [compactheader] 21/441: Version 0.4.0: Choose between buttons with icon and text or icon only. Cleanup of CSS
David Prévot
taffit at moszumanska.debian.org
Wed Mar 18 12:28:40 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 2a0ac7ee0d16b12a706edef00d79e6db882fb12e
Author: joachim.herb <none at none>
Date: Wed Aug 19 21:50:51 2009 +0000
Version 0.4.0:
Choose between buttons with icon and text or icon only.
Cleanup of CSS
---
.../CompactHeader/content/compactHeaderOverlay.js | 81 ++++++++++++++++++++--
chrome/CompactHeader/content/preferences.js | 5 +-
chrome/CompactHeader/content/preferences.xul | 32 +++------
chrome/CompactHeader/locale/en-US/preferences.dtd | 8 +--
defaults/preferences/prefs.js | 2 +-
install.rdf | 4 +-
6 files changed, 94 insertions(+), 38 deletions(-)
diff --git a/chrome/CompactHeader/content/compactHeaderOverlay.js b/chrome/CompactHeader/content/compactHeaderOverlay.js
index 30cb85f..fb5161b 100644
--- a/chrome/CompactHeader/content/compactHeaderOverlay.js
+++ b/chrome/CompactHeader/content/compactHeaderOverlay.js
@@ -168,6 +168,8 @@ function create2LHeaderXUL() {
myElement.appendChild(xul5, myElement);
+ document.getElementById("collapsedsubjectBox").setAttribute("twolineview", "true");
+
}
function create1LHeaderXUL() {
@@ -185,12 +187,12 @@ function create1LHeaderXUL() {
var xul4 = document.createElement("hbox");
xul4.id = "collapsedsubjectBox";
xul4.align = "start";
- xul4.flex = "1";
+ xul4.flex = "99";
xul0.appendChild(xul4, xul0);
var xultmp = document.createElement("textbox");
xultmp.id = "collapsedsubjectValue";
- xultmp.flex = "1";
+ xultmp.flex = "99";
xultmp.setAttribute("class", "collapsedHeaderValue plain");
xultmp.setAttribute("readonly", "true");
xul4.appendChild(xultmp, xul4);
@@ -242,7 +244,7 @@ function create1LHeaderXUL() {
xul3.hidden = "true";
myElement.appendChild(xul3, myElement);
-
+ document.getElementById("collapsedsubjectBox").removeAttribute("twolineview");
}
// Now, for each view the message pane can generate, we need a global table
@@ -268,12 +270,30 @@ function coheReInitializeHeaderViewTables()
gCoheCollapsedHeaderView[gCoheCollapsedHeaderList[index].name] =
new createHeaderEntry('collapsed', gCoheCollapsedHeaderList[index]);
}
+ updateHdrButtons();
+ updateHdrIconText();
}
function coheInitializeHeaderViewTables()
{
- coheReInitializeHeaderViewTables();
+/* coheReInitializeHeaderViewTables(); */
+ // iterate over each header in our header list array, create a header entry
+ // for it, and store it in our header table
+ if (prefBranch.getBoolPref("headersize.twolineview")) {
+ create2LHeaderXUL();
+ } else {
+ create1LHeaderXUL();
+ }
+
+ var tb = document.getElementById("collapsedsubjectValue");
+ gCoheCollapsedHeaderView = {};
+ var index;
+ for (index = 0; index < gCoheCollapsedHeaderList.length; index++) {
+ gCoheCollapsedHeaderView[gCoheCollapsedHeaderList[index].name] =
+ new createHeaderEntry('collapsed', gCoheCollapsedHeaderList[index]);
+ }
updateHdrButtons();
+ updateHdrIconText();
}
function coheOnLoadMsgHeaderPane()
@@ -451,9 +471,9 @@ addEventListener('messagepane-unloaded', coheOnUnloadMsgHeaderPane, true);
function updateHdrButtons() {
+ var buttonBox = document.getElementById('msgHeaderViewDeck').selectedPanel
+ .getElementsByTagName("header-view-button-box").item(0);
for(var buttonname in buttonslist) {
- var buttonBox = document.getElementById('msgHeaderViewDeck').selectedPanel
- .getElementsByTagName("header-view-button-box").item(0);
var strViewMode;
if (gCoheCollapsedHeaderViewMode)
@@ -479,6 +499,18 @@ function updateHdrButtons() {
}
}
+function updateHdrIconText() {
+ var myE1 = document.getElementById("collapsedButtonBox");
+ var myE2 = document.getElementById("expandedButtonBox");
+
+ if (prefBranch.getBoolPref("buttons.showonlyicon")) {
+ myE1.setAttribute("OnlyIcon", "Icon");
+ myE2.setAttribute("OnlyIcon", "Icon");
+ } else {
+ myE1.removeAttribute("OnlyIcon");
+ myE2.removeAttribute("OnlyIcon");
+ }
+}
var myPrefObserverView =
{
@@ -550,11 +582,46 @@ var myPrefObserverHeaderSize =
coheReInitializeHeaderViewTables();
UpdateReplyButtons();
- updateHdrButtons();
gDBView.reloadMessage();
}
}
+var myPrefObserverIconText =
+{
+ register: function()
+ {
+ // First we'll need the preference services to look for preferences.
+ var prefService = Components.classes["@mozilla.org/preferences-service;1"]
+ .getService(Components.interfaces.nsIPrefService);
+
+ // For this._branch we ask that the preferences for extensions.myextension. and children
+ this._branch = prefService.getBranch("extensions.CompactHeader.buttons.");
+
+ // Now we queue the interface called nsIPrefBranch2. This interface is described as:
+ // "nsIPrefBranch2 allows clients to observe changes to pref values."
+ this._branch.QueryInterface(Components.interfaces.nsIPrefBranch2);
+
+ // Finally add the observer.
+ this._branch.addObserver("", this, false);
+ },
+
+ unregister: function()
+ {
+ if(!this._branch) return;
+ this._branch.removeObserver("", this);
+ },
+
+ observe: function(aSubject, aTopic, aData)
+ {
+ if(aTopic != "nsPref:changed") return;
+ // aSubject is the nsIPrefBranch we're observing (after appropriate QI)
+ // aData is the name of the pref that's been changed (relative to aSubject)
+
+ updateHdrIconText();
+ }
+}
+
myPrefObserverView.register();
myPrefObserverHeaderSize.register();
+myPrefObserverIconText.register();
diff --git a/chrome/CompactHeader/content/preferences.js b/chrome/CompactHeader/content/preferences.js
index c573669..b45b564 100644
--- a/chrome/CompactHeader/content/preferences.js
+++ b/chrome/CompactHeader/content/preferences.js
@@ -33,7 +33,7 @@ function onLoad()
loadPrefCheckbox("headersize.twolineview", "checkbox.Compact.TwolineView");
updateTwolineView(prefBranch.getBoolPref("headersize.twolineview"));
- //document.getElementById("prefIconText").value = prefBranch.getIntPref("buttons.showicontext");
+ loadPrefCheckbox("buttons.showonlyicon", "checkbox.IconText");
for(var buttonname in buttonslist) {
loadPrefCheckbox("view.compact.display" + buttonname, "checkbox.Compact." + buttonname);
@@ -59,7 +59,8 @@ function onDialogAccept()
{
savePrefCheckbox("headersize.twolineview", "checkbox.Compact.TwolineView");
- //prefBranch.setIntPref("buttons.showicontext", document.getElementById("prefIconText").value);
+ 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);
diff --git a/chrome/CompactHeader/content/preferences.xul b/chrome/CompactHeader/content/preferences.xul
index 97f7468..be6d435 100644
--- a/chrome/CompactHeader/content/preferences.xul
+++ b/chrome/CompactHeader/content/preferences.xul
@@ -16,28 +16,16 @@
<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;"/>
-
- <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"/>
@@ -48,10 +36,10 @@
<row>
<label value=""/>
<hbox pack="center">
- <label value="Compact"/>
+ <label value="&groupbox.Column.Compact;"/>
</hbox>
<hbox pack="center">
- <label value="Expanded"/>
+ <label value="&groupbox.Column.Expanded;"/>
</hbox>
</row>
<row>
diff --git a/chrome/CompactHeader/locale/en-US/preferences.dtd b/chrome/CompactHeader/locale/en-US/preferences.dtd
index d8d88a0..aa41473 100644
--- a/chrome/CompactHeader/locale/en-US/preferences.dtd
+++ b/chrome/CompactHeader/locale/en-US/preferences.dtd
@@ -1,6 +1,9 @@
<!ENTITY dialog.title "Compact Header">
<!ENTITY groupbox.Buttons.caption "Select Buttons to Display">
+<!ENTITY groupbox.Column.Compact "Compact">
+<!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">
@@ -8,7 +11,4 @@
<!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">
+<!ENTITY menu.IconText.caption "Show only icons inside buttons">
diff --git a/defaults/preferences/prefs.js b/defaults/preferences/prefs.js
index 3bae841..106cbca 100644
--- a/defaults/preferences/prefs.js
+++ b/defaults/preferences/prefs.js
@@ -1,5 +1,5 @@
pref("extensions.CompactHeader.headersize.twolineview", false);
-pref("extensions.CompactHeader.buttons.showicontext", 0);
+pref("extensions.CompactHeader.buttons.showonlyicon", false);
pref("extensions.CompactHeader.view.compact.displayReply", false);
pref("extensions.CompactHeader.view.compact.displayForward", false);
diff --git a/install.rdf b/install.rdf
index ffa5903..39e14dc 100644
--- a/install.rdf
+++ b/install.rdf
@@ -6,8 +6,8 @@
<RDF:Description about="urn:mozilla:install-manifest">
<em:name>CompactHeader</em:name>
- <em:version>0.3.5</em:version>
- <em:description>Add ability to reduce header size to one line.</em:description>
+ <em:version>0.4.0</em:version>
+ <em:description>Add ability to reduce header size to one or two lines.</em:description>
<em:creator>Joachim Herb</em:creator>
<em:contributor>Zamula</em:contributor>
<em:optionsURL>chrome://CompactHeader/content/preferences.xul</em:optionsURL>
--
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