[Pkg-mozext-commits] [compactheader] 279/441: Made compatible with Thunderbird 9.0a1 (follow up of patch for Bug 478468)
David Prévot
taffit at moszumanska.debian.org
Wed Mar 18 12:29:09 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 86854ab31a8184be4462155209f7805b526b59e6
Author: Joachim.Herb at gmx.de <Joachim.Herb at gmx.de>
Date: Sun Sep 11 00:37:25 2011 +0200
Made compatible with Thunderbird 9.0a1 (follow up of patch for Bug 478468)
--HG--
branch : review_requests
---
chrome.manifest | 3 +-
.../content/compactHeaderOverlay-9.xul | 240 +++++++++++++++++++++
test/executeTests.pl | 2 -
3 files changed, 242 insertions(+), 3 deletions(-)
diff --git a/chrome.manifest b/chrome.manifest
index 3230cbc..5a58cfb 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -13,7 +13,8 @@ locale CompactHeader da-DK chrome/CompactHeader/locale/da-DK/
locale CompactHeader fr-FR chrome/CompactHeader/locale/fr-FR/
locale CompactHeader es-ES chrome/CompactHeader/locale/es-ES/
-overlay chrome://messenger/content/msgHdrViewOverlay.xul chrome://CompactHeader/content/compactHeaderOverlay.xul
+overlay chrome://messenger/content/msgHdrViewOverlay.xul chrome://CompactHeader/content/compactHeaderOverlay.xul appversion<9.0a1
+overlay chrome://messenger/content/msgHdrViewOverlay.xul chrome://CompactHeader/content/compactHeaderOverlay-9.xul appversion>=9.0a1
overlay chrome://global/content/customizeToolbar.xul chrome://CompactHeader/content/customizeToolbarOverlay.xul
style chrome://global/content/customizeToolbar.xul chrome://CompactHeader-os/skin/osdef.css
style chrome://global/content/customizeToolbar.xul chrome://CompactHeader/skin/CompactHeader.css
diff --git a/chrome/CompactHeader/content/compactHeaderOverlay-9.xul b/chrome/CompactHeader/content/compactHeaderOverlay-9.xul
new file mode 100644
index 0000000..f468925
--- /dev/null
+++ b/chrome/CompactHeader/content/compactHeaderOverlay-9.xul
@@ -0,0 +1,240 @@
+<?xml version="1.0" ?>
+
+<!DOCTYPE overlay [
+ <!ENTITY % msgHeaderDTD SYSTEM
+ "chrome://messenger/locale/msgHdrViewOverlay.dtd">
+ %msgHeaderDTD;
+ <!ENTITY % compactHeaderDTD SYSTEM
+ "chrome://CompactHeader/locale/CompactHeader.dtd">
+ %compactHeaderDTD;
+ <!ENTITY % preferencesDTD SYSTEM
+ "chrome://CompactHeader/locale/preferences.dtd">
+ %preferencesDTD;
+ <!ENTITY % messengerDTD SYSTEM "chrome://messenger/locale/messenger.dtd">
+ %messengerDTD;
+]>
+
+<?xml-stylesheet href="chrome://CompactHeader/skin/CompactHeader.css" type="text/css"?>
+<?xml-stylesheet href="chrome://CompactHeader-os/skin/osdef.css" type="text/css"?>
+
+
+<overlay id="compactHeaderOverlay"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+ <script type="application/javascript" src="chrome://CompactHeader/content/debug.js"/>
+ <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/javascript" src="chrome://CompactHeader/content/buttonsOverlay.js"/>
+
+ <keyset>
+ <key id="CompactHeader_hideDetailsKey"
+ modifiers="shift"
+ key="&CompactHeader_toggleDetails.key;"
+ oncommand="org.mozdev.compactHeader.pane.coheToggleHeaderView();"/>
+ </keyset>
+
+ <menupopup id="header-toolbar-context-menu">
+ <menuitem id="CompactHeader_hidecohePreferencesButton"
+ label="&CompactHeader_dialog.title;"
+ oncommand="openDialog('chrome://CompactHeader/content/preferences.xul', 'prefs', 'chrome,resizable=no,centerscreen,modal');"/>
+ </menupopup>
+
+ <deck id="msgHeaderViewDeck">
+
+ <vbox id="expandedHeaderView" orient="horizontal">
+ <vbox id="CompactHeader_hideDetailsButtonBox" insertbefore="expandedHeadersBox">
+ <button id="CompactHeader_hideDetailsButton"
+ tooltiptext="&CompactHeader_hideDetailsButton.label;"
+ onclick="org.mozdev.compactHeader.pane.coheToggleHeaderView();"
+ class="msgHeaderView-flat-button"/>
+ </vbox>
+
+ <hbox id="CompactHeader_coheStringTransferBox" hidden="true">
+ <label id="CompactHeader_CoheHideDetailsLabel" value="&CompactHeader_hideDetailsButton.label;"/>
+ <label id="CompactHeader_CoheShowDetailsLabel" value="&CompactHeader_showDetailsButton.label;"/>
+ </hbox>
+
+ <vbox id="expandedHeadersBox">
+ <hbox id="expandedHeadersTopBox" flex="1">
+ <toolbox id="header-view-toolbox"
+ mode="icons"
+ defaultmode="icons">
+ <toolbarpalette id="header-view-toolbar-palette">
+ <toolbarbutton id="CompactHeader_hdrOtherActionsButton"
+ label="&otherActionsButton1.label;"
+ tooltiptext="&otherActionsButton1.label;"
+ class="toolbarbutton-1 msgHeaderView-button hdrOtherActionsButton"
+ type="menu"/>
+ </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>
+
+
+ <hbox id="expandedHeadersBottomBox">
+
+ <vbox id="otherActionsBox" flex="0">
+ <hbox id="dateValueBox" flex="0"/>
+ <button type="menu" id="otherActionsButton" collapsed="true"
+ label="&otherActionsButton1.label;"
+ class="msgHeaderView-button msgHeaderView-flat-button">
+ <menupopup id="otherActionsPopup" onpopupshowing="InitMessageMark()">
+ <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="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="otherActionPopupAfterViewSource"/>
+ <menuitem id="CompactHeader_hideDetailsMenu"
+ label="&CompactHeader_hideDetailsButton.label;"
+ oncommand="org.mozdev.compactHeader.pane.coheToggleHeaderView();"/>
+ <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">
+ <image id="CompactHeader_dispMUAiconExp" tooltiptext=""
+ style="width:48px; height:48px; margin-left:2px; margin-right:2px;"
+ onclick="dispMUA.infopopup();"/>
+ </vbox>
+
+ </vbox>
+
+ <vbox id="CompactHeader_collapsedHeaderView" orient="horizontal" flex="1">
+ <menupopup id="CompactHeader_CohecopyUrlPopup" popupanchor="bottomleft">
+ <menuitem label="©LinkCmd.label;" accesskey="©LinkCmd.accesskey;"
+ oncommand="org.mozdev.compactHeader.RSSLinkify.CoheCopyWebsiteAddress(document.popupNode)"/>
+ </menupopup>
+ <vbox id="CompactHeader_showDetailsButtonBox" align="start" flex="0">
+ <button id="CompactHeader_showDetailsButton"
+ tooltiptext="&CompactHeader_showDetailsButton.label;"
+ onclick="org.mozdev.compactHeader.pane.coheToggleHeaderView();"
+ class="msgHeaderView-flat-button"/>
+ </vbox>
+ <vbox id="CompactHeader_collapsed1LHeadersBox" flex="1" collapsed="false">
+ <hbox id="CompactHeader_collapsed1LHeaderViewFirstLine" flex="0">
+ <hbox id="CompactHeader_collapsed1LsubjectOutBox" align="start" flex="99">
+ <row id="CompactHeader_collapsed1LsubjectRow" flex="99">
+ <mail-headerfield id="CompactHeader_collapsed1LsubjectBox" flex="99"/>
+ </row>
+ </hbox>
+ <hbox id="CompactHeader_collapsed1LfromOutBox" align="start" flex="0">
+ <grid flex="1">
+ <columns>
+ <column flex="0"/>
+ </columns>
+ <rows>
+ <row id="CompactHeader_collapsed1LfromRow">
+ <mail-multi-emailHeaderField id="CompactHeader_collapsed1LfromBox" flex="0"/>
+ </row>
+ </rows>
+ </grid>
+ </hbox>
+ <hbox id="CompactHeader_collapsed1LdateOutBox" align="start" pack="end" flex="0">
+ <row id="CompactHeader_collapsed1LdateRow">
+ <label id="CompactHeader_collapsed1LdateBox" class="dateLabel" flex="1"/>
+ </row>
+ </hbox>
+ <header-view-button-box id="CompactHeader_collapsed1LButtonBox" flex="0" align="start" hidden="true"/>
+ </hbox>
+ <hbox id="CompactHeader_collapsed1LHeaderViewSecondLine" align="top" flex="1" collapsed="true">
+ </hbox>
+ </vbox>
+
+ <vbox id="CompactHeader_collapsed2LHeadersBox" flex="1" collapsed="true">
+ <hbox id="CompactHeader_collapsed2LHeaderViewFirstLine" flex="0">
+ <hbox id="CompactHeader_collapsed2LfromOutBox" align="start" flex="0">
+ <grid flex="1">
+ <columns>
+ <column flex="0"/>
+ </columns>
+ <rows>
+ <row id="CompactHeader_collapsed2LfromRow">
+ <mail-multi-emailHeaderField id="CompactHeader_collapsed2LfromBox" flex="0"/>
+ </row>
+ </rows>
+ </grid>
+ </hbox>
+ <grid id="CompactHeader_collapsed2LtoCcBccOutBox" flex="1">
+ <columns>
+ <column flex="0"/>
+ <column flex="1"/>
+ </columns>
+ <rows>
+ <row id="CompactHeader_collapsed2LtoCcBccRow" align="baseline">
+ <label id="CompactHeader_collapsed2LtoCcBccLabel" class="headerName"
+ value="&toField3.label;" control="CompactHeader_collapsed2LtoCcBccBox"/>
+ <mail-multi-emailHeaderField id="CompactHeader_collapsed2LtoCcBccBox" flex="1"/>
+ </row>
+ </rows>
+ </grid>
+ <header-view-button-box id="CompactHeader_collapsed2LButtonBox" flex="0" align="start"/>
+ </hbox>
+ <hbox id="CompactHeader_collapsed2LHeaderViewSecondLine" align="top" flex="1">
+ <hbox id="CompactHeader_collapsed2LsubjectOutBox" align="top" flex="99">
+ <row id="CompactHeader_collapsed2LsubjectRow" flex="99">
+ <mail-headerfield id="CompactHeader_collapsed2LsubjectBox" flex="99"/>
+ </row>
+ </hbox>
+ <hbox id="CompactHeader_collapsed2LdateOutBox" align="top" pack="end" flex="0">
+ <row id="CompactHeader_collapsed2LdateRow" align="top" pack="end">
+ <label id="CompactHeader_collapsed2LdateBox" class="dateLabel" flex="1"/>
+ </row>
+ </hbox>
+ </hbox>
+
+
+
+ </vbox>
+
+ <vbox id="CompactHeader_dispMUA2line">
+ <image id="CompactHeader_dispMUAicon2line"
+ tooltiptext=""
+ style="width:32px; height:32px; margin-left:2px; margin-right:2px;"
+ onclick="dispMUA.infopopup();"/>
+ </vbox>
+
+ <vbox id="CompactHeader_dispMUAcompact">
+ <image id="CompactHeader_dispMUAiconCompact"
+ tooltiptext=""
+ style="width:24px; height:24px; margin:-2px 2px -2px 2px;"
+ onclick="dispMUA.infopopup();"/>
+ </vbox>
+
+
+ </vbox>
+
+ </deck>
+
+</overlay>
+
+<!--
+-->
\ No newline at end of file
diff --git a/test/executeTests.pl b/test/executeTests.pl
index d5ce2a5..50f063d 100644
--- a/test/executeTests.pl
+++ b/test/executeTests.pl
@@ -74,7 +74,6 @@ elsif ($^O eq "linux") {
$virtualpython = "../mozmill-virtualenv/bin/python";
}
-
while (my $line = <F>)
{
($ostype,$hosttype,$version,$ftppath,$app,$tests,$lightning) =
@@ -101,7 +100,6 @@ while (my $line = <F>)
system "wget", "-P", "$ftpdir/$ostype-$hosttype-$version", "-N", "$ftppath/$tests";
system "wget", "-P", "$ftpdir/$ostype-$hosttype-$version", "-N", "$lightning";
-
system $unpack, $unpackargs, "$ftpdir//$ostype-$hosttype-$version/$app", $unpacktargetargs, $testdir;
system "unzip", "-o", "$ftpdir//$ostype-$hosttype-$version/$tests", "-d", $testdir, "-x", "*mochitest*", "*xpcshell*";
--
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