[Pkg-mozext-commits] [compactheader] 425/441: Other cleanup work for 37.0
David Prévot
taffit at moszumanska.debian.org
Wed Mar 18 12:29:24 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 d38efd974848c8d8a66ae050b067dd846a0dea57
Author: Joachim Herb <Joachim.Herb at gmx.de>
Date: Sun Dec 21 22:02:09 2014 +0100
Other cleanup work for 37.0
--HG--
branch : 36.0a1
rename : chrome/CompactHeader/content/compactHeaderOverlay-36.xul => chrome/CompactHeader/content/compactHeaderOverlay.xul
---
chrome.manifest | 2 +-
.../CompactHeader/content/compactHeaderOverlay.js | 3 -
...aderOverlay-36.xul => compactHeaderOverlay.xul} | 91 +++++++++-------------
chrome/CompactHeader/content/toolbar.js | 44 -----------
install.rdf | 4 +-
5 files changed, 40 insertions(+), 104 deletions(-)
diff --git a/chrome.manifest b/chrome.manifest
index a7911af..7d850ad 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -26,7 +26,7 @@ locale CompactHeader sl-SI chrome/CompactHeader/locale/sl-SI/
overlay chrome://messenger/content/messageWindow.xul chrome://CompactHeader/content/CHTMessenger.xul
overlay chrome://messenger/content/messenger.xul chrome://CompactHeader/content/CHTMessenger.xul
-overlay chrome://messenger/content/msgHdrViewOverlay.xul chrome://CompactHeader/content/compactHeaderOverlay-36.xul appversion>=36.0a1
+overlay chrome://messenger/content/msgHdrViewOverlay.xul chrome://CompactHeader/content/compactHeaderOverlay.xul
overlay chrome://global/content/customizeToolbar.xul chrome://CompactHeader/content/customizeToolbarOverlay.xul
style chrome://global/content/customizeToolbar.xul chrome://CompactHeader-os/skin/osdef.css
diff --git a/chrome/CompactHeader/content/compactHeaderOverlay.js b/chrome/CompactHeader/content/compactHeaderOverlay.js
index fb08684..789023c 100644
--- a/chrome/CompactHeader/content/compactHeaderOverlay.js
+++ b/chrome/CompactHeader/content/compactHeaderOverlay.js
@@ -565,9 +565,6 @@ org.mozdev.compactHeader.pane = function() {
document.getElementById("CompactHeader_hideDetailsMenu").setAttribute("label", strLabel);
}
- document.getElementById("CompactHeader_viewMenuCompactBroadcast")
- .setAttribute("checked", gCoheCollapsedHeaderViewMode);
-
org.mozdev.compactHeader.debug.log("coheToggleHeaderContent stop");
}
diff --git a/chrome/CompactHeader/content/compactHeaderOverlay-36.xul b/chrome/CompactHeader/content/compactHeaderOverlay.xul
similarity index 76%
rename from chrome/CompactHeader/content/compactHeaderOverlay-36.xul
rename to chrome/CompactHeader/content/compactHeaderOverlay.xul
index b394bf1..00740f3 100644
--- a/chrome/CompactHeader/content/compactHeaderOverlay-36.xul
+++ b/chrome/CompactHeader/content/compactHeaderOverlay.xul
@@ -60,73 +60,59 @@
<vbox id="expandedHeadersBox">
<html:div xmlns:html="http://www.w3.org/1999/xhtml" id="expandedHeadersTopBox" flex="1">
- <!-- <hbox id="expandedHeadersTopBox" flex="1"> -->
<toolbox id="header-view-toolbox"
mode="icons"
minwidth="10px"
defaultmode="icons">
-<!--
<toolbarpalette id="header-view-toolbar-palette">
- <toolbarbutton id="CompactHeader_hdrOtherActionsButton"
+ <toolbarbutton type="menu"
+ id="otherActionsButton"
label="&otherActionsButton2.label;"
tooltiptext="&otherActionsButton.tooltip;"
- class="toolbarbutton-1 msgHeaderView-button hdrOtherActionsButton"
- type="menu"/>
+ class="toolbarbutton-1 msgHeaderView-button">
+ <menupopup id="otherActionsPopup">
+ <menuitem id="CompactHeader_hdrPane-markFlagged"
+ type="checkbox"
+ label="&markStarredCmd.label;"
+ accesskey="&markStarredCmd.accesskey;"
+ command="cmd_markAsFlagged"
+ insertbefore="viewSourceMenuItem"
+ key="key_toggleFlagged"/>
+ <menu id="CompactHeader_hdrPane-HeadersPopupMenu" label="&headersMenu.label;" accesskey="&headersMenu.accesskey;">
+ <menupopup id="CompactHeader_menu_HeadersPopup" onpopupshowing="InitViewHeadersMenu();">
+ <menuitem id="CompactHeader_hdrPane-viewallheaders"
+ type="radio"
+ name="viewheadergroup"
+ label="&headersAllCmd.label;"
+ accesskey="&headersAllCmd.accesskey;"
+ command="cmd_viewAllHeader"/>
+ <menuitem id="CompactHeader_hdrPane-viewnormalheaders"
+ type="radio"
+ name="viewheadergroup"
+ label="&headersNormalCmd.label;"
+ accesskey="&headersNormalCmd.accesskey;"
+ command="cmd_viewNormalHeader"/>
+ </menupopup>
+ </menu>
+ <menuseparator id="CompactHeader_otherActionPopupAfterViewSource"/>
+ <menuitem id="CompactHeader_hideDetailsMenu"
+ label="&CompactHeader_hideDetailsButton.label;"
+ oncommand="org.mozdev.compactHeader.pane.coheToggleHeaderView();"
+ key="CompactHeader_hideDetailsKey"/>
+ <menuitem id="CompactHeader_hidecohePreferencesButton"
+ label="&CompactHeader_dialog.title;"
+ oncommand="openDialog('chrome://CompactHeader/content/preferences.xul', 'prefs', 'chrome,centerscreen,dependent,all,resizable=no');"/>
+ </menupopup>
+ </toolbarbutton>
</toolbarpalette>
- -->
<toolbar id="header-view-toolbar"
mode="icons" defaultmode="icons"
defaultset="hdrReplyToSenderButton,hdrForwardButton,button-reply,button-forward,hdrArchiveButton,hdrJunkButton,hdrTrashButton,CompactHeader_hdrOtherActionsButton">
</toolbar>
</toolbox>
- <!-- </hbox> -->
</html:div>
- <hbox id="expandedHeadersBottomBox">
-
- <vbox id="otherActionsBox" flex="0">
- <hbox id="dateValueBox" flex="0"/>
- <button type="menu" id="otherActionsButton" collapsed="true"
- label="&otherActionsButton2.label;"
- class="msgHeaderView-button msgHeaderView-flat-button">
- <menupopup id="otherActionsPopup" onpopupshowing="org.mozdev.compactHeader.toolbar.showOtherActionButtonMenu();">
- <menuitem id="CompactHeader_hdrPane-markFlagged"
- type="checkbox"
- label="&markStarredCmd.label;"
- accesskey="&markStarredCmd.accesskey;"
- command="cmd_markAsFlagged"
- insertbefore="viewSourceMenuItem"
- key="key_toggleFlagged"/>
- <menu id="CompactHeader_hdrPane-HeadersPopupMenu" label="&headersMenu.label;" accesskey="&headersMenu.accesskey;">
- <menupopup id="CompactHeader_menu_HeadersPopup" onpopupshowing="InitViewHeadersMenu();">
- <menuitem id="CompactHeader_hdrPane-viewallheaders"
- type="radio"
- name="viewheadergroup"
- label="&headersAllCmd.label;"
- accesskey="&headersAllCmd.accesskey;"
- command="cmd_viewAllHeader"/>
- <menuitem id="CompactHeader_hdrPane-viewnormalheaders"
- type="radio"
- name="viewheadergroup"
- label="&headersNormalCmd.label;"
- accesskey="&headersNormalCmd.accesskey;"
- command="cmd_viewNormalHeader"/>
- </menupopup>
- </menu>
- <menuseparator id="CompactHeader_otherActionPopupAfterViewSource"/>
- <menuitem id="CompactHeader_hideDetailsMenu"
- label="&CompactHeader_hideDetailsButton.label;"
- oncommand="org.mozdev.compactHeader.pane.coheToggleHeaderView();"
- key="CompactHeader_hideDetailsKey"/>
- <menuitem id="CompactHeader_hidecohePreferencesButton"
- label="&CompactHeader_dialog.title;"
- oncommand="openDialog('chrome://CompactHeader/content/preferences.xul', 'prefs', 'chrome,centerscreen,dependent,all,resizable=no');"/>
- </menupopup>
- </button>
- </vbox>
- </hbox>
-
</vbox>
<vbox id="CompactHeader_dispMUAexp" collapsed="false">
@@ -248,6 +234,3 @@
</deck>
</overlay>
-
-<!--
--->
\ No newline at end of file
diff --git a/chrome/CompactHeader/content/toolbar.js b/chrome/CompactHeader/content/toolbar.js
index fead770..f259231 100644
--- a/chrome/CompactHeader/content/toolbar.js
+++ b/chrome/CompactHeader/content/toolbar.js
@@ -60,17 +60,6 @@ org.mozdev.compactHeader.toolbar = function() {
{pos:"none", id:"", orient:""},
];
- let gOtherMenuCommands = {
-// otherActionsOpenConversation: "cmd_openConversation",
-// otherActionsOpenInNewWindow: "cmd_openMessage",
-// otherActionsOpenInNewTab: "cmd_openMessage",
-// viewSourceMenuItem: "cmd_viewPageSource",
-// markAsReadMenuItem: "cmd_markAsRead",
-// markAsUnreadMenuItem: "cmd_markAsUnread",
-// saveAsMenuItem: "cmd_saveAsFile",
-// otherActionsPrint: "cmd_print"
- };
-
pub.cannotMoveToolbox = function() {
var appInfo = Components.classes["@mozilla.org/xre/app-info;1"]
.getService(Components.interfaces.nsIXULAppInfo);
@@ -169,42 +158,9 @@ org.mozdev.compactHeader.toolbar = function() {
button.setAttribute("collapsed", "true");
}
}
-
-// var target = "otherActionsButton";
-//
-// var newParent = document.getElementById(target) ||
-// document.getElementById("header-view-toolbox").palette.getElementsByAttribute("id", target)[0];
-//
-// org.mozdev.compactHeader.debug.log("looking for otherActionsButton");
-//
-// if (newParent != null) {
-// var myElement;
-// myElement= document.getElementById("otherActionsPopup");
-// if (myElement) {
-// newParent.appendChild(myElement);
-// for (let menu in gOtherMenuCommands) {
-// let menuEl = document.getElementById(menu);
-// org.mozdev.compactHeader.debug.log("command to " + menu);
-// if (menuEl) {
-// org.mozdev.compactHeader.debug.log("fillToolboxPalette add command to " + menu + ": " + gOtherMenuCommands[menu]);
-// menuEl.setAttribute("command", gOtherMenuCommands[menu]);
-// }
-// }
-// }
-// }
org.mozdev.compactHeader.debug.log("fillToolboxPalette stop");
};
- pub.showOtherActionButtonMenu = function() {
- org.mozdev.compactHeader.debug.log("showOtherActionButtonMenu start");
-// onShowOtherActionsPopup();
-// InitMessageMark();
-// for (let menu in gOtherMenuCommands) {
-// goUpdateCommand(gOtherMenuCommands[menu]);
-// }
- org.mozdev.compactHeader.debug.log("showOtherActionButtonMenu stop");
- }
-
pub.setButtonStyle = function() {
org.mozdev.compactHeader.debug.log("setButtonStyle start");
var hdrToolbar = document.getElementById("header-view-toolbar");
diff --git a/install.rdf b/install.rdf
index 99da4dc..a90008b 100644
--- a/install.rdf
+++ b/install.rdf
@@ -31,8 +31,8 @@
<em:targetApplication>
<RDF:Description>
<em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
- <em:minVersion>36.0a1</em:minVersion>
- <em:maxVersion>36.0</em:maxVersion>
+ <em:minVersion>37.0a1</em:minVersion>
+ <em:maxVersion>37.0</em:maxVersion>
</RDF:Description>
</em:targetApplication>
</RDF:Description>
--
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