[Pkg-mozext-commits] [compactheader] 233/441: Handle dispMUA icon/tooltiptext changes by broadcast
David Prévot
taffit at moszumanska.debian.org
Wed Mar 18 12:29:02 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 502ed04f06765b29fbf39cf583e74ef589ef4323
Author: joachim <none at none>
Date: Sun Jul 24 01:52:56 2011 +0200
Handle dispMUA icon/tooltiptext changes by broadcast
--HG--
branch : B_broadcaster
---
chrome/CompactHeader/content/buttonsOverlay.xul | 6 +-
.../CompactHeader/content/compactHeaderOverlay.js | 10 +--
.../CompactHeader/content/compactHeaderOverlay.xul | 40 ++++++------
chrome/CompactHeader/content/toolbar.js | 73 +++++++++++-----------
4 files changed, 67 insertions(+), 62 deletions(-)
diff --git a/chrome/CompactHeader/content/buttonsOverlay.xul b/chrome/CompactHeader/content/buttonsOverlay.xul
index db50da7..b755ba5 100644
--- a/chrome/CompactHeader/content/buttonsOverlay.xul
+++ b/chrome/CompactHeader/content/buttonsOverlay.xul
@@ -10,6 +10,7 @@
<overlay id="CompactHeaderButtonsOverlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<script type="application/javascript" src="chrome://CompactHeader/content/buttonsOverlay.js"/>
+<script type="application/javascript" src="chrome://CompactHeader/content/toolbar.js"/>
<!--ThunderBird-->
<toolbarpalette id="MailToolbarPalette">
@@ -30,7 +31,10 @@
image="chrome://dispmua/content/48x48/thunderbird-windows.png"
label="display MUA"
oncommand="dispMUA.infopopup();">
+ <observes element="dispMUAbroadcast" attribute="src"
+ onbroadcast="org.mozdev.compactHeader.toolbar.onChangeDispMUAicon('src');"/>
+ <observes element="dispMUAbroadcast" attribute="tooltiptext"/>
</toolbarbutton>
</toolbarpalette>
-
+
</overlay>
diff --git a/chrome/CompactHeader/content/compactHeaderOverlay.js b/chrome/CompactHeader/content/compactHeaderOverlay.js
index c490cfc..3cf3c76 100644
--- a/chrome/CompactHeader/content/compactHeaderOverlay.js
+++ b/chrome/CompactHeader/content/compactHeaderOverlay.js
@@ -212,11 +212,11 @@ org.mozdev.compactHeader.pane = function() {
mailToolbox.addEventListener("DOMAttrModified",
org.mozdev.compactHeader.toolbar.onDoCustomizationHeaderViewToolbox, false);
}
- var dispMUAicon = document.getElementById("dispMUAicon");
- if (dispMUAicon) {
- dispMUAicon.addEventListener("DOMAttrModified",
- org.mozdev.compactHeader.toolbar.onChangeDispMUAicon, false);
- }
+// var dispMUAicon = document.getElementById("dispMUAicon");
+// if (dispMUAicon) {
+// dispMUAicon.addEventListener("DOMAttrModified",
+// org.mozdev.compactHeader.toolbar.onChangeDispMUAicon, false);
+// }
// work around XUL deck bug where collapsed header view, if it's the persisted
// default, wouldn't be sized properly because of the larger expanded
diff --git a/chrome/CompactHeader/content/compactHeaderOverlay.xul b/chrome/CompactHeader/content/compactHeaderOverlay.xul
index fd01513..397bab5 100644
--- a/chrome/CompactHeader/content/compactHeaderOverlay.xul
+++ b/chrome/CompactHeader/content/compactHeaderOverlay.xul
@@ -1,8 +1,8 @@
<?xml version="1.0" ?>
<!DOCTYPE overlay [
- <!ENTITY % msgHeaderDTD SYSTEM
- "chrome://messenger/locale/msgHdrViewOverlay.dtd">
+ <!ENTITY % msgHeaderDTD SYSTEM
+ "chrome://messenger/locale/msgHdrViewOverlay.dtd">
%msgHeaderDTD;
<!ENTITY % compactHeaderDTD SYSTEM
"chrome://CompactHeader/locale/CompactHeader.dtd">
@@ -25,19 +25,19 @@
<script type="application/javascript" src="chrome://CompactHeader/content/compactHeaderOverlay.js"/>
<script type="application/javascript" src="chrome://CompactHeader/content/RSSLinkify.js"/>
<script type="application/javascript" src="chrome://CompactHeader/content/toolbar.js"/>
- <script type="application/x-javascript"
+ <script type="application/x-javascript"
src="chrome://CompactHeader/content/CHTMessenger.js"/>
<script type="application/javascript" src="chrome://CompactHeader/content/buttonsOverlay.js"/>
<keyset>
- <key id="hideDetailsKey"
- modifiers="shift"
+ <key id="hideDetailsKey"
+ modifiers="shift"
key="&toggleDetails.key;"
oncommand="org.mozdev.compactHeader.pane.coheToggleHeaderView();"/>
</keyset>
<menupopup id="header-toolbar-context-menu">
- <menuitem id="hidecohePreferencesButton"
+ <menuitem id="hidecohePreferencesButton"
label="&dialog.title;"
oncommand="openDialog('chrome://CompactHeader/content/preferences.xul', 'prefs', 'chrome,resizable=no,centerscreen,modal');"/>
</menupopup>
@@ -46,9 +46,9 @@
<vbox id="expandedHeaderView" orient="horizontal">
<vbox id="hideDetailsButtonBox" insertbefore="expandedHeadersBox">
- <button id="hideDetailsButton"
+ <button id="hideDetailsButton"
tooltiptext="&hideDetailsButton.label;"
- onclick="org.mozdev.compactHeader.pane.coheToggleHeaderView();"
+ onclick="org.mozdev.compactHeader.pane.coheToggleHeaderView();"
class="msgHeaderView-flat-button"/>
</vbox>
@@ -57,7 +57,7 @@
<label id="CoheShowDetailsLabel" value="&showDetailsButton.label;"/>
</hbox>
- <vbox id="expandedHeadersBox">
+ <vbox id="expandedHeadersBox">
<hbox id="expandedHeadersTopBox" flex="1">
<toolbox id="header-view-toolbox"
mode="icons"
@@ -78,7 +78,7 @@
<hbox id="expandedHeadersBottomBox">
-
+
<vbox id="otherActionsBox" flex="0">
<hbox id="dateValueBox" flex="0"/>
<button type="menu" id="otherActionsButton" collapsed="true"
@@ -109,21 +109,21 @@
</menupopup>
</menu>
<menuseparator id="otherActionPopupAfterViewSource"/>
- <menuitem id="hideDetailsMenu"
+ <menuitem id="hideDetailsMenu"
label="&hideDetailsButton.label;"
oncommand="org.mozdev.compactHeader.pane.coheToggleHeaderView();"/>
- <menuitem id="hidecohePreferencesButton"
+ <menuitem id="hidecohePreferencesButton"
label="&dialog.title;"
oncommand="openDialog('chrome://CompactHeader/content/preferences.xul', 'prefs', 'chrome,centerscreen,dependent,all,resizable=no');"/>
</menupopup>
</button>
</vbox>
</hbox>
-
+
</vbox>
<vbox id="dispMUAexp" collapsed="false">
- <image id="dispMUAiconExp" tooltiptext="" style="width:48px; height:48px; margin-left:2px; margin-right:2px;" onclick="dispMUA.infopopup();"/>
+ <image id="dispMUAiconExp" observes="dispMUAbroadcast" tooltiptext="" style="width:48px; height:48px; margin-left:2px; margin-right:2px;" onclick="dispMUA.infopopup();"/>
</vbox>
</vbox>
@@ -165,7 +165,7 @@
<column flex="1"/>
</columns>
<row id="collapsed1LtoCcBccRow" align="baseline">
- <label id="collapsed1LtoCcBccLabel" class="headerName"
+ <label id="collapsed1LtoCcBccLabel" class="headerName"
value="&toField2.label;" control="collapsed1LtoCcBccBox"/>
<mail-multi-emailHeaderField id="collapsed1LtoCcBccBox" flex="1"/>
</row>
@@ -175,7 +175,7 @@
<row id="collapsed1LdateRow">
<label id="collapsed1LdateBox" class="dateLabel" flex="1"/>
</row>
- </hbox>
+ </hbox>
<header-view-button-box id="collapsed1LButtonBox" flex="0" align="start" hidden="true"/>
</hbox>
<hbox id="collapsed1LHeaderViewSecondLine" align="top" flex="1" collapsed="true">
@@ -203,7 +203,7 @@
</columns>
<rows>
<row id="collapsed2LtoCcBccRow" align="baseline">
- <label id="collapsed2LtoCcBccLabel" class="headerName"
+ <label id="collapsed2LtoCcBccLabel" class="headerName"
value="&toField2.label;" control="collapsed2LtoCcBccBox"/>
<mail-multi-emailHeaderField id="collapsed2LtoCcBccBox" flex="1"/>
</row>
@@ -229,11 +229,11 @@
</vbox>
<vbox id="dispMUA2line">
- <image id="dispMUAicon2line" tooltiptext="" style="width:32px; height:32px; margin-left:2px; margin-right:2px;" onclick="dispMUA.infopopup();"/>
+ <image id="dispMUAicon2line" observes="dispMUAbroadcast" tooltiptext="" style="width:32px; height:32px; margin-left:2px; margin-right:2px;" onclick="dispMUA.infopopup();"/>
</vbox>
<vbox id="dispMUAcompact">
- <image id="dispMUAiconCompact" tooltiptext="" style="width:24px; height:24px; margin:-2px 2px -2px 2px;" onclick="dispMUA.infopopup();"/>
+ <image id="dispMUAiconCompact" observes="dispMUAbroadcast" tooltiptext="" style="width:24px; height:24px; margin:-2px 2px -2px 2px;" onclick="dispMUA.infopopup();"/>
</vbox>
@@ -243,5 +243,5 @@
</overlay>
-<!--
+<!--
-->
\ No newline at end of file
diff --git a/chrome/CompactHeader/content/toolbar.js b/chrome/CompactHeader/content/toolbar.js
index 6e7f167..38a8ce6 100644
--- a/chrome/CompactHeader/content/toolbar.js
+++ b/chrome/CompactHeader/content/toolbar.js
@@ -243,6 +243,7 @@ org.mozdev.compactHeader.toolbar = function() {
hdrToolbar.lastPermanentChild = lastPermanentChild;
}
}
+ pub.onChangeDispMUAicon();
org.mozdev.compactHeader.debug.log("toolbar toggle stop");
};
@@ -306,48 +307,48 @@ org.mozdev.compactHeader.toolbar = function() {
org.mozdev.compactHeader.debug.log("dispMUACheck stop");
};
- pub.onChangeDispMUAicon = function(event) {
- if (event.attrName == "src") {
+ pub.onChangeDispMUAicon = function(attribute) {
+ if (attribute == "src") {
org.mozdev.compactHeader.debug.log("onChangeDispMUAicon start");
- var imageSrc = document.getElementById("dispMUAicon").getAttribute("src");
+ var imageSrc = document.getElementById("button-dispMUA").getAttribute("src");
var IconContainerDispMUA = null;
/* toolbar button */
if (IconContainerDispMUA = document.getElementById("button-dispMUA")) {
IconContainerDispMUA.setAttribute("image", imageSrc);
}
- /* expanded view 48 * 48 */
- if (IconContainerDispMUA = document.getElementById("dispMUAiconExp")) {
- IconContainerDispMUA.setAttribute("src", imageSrc);
- }
- /* two line view 32 * 32 */
- if (IconContainerDispMUA = document.getElementById("dispMUAicon2line")) {
- IconContainerDispMUA.setAttribute("src", imageSrc);
- }
- /* compact view 24 * 24 */
- if (IconContainerDispMUA = document.getElementById("dispMUAiconCompact")) {
- IconContainerDispMUA.setAttribute("src", imageSrc);
- }
- org.mozdev.compactHeader.debug.log("onChangeDispMUAicon stop");
- }
- else if (event.attrName == "tooltiptext") {
- org.mozdev.compactHeader.debug.log("onChangeDispMUAicon start");
- var tooltipText = document.getElementById("dispMUAicon").getAttribute("tooltiptext");
- var buttonDispMUA = document.getElementById("button-dispMUA");
- if (buttonDispMUA) {
- buttonDispMUA.setAttribute("tooltiptext", tooltipText);
- }
- /* expanded view 48 * 48 */
- if (IconContainerDispMUA = document.getElementById("dispMUAiconExp")) {
- IconContainerDispMUA.setAttribute("tooltiptext", tooltipText);
- }
- /* two line view 32 * 32 */
- if (IconContainerDispMUA = document.getElementById("dispMUAicon2line")) {
- IconContainerDispMUA.setAttribute("tooltiptext", tooltipText);
- }
- /* compact view 24 * 24 */
- if (IconContainerDispMUA = document.getElementById("dispMUAiconCompact")) {
- IconContainerDispMUA.setAttribute("tooltiptext", tooltipText);
- }
+// /* expanded view 48 * 48 */
+// if (IconContainerDispMUA = document.getElementById("dispMUAiconExp")) {
+// IconContainerDispMUA.setAttribute("src", imageSrc);
+// }
+// /* two line view 32 * 32 */
+// if (IconContainerDispMUA = document.getElementById("dispMUAicon2line")) {
+// IconContainerDispMUA.setAttribute("src", imageSrc);
+// }
+// /* compact view 24 * 24 */
+// if (IconContainerDispMUA = document.getElementById("dispMUAiconCompact")) {
+// IconContainerDispMUA.setAttribute("src", imageSrc);
+// }
+// org.mozdev.compactHeader.debug.log("onChangeDispMUAicon stop");
+// }
+// else if (event.attrName == "tooltiptext") {
+// org.mozdev.compactHeader.debug.log("onChangeDispMUAicon start");
+// var tooltipText = document.getElementById("dispMUAicon").getAttribute("tooltiptext");
+// var buttonDispMUA = document.getElementById("button-dispMUA");
+// if (buttonDispMUA) {
+// buttonDispMUA.setAttribute("tooltiptext", tooltipText);
+// }
+// /* expanded view 48 * 48 */
+// if (IconContainerDispMUA = document.getElementById("dispMUAiconExp")) {
+// IconContainerDispMUA.setAttribute("tooltiptext", tooltipText);
+// }
+// /* two line view 32 * 32 */
+// if (IconContainerDispMUA = document.getElementById("dispMUAicon2line")) {
+// IconContainerDispMUA.setAttribute("tooltiptext", tooltipText);
+// }
+// /* compact view 24 * 24 */
+// if (IconContainerDispMUA = document.getElementById("dispMUAiconCompact")) {
+// IconContainerDispMUA.setAttribute("tooltiptext", tooltipText);
+// }
org.mozdev.compactHeader.debug.log("onChangeDispMUAicon stop");
}
};
--
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