[Pkg-mozext-commits] [compactheader] 74/441: New version 0.9.0: First version for Thunderbird 3.0pre. Should work, but no buttons in compact header mode.
David Prévot
taffit at moszumanska.debian.org
Wed Mar 18 12:28:45 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 7b36976b39e97fed6080ff8113eb064c8c5046aa
Author: joachim.herb <none at none>
Date: Tue Oct 6 21:09:00 2009 +0000
New version 0.9.0:
First version for Thunderbird 3.0pre. Should work, but no buttons in compact header mode.
---
build.xml | 56 ++-
chrome/CompactHeader/content/buttons.js | 4 +-
.../CompactHeader/content/compactHeaderOverlay.js | 473 +++------------------
.../CompactHeader/content/compactHeaderOverlay.xul | 148 ++++---
chrome/CompactHeader/content/preferences.js | 16 +-
chrome/CompactHeader/skin/global/CompactHeader.css | 82 ++--
chrome/CompactHeader/skin/windows/osdef.css | 25 +-
install.rdf | 4 +-
8 files changed, 219 insertions(+), 589 deletions(-)
diff --git a/build.xml b/build.xml
index bcace01..f12458a 100644
--- a/build.xml
+++ b/build.xml
@@ -4,30 +4,24 @@
<property name="src.dir" value="." />
<property name="dist.dir" value="../downloads/"/>
<property name="www.dir" value="../www/"/>
-
+
+ <taskdef name="xmltask" classname="com.oopsconsultancy.xmltask.ant.XmlTask"/>
+
+ <xmltask source="./install.rdf">
+ <copy path="//em:version/text()" property="app.version"/>
+ <copy path="//em:name/text()" property="app.name"/>
+ <copy path="//em:id/text()" property="app.id"/>
+ </xmltask>
+
+ <!--
<xmlproperty file="./install.rdf" prefix="installContent"/>
+
<property name="app.version" value="${installContent.RDF.RDF:Description.em:version}"/>
<property name="app.name" value="${installContent.RDF.RDF:Description.em:name}" />
<property name="app.id" value="${installContent.RDF.RDF:Description.em:id}" />
-
- <taskdef name="xmltask" classname="com.oopsconsultancy.xmltask.ant.XmlTask"/>
-
- <!--
- <property name="ff.dir" value="C:\Users\joachim\comm-central\objdir-tb-release\mozilla\dist\bin" />
- <condition property="ff.present">
- <and>
- <isset property="ff.dir" />
- <available file="${ff.dir}" type="dir" />
- </and>
- </condition>
- -->
- <!-- copy to extensions directory -->
- <!--
- <target name="test.ext" depends="chrome" if="ff.present">
- <copy file="${dist.dir}/${app.name}.jar" todir="${ff.dir}/extensions/${app.id}/chrome" overwrite="true" />
- <copy file="${src.dir}/chrome.manifest" todir="${ff.dir}/extensions/${app.id}" overwrite="true" />
- </target>
- -->
+
+ <echo message="${app.version}"/>
+ -->
<target name="dist" depends="spreadVersion">
@@ -48,19 +42,23 @@
</target>
<target name="spreadVersion">
+ <!--
<xmltask source="${www.dir}/availableVersion.xml" dest="${www.dir}/availableVersion.xml.new">
<replace path="/updates/update[1]/version" withXml="<version>${app.version}</version>"/>
</xmltask>
<move file="${www.dir}/availableVersion.xml.new" tofile="${www.dir}/availableVersion.xml"/>
-
+ -->
+
+ <xmltask source="${www.dir}/availVersion.xml" dest="${www.dir}/availVersion.xml.new">
+ <replace path="/updates/update[@server='mozdev']/@version" withText="${app.version}"/>
+ </xmltask>
+ <move file="${www.dir}/availVersion.xml.new" tofile="${www.dir}/availVersion.xml"/>
+
+ <replaceregexp file="${www.dir}/installation.html"
+ byline="true"
+ match="(.*update the version.*CompactHeader-).*(.xpi">Version ).*( of Co.*)"
+ replace="\1${app.version}\2${app.version}\3"/>
+
</target>
-
- <!--
- <target name="clean.ff" if="ff.present">
- <delete dir="${ff.dir}/extensions/${app.id}" failonerror="false" />
- <delete file="${ff.dir}/chrome/${app.name}.manifest" failonerror="false" />
- <delete file="${ff.dir}/chrome/chrome/${app.name}.jar" failonerror="false" />
- </target>
- -->
</project>
diff --git a/chrome/CompactHeader/content/buttons.js b/chrome/CompactHeader/content/buttons.js
index e723c1a..1f20f8e 100644
--- a/chrome/CompactHeader/content/buttons.js
+++ b/chrome/CompactHeader/content/buttons.js
@@ -46,8 +46,8 @@ buttonslist["Forward"] = ["hdrForwardButton"];
buttonslist["Archive"] = ["archiveButton"];
buttonslist["Junk"] = ["hdrJunkButton"];
buttonslist["Trash"] = ["hdrTrashButton"];
-buttonslist["OtherAction"] = ["otherActionsButton"];
-buttonslist["Tag"] = ["tagMenuPopup"];
+buttonslist["OtherAction"] = ["hdrOtherActionsButton"];
+buttonslist["Tag"] = ["hdrTagButton"];
var buttonicons = new Array;
buttonicons["hdrReplyButton"] = ["button-reply"];
diff --git a/chrome/CompactHeader/content/compactHeaderOverlay.js b/chrome/CompactHeader/content/compactHeaderOverlay.js
index e158bd4..fb0b011 100644
--- a/chrome/CompactHeader/content/compactHeaderOverlay.js
+++ b/chrome/CompactHeader/content/compactHeaderOverlay.js
@@ -60,20 +60,21 @@ var gCoheBuiltCollapsedView = false;
* The collapsed view: very lightweight. We only show a couple of fields. See
* msgHdrViewOverlay.js for details of the field definition semantics.
*/
-var gCoheCollapsedHeaderListLongAddresses = [
+var gCoheCollapsedHeader1LListLongAddresses = [
{name:"subject"},
{name:"from", useToggle:true, outputFunction:OutputEmailAddresses},
{name:"toCcBcc", useToggle:true, outputFunction: OutputEmailAddresses},
{name:"date", outputFunction:coheUpdateDateValue}
];
-var gCoheCollapsedHeaderListShortAddresses = [
+var gCoheCollapsedHeader2LListLongAddresses = [
{name:"subject"},
- {name:"from", useToggle:true, useShortView:true, outputFunction:OutputEmailAddresses},
- {name:"toCcBcc", useToggle:true, useShortView:true, outputFunction: OutputEmailAddresses},
+ {name:"from", useToggle:true, outputFunction:OutputEmailAddresses},
+ {name:"toCcBcc", useToggle:true, outputFunction: OutputEmailAddresses},
{name:"date", outputFunction:coheUpdateDateValue}
];
-
+
+
var prefBranch = Components.classes["@mozilla.org/preferences-service;1"]
.getService(Components.interfaces.nsIPrefService)
.getBranch("extensions.CompactHeader.");
@@ -81,268 +82,14 @@ var prefBranch = Components.classes["@mozilla.org/preferences-service;1"]
var coheIntegrateRSSLinkify = false;
var RSSLinkify = {
- oldSubject: null,
- newSubject: null
+ oldSubject1L: null,
+ newSubject1L: null,
+ oldSubject2L: null,
+ newSubject2L: null
};
var coheFirstTime = true;
-function cleanupHeaderXUL(){
- var xularray = ["collapsedfromOutBox", "collapsedtoCcBccOutBox",
- "collapsedButtonBox", "collapsedsubjectOutBox",
- "collapseddateOutBox", "coheBaselineBox"];
-
- /* rescue otheraction and tagpopup */
- moveMenusToButtonBox(false);
- for (var i=0; i<xularray.length; i++) {
- var x = document.getElementById(xularray[i]);
- if (x != null) {
- x.parentNode.removeChild(x);
- }
- }
-}
-
-function create2LHeaderXUL() {
- cleanupHeaderXUL();
-
- var myElement = document.getElementById("collapsedHeaderViewFirstLine");
-
- var xul1 = document.createElement("hbox");
- xul1.id = "collapsedfromOutBox";
- xul1.align = "start";
- xul1.flex = "0";
- myElement.appendChild(xul1,myElement);
-
- var xultmp1 = document.createElement("grid");
- xultmp1.flex = "1";
- xul1.appendChild(xultmp1,xul1);
-
- var xultmp2 = document.createElement("columns");
- xultmp1.appendChild(xultmp2,xultmp1);
-
- var xultmp3 = document.createElement("column");
- xultmp3.flex = "0";
- xultmp2.appendChild(xultmp3,xultmp2);
-
- var xultmp2 = document.createElement("rows");
- xultmp1.appendChild(xultmp2,xultmp1);
-
- var xultmp3 = document.createElement("row");
- xultmp3.id = "collapsedfromRow";
- xultmp2.appendChild(xultmp3,xultmp2);
-
- var xultmp4 = document.createElement("mail-multi-emailHeaderField");
- xultmp4.id = "collapsedfromBox";
- xultmp4.flex = "0";
- xultmp3.appendChild(xultmp4,xultmp3);
-
- var xultmp1 = document.createElement("grid");
- xultmp1.id = "collapsedtoCcBccOutBox";
- xultmp1.flex = "1";
- myElement.appendChild(xultmp1,myElement);
-
- var xultmp2 = document.createElement("columns");
- xultmp1.appendChild(xultmp2,xultmp1);
-
- var xultmp3 = document.createElement("column");
- xultmp3.flex = "0";
- xultmp2.appendChild(xultmp3,xultmp2);
-
- var xultmp3 = document.createElement("column");
- xultmp3.flex = "1";
- xultmp2.appendChild(xultmp3,xultmp2);
-
- var xultmp2 = document.createElement("rows");
- xultmp1.appendChild(xultmp2,xultmp1);
-
- var xultmp3 = document.createElement("row");
- xultmp3.id = "collapsedtoCcBccRow";
- xultmp3.align = "baseline";
- xultmp2.appendChild(xultmp3,xultmp2);
-
- var xultmp4 = document.createElement("label");
- xultmp4.id = "collapsedtoCcBccLabel";
- xultmp4.setAttribute("class","headerName");
- xultmp4.setAttribute("value","to");
- xultmp4.setAttribute("control","collapsedtoCcBccBox");
- xultmp3.appendChild(xultmp4,xultmp3);
-
- var xultmp4 = document.createElement("mail-multi-emailHeaderField");
- xultmp4.id = "collapsedtoCcBccBox";
- xultmp4.flex = "1";
- xultmp3.appendChild(xultmp4,xultmp3);
-
- var xultmp1 = document.createElement("header-view-button-box");
- xultmp1.id = "collapsedButtonBox";
- xultmp1.flex = "0";
- xultmp1.align = "start";
- myElement.appendChild(xultmp1,myElement);
-
-
- var myElement = document.getElementById("collapsedHeaderViewSecondLine");
-
- var xul1 = document.createElement("hbox");
- xul1.id = "collapsedsubjectOutBox";
- xul1.align = "start";
- xul1.flex = "99";
- myElement.appendChild(xul1,myElement);
-
- var xultmp2 = document.createElement("row");
- xultmp2.id = "collapsedsubjectRow";
- xultmp2.flex = "99";
- xul1.appendChild(xultmp2,xul1);
-
- var xultmp3 = document.createElement("mail-headerfield");
- xultmp3.id = "collapsedsubjectBox";
- xultmp3.flex = "99";
- xultmp2.appendChild(xultmp3,xultmp2);
-
- var xul1 = document.createElement("hbox");
- xul1.id = "collapseddateOutBox";
- xul1.align = "end";
- xul1.flex = "0";
- myElement.appendChild(xul1,myElement);
-
- var xultmp2 = document.createElement("row");
- xultmp2.id = "collapseddateRow";
- xultmp2.align = "end";
- xultmp2.pack = "end";
- xul1.appendChild(xultmp2,xul1);
-
- var xultmp3 = document.createElement("label");
- xultmp3.id = "collapseddateBox";
- xultmp3.flex = "1";
- xultmp3.setAttribute("class","dateLabel");
- xultmp2.appendChild(xultmp3,xultmp2);
-
- document.getElementById("collapsedHeaderView").setAttribute("twolineview", "true");
-}
-
-function create1LHeaderXUL() {
- cleanupHeaderXUL();
-
- var myElement = document.getElementById("collapsedHeaderViewFirstLine");
-
- var xul1 = document.createElement("hbox");
- xul1.id = "collapsedsubjectOutBox";
- xul1.align = "start";
- xul1.flex = "99";
- myElement.appendChild(xul1,myElement);
-
- var xultmp2 = document.createElement("row");
- xultmp2.id = "collapsedsubjectRow";
- xultmp2.flex = "99";
- xul1.appendChild(xultmp2,xul1);
-
- var xultmp3 = document.createElement("mail-headerfield");
- xultmp3.id = "collapsedsubjectBox";
- xultmp3.flex = "99";
- xultmp2.appendChild(xultmp3,xultmp2);
-
- var xul1 = document.createElement("hbox");
- xul1.id = "collapsedfromOutBox";
- xul1.align = "start";
- xul1.flex = "0";
- myElement.appendChild(xul1,myElement);
-
- var xultmp1 = document.createElement("grid");
- xultmp1.flex = "1";
- xul1.appendChild(xultmp1,xul1);
-
- var xultmp2 = document.createElement("columns");
- xultmp1.appendChild(xultmp2,xultmp1);
-
- var xultmp3 = document.createElement("column");
- xultmp3.flex = "0";
- xultmp2.appendChild(xultmp3,xultmp2);
-
- var xultmp2 = document.createElement("rows");
- xultmp1.appendChild(xultmp2,xultmp1);
-
- var xultmp3 = document.createElement("row");
- xultmp3.id = "collapsedfromRow";
- xultmp2.appendChild(xultmp3,xultmp2);
-
- var xultmp4 = document.createElement("mail-multi-emailHeaderField");
- xultmp4.id = "collapsedfromBox";
- xultmp4.flex = "0";
- xultmp3.appendChild(xultmp4,xultmp3);
-
- var xultmp1 = document.createElement("grid");
- xultmp1.id = "collapsedtoCcBccOutBox";
- xultmp1.flex = "1";
- myElement.appendChild(xultmp1,myElement);
-
- var xultmp2 = document.createElement("rows");
- xultmp1.appendChild(xultmp2,xultmp1);
-
- var xultmp3 = document.createElement("row");
- xultmp3.id = "collapsedtoCcBccRow";
- xultmp3.align = "baseline";
- xultmp2.appendChild(xultmp3,xultmp2);
-
- var xultmp4 = document.createElement("mail-multi-emailHeaderField");
- xultmp4.id = "collapsedtoCcBccBox";
- xultmp4.flex = "1";
- xultmp4.hidden = "true";
- xultmp3.appendChild(xultmp4,xultmp3);
-
- var xul1 = document.createElement("hbox");
- xul1.id = "collapseddateOutBox";
- xul1.align = "end";
- xul1.flex = "0";
- myElement.appendChild(xul1,myElement);
-
- var xultmp2 = document.createElement("row");
- xultmp2.id = "collapseddateRow";
-// xultmp2.align = "start";
- xultmp2.align = "baseline";
- xultmp2.pack = "end";
- xul1.appendChild(xultmp2,xul1);
-
- var xultmp3 = document.createElement("label");
- xultmp3.id = "collapseddateBox";
- xultmp3.flex = "1";
- xultmp3.setAttribute("class","dateLabel");
- xultmp2.appendChild(xultmp3,xultmp2);
-
- var xul3 = document.createElement("header-view-button-box");
- xul3.id = "collapsedButtonBox";
- xul3.flex = "0";
- xul3.align = "start";
- xul3.hidden = "true";
-
- myElement.appendChild(xul3, myElement);
-
- document.getElementById("collapsedHeaderView").removeAttribute("twolineview");
-}
-
-/*
-function createExpandedHeaderXUL() {
- return;
-
- var myElement = document.getElementById("expandedHeaderView");
-
- var xul0 = document.createElement("vbox");
- xul0.id = "expandedHeadersBox";
- xul0.flex = "1";
- xul0.setAttribute("insertafter", "hideDetailsButtonBox");
-
- myElement.appendChild(xul0, myElement);
- //myElement.insertBefore(xul0, "expandedHeadersTopBox")
-
- var newParent = document.getElementById("expandedHeadersBox");
- if (newParent != null) {
- var myElement = document.getElementById("expandedHeadersTopBox");
- newParent.appendChild(myElement);
- myElement = document.getElementById("expandedHeadersBottomBox");
- newParent.appendChild(myElement);
- } else {
- alert ("null");
- }
-}
-*/
-
// Now, for each view the message pane can generate, we need a global table
// of headerEntries. These header entry objects are generated dynamically
// based on the static data in the header lists (see above) and elements
@@ -352,40 +99,22 @@ var gCoheCollapsedHeaderView = {};
function coheInitializeHeaderViewTables()
{
-/* 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();
- }
- //document.getElementById("collapsedHeaderView").removeAttribute("twolineview");
-
- //var tb = document.getElementById("collapsedsubjectValue");
gCoheCollapsedHeaderView = {};
var index;
- for (index = 0; index < gCoheCollapsedHeaderListLongAddresses.length; index++) {
- gCoheCollapsedHeaderView[gCoheCollapsedHeaderListLongAddresses[index].name] =
- new createHeaderEntry('collapsed', gCoheCollapsedHeaderListLongAddresses[index]);
+ if (prefBranch.getBoolPref("headersize.twolineview")) {
+ for (index = 0; index < gCoheCollapsedHeader2LListLongAddresses.length; index++) {
+ gCoheCollapsedHeaderView[gCoheCollapsedHeader2LListLongAddresses[index].name] =
+ new createHeaderEntry('collapsed2L', gCoheCollapsedHeader2LListLongAddresses[index]);
+ }
+ } else {
+ for (index = 0; index < gCoheCollapsedHeader1LListLongAddresses.length; index++) {
+ gCoheCollapsedHeaderView[gCoheCollapsedHeader1LListLongAddresses[index].name] =
+ new createHeaderEntry('collapsed1L', gCoheCollapsedHeader1LListLongAddresses[index]);
+ }
}
- /*
- if (prefBranch.getBoolPref("headersize.addressstyle") != 1) {
- for (index = 0; index < gCoheCollapsedHeaderListLongAddresses.length; index++) {
- gCoheCollapsedHeaderView[gCoheCollapsedHeaderListLongAddresses[index].name] =
- new createHeaderEntry('collapsed', gCoheCollapsedHeaderListLongAddresses[index]);
- }
- } else {
- for (index = 0; index < gCoheCollapsedHeaderListShortAddresses.length; index++) {
- gCoheCollapsedHeaderView[gCoheCollapsedHeaderListShortAddresses[index].name] =
- new createHeaderEntry('collapsed', gCoheCollapsedHeaderListShortAddresses[index]);
- }
- }
- */
-
- if (prefBranch.getBoolPref("headersize.linkify")) {
+ if (prefBranch.getBoolPref("headersize.linkify")) {
RSSLinkify.newSubject = document.createElement("label");
RSSLinkify.newSubject.setAttribute("id", "collapsedsubjectlinkBox");
RSSLinkify.newSubject.setAttribute("class", "headerValue plain headerValueUrl");
@@ -395,14 +124,18 @@ function coheInitializeHeaderViewTables()
RSSLinkify.newSubject.setAttribute("readonly", "true");
RSSLinkify.newSubject.setAttribute("appendoriginalclass", "true");
RSSLinkify.newSubject.setAttribute("flex", "1");
- RSSLinkify.oldSubject = document.getElementById("collapsedsubjectBox");
- RSSLinkify.oldSubject.parentNode.insertBefore(RSSLinkify.newSubject, RSSLinkify.oldSubject);
+ if (prefBranch.getBoolPref("headersize.twolineview")) {
+ RSSLinkify.oldSubject = document.getElementById("collapsed2LsubjectBox");
+ } else {
+ RSSLinkify.oldSubject = document.getElementById("collapsed1LsubjectBox");
+ }
+ RSSLinkify.oldSubject.parentNode.insertBefore(RSSLinkify.newSubject, RSSLinkify.oldSubject);
}
// moveMenusToButtonBox(gCoheCollapsedHeaderViewMode);
- updateHdrButtons();
- updateHdrIconText();
+ //updateHdrButtons(); XXX
+ //updateHdrIconText(); XXX
}
@@ -430,6 +163,14 @@ function coheOnLoadMsgHeaderPane()
else
document.getElementById('collapsedHeaderView').collapsed = true;
+ if (prefBranch.getBoolPref("headersize.twolineview")) {
+ document.getElementById('collapsed1LHeadersBox').collapsed = true;
+ document.getElementById('collapsed2LHeadersBox').collapsed = false;
+ } else {
+ document.getElementById('collapsed1LHeadersBox').collapsed = false;
+ document.getElementById('collapsed2LHeadersBox').collapsed = true;
+ }
+
if (coheFirstTime)
{
gMessageListeners.push(coheMessageListener);
@@ -512,7 +253,7 @@ function coheUpdateHeaderView()
var url = currentHeaderData["content-base"];
if(url) {
RSSLinkify.newSubject.setAttribute("onclick", "if (!event.button) messenger.launchExternalURL('" +
- url.headerValue + "');");
+ url.headerValue + "');");
RSSLinkify.newSubject.setAttribute("value", currentHeaderData["subject"].headerValue);
RSSLinkify.newSubject.setAttribute("url", url.headerValue);
RSSLinkify.newSubject.setAttribute("collapsed", "false");
@@ -527,8 +268,8 @@ function coheUpdateHeaderView()
}
UpdateJunkButton();
- updateMyReplyButtons();
- updateHdrButtons();
+ //updateMyReplyButtons(); XXX
+ //updateHdrButtons(); XXX
}
@@ -540,17 +281,19 @@ function moveMenusToButtonBox(viewMode) {
else
target = "expandedButtonBox";
- //target = "otherActionsBox";
+ target = "hdrOtherActionsButton";
- var newParent = document.getElementById(target).boxObject.firstChild;
+ //var newParent = document.getElementById(target).boxObject.firstChild;
+ var newParent = document.getElementById(target);
if (newParent != null) {
var myElement;
- myElement = document.getElementById("tagMenuPopup");
- newParent.appendChild(myElement);
- myElement= document.getElementById("otherActionsButton");
+ //myElement = document.getElementById("tagMenuPopup");
+ //newParent.appendChild(myElement);
+ myElement= document.getElementById("otherActionsPopup");
newParent.appendChild(myElement);
+ //alert("test2")
} else {
- //alert ("null");
+ //alert ("null"); /* XXX */
}
}
@@ -572,8 +315,8 @@ function coheToggleHeaderView ()
ClearHeaderView(gExpandedHeaderView);
UpdateExpandedMessageHeaders();
gDBView.reloadMessage();
- updateMyReplyButtons();
- updateHdrButtons();
+ //updateMyReplyButtons(); XXX
+ //updateHdrButtons(); XXX
}
moveMenusToButtonBox(gCoheCollapsedHeaderViewMode);
@@ -607,8 +350,11 @@ function coheUpdateHeaderValueInTextNode(headerEntry, headerValue)
function coheUpdateDateValue(headerEntry, headerValue) {
//var t = currentHeaderData.date.headerValue;
- var d = document.getElementById("collapseddateBox");
+ var d
+ d = document.getElementById("collapsed1LdateBox");
d.textContent = headerValue;
+ d = document.getElementById("collapsed2LdateBox");
+ d.textContent = headerValue;
}
@@ -820,42 +566,6 @@ function selectEmailDisplayed() {
}
}
-var myPrefObserverView =
-{
- 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.view.");
-
- // 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)
-
- updateMyReplyButtons();
- updateHdrButtons();
- }
-}
-
var myPrefObserverHeaderSize =
{
register: function()
@@ -892,82 +602,11 @@ var myPrefObserverHeaderSize =
var headerViewElement = document.getElementById("msgHeaderView");
headerViewElement.dispatchEvent(event);
- updateMyReplyButtons();
- /*updateHdrButtons();*/
+ //updateMyReplyButtons(); XXX
+ ///*updateHdrButtons();*/ XXX
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();
-
-/*
-function CoHe_customizeToolbar(aWhich) {
-
- // feststellen, welche Toolbar konfiguriert werden soll
- var elem = aWhich;
- while(elem.tagName != "popup") {
- elem = elem.parentNode;
- }
- var tbar = document.getElementById("HeaderPaneToolbar");
- var toolbox = document.getElementById(tbar.parentNode.id);
-
- toolbox.customizeDone = CoHe_customizeToolbarDone;
- document.getElementById('CoHe-customize-mitem').setAttribute("disabled", "true");
-
- // l�st Reaktion auf �nderungen der Icongr��e/Symbolanzeige im Anpassen-Dialog aus
- CoHeInterval = window.setInterval("CoHe_adjustToolboxWidth(true)", 100);
-
- openDialog("chrome://global/content/customizeToolbar.xul", "CustomizeToolbar", "chrome,all,dependent", toolbox);
-}
-*/
-
-/*
- Schlie�t die Symbolleisten-Konfiguration ab
- => Aufruf durch CoHe_customizeToolbar()
-*/
-/*
-function CoHe_customizeToolbarDone(aToolboxChanged) {
- if(document.getElementById('CoHe-customize-mitem'))
- document.getElementById('CoHe-customize-mitem').removeAttribute("disabled");
-
- window.focus();
-}
-*/
\ No newline at end of file
diff --git a/chrome/CompactHeader/content/compactHeaderOverlay.xul b/chrome/CompactHeader/content/compactHeaderOverlay.xul
index af73b93..2b844e1 100644
--- a/chrome/CompactHeader/content/compactHeaderOverlay.xul
+++ b/chrome/CompactHeader/content/compactHeaderOverlay.xul
@@ -48,21 +48,6 @@
<deck id="msgHeaderViewDeck">
- <toolbarbox id="hiddenIconSpaceBox">
- <toolbar id="hiddenIconSpace" mode="icon" iconsize="small">
- <observes element="changeIconSize" attribute="iconsize" onbroadcast="alert('test');"/>
- <toolbarbutton id="button-reply" class="toolbarbutton-1" hidden="true"/>
- <toolbarbutton id="button-replyall" class="toolbarbutton-1" hidden="true"/>
- <toolbarbutton id="button-replylist" class="toolbarbutton-1" hidden="true"/>
- <toolbarbutton id="button-forward" class="toolbarbutton-1" hidden="true"/>
- <toolbarbutton id="button-archive" class="toolbarbutton-1" hidden="true"/>
- <toolbarbutton id="button-isJunk" class="toolbarbutton-1 junk-button" hidden="true"/>
- <toolbarbutton id="button-mark-deleted" class="toolbarbutton-1 delete-button" hidden="true"/>
- <toolbarbutton id="button-tag" class="toolbarbutton-1" hidden="true"/>
- <toolbarbutton id="button-other-actions" class="toolbarbutton-1" hidden="true"/>
- </toolbar>
- </toolbarbox>
-
<vbox id="expandedHeaderView" orient="horizontal">
<vbox id="hideDetailsButtonBox" insertbefore="expandedHeadersBox">
<button id="hideDetailsButton"
@@ -121,11 +106,44 @@
<vbox id="expandedHeadersBox">
+ <hbox id="expandedHeadersTopBox" flex="1">
+ <toolbox id="header-view-toolbox">
+ <toolbarpalette id="header-view-toolbar-palette">
+ <toolbarbutton id="hdrOtherActionsButton"
+ insertafter="hdrReplyButton,hdrReplyAllButton,hdrReplyListButton,hdrForwardButton,hdrArchiveButton,hdrJunkButton,hdrTrashButton,hdrTagButton"
+ label="&otherActionsButton.label;"
+ tooltiptext="&otherActionsButton.label;"
+ class="msgHeaderView-button hdrOtherActionsButton"
+ type="menu"/>
+ <toolbarbutton id="hdrTagButton"
+ insertafter="hdrReplyButton,hdrReplyAllButton,hdrReplyListButton,hdrForwardButton,hdrArchiveButton,hdrJunkButton,hdrTrashButton,hdrTagButton"
+ type="menu"
+ label="&tagButton.label;"
+ class="msgHeaderView-button hdrTagButton">
+ <menupopup id="tagMenuPopup-tagpopup" onpopupshowing="InitMessageTags(this)">
+ <menuitem id="tagMenuPopup-tagRemoveAll" oncommand="RemoveAllMessageTags();"/>
+ <menuseparator id="tagMenuPopupAfterRemoveSeparator"/>
+ <menuseparator id="tagMenuPopupBeforeAddSeparator"/>
+ <menuitem id="PopupaddNewTag" label="&addNewTag.label;" accesskey="&addNewTag.accesskey;"
+ oncommand="AddTag();"/>
+ </menupopup>
+ </toolbarbutton>
+ </toolbarpalette>
+<!--
+ <toolbar id="header-view-toolbar" align="start" customizable="true"
+ mode="full" context="header-toolbar-context-menu"
+ defaultset="hdrReplyButton,hdrReplyAllButton,hdrReplyListButton,hdrForwardButton,hdrArchiveButton,hdrJunkButton,hdrTrashButton,hdrTagButton,hdrOtherActionsButton">
+ </toolbar>
+-->
+ </toolbox>
+ </hbox>
+
+
<hbox id="expandedHeadersBottomBox">
<vbox id="otherActionsBox" flex="0">
<hbox id="dateValueBox" flex="0"/>
- <button type="menu" id="otherActionsButton"
+ <button type="menu" id="otherActionsButton" collapsed="true"
label="&otherActionsButton.label;"
class="msgHeaderView-button msgHeaderView-flat-button">
<menupopup id="otherActionsPopup" onpopupshowing="InitMessageMark()">
@@ -161,6 +179,7 @@
oncommand="openDialog('chrome://CompactHeader/content/preferences.xul', 'prefs', 'chrome,resizable=no');"/>
</menupopup>
</button>
+<!--
<button type="menu" id="tagMenuPopup"
label="&tagMenu.label;"
class="msgHeaderView-button msgHeaderView-flat-button">
@@ -172,6 +191,7 @@
oncommand="AddTag();"/>
</menupopup>
</button>
+-->
</vbox>
</hbox>
@@ -188,101 +208,89 @@
onclick="coheToggleHeaderView();"
class="msgHeaderView-button msgHeaderView-flat-button"/>
</vbox>
- <vbox id="collapsedHeadersBox" flex="1">
- <hbox id="collapsedHeaderViewFirstLine" flex="0">
-<!--
- <hbox id="collapsedsubjectOutBox" align="start" flex="99">
- <row id="collapsedsubjectRow" flex="99">
- <mail-headerfield id="collapsedsubjectBox" flex="99"/>
+ <vbox id="collapsed1LHeadersBox" flex="1" collapsed="false">
+ <hbox id="collapsed1LHeaderViewFirstLine" flex="0">
+ <hbox id="collapsed1LsubjectOutBox" align="start" flex="99">
+ <row id="collapsed1LsubjectRow" flex="99">
+ <mail-headerfield id="collapsed1LsubjectBox" flex="99"/>
</row>
</hbox>
- <hbox id="collapsedfromOutBox" align="start" flex="0">
+ <hbox id="collapsed1LfromOutBox" align="start" flex="0">
<grid flex="1">
<columns>
<column flex="0"/>
</columns>
<rows>
- <row id="collapsedfromRow">
- <mail-multi-emailHeaderField id="collapsedfromBox" flex="0"/>
+ <row id="collapsed1LfromRow">
+ <mail-multi-emailHeaderField id="collapsed1LfromBox" flex="0"/>
</row>
</rows>
</grid>
</hbox>
- <grid id="collapsedtoCcBccOutBox" flex="1" hidden="true">
- <row id="collapsedtoCcBccRow" align="baseline">
- <mail-multi-emailHeaderField id="collapsedtoCcBccBox" flex="1"/>
+ <grid id="collapsed1LtoCcBccOutBox" flex="1" hidden="true">
+ <row id="collapsed1LtoCcBccRow" align="baseline">
+ <mail-multi-emailHeaderField id="collapsed1LtoCcBccBox" flex="1"/>
</row>
</grid>
- <hbox id="collapseddateOutBox" align="start" pack="end" flex="0">
- <row id="collapseddateRow">
- <label id="collapseddateBox" class="dateLabel" flex="1"/>
+ <hbox id="collapsed1LdateOutBox" align="start" pack="end" flex="0">
+ <row id="collapsed1LdateRow">
+ <label id="collapsed1LdateBox" class="dateLabel" flex="1"/>
</row>
</hbox>
- <header-view-button-box id="collapsedButtonBox" flex="0" align="start" hidden="true"/>
- -->
+ <header-view-button-box id="collapsed1LButtonBox" flex="0" align="start" hidden="true"/>
</hbox>
- <hbox id="collapsedHeaderViewSecondLine" align="start" flex="1">
-<!--
- <hbox id="collapsedsubjectOutBox" align="start" flex="99">
- <row id="collapsedsubjectRow" flex="99">
- <mail-headerfield id="collapsedsubjectBox" flex="99"/>
- </row>
- </hbox>
- <hbox id="collapseddateOutBox" align="end" pack="end" flex="0">
- <row id="collapseddateRow" align="end" pack="end">
- <label id="collapseddateBox" class="dateLabel" flex="1"/>
- </row>
- </hbox>
--->
+ <hbox id="collapsed1LHeaderViewSecondLine" align="start" flex="1" collapsed="true">
</hbox>
</vbox>
- </vbox>
- </deck>
-
-</overlay>
-
-<!--
- <vbox id="collapsedHeadersBox" flex="1">
- <hbox id="collapsedHeaderViewFirstLine" flex="0">
- <hbox id="collapsedfromOutBox" align="start" flex="0">
+ <vbox id="collapsed2LHeadersBox" flex="1" collapsed="true">
+ <hbox id="collapsed2LHeaderViewFirstLine" flex="0">
+ <hbox id="collapsed2LfromOutBox" align="start" flex="0">
<grid flex="1">
<columns>
<column flex="0"/>
</columns>
<rows>
- <row id="collapsedfromRow">
- <mail-multi-emailHeaderField id="collapsedfromBox" flex="0"/>
+ <row id="collapsed2LfromRow">
+ <mail-multi-emailHeaderField id="collapsed2LfromBox" flex="0"/>
</row>
</rows>
</grid>
</hbox>
- <grid id="collapsedtoCcBccOutBox" flex="1">
+ <grid id="collapsed2LtoCcBccOutBox" flex="1">
<columns>
<column flex="0"/>
<column flex="1"/>
</columns>
<rows>
- <row id="collapsedtoCcBccRow" align="baseline">
- <label id="collapsedtoCcBccLabel" class="headerName"
- value="&toField2.label;" control="collapsedtoCcBccBox"/>
- <mail-multi-emailHeaderField id="collapsedtoCcBccBox" flex="1"/>
+ <row id="collapsed2LtoCcBccRow" align="baseline">
+ <label id="collapsed2LtoCcBccLabel" class="headerName"
+ value="&toField2.label;" control="collapsed2LtoCcBccBox"/>
+ <mail-multi-emailHeaderField id="collapsed2LtoCcBccBox" flex="1"/>
</row>
</rows>
</grid>
- <header-view-button-box id="collapsedButtonBox" flex="0" align="start"/>
+ <header-view-button-box id="collapsed2LButtonBox" flex="0" align="start"/>
</hbox>
- <hbox id="collapsedHeaderViewSecondLine" align="start" flex="1">
- <hbox id="collapsedsubjectOutBox" align="start" flex="99">
- <row id="collapsedsubjectRow" flex="99">
- <mail-headerfield id="collapsedsubjectBox" flex="99"/>
+ <hbox id="collapsed2LHeaderViewSecondLine" align="start" flex="1">
+ <hbox id="collapsed2LsubjectOutBox" align="start" flex="99">
+ <row id="collapsed2LsubjectRow" flex="99">
+ <mail-headerfield id="collapsed2LsubjectBox" flex="99"/>
</row>
</hbox>
- <hbox id="collapseddateOutBox" align="end" pack="end" flex="0">
- <row id="collapseddateRow" align="end" pack="end">
- <label id="collapseddateBox" class="dateLabel" flex="1"/>
+ <hbox id="collapsed2LdateOutBox" align="end" pack="end" flex="0">
+ <row id="collapsed2LdateRow" align="end" pack="end">
+ <label id="collapsed2LdateBox" class="dateLabel" flex="1"/>
</row>
</hbox>
</hbox>
</vbox>
+
+ </vbox>
+
+ </deck>
+
+</overlay>
+
+<!--
-->
\ No newline at end of file
diff --git a/chrome/CompactHeader/content/preferences.js b/chrome/CompactHeader/content/preferences.js
index dc6281d..c00da6a 100644
--- a/chrome/CompactHeader/content/preferences.js
+++ b/chrome/CompactHeader/content/preferences.js
@@ -27,13 +27,10 @@ var gXMLHttpRequest;
function CoheCheckForUpdates() {
gXMLHttpRequest = new XMLHttpRequest();
gXMLHttpRequest.onload = updateCohe;
- gXMLHttpRequest.open("GET", "http://compactheader.mozdev.org/availableVersion.xml",true);
+ gXMLHttpRequest.open("GET", "http://compactheader.mozdev.org/availVersion.xml",true);
gXMLHttpRequest.send(null);
- setTimeout(loadCoheStatus, 60000);
}
-setTimeout(loadCoheStatus, 1000);
-
function updateCohe()
{
var updateAMO = false;
@@ -49,15 +46,8 @@ function updateCohe()
for (var i = 0; i < updates.length; i++) {
var strServer, strVersion;
var update = updates[i];
- for (var j = 0; j < update.childNodes.length; j++) {
- with (update.childNodes[j]){
- if (nodeName == "server") {
- strServer = firstChild.nodeValue;
- } else if (nodeName == "version") {
- strVersion = firstChild.nodeValue;
- }
- }
- }
+ strServer = update.getAttribute("server");
+ strVersion = update.getAttribute("version");
var x = Components.classes["@mozilla.org/xpcom/version-comparator;1"]
.getService(Components.interfaces.nsIVersionComparator)
.compare(strVersion, strCoheVersion);
diff --git a/chrome/CompactHeader/skin/global/CompactHeader.css b/chrome/CompactHeader/skin/global/CompactHeader.css
index fae16e1..6d204e0 100644
--- a/chrome/CompactHeader/skin/global/CompactHeader.css
+++ b/chrome/CompactHeader/skin/global/CompactHeader.css
@@ -56,7 +56,15 @@
}
*/
-#collapsedtoCcBccLabel {
+toolbar[mode="full"] > .msgHeaderView-button,
+toolbar[mode="full"] > .msgHeaderView-button > .toolbarbutton-menubutton-button
+{
+ -moz-box-orient: horizontal !important;
+}
+
+
+
+#collapsed1LtoCcBccLabel {
-moz-padding-start: 2px;
-moz-padding-end: 1px;
}
@@ -67,8 +75,8 @@
max-height: 30em;
}
-#collapsedHeaderRows > row,
-#collapsedHeader2Rows > row {
+#collapsed1LHeaderRows > row,
+#collapsed1LHeader2Rows > row {
/* Ensure that the header names and values are aligned with each other. */
-moz-box-align: baseline;
}
@@ -79,20 +87,20 @@
-moz-box-align: end;
}
-#collapsedHeaderViewFirstLine {
+#collapsed1LHeaderViewFirstLine {
-moz-box-align: baseline;
}
-#collapsedHeaderView[twolineview="true"] #collapsedHeaderViewFirstLine {
+#collapsed2LHeaderViewFirstLine {
-moz-box-align: start;
}
-#collapsedsubjectBox > .headerValue {
+#collapsed1LsubjectBox > .headerValue {
font-weight: bold;
}
#expandedButtonBox .button-menubutton-button,
-#collapsedButtonBox .button-menubutton-button {
+#collapsed1LButtonBox .button-menubutton-button {
background-color: transparent;
border: transparent;
}
@@ -103,11 +111,11 @@
margin: 0px;
}
-#collapsedtoCcBccBox .headerNameBox,
-#collapsedfromBox .headerNameBox {
+#collapsed1LtoCcBccBox .headerNameBox,
+#collapsed1LfromBox .headerNameBox {
display: none;
}
-#collapsedfromBox > .headerNameBox {
+#collapsed1LfromBox > .headerNameBox {
display: none;
}
@@ -146,7 +154,7 @@
text-align: left;
}
-#collapsedsubjectBox {
+#collapsed1LsubjectBox {
font-weight: bold;
}
@@ -167,7 +175,7 @@
border: 0px;
}
*/
-#collapseddateBox {
+#collapsed1LdateBox {
-moz-box-align: stretch;
text-align: right;
-moz-padding-end: 0.5em;
@@ -220,10 +228,10 @@
}
#expandedfromBox,
-#collapsedtoCcBccRow,
-#collapsedsubjectOutBox, #collapsedfromOutBox,#collapsedButtonBox,
+#collapsed1LtoCcBccRow,
+#collapsed1LsubjectOutBox, #collapsed1LfromOutBox,#collapsedButtonBox,
#expandedButtonBox,
-#collapsedsubjectBox, #collapsedfromBox {
+#collapsed1LsubjectBox, #collapsed1LfromBox {
margin: 0px;
padding: 0px;
}
@@ -232,54 +240,20 @@
-moz-box-align: start;
}
-#expandedfromBox, #collapsedfromOutBox, #collapsedtoCcBccOutBox,
-#collapsedHeaderView[twolineview="true"] #collapsedfromOutBox,
-#collapsedHeaderView[twolineview="true"] #collapsedtoCcBccOutBox {
+#expandedfromBox, #collapsed1LfromOutBox, #collapsed1LtoCcBccOutBox,
+#collapsed2LfromOutBox,
+#collapsed2LtoCcBccOutBox {
margin-top: 2px;
}
-#collapsedHeaderView[twolineview="true"] #collapsedsubjectBox {
+#collapsed2LsubjectBox {
-moz-margin-start: 0px;
}
-#collapsedHeaderView[twolineview="true"] #collapseddateBox {
+#collapsed2LdateBox {
-moz-margin-end: 2px;
}
-/* ::::: Message Header Pane - Button Icons ::::: */
-
-/*
-.hdrReplyButton[mode="hdrReplyButton"] {
- list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-small.png");
- -moz-image-region: rect(0px 64px 16px 48px);
-}
-
-.hdrReplyButton[mode="hdrReplyAllButton"] {
- list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-small.png");
- -moz-image-region: rect(0px 80px 16px 64px);
-}
-
-.hdrReplyButton[mode="hdrReplyListButton"] {
- list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-small.png");
- -moz-image-region: rect(0px 80px 16px 64px);
-}
-
-.hdrForwardButton {
- list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-small.png");
- -moz-image-region: rect(0px 96px 16px 80px);
-}
-
-.hdrArchiveButton {
- list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-small.png");
- -moz-image-region: rect(0px 180px 16px 160px);
-}
-
-.hdrJunkButton {
- list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-small.png");
- -moz-image-region: rect(0px 128px 16px 112px);
-}
-*/
-
#collapsedButtonBox[OnlyIcon="Icon"] .msgHeaderView-button .button-text,
#expandedButtonBox[OnlyIcon="Icon"] .msgHeaderView-button .button-text {
display: none;
diff --git a/chrome/CompactHeader/skin/windows/osdef.css b/chrome/CompactHeader/skin/windows/osdef.css
index 33c015c..270442e 100644
--- a/chrome/CompactHeader/skin/windows/osdef.css
+++ b/chrome/CompactHeader/skin/windows/osdef.css
@@ -41,10 +41,25 @@
@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);
+ 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 {
@@ -52,6 +67,12 @@ toolbar[iconsize="small"] #button-other-actions,
-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");
diff --git a/install.rdf b/install.rdf
index da8d580..a2907d0 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.3</em:version>
+ <em:version>0.9.0</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>
@@ -24,4 +24,4 @@
</RDF:Description>
</em:targetApplication>
</RDF:Description>
-</RDF>
\ No newline at end of file
+</RDF>
--
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