зеркало из https://github.com/mozilla/pjs.git
Bug 387247 ��� Use toolkit printUtils.js instead of communicator printing.js, Thunderbird part, r=mscott
This commit is contained in:
Родитель
f113f61217
Коммит
31c8313b76
|
@ -572,7 +572,7 @@ var DefaultController =
|
|||
MsgOpenSelectedMessages();
|
||||
return;
|
||||
case "cmd_printSetup":
|
||||
NSPrintSetup();
|
||||
PrintUtils.showPageSetup();
|
||||
return;
|
||||
case "cmd_print":
|
||||
PrintEnginePrint();
|
||||
|
|
|
@ -64,7 +64,7 @@
|
|||
<script type="application/x-javascript" src="chrome://messenger/content/mailWindowOverlay.js"/>
|
||||
<script type="application/x-javascript" src="chrome://messenger/content/mail-offline.js"/>
|
||||
<script type="application/x-javascript" src="chrome://messenger/content/mailCore.js"/>
|
||||
<script type="application/x-javascript" src="chrome://communicator/content/printing.js"/>
|
||||
<script type="application/x-javascript" src="chrome://global/content/printUtils.js"/>
|
||||
<script type="application/x-javascript" src="chrome://messenger/content/msgViewPickerOverlay.js"/>
|
||||
<script type="application/x-javascript" src="chrome://global/content/viewZoomOverlay.js"/>
|
||||
|
||||
|
|
|
@ -1033,7 +1033,7 @@ var MessageWindowController =
|
|||
MsgDeleteMessageFromMessageWindow(false, true);
|
||||
break;
|
||||
case "cmd_printSetup":
|
||||
NSPrintSetup();
|
||||
PrintUtils.showPageSetup();
|
||||
break;
|
||||
case "cmd_print":
|
||||
PrintEnginePrint();
|
||||
|
|
|
@ -59,7 +59,7 @@
|
|||
|
||||
<!-- XXX: utilityOverlay.xul uses strres.js - once it is converted, this should be removed-->
|
||||
<script src="chrome://global/content/strres.js"/>
|
||||
<script type="application/x-javascript" src="chrome://communicator/content/printing.js"/>
|
||||
<script type="application/x-javascript" src="chrome://global/content/printUtils.js"/>
|
||||
<script src="chrome://messenger/content/msgPrintEngine.js"/>
|
||||
|
||||
<!-- The main display frame -->
|
||||
|
|
|
@ -75,7 +75,7 @@
|
|||
<script type="application/x-javascript" src="chrome://messenger/content/addressbook/addressbook.js"/>
|
||||
<script type="application/x-javascript" src="chrome://messenger/content/addressbook/abCommon.js"/>
|
||||
<script type="application/x-javascript" src="chrome://communicator/content/contentAreaClick.js"/>
|
||||
<script type="application/x-javascript" src="chrome://communicator/content/printing.js"/>
|
||||
<script type="application/x-javascript" src="chrome://global/content/printUtils.js"/>
|
||||
<script type="application/x-javascript" src="chrome://messenger/content/msgPrintEngine.js"/>
|
||||
|
||||
<!-- move needed functions into a single js file -->
|
||||
|
@ -259,7 +259,7 @@
|
|||
</menu>
|
||||
<menuitem id="menu_close" label="&closeCmd.label;" key="key_close" accesskey="&closeCmd.accesskey;" oncommand="AbClose()"/>
|
||||
<menuseparator/>
|
||||
<menuitem id="printSetupMenuItem" label="&printSetupCmd.label;" accesskey="&printSetupCmd.accesskey;" oncommand="NSPrintSetup()"/>
|
||||
<menuitem id="printSetupMenuItem" label="&printSetupCmd.label;" accesskey="&printSetupCmd.accesskey;" oncommand="PrintUtils.showPageSetup()"/>
|
||||
#ifndef XP_MACOSX
|
||||
<menuitem id="printPreviewMenuItem" label="&printPreviewCardViewCmd.label;" accesskey="&printPreviewCardViewCmd.accesskey;" command="cmd_printcardpreview"/>
|
||||
<menuitem id="printPreviewAddressBook" label="&printPreviewAddressBook.label;" accesskey="&printPreviewAddressBook.accesskey;" oncommand="AbPrintPreviewAddressBook()"/>
|
||||
|
|
|
@ -511,7 +511,7 @@ var defaultController =
|
|||
case "cmd_sendNow" : if (defaultController.isCommandEnabled(command)) SendMessage(); break;
|
||||
case "cmd_sendWithCheck" : if (defaultController.isCommandEnabled(command)) SendMessageWithCheck(); break;
|
||||
case "cmd_sendLater" : if (defaultController.isCommandEnabled(command)) SendMessageLater(); break;
|
||||
case "cmd_printSetup" : NSPrintSetup(); break;
|
||||
case "cmd_printSetup" : PrintUtils.showPageSetup(); break;
|
||||
case "cmd_print" : DoCommandPrint(); break;
|
||||
|
||||
//Edit Menu
|
||||
|
@ -1081,7 +1081,7 @@ function DoCommandClose()
|
|||
function DoCommandPrint()
|
||||
{
|
||||
try {
|
||||
NSPrint();
|
||||
PrintUtils.print();
|
||||
} catch(ex) {dump("#PRINT ERROR: " + ex + "\n");}
|
||||
}
|
||||
|
||||
|
|
|
@ -73,7 +73,7 @@
|
|||
<stringbundle id="languageBundle" src="chrome://global/locale/languageNames.properties"/>
|
||||
</stringbundleset>
|
||||
|
||||
<script type="application/x-javascript" src="chrome://communicator/content/printing.js"/>
|
||||
<script type="application/x-javascript" src="chrome://global/content/printUtils.js"/>
|
||||
<script type="application/x-javascript" src="chrome://messenger/content/accountUtils.js"/>
|
||||
<script type="application/x-javascript" src="chrome://messenger/content/widgetglue.js"/>
|
||||
<script type="application/x-javascript" src="chrome://messenger/content/mailCore.js"/>
|
||||
|
|
Загрузка…
Ссылка в новой задаче