Bug 676836 - Remove code duplication for print menus by moving them to utilityOverlay r=neil/standard8
authorIan Neal <iann_cvs@blueyonder.co.uk>
Tue, 16 Aug 2011 22:18:35 +0100
changeset 9002 400d40dac19b3a0aab5c098267c7fe0ca83dbf14
parent 8769 e1ae2ddb930cee9faf344fd65ae8f5b9ac4b10de
child 9003 7ca7a3f2602c63bbe546b0877f7106aa7cda8d3a
push idunknown
push userunknown
push dateunknown
reviewersneil, standard8
bugs676836
Bug 676836 - Remove code duplication for print menus by moving them to utilityOverlay r=neil/standard8
editor/ui/composer/content/editorOverlay.xul
editor/ui/locales/en-US/chrome/composer/editorOverlay.dtd
suite/browser/navigator.js
suite/browser/navigatorOverlay.xul
suite/common/utilityOverlay.xul
suite/locales/en-US/chrome/browser/navigator.dtd
suite/locales/en-US/chrome/common/utilityOverlay.dtd
suite/locales/en-US/chrome/mailnews/addressbook/abMainWindow.dtd
suite/locales/en-US/chrome/mailnews/compose/messengercompose.dtd
suite/locales/en-US/chrome/mailnews/messenger.dtd
suite/mailnews/addrbook/addressbook.xul
suite/mailnews/compose/messengercompose.xul
suite/mailnews/mailWindowOverlay.xul
--- a/editor/ui/composer/content/editorOverlay.xul
+++ b/editor/ui/composer/content/editorOverlay.xul
@@ -67,20 +67,17 @@
     <key id="savekb"
          key="&saveCmd.key;"
          command="cmd_save"
          modifiers="accel"/>
     <key id="publishkb"
          key="&publishCmd.key;"
          command="cmd_publish"
          modifiers="accel,shift"/>
-    <key id="printkb"
-         key="&printCmd.key;"
-         command="cmd_print"
-         modifiers="accel"/>
+    <key id="key_print"/>
     <key id="key_close"/>
     <key id="key_quit"/>
     <key id="key_undo"/>
     <key id="key_redo"/>
     <key id="key_cut"/>
     <key id="key_copy"/>
     <key id="key_paste"/>
     <key id="key_delete"/>
@@ -403,25 +400,18 @@
                 accesskey="&publishAsCmd.accesskey;"
                 command="cmd_publishAs"/>
       <menuseparator id="fileMenuAfterPublishAsSeparator"/>
       <menuitem id="menu_fileRevert"
                 accesskey="&fileRevert.accesskey;"
                 command="cmd_revert"/>
       <menuseparator id="fileMenuAfterFileRevertSeparator"/>
       <!-- menuitems are merged in here from composerOverlay.xul -->
-      <menuitem id="printSetupMenuItem"
-                label="&printSetupCmd.label;"
-                accesskey="&printSetupCmd.accesskey;"
-                command="cmd_printSetup"/>
-      <menuitem id="printMenuItem"
-                label="&printCmd.label;"
-                accesskey="&printCmd.accesskey;"
-                key="printkb"
-                command="cmd_print"/>
+      <menuitem id="menu_printSetup"/>
+      <menuitem id="menu_print"/>
       <!-- The Exit/Quit item is merged from platformGlobalOverlay.xul -->
     </menupopup>
   </menu>
 
   <menu id="editMenu" label="&editMenu.label;" accesskey="&editMenu.accesskey;">
     <menupopup id="edEditMenuPopup">
       <!-- from utilityOverlay.xul -->
       <menuitem id="menu_undo"/>
--- a/editor/ui/locales/en-US/chrome/composer/editorOverlay.dtd
+++ b/editor/ui/locales/en-US/chrome/composer/editorOverlay.dtd
@@ -63,21 +63,18 @@
 
 <!ENTITY publishCmd.label "Publish">
 <!ENTITY publishCmd.accesskey "b">
 <!ENTITY publishCmd.key "S">
 <!ENTITY publishAsCmd.label "Publish As…">
 <!ENTITY publishAsCmd.accesskey "h">
 <!ENTITY saveAsChangeEncodingCmd.label "Save And Change Character Encoding">
 <!ENTITY saveAsChangeEncodingCmd.accesskey "E">
-<!ENTITY printSetupCmd.label "Page Setup…">
-<!ENTITY printSetupCmd.accesskey "u">
 <!ENTITY printCmd.label "Print…">
 <!ENTITY printCmd.accesskey "P">
-<!ENTITY printCmd.key "P">
 
 <!-- Edit menu items -->
 <!ENTITY editMenu.label "Edit">
 <!ENTITY editMenu.accesskey "E">
 <!ENTITY pasteNoFormatting.label "Paste Without Formatting">
 <!ENTITY pasteNoFormatting.accesskey "n">
 <!ENTITY pasteNoFormatting.key "V">
 <!ENTITY pasteAs.label "Paste As">
--- a/suite/browser/navigator.js
+++ b/suite/browser/navigator.js
@@ -1900,17 +1900,17 @@ function hiddenWindowStartup()
   ReloadThemes();
 
   // focus the hidden window
   window.focus();
 
   // Disable menus which are not appropriate
   var disabledItems = ['cmd_close', 'Browser:SendPage',
                        'Browser:EditPage', 'Browser:SavePage', 'cmd_printSetup',
-                       'Browser:Print', 'canGoBack', 'canGoForward',
+                       'cmd_print', 'canGoBack', 'canGoForward',
                        'Browser:AddBookmark', 'Browser:AddBookmarkAs',
                        'cmd_undo', 'cmd_redo', 'cmd_cut', 'cmd_copy',
                        'cmd_paste', 'cmd_delete', 'cmd_selectAll',
                        'cmd_findTypeText', 'cmd_findTypeLinks', 'cmd_find',
                        'cmd_findNext', 'cmd_findPrev', 'menu_Toolbars',
                        'menuitem_reload', 'menu_UseStyleSheet', 'charsetMenu',
                        'View:PageSource', 'View:PageInfo', 'menu_translate',
                        'cookie_deny', 'cookie_default', 'View:FullScreen',
--- a/suite/browser/navigatorOverlay.xul
+++ b/suite/browser/navigatorOverlay.xul
@@ -74,17 +74,17 @@
     <key id="key_restoreWindow" key="&recentWindows.commandkey;" modifiers="accel,shift" oncommand="undoCloseWindow();"/>
     <key id="key_newBlankPage"/>
     <key id="focusURLBar"      key="&openCmd.commandkey;" oncommand="ShowAndSelectContentsOfURLBar();"
          modifiers="accel"/>
     <key id="openLocationKb"   key="&openCmd.commandkey;" command="Browser:Open" modifiers="accel,shift"/>
     <key id="openFileKb"         key="&openFileCmd.commandkey;" command="Browser:OpenFile"  modifiers="accel"/>
     <key id="key_savePage"       key="&savePageCmd.commandkey;" command="Browser:SavePage" modifiers="accel"/>
     <key id="key_editPage"       key="&editPageCmd.commandkey;" command="Browser:EditPage" modifiers="accel"/>
-    <key id="printKb"            key="&printCmd.commandkey;" command="Browser:Print"  modifiers="accel"/>
+    <key id="key_print"/>
     <key id="key_close"/>
     <key id="key_closeWindow"/>
     <key id="key_quit"/>
 
     <!-- Edit Menu -->
     <key id="key_undo"/>
     <key id="key_redo"/>
     <key id="key_cut"/>
@@ -143,18 +143,18 @@
     <command id="cmd_newEditorTemplate"/>
     <command id="cmd_newEditorDraft"/> -->
     <command id="Browser:OpenFile"  oncommand="BrowserOpenFileWindow();"/>
     <command id="Browser:SavePage" oncommand="saveDocument(window.content.document, true);"/>
     <command id="Browser:EditPage" oncommand="editPageOrFrame();" observes="isImage"/>
     <command id="Browser:UploadFile" oncommand="BrowserUploadFile();"/>
     <command id="Browser:Open" oncommand="BrowserOpenWindow();"/>
     <command id="cmd_printSetup" oncommand="PrintUtils.showPageSetup();"/>
-    <command id="Browser:Print" oncommand="PrintUtils.print();"/>
-    <command id="Browser:PrintPreview" oncommand="BrowserPrintPreview();"/>
+    <command id="cmd_print" oncommand="PrintUtils.print();"/>
+    <command id="cmd_printpreview" oncommand="BrowserPrintPreview();"/>
     <command id="cmd_quit"/>
     <command id="cmd_close" oncommand="BrowserCloseTabOrWindow()"/>
     <command id="cmd_closeOtherTabs" oncommand="BrowserCloseOtherTabs()"/>
     <command id="cmd_closeWindow" oncommand="BrowserTryToCloseWindow()"/>
 
     <!-- Edit Menu -->
     <command id="cmd_undo"/>
     <command id="cmd_redo"/>
@@ -271,19 +271,19 @@
                   accesskey="&savePageCmd.accesskey;" key="key_savePage" command="Browser:SavePage"/>
         <menuitem id="saveframe" valueSaveAs="&saveFrameAsCmd.label;" valueSave="&saveFrameCmd.label;"
                   accesskey="&saveFrameCmd.accesskey;" oncommand="saveFrameDocument();" hidden="true"/>
         <menuseparator id="saveMenuBlockEnd"/>
         <menuitem label="&editPageCmd.label;" accesskey="&editPageCmd.accesskey;" key="key_editPage" command="Browser:EditPage" />
         <menuseparator/>
         <menuitem command="Browser:UploadFile" label="&uploadFile.label;" accesskey="&uploadFile.accesskey;"/>
         <menuseparator/>
-        <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"/>
+        <menuitem id="menu_printSetup"/>
+        <menuitem id="menu_printPreview"/>
+        <menuitem id="menu_print"/>
         <menuseparator/>
         <menuitem id="offlineGoOfflineCmd"/>
       </menupopup>
     </menu>
 
     <menu id="menu_Edit">
       <menupopup id="menu_EditPopup">
         <menuitem id="menu_undo"/>
--- a/suite/common/utilityOverlay.xul
+++ b/suite/common/utilityOverlay.xul
@@ -170,25 +170,42 @@
         label="&newMenu.label;"
         accesskey="&newMenu.accesskey;"/>
 
   <menuitem id="menu_newNavigator"
             label="&newNavigatorCmd.label;"
             accesskey="&newNavigatorCmd.accesskey;"
             key="key_newNavigator"
             command="cmd_newNavigator"/>
+  <menuitem id="menu_printSetup"
+            label="&printSetupCmd.label;"
+            accesskey="&printSetupCmd.accesskey;"
+            command="cmd_printSetup"/>
+  <menuitem id="menu_printPreview"
+            label="&printPreviewCmd.label;"
+            accesskey="&printPreviewCmd.accesskey;"
+            command="cmd_printpreview"/>
+  <menuitem id="menu_print"
+            label="&printCmd.label;"
+            accesskey="&printCmd.accesskey;"
+            key="key_print"
+            command="cmd_print"/>
 
   <key id="key_newBlankPage"
        key="&newBlankPageCmd.key;"
        command="cmd_newEditor"
        modifiers="accel, shift"/>
   <key id="key_newNavigator"
        key="&newNavigatorCmd.key;"
        command="cmd_newNavigator"
        modifiers="accel"/>
+  <key id="key_print"
+       key="&printCmd.key;"
+       command="cmd_print"
+       modifiers="accel"/>
 
   <keyset id="findKeys">
     <key id="key_find"
          key="&findCmd.key;"
          command="cmd_find"
          modifiers="accel"/>
     <key id="key_findNext"
          key="&findAgainCmd.key;"
--- a/suite/locales/en-US/chrome/browser/navigator.dtd
+++ b/suite/locales/en-US/chrome/browser/navigator.dtd
@@ -13,17 +13,16 @@
 <!ENTITY editPageCmd.label "Edit Page">
 <!ENTITY editPageCmd.accesskey "E">
 <!ENTITY editPageCmd.commandkey "e">
 
 <!ENTITY printPreviewCmd.label "Print Preview">
 <!ENTITY printPreviewCmd.accesskey "v">
 <!ENTITY printCmd.label "Print…">
 <!ENTITY printCmd.accesskey "p">
-<!ENTITY printCmd.commandkey "p">
 
 <!ENTITY navbarCmd.label "Navigation Toolbar">
 <!ENTITY navbarCmd.accesskey "N">
 <!ENTITY personalbarCmd.label "Personal Toolbar">
 <!ENTITY personalbarCmd.accesskey "P">
 
 <!ENTITY closeWindow.label "Close Window">
 <!ENTITY closeWindow.accesskey "W">
--- a/suite/locales/en-US/chrome/common/utilityOverlay.dtd
+++ b/suite/locales/en-US/chrome/common/utilityOverlay.dtd
@@ -13,16 +13,23 @@
 <!ENTITY newBlankPageCmd.key              "n">
 <!ENTITY newPageFromTemplateCmd.label "Page Using Template">
 <!ENTITY newPageFromTemplateCmd.accesskey "t">
 <!ENTITY newPageFromDraftCmd.label "Page Using Draft">
 <!ENTITY newPageFromDraftCmd.accesskey "d">
 <!ENTITY newNavigatorCmd.label "Browser Window">
 <!ENTITY newNavigatorCmd.key "N">
 <!ENTITY newNavigatorCmd.accesskey "B">
+<!ENTITY printSetupCmd.label "Page Setup…">
+<!ENTITY printSetupCmd.accesskey "u">
+<!ENTITY printPreviewCmd.label "Print Preview">
+<!ENTITY printPreviewCmd.accesskey "v">
+<!ENTITY printCmd.label "Print…">
+<!ENTITY printCmd.accesskey "P">
+<!ENTITY printCmd.key "P">
 
 <!ENTITY editMenu.label                   "Edit">
 <!ENTITY editMenu.accesskey               "E">
 <!ENTITY undoCmd.label                    "Undo">
 <!ENTITY undoCmd.key                      "Z">
 <!ENTITY undoCmd.accesskey                "U">
 <!ENTITY redoCmd.label                    "Redo">
 <!ENTITY redoCmd.key                      "Y">
--- a/suite/locales/en-US/chrome/mailnews/addressbook/abMainWindow.dtd
+++ b/suite/locales/en-US/chrome/mailnews/addressbook/abMainWindow.dtd
@@ -57,18 +57,16 @@
 <!ENTITY printContactViewCmd.accesskey                  "p">
 <!ENTITY printPreviewContactViewCmd.label               "Print Preview Contact">
 <!ENTITY printPreviewContactViewCmd.accesskey           "v">
 <!ENTITY printContactViewCmd.key                        "P">
 <!ENTITY printAddressBook.label                         "Print Address Book…"> 
 <!ENTITY printAddressBook.accesskey                     "A"> 
 <!ENTITY printPreviewAddressBook.label                  "Print Preview Address Book"> 
 <!ENTITY printPreviewAddressBook.accesskey              "B">
-<!ENTITY printSetupCmd.label                            "Page Setup…">
-<!ENTITY printSetupCmd.accesskey                        "u">
 
 <!-- Edit Menu -->
 <!ENTITY deleteAbCmd.label                              "Delete Address Book">  
 <!ENTITY deleteContactCmd.label                         "Delete Contact">
 <!ENTITY deleteContactsCmd.label                        "Delete Selected Contacts">
 <!ENTITY deleteListCmd.label                            "Delete List">
 <!ENTITY deleteListsCmd.label                           "Delete Selected Lists">
 <!ENTITY deleteItemsCmd.label                           "Delete Selected Items">
--- a/suite/locales/en-US/chrome/mailnews/compose/messengercompose.dtd
+++ b/suite/locales/en-US/chrome/mailnews/compose/messengercompose.dtd
@@ -34,21 +34,16 @@
 <!ENTITY attachVCardCmd.label "Personal Card (vCard)">
 <!ENTITY attachVCardCmd.accesskey "P">
 <!ENTITY sendNowCmd.label "Send Now">
 <!ENTITY sendCmd.keycode "VK_RETURN">
 <!ENTITY sendNowCmd.accesskey "d">
 <!ENTITY sendLaterCmd.label "Send Later">
 <!ENTITY sendLaterCmd.keycode "VK_RETURN">
 <!ENTITY sendLaterCmd.accesskey "L">
-<!ENTITY printSetupCmd.label "Page Setup…">
-<!ENTITY printSetupCmd.accesskey "u">
-<!ENTITY printCmd.label "Print…">
-<!ENTITY printCmd.key "P">
-<!ENTITY printCmd.accesskey "P">
 
 <!-- Edit menu items -->
 <!ENTITY editRewrapCmd.label "Rewrap">
 <!ENTITY editRewrapCmd.key "R">
 <!ENTITY editRewrapCmd.accesskey  "w">
 <!ENTITY findCmd.label "Find and Replace…">
 <!ENTITY accountManagerCmd.label "Mail &amp; Newsgroups Account Settings…">
 <!ENTITY accountManagerCmd.accesskey "m">
--- a/suite/locales/en-US/chrome/mailnews/messenger.dtd
+++ b/suite/locales/en-US/chrome/mailnews/messenger.dtd
@@ -104,21 +104,18 @@
 <!ENTITY settingsOfflineCmd.label "Offline Settings…">
 <!ENTITY settingsOfflineCmd.accesskey "e">
 <!ENTITY downloadSelectedCmd.label "Get Selected Messages">
 <!ENTITY downloadSelectedCmd.accesskey "t">
 <!ENTITY downloadFlaggedCmd.label "Get Flagged Messages">
 <!ENTITY downloadFlaggedCmd.accesskey "G">
 <!ENTITY printCmd.label "Print…">
 <!ENTITY printCmd.accesskey "P">
-<!ENTITY printCmd.key "p">
 <!ENTITY printPreviewCmd.label "Print Preview">
 <!ENTITY printPreviewCmd.accesskey "v">
-<!ENTITY printSetupCmd.label "Page Setup…">
-<!ENTITY printSetupCmd.accesskey "u">
 
 <!-- Edit Menu -->
 <!ENTITY deleteMsgCmd.label "Delete Message">
 <!ENTITY deleteMsgCmd.accesskey "D">
 <!ENTITY undeleteMsgCmd.label "Undelete Message">
 <!ENTITY undeleteMsgCmd.accesskey "d">
 <!ENTITY cancelNewsMsgCmd.label "Cancel Message">
 <!ENTITY cancelNewsMsgCmd.accesskey "n">
--- a/suite/mailnews/addrbook/addressbook.xul
+++ b/suite/mailnews/addrbook/addressbook.xul
@@ -245,17 +245,17 @@
                       <menuitem label="&newLDAPDirectoryCmd.label;" id="addLDAP" accesskey="&newLDAPDirectoryCmd.accesskey;" oncommand="AbNewLDAPDirectory()"/>
                       <menuseparator/>
                       <menuitem id="menu_newNavigator"/>
                       <menuitem id="menu_newEditor"/>
                     </menupopup>
                 </menu>
                 <menuitem id="menu_close"/>
                 <menuseparator/>
-        <menuitem id="printSetupMenuItem" label="&printSetupCmd.label;" accesskey="&printSetupCmd.accesskey;" command="cmd_printSetup"/>
+        <menuitem id="menu_printSetup"/>
         <menuitem id="printPreviewMenuItem"
                   label="&printPreviewContactViewCmd.label;"
                   accesskey="&printPreviewContactViewCmd.accesskey;"
                   command="cmd_printPreviewCard"/>
         <menuitem id="printPreviewAddressBook" label="&printPreviewAddressBook.label;" accesskey="&printPreviewAddressBook.accesskey;" command="cmd_printPreviewAddressBook"/>
               <menuitem id="printMenuItem" label="&printContactViewCmd.label;"
                         accesskey="&printContactViewCmd.accesskey;"
                         key="key_printCard" command="cmd_printCard"/>
--- a/suite/mailnews/compose/messengercompose.xul
+++ b/suite/mailnews/compose/messengercompose.xul
@@ -156,17 +156,17 @@
 <broadcasterset id="mainBroadcasterSet"/>
 
 <keyset id="tasksKeys">
   <!-- File Menu -->
   <key id="key_close"/>
   <key id="key_save"  key="&saveCmd.key;" command="cmd_saveDefault" modifiers="accel"/>
   <key id="key_send" keycode="&sendCmd.keycode;" observes="cmd_sendWithCheck" modifiers="accel"/>
   <key id="key_sendLater" keycode="&sendLaterCmd.keycode;" observes="cmd_sendLater" modifiers="accel, shift"/>
-  <key id="key_print"  key="&printCmd.key;" command="cmd_print" modifiers="accel"/>
+  <key id="key_print"/>
 
   <!-- Edit Menu -->
   <key id="key_rewrap" key="&editRewrapCmd.key;" command="cmd_rewrap" modifiers="accel"/>
   <key id="key_delete2"/>
   <keyset id="findKeys"/>
 
   <!-- Options Menu -->
   <!-- key id="key_selectAddresses" key="&selectAddressCmd.key;" command="cmd_selectAddress"/ -->
@@ -305,24 +305,18 @@
                         accesskey="&sendNowCmd.accesskey;"
                         key="key_send" command="cmd_sendNow"/>
               <menuitem id="menu_sendLater"
                         label="&sendLaterCmd.label;"
                         accesskey="&sendLaterCmd.accesskey;"
                         key="key_sendLater"
                         command="cmd_sendLater"/>
               <menuseparator id="menuFileAfterSendLaterSeparator"/>
-              <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"/>
+              <menuitem id="menu_printSetup"/>
+              <menuitem id="menu_print"/>
             </menupopup>
           </menu>
           <menu id="menu_Edit">
             <menupopup id="menu_EditPopup" onpopupshowing="updateEditItems();">
               <menuitem id="menu_undo"/>
               <menuitem id="menu_redo"/>
               <menuseparator id="menuEditAfterRedoSeparator"/>
               <menuitem id="menu_cut"/>
--- a/suite/mailnews/mailWindowOverlay.xul
+++ b/suite/mailnews/mailWindowOverlay.xul
@@ -113,17 +113,17 @@
 
 <commandset id="mailDownloadCommands">
   <command id="cmd_downloadFlagged" oncommand="goDoCommand('cmd_downloadFlagged')"/>
   <command id="cmd_downloadSelected" oncommand="goDoCommand('cmd_downloadSelected')"/>
 </commandset>
 
 <commandset id="mailFileMenuItems"
             commandupdater="true"
-            events="create-menu-file"
+            events="create-menu-file, message-header-pane"
             oncommandupdate="goUpdateMailMenuItems(this)">
 
     <command id="cmd_getNewMessages" oncommand="goDoCommand('cmd_getNewMessages')" disabled="true"/>
     <command id="cmd_close" oncommand="goDoCommand('cmd_close')"/>
     <command id="cmd_open" oncommand="goDoCommand('cmd_open')"/>
 
     <command id="cmd_emptyTrash" oncommand="goDoCommand('cmd_emptyTrash')" disabled="true"/>
     <command id="cmd_compactFolder" oncommand="goDoCommand('cmd_compactFolder')" disabled="true"/>
@@ -385,17 +385,17 @@
   <key id="key_reply" key="&replyMsgCmd.key;"                        oncommand="goDoCommand('cmd_reply')" modifiers="accel"/>
   <key id="key_replyall" key="&replyToAllMsgCmd.key;"                oncommand="goDoCommand('cmd_replyall')" modifiers="accel, shift"/>
   <key id="key_forward" key="&forwardMsgCmd.key;"                    oncommand="goDoCommand('cmd_forward')" modifiers="accel"/>
   <key id="key_editAsNew" key="&editMsgAsNewCmd.key;"                oncommand="goDoCommand('cmd_editAsNew')" modifiers="accel"/>
   <key id="key_watchThread" key="&watchThreadMenu.key;"              oncommand="goDoCommand('cmd_watchThread')" />
   <key id="key_killThread" key="&killThreadMenu.key;"                oncommand="goDoCommand('cmd_killThread')" />
   <key id="key_killSubthread" key="&killSubthreadMenu.key;"          oncommand="goDoCommand('cmd_killSubthread')" modifiers="shift" />
   <key id="key_openMessage" key="&openMessageWindowCmd.key;"         oncommand="goDoCommand('cmd_openMessage')" modifiers="accel"/>
-  <key id="key_print" key="&printCmd.key;"                           oncommand="goDoCommand('cmd_print')" modifiers="accel"/>
+  <key id="key_print"/>
   <key id="key_saveAsFile" key="&saveAsFileCmd.key;"                 oncommand="goDoCommand('cmd_saveAsFile')" modifiers="accel"/>
   <key id="key_viewPageSource" key="&pageSourceCmd.key;"             oncommand="goDoCommand('cmd_viewPageSource')" modifiers="accel"/>
   <key id="key_getNewMessages" key="&getNewMsgCmd2.key;"             oncommand="goDoCommand('cmd_getNewMessages')" modifiers="accel"/>
   <key id="key_getAllNewMessages"
        key="&getAllNewMsgCmd2.key;"
        oncommand="goDoCommand('cmd_getMsgsForAuthAccounts');"
        modifiers="accel, shift"/>
   <keyset id="findKeys"/>
@@ -1073,19 +1073,19 @@
                       command="cmd_downloadFlagged"/>
            <menuitem id="menu_downloadSelected"
                      label="&downloadSelectedCmd.label;"
                      accesskey="&downloadSelectedCmd.accesskey;"
                      command="cmd_downloadSelected"/>
         </menupopup>
       </menu>
       <menuseparator id="fileMenuAfterOfflineSeparator"/>
-      <menuitem id="printSetupMenuItem" label="&printSetupCmd.label;" accesskey="&printSetupCmd.accesskey;" command="cmd_printSetup"/>
-      <menuitem id="printPreviewMenuItem" label="&printPreviewCmd.label;" accesskey="&printPreviewCmd.accesskey;" command="cmd_printpreview"/>
-      <menuitem id="printMenuItem" key="key_print" label="&printCmd.label;" accesskey="&printCmd.accesskey;" command="cmd_print"/>
+      <menuitem id="menu_printSetup"/>
+      <menuitem id="menu_printPreview"/>
+      <menuitem id="menu_print"/>
     </menupopup>
   </menu>
 
   <menu id="menu_Edit" oncommand="CommandUpdate_UndoRedo();">
     <menupopup id="menu_EditPopup" onpopupshowing="InitEditMessagesMenu()">
       <menuitem id="menu_undo"/>
       <menuitem id="menu_redo"/>
       <menuseparator id="editMenuAfterRedoSeparator"/>