147653 - page setup commands doesn't work in mail and composer. r/sr=sspitzer,jag

editor/ui/composer/content/ComposerCommands.js

@@ -2297,7 +2297,7 @@ var nsPrintSetupCommand =
   {
     // In editor.js
     FinishHTMLSource();
-    goPageSetup();
+    NSPrintSetup();
   }
 };
 

mailnews/compose/resources/content/MsgComposeCommands.js

@@ -477,8 +477,8 @@ 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_print"              : DoCommandPrint();                                                        break;
+      case "cmd_printSetup"         : NSPrintSetup(); break;
+      case "cmd_print"              : DoCommandPrint(); break;
 
       //Edit Menu
       case "cmd_delete"             : if (MessageHasSelectedAttachments()) RemoveSelectedAttachment();         break;

mailnews/compose/resources/content/messengercompose.xul

@@ -229,7 +229,7 @@
           <menuitem label="&sendNowCmd.label;" accesskey="&sendNowCmd.accesskey;" key="key_send" command="cmd_sendNow" id="menu-item-send-now"/>
           <menuitem label="&sendLaterCmd.label;" accesskey="&sendLaterCmd.accesskey;" key="key_sendLater" command="cmd_sendLater"/>
           <menuseparator/>
-          <menuitem id="printSetupMenuItem" label="&printSetupCmd.label;" accesskey="&printSetupCmd.accesskey;" command="Browser:PrintSetup"/>
+          <menuitem id="printSetupMenuItem" label="&printSetupCmd.label;" accesskey="&printSetupCmd.accesskey;" command="cmd_printSetup"/>
           <menuitem id="printMenuItem" label="&printCmd.label;" accesskey="&printCmd.accesskey;" key="key_print" command="cmd_print"/>
         </menupopup>
       </menu>

xpfe/browser/resources/content/navigator.js

@@ -1486,7 +1486,7 @@ function hiddenWindowStartup()
   window.focus();
 
   // Disable menus which are not appropriate
-  var disabledItems = ['cmd_close', 'Browser:SendPage', 'Browser:EditPage', 'Browser:PrintSetup', /*'Browser:PrintPreview',*/
+  var disabledItems = ['cmd_close', 'Browser:SendPage', 'Browser:EditPage', 'cmd_printSetup', /*'Browser:PrintPreview',*/
                        'Browser:Print', 'canGoBack', 'canGoForward', 'Browser:Home', 'Browser:AddBookmark', 'cmd_undo',
                        'cmd_redo', 'cmd_cut', 'cmd_copy','cmd_paste', 'cmd_delete', 'cmd_selectAll', 'menu_textZoom'];
   for (var id in disabledItems) {

xpfe/browser/resources/content/navigatorOverlay.xul

@@ -121,7 +121,7 @@
     <command id="Browser:SavePage" oncommand="saveDocument(window._content.document);"/>
     <command id="Browser:EditPage" oncommand="editPageOrFrame();" observes="isImage"/>
     <command id="Browser:Open" oncommand="BrowserOpenWindow();"/>
-    <command id="Browser:PrintSetup" oncommand="NSPrintSetup();"/>
+    <command id="cmd_printSetup" oncommand="NSPrintSetup();"/>
     <command id="Browser:Print" oncommand="NSPrint();"/>
     <command id="Browser:PrintPreview" oncommand="BrowserPrintPreview();"/>
     <command id="cmd_quit"/>
@@ -215,7 +215,7 @@
         <menuseparator id="saveMenuBlockEnd"/>
         <menuitem label="&editPageCmd.label;" accesskey="&editPageCmd.accesskey;" key="key_editPage" command="Browser:EditPage" />
         <menuseparator/>
-        <menuitem id="printSetupMenuItem" label="&printSetupCmd.label;" accesskey="&printSetupCmd.accesskey;" command="Browser:PrintSetup"/>
+        <menuitem id="printSetupMenuItem" label="&printSetupCmd.label;" accesskey="&printSetupCmd.accesskey;" command="cmd_printSetup"/>
         <menuitem id="printPreviewMenuItem" label="&printPreviewCmd.label;" accesskey="&printPreviewCmd.accesskey;" command="Browser:PrintPreview"/>
         <menuitem id="printMenuItem" label="&printCmd.label;" accesskey="&printCmd.accesskey;" key="printKb" command="Browser:Print"/>
         <menuseparator/>

xpfe/browser/resources/content/viewSourceOverlay.xul

@@ -139,7 +139,7 @@
                     label="&editPageCmd.label;" accesskey="&editPageCmd.accesskey;"/>
           <menuseparator/>
           <menuitem label="&printCmd.label;" accesskey="&printCmd.accesskey;" key="printKb" command="Browser:Print"/>     
-          <menuitem id="printSetupMenuItem" label="&printSetupCmd.label;" accesskey="&printSetupCmd.accesskey;" command="Browser:PrintSetup"/>
+          <menuitem id="printSetupMenuItem" label="&printSetupCmd.label;" accesskey="&printSetupCmd.accesskey;" command="cmd_printSetup"/>
         </menupopup>
       </menu>
 

xpfe/communicator/resources/content/mac/platformCommunicatorOverlay.xul

@@ -25,7 +25,7 @@
          insertbefore="printMenuItem"
          label="&printSetupCmd.label;"
          accesskey="&printSetupCmd.accesskey;"
-         command="Browser:PrintSetup"/>
+         command="cmd_printSetup"/>
     <!-- quit -->
     <menuseparator id="menu_FileQuitSeparator"/>
     <menuitem label="&quitApplicationCmd.label;" id="menu_FileQuitItem"
@@ -51,7 +51,7 @@
          insertafter="printMenuItemToolbar"
          label="&printSetupCmd.label;"
          accesskey="&printSetupCmd.accesskey;"
-         command="Browser:PrintSetup"/>
+         command="cmd_printSetup"/>
   </menupopup>
 
   <!-- Find As You Type Keys -->

xpfe/communicator/resources/content/utilityOverlay.xul

@@ -55,9 +55,6 @@
   <command id="cmd_newEditorDraft"
            disabled="true"
            oncommand="NewEditorFromDraft();"/>
-  <command id="cmd_pageSetup"
-           disabled="true"
-           oncommand="goPageSetup();"/>
   -->
 
   <menuitem id="menu_newEditor"