[Pkg-mozext-commits] [compactheader] 70/441: New version: 0.8.3 Another try to fix Mac OS X version. Button icons are copied from toolbar buttons again.
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 9a7d142f3274380536c32d8810891c25c569136e
Author: joachim.herb <none at none>
Date: Sun Sep 27 22:47:32 2009 +0000
New version: 0.8.3
Another try to fix Mac OS X version. Button icons are copied from toolbar buttons again.
---
chrome/CompactHeader/content/buttons.js | 8 ++++----
.../CompactHeader/content/compactHeaderOverlay.js | 18 ++++++++--------
.../CompactHeader/content/compactHeaderOverlay.xul | 2 --
.../content/customizeToolbarOverlay.xul | 18 ++++++++++++++++
chrome/CompactHeader/skin/gnome/osdef.css | 24 +++++++++++++++++++++-
5 files changed, 55 insertions(+), 15 deletions(-)
diff --git a/chrome/CompactHeader/content/buttons.js b/chrome/CompactHeader/content/buttons.js
index 47e555f..e723c1a 100644
--- a/chrome/CompactHeader/content/buttons.js
+++ b/chrome/CompactHeader/content/buttons.js
@@ -55,9 +55,9 @@ buttonicons["hdrReplyAllButton"] = ["button-replyall"];
buttonicons["hdrReplyListButton"] = ["button-replylist"];
buttonicons["hdrForwardButton"] = ["button-forward"];
buttonicons["archiveButton"] = ["button-archive"];
-//buttonicons["hdrJunkButton"] = ["button-isJunk"];
-//buttonicons["hdrTrashButton"] = ["button-mark-deleted"];
-buttonicons["hdrJunkButton"] = ["button-junk"];
-buttonicons["hdrTrashButton"] = ["button-deleted"];
+buttonicons["hdrJunkButton"] = ["button-isJunk"];
+buttonicons["hdrTrashButton"] = ["button-mark-deleted"];
+//buttonicons["hdrJunkButton"] = ["button-junk"];
+//buttonicons["hdrTrashButton"] = ["button-deleted"];
buttonicons["otherActionsButton"] = ["button-other-actions"];
buttonicons["tagMenuPopup"] = ["button-tag"];
\ No newline at end of file
diff --git a/chrome/CompactHeader/content/compactHeaderOverlay.js b/chrome/CompactHeader/content/compactHeaderOverlay.js
index 3eb08fc..e158bd4 100644
--- a/chrome/CompactHeader/content/compactHeaderOverlay.js
+++ b/chrome/CompactHeader/content/compactHeaderOverlay.js
@@ -295,7 +295,8 @@ function create1LHeaderXUL() {
var xultmp2 = document.createElement("row");
xultmp2.id = "collapseddateRow";
- xultmp2.align = "start";
+// xultmp2.align = "start";
+ xultmp2.align = "baseline";
xultmp2.pack = "end";
xul1.appendChild(xultmp2,xul1);
@@ -316,6 +317,7 @@ function create1LHeaderXUL() {
document.getElementById("collapsedHeaderView").removeAttribute("twolineview");
}
+/*
function createExpandedHeaderXUL() {
return;
@@ -338,9 +340,9 @@ function createExpandedHeaderXUL() {
} 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
@@ -651,7 +653,6 @@ function coheUpdateMessageHeaders()
addEventListener('messagepane-loaded', coheOnLoadMsgHeaderPane, true);
addEventListener('messagepane-unloaded', coheOnUnloadMsgHeaderPane, true);
-/* XXX Remove obsolet function
function copyButtonIcons(buttonname, element) {
var e0 = document.getElementById("mail-bar3");
var iconsize;
@@ -683,10 +684,10 @@ function copyButtonIcons(buttonname, element) {
removeClass(element, "hdrTrashButton");
}
}
-*/
function updateHdrButtons() {
+ var test = document.getElementById('msgHeaderViewDeck');
var buttonBox = document.getElementById('msgHeaderViewDeck').selectedPanel
.getElementsByTagName("header-view-button-box").item(0);
for(var buttonname in buttonslist) {
@@ -698,14 +699,15 @@ function updateHdrButtons() {
strViewMode = "view.expanded";
for (var j=0; j<buttonslist[buttonname].length; j++){
var myElement = buttonBox.getButton(buttonslist[buttonname][j]) || document.getElementById(buttonslist[buttonname][j]);
- //copyButtonIcons(buttonslist[buttonname][j], myElement);
+ copyButtonIcons(buttonslist[buttonname][j], myElement);
if (myElement != null) {
- addClass(myElement, "cohe-buttons");
- addClass(myElement, "cohe-" + buttonicons[buttonslist[buttonname][j]]);
+ //addClass(myElement, "cohe-buttons");
+ //addClass(myElement, "cohe-" + buttonicons[buttonslist[buttonname][j]]);
addClass(myElement, "msgHeaderView-flat-button");
myElement.setAttribute("tooltiptext", document.getElementById("Cohe"+buttonslist[buttonname][j]).value);
if (buttonslist[buttonname][j] == "hdrTrashButton") {
removeClass(myElement, "hdrTrashButton");
+ myElement.setAttribute("label", document.getElementById("Cohe"+buttonslist[buttonname][j]).value);
}
if (prefBranch.getBoolPref(strViewMode + ".display" + buttonname)) {
if (buttonname != "Reply") {
diff --git a/chrome/CompactHeader/content/compactHeaderOverlay.xul b/chrome/CompactHeader/content/compactHeaderOverlay.xul
index ceaf569..af73b93 100644
--- a/chrome/CompactHeader/content/compactHeaderOverlay.xul
+++ b/chrome/CompactHeader/content/compactHeaderOverlay.xul
@@ -48,7 +48,6 @@
<deck id="msgHeaderViewDeck">
-<!--
<toolbarbox id="hiddenIconSpaceBox">
<toolbar id="hiddenIconSpace" mode="icon" iconsize="small">
<observes element="changeIconSize" attribute="iconsize" onbroadcast="alert('test');"/>
@@ -63,7 +62,6 @@
<toolbarbutton id="button-other-actions" class="toolbarbutton-1" hidden="true"/>
</toolbar>
</toolbarbox>
--->
<vbox id="expandedHeaderView" orient="horizontal">
<vbox id="hideDetailsButtonBox" insertbefore="expandedHeadersBox">
diff --git a/chrome/CompactHeader/content/customizeToolbarOverlay.xul b/chrome/CompactHeader/content/customizeToolbarOverlay.xul
new file mode 100644
index 0000000..e554e21
--- /dev/null
+++ b/chrome/CompactHeader/content/customizeToolbarOverlay.xul
@@ -0,0 +1,18 @@
+<?xml version="1.0" ?>
+
+<!DOCTYPE overlay [
+<!ENTITY % customizeToolbarDTD SYSTEM "chrome://global/locale/customizeToolbar.dtd">
+ %customizeToolbarDTD;
+]>
+
+
+
+<overlay id="customizeToolbarOverlay"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+ <script type="application/javascript" src="chrome://CompactHeader/content/buttons.js"/>
+ <script type="application/javascript" src="chrome://CompactHeader/content/compactHeaderOverlay.js"/>
+
+<checkbox id="smallicons" oncommand="updateIconSize(this.checked);opener.updateHdrButtons();" label="&useSmallIcons.label;"/>
+
+</overlay>
diff --git a/chrome/CompactHeader/skin/gnome/osdef.css b/chrome/CompactHeader/skin/gnome/osdef.css
index 9934689..f06c472 100644
--- a/chrome/CompactHeader/skin/gnome/osdef.css
+++ b/chrome/CompactHeader/skin/gnome/osdef.css
@@ -41,6 +41,28 @@
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+#button-archive {
+ list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
+ -moz-image-region: rect(0px 336px 24px 312px);
+}
+
+toolbar[iconsize="small"] #button-archive {
+ list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-small.png");
+ -moz-image-region: rect(0px 224px 16px 208px);
+}
+
+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);
+}
+
+#button-other-actions {
+ list-style-image: url("chrome://CompactHeader-os/skin/other-action.png");
+ -moz-image-region: rect(0px 24px 24px 0px);
+}
+
+/*
.cohe-buttons {
list-style-image: url("chrome://CompactHeader-os/skin/mail-toolbar-small.png");
}
@@ -82,7 +104,7 @@
.cohe-button-tag {
-moz-image-region: rect(0px 192px 16px 176px);
}
-
+*/
#expandedButtonBox {
margin: 0px;
padding: 0px;
--
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