Bug 791957 - New app menu doesn't list keyboard shortcuts next to menu items. r=mconley, a=mbanner GECKO1701_2013010313_RELBRANCH
authorRichard Marti <richard.marti@gmail.com>
Sun, 25 Nov 2012 16:55:00 +0100
branchGECKO1701_2013010313_RELBRANCH
changeset 30918 175528113a0a2a0cf879aea94f389375b2be72a9
parent 30917 1225d8c122c4962f84222a8bd0a84f93e16e3f68
child 30919 82f6c5d18295b28ec139445f78ad9af945958ad3
push id1
push userclokep@gmail.com
push dateMon, 07 May 2018 22:45:56 +0000
treeherdercomm-esr60@57eacde5ef40 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmconley, mbanner
bugs791957
Bug 791957 - New app menu doesn't list keyboard shortcuts next to menu items. r=mconley, a=mbanner
mail/base/content/mailWindowOverlay.xul
--- a/mail/base/content/mailWindowOverlay.xul
+++ b/mail/base/content/mailWindowOverlay.xul
@@ -949,16 +949,17 @@
     <hbox>
       <vbox id="appmenuPrimaryPane">
         <splitmenu id="appmenu_newMessage"
                    label="&appmenuNewMsgCmd.label;"
                    oncommand="MsgNewMessage(null);">
             <menupopup id="appmenu_newMenupopup">
               <menuitem id="newNewMsgCmd"
                         label="&newNewMsgCmd.label;"
+                        key="key_newMessage2"
                         oncommand="MsgNewMessage(null);"/>
               <menuitem id="appmenu_newFolder"
                         label="&newFolderCmd.label;"
                         oncommand="gFolderTreeController.newFolder();"/>
               <menuitem id="appmenu_newVirtualFolder"
                         label="&newVirtualFolderCmd.label;"
                         oncommand="gFolderTreeController.newVirtualFolder();"/>
               <menuseparator id="appmenu_newAccountPopupMenuSeparator"/>
@@ -1046,40 +1047,43 @@
           </menu>
         </hbox>
         <splitmenu id="appmenu_find"
                    label="&findMenu.label;"
                    command="cmd_find">
           <menupopup id="appmenu_FindPopup">
             <menuitem id="appmenu_findCmd"
                       label="&findCmd.label;"
+                      key="key_find"
                       command="cmd_find"/>
             <menuitem id="appmenu_findAgainCmd"
                       label="&findAgainCmd.label;"
+                      key="key_findAgain"
                       command="cmd_findAgain"/>
             <menuseparator id="appMenuAfterFindSeparator"/>
             <menuitem id="appmenu_searchMailCmd"
                       label="&searchMailCmd.label;"
+                      key="key_searchMail"
                       command="cmd_search"/>
             <menuitem id="appmenu_searchAddressesCmd"
                       label="&searchAddressesCmd.label;"
                       oncommand="MsgSearchAddresses()"/>
           </menupopup>
         </splitmenu>
         <splitmenu id="appmenu_print"
                    iconic="true"
                    label="&printCmd.label;"
                    key="printKb"
                    command="cmd_print">
             <menupopup>
               <menuitem id="appmenu_print_popup"
                         class="menuitem-iconic"
                         label="&printCmd.label;"
-                        command="cmd_print"
-                        key="printKb"/>
+                        key="key_print"
+                        command="cmd_print"/>
               <menuitem id="appmenu_printPreview"
                         label="&printPreviewCmd.label;"
                         command="cmd_printpreview"/>
               <menuitem id="appmenu_printSetup"
                         label="&printSetupCmd.label;"
                         command="cmd_printSetup"/>
             </menupopup>
         </splitmenu>
@@ -1236,45 +1240,49 @@
                 <menuseparator id="appmenu_viewMenuAfterPaneVerticalSeparator"/>
                 <menuitem id="appmenu_showFolderPane"
                           type="checkbox"
                           label="&showFolderPaneCmd.label;"
                           command="cmd_toggleFolderPane"/>
                 <menuitem id="appmenu_showMessage"
                           type="checkbox"
                           label="&showMessageCmd.label;"
+                          key="key_toggleMessagePane"
                           command="cmd_toggleMessagePane"/>
               </menupopup>
             </menu>
           </menupopup>
         </splitmenu>
         <spacer class="appmenuPane-spacer"/>
         <!-- File menu -->
         <menu id="appmenu_File"
               label="&fileMenu.label;">
           <menupopup id="appmenu_FilePopup">
             <menuitem id="appmenu_openMessageFileMenuitem"
                       label="&openMessageFileCmd.label;"
                       oncommand="MsgOpenFromFile();"/>
             <menuitem id="appmenu_close"
                       label="&closeCmd.label;"
+                      key="key_close"
                       command="cmd_close"/>
             <menuseparator id="appmenu_fileMenuAfterCloseSeparator"/>
             <menu id="appmenu_getNewMsgFor"
                   label="&getNewMsgForCmd.label;"
                   oncommand="MsgGetMessagesForAccount(event.target._folder)">
               <menupopup type="folder"
                          mode="getMail"
                          id="appmenu_getAllNewMsgPopup"
                          expandFolders="false">
                 <menuitem id="appmenu_getnewmsgs_all_accounts"
                           label="&getAllNewMsgCmdPopupMenu.label;"
+                          key="key_getAllNewMessages"
                           command="cmd_getMsgsForAuthAccounts"/>
                 <menuitem id="appmenu_getnewmsgs_current_account"
                           label="&getNewMsgCurrentAccountCmdPopupMenu.label;"
+                          key="key_getNewMessages"
                           command="cmd_getNewMessages"/>
                 <menuseparator/>
               </menupopup>
             </menu>
             <menuitem id="appmenu_getNextNMsgs"
                       label="&getNextNMsgCmd.label;"
                       command="cmd_getNextNMessages"/>
             <menuitem id="appmenu_sendUnsentMsgs"
@@ -1284,16 +1292,17 @@
                       label="&subscribeCmd.label;"
                       oncommand="MsgSubscribe();"/>
             <menuseparator id="appmenu_fileMenuAfterSubscribeSeparator"/>
             <menuitem id="appmenu_deleteFolder"
                       label="&deleteFolder.label;"
                       command="cmd_deleteFolder"/>
             <menuitem id="appmenu_renameFolder"
                       label="&renameFolder.label;"
+                      key="key_renameFolder"
                       command="cmd_renameFolder"/>
             <menuseparator id="appmenu_fileMenuAfterRenameSeparator"/>
             <menuitem id="appmenu_compactFolder"
                       label="&compactFolders.label;"
                       command="cmd_compactFolder"/>
             <menuseparator id="appmenu_fileMenuAfterCompactSeparator"/>
             <menu id="appmenu_offline"
                   label="&offlineMenu.label;">
@@ -1496,20 +1505,22 @@
                 <menuitem id="appmenu_viewIgnoredThreadsMenuItem"
                           type="checkbox"
                           label="&ignoredThreadsCmd.label;"
                           disabled="true"
                           command="cmd_viewIgnoredThreads"/>
                 <menuseparator id="appmenu_threadsAfterIgnoredSeparator"/>
                 <menuitem id="appmenu_expandAllThreads"
                           label="&expandAllThreadsCmd.label;"
+                          key="key_expandAllThreads"
                           disabled="true"
                           command="cmd_expandAllThreads"/>
                 <menuitem id="appmenu_collapseAllThreads"
                           label="&collapseAllThreadsCmd.label;"
+                          key="key_collapseAllThreads"
                           disabled="true"
                           command="cmd_collapseAllThreads"/>
               </menupopup>
             </menu>
             <menuseparator id="appmenu_viewAfterThreadsSeparator"/>
             <menu id="appmenu_viewHeadersMenu"
                   label="&headersMenu.label;">
               <menupopup id="appmenu_HeadersPopup" onpopupshowing="InitViewHeadersMenu();">
@@ -1595,23 +1606,26 @@
                       checked="true"/>
             <menuseparator id="appmenu_viewAfterAttachmentsSeparator"/>
             <menu id="appmenu_viewFullZoomMenu"
                   label="&fullZoom.label;"
                   onpopupshowing="UpdateFullZoomMenu()">
               <menupopup id="appmenu_viewFullZoomPopupMenu">
                 <menuitem id="appmenu_fullZoomEnlarge"
                           label="&fullZoomEnlargeCmd.label;"
+                          key="key_fullZoomEnlarge"
                           command="cmd_fullZoomEnlarge"/>
                 <menuitem id="appmenu_fullZoomReduce"
                           label="&fullZoomReduceCmd.label;"
+                          key="key_fullZoomReduce"
                           command="cmd_fullZoomReduce"/>
                 <menuseparator id="appmenu_fullZoomAfterReduceSeparator"/>
                 <menuitem id="appmenu_fullZoomReset"
                           label="&fullZoomResetCmd.label;"
+                          key="key_fullZoomReset"
                           command="cmd_fullZoomReset"/>
                 <menuseparator id="appmenu_fullZoomAfterResetSeparator"/>
                 <menuitem id="appmenu_fullZoomToggle"
                           label="&fullZoomToggleCmd.label;"
                           type="checkbox"
                           command="cmd_fullZoomToggle"
                           checked="false"/>
               </menupopup>
@@ -1737,64 +1751,73 @@
                 <menuitem name="charsetCustomize"
                           label="&charsetCustomize.label;"
                           oncommand="window.openDialog('chrome://global/content/customizeCharset.xul', 'PrefWindow', 'chrome,modal=yes,resizable=yes', 'browser');"/>
               </menupopup>
             </menu>
             <menuseparator id="appmenu_viewAfterCharsetSeparator"/>
             <menuitem id="appmenu_pageSourceMenuItem"
                       label="&pageSourceCmd.label;"
+                      key="key_viewPageSource"
                       command="cmd_viewPageSource"/>
           </menupopup>
         </menu>
         <!-- Go menu -->
         <menu id="appmenu_Go"
               label="&goMenu.label;">
           <menupopup id="appmenu_GoPopup">
             <menu id="appmenu_goNextMenu"
                   label="&nextMenu.label;">
               <menupopup id="appmenu_GoNextPopup">
                 <menuitem id="appmenu_nextMsg"
                           label="&nextMsgCmd.label;"
+                          key="key_nextMsg"
                           command="cmd_nextMsg"/>
                 <menuitem id="appmenu_nextUnreadMsg"
                           label="&nextUnreadMsgCmd.label;"
+                          key="key_nextUnreadMsg"
                           command="cmd_nextUnreadMsg"/>
                 <menuitem id="appmenu_nextFlaggedMsg"
                           label="&nextStarredMsgCmd.label;"
                           command="cmd_nextFlaggedMsg"/>
                 <menuseparator id="appmenu_goNextAfterFlaggedSeparator"/>
                 <menuitem id="appmenu_nextUnreadThread"
                           label="&nextUnreadThread.label;"
+                          key="key_nextUnreadThread"
                           command="cmd_nextUnreadThread"/>
               </menupopup>
             </menu>
             <menu id="appmenu_goPreviousMenu"
                   label="&prevMenu.label;">
               <menupopup id="appmenu_GoPreviousPopup">
                 <menuitem id="appmenu_prevMsg"
                           label="&prevMsgCmd.label;"
+                          key="key_previousMsg"
                           command="cmd_previousMsg"/>
                 <menuitem id="appmenu_prevUnreadMsg"
                           label="&prevUnreadMsgCmd.label;"
+                          key="key_previousUnreadMsg"
                           command="cmd_previousUnreadMsg"/>
                 <menuitem id="appmenu_prevFlaggedMsg"
                           label="&prevStarredMsgCmd.label;"
                           command="cmd_previousFlaggedMsg"/>
               </menupopup>
             </menu>
             <menuitem id="appmenu_goForward"
                       label="&goForwardCmd.label;"
+                      key="key_goForward"
                       command="cmd_goForward"/>
             <menuitem id="appmenu_goBack"
                       label="&goBackCmd.label;"
+                      key="key_goBack"
                       command="cmd_goBack"/>
             <menuseparator id="appmenu_goNextSeparator"/>
             <menuitem id="appmenu_goChat"
                       label="&goChatCmd.label;"
+                      key="key_goChat"
                       oncommand="showChatTab();"/>
             <menuseparator id="appmenu_goChatSeparator"/>
             <menu id="appmenu_goFolderMenu"
                   label="&folderMenu.label;"
                   oncommand="gFolderTreeView.selectFolder(event.target._folder, true)">
               <menupopup id="appmenu_GoFolderPopup"
                          type="folder"
                          showFileHereLabel="true"
@@ -1806,65 +1829,75 @@
             <menu id="appmenu_goRecentlyClosedTabs"
                   label="&goRecentlyClosedTabs.label;">
               <menupopup id="appmenu_GoRecentlyClosedTabsPopup"
                          onpopupshowing="return InitRecentlyClosedTabsPopup(this)" />
             </menu>
             <menuseparator id="appmenu_goRecentlyClosedTabsSeparator"/>
             <menuitem id="appmenu_goStartPage"
                       label="&startPageCmd.label;"
+                      key="key_goStartPage"
                       command="cmd_goStartPage"/>
           </menupopup>
         </menu>
         <!-- Message menu -->
         <menu id="appmenu_messageMenu"
               label="&msgMenu.label;">
           <menupopup id="appmenu_messageMenuPopup"
                      onpopupshowing="InitAppMessageMenu();">
             <menuitem id="appmenu_newMsgCmd"
                       label="&newMsgCmd.label;"
+                      key="key_newMessage2"
                       oncommand="MsgNewMessage(null);"/>
             <menuitem id="appmenu_replyMainMenu"
                       label="&replyMsgCmd.label;"
+                      key="key_reply"
                       command="cmd_reply"/>
             <menuitem id="appmenu_replyNewsgroupMainMenu"
                       label="&replyNewsgroupCmd2.label;"
+                      key="key_reply"
                       command="cmd_replyGroup"/>
             <menuitem id="appmenu_replySenderMainMenu"
                       label="&replySenderCmd.label;"
                       command="cmd_replySender"/>
             <menuitem id="appmenu_replyToAll"
                       label="&replyToAllMsgCmd.label;"
+                      key="key_replyall"
                       command="cmd_replyall"/>
             <menuitem id="appmenu_replyToList"
                       label="&replyToListMsgCmd.label;"
+                      key="key_replylist"
                       command="cmd_replylist"/>
             <menuitem id="appmenu_forwardMsg"
                       label="&forwardMsgCmd.label;"
+                      key="key_forward"
                       command="cmd_forward"/>
             <menu id="appmenu_forwardAsMenu"
                   label="&forwardAsMenu.label;">
               <menupopup id="appmenu_forwardAsPopup">
                 <menuitem id="appmenu_forwardAsInline"
                           label="&forwardAsInline.label;"
                           command="cmd_forwardInline"/>
                 <menuitem id="appmenu_forwardAsAttachment"
                           label="&forwardAsAttachmentCmd.label;"
                           command="cmd_forwardAttachment"/>
               </menupopup>
             </menu>
             <menuitem id="appmenu_editMsgAsNew"
                       label="&editMsgAsNewCmd.label;"
+                      key="key_editAsNew"
                       command="cmd_editAsNew"/>
             <menuseparator id="appmenu_messageMenuAfterCompositionCommandsSeparator"/>
             <menuitem id="appmenu_openMessageWindowMenuitem"
                       label="&openMessageWindowCmd.label;"
+                      key="key_openMessage"
                       command="cmd_openMessage"/>
             <menuitem id="appmenu_openConversationMenuitem"
                       label="&openConversationCmd.label;"
+                      key="key_openConversation"
                       command="cmd_openConversation"/>
             <menu id="appmenu_openFeedMessage"
                   label="&openFeedMessage.label;">
               <menupopup id="appmenu_openFeedMessage">
                 <menuitem id="appmenu_openFeedWebPageInWindow"
                           type="radio"
                           name="openFeedGroup"
                           label="&openFeedWebPageInWindow.label;"
@@ -1906,43 +1939,50 @@
                 <menuitem id="appmenu_markReadMenuItem"
                           label="&markAsReadCmd.label;"
                           command="cmd_markAsRead"/>
                 <menuitem id="appmenu_markUnreadMenuItem"
                           label="&markAsUnreadCmd.label;"
                           command="cmd_markAsUnread"/>
                 <menuitem id="appmenu_markThreadAsRead"
                           label="&markThreadAsReadCmd.label;"
+                          key="key_markThreadAsRead"
                           command="cmd_markThreadAsRead"/>
                 <menuitem id="appmenu_markReadByDate"
                           label="&markReadByDateCmd.label;"
+                          key="key_markReadByDate"
                           command="cmd_markReadByDate"/>
                 <menuitem id="appmenu_markAllRead"
                           label="&markAllReadCmd.label;"
+                          key="key_markAllRead"
                           command="cmd_markAllRead"/>
                 <menuseparator id="markMenuAfterAllReadSeparator"/>
                 <menuitem id="appmenu_markFlaggedMenuItem"
                           type="checkbox"
                           label="&markStarredCmd.label;"
+                          key="key_toggleFlagged"
                           command="cmd_markAsFlagged"/>
                 <menuseparator id="markMenuAfterFlaggedSeparator"/>
                 <menuitem id="appmenu_markAsJunk"
                           label="&markAsJunkCmd.label;"
+                          key="key_markJunk"
                           command="cmd_markAsJunk"/>
                 <menuitem id="appmenu_markAsNotJunk"
                           label="&markAsNotJunkCmd.label;"
+                          key="key_markNotJunk"
                           command="cmd_markAsNotJunk"/>
                 <menuitem id="appmenu_recalculateJunkScore"
                           label="&recalculateJunkScoreCmd.label;"
                           command="cmd_recalculateJunkScore"/>
               </menupopup>
             </menu>
             <menuseparator id="appmenu_messageMenuAfterMarkSeparator"/>
             <menuitem id="appmenu_archiveMainMenu"
                       label="&archiveMsgCmd.label;"
+                      key="key_archive"
                       command="cmd_archive"/>
             <menuitem id="appmenu_cancel"
                       command="cmd_cancel"
                       label="&cancelNewsMsgCmd.label;"/>
             <menu id="appmenu_moveMenu"
                   label="&moveMsgToMenu.label;"
                   oncommand="MsgMoveMessage(event.target._folder)">
               <menupopup type="folder"
@@ -1959,48 +1999,55 @@
                          mode="filing"
                          showFileHereLabel="true"
                          showRecent="true"
                          fileHereLabel="&copyHereMenu.label;"
                          recentLabel="&moveCopyMsgRecentMenu.label;"/>
             </menu>
             <menuitem id="appmenu_moveToFolderAgain"
                       command="cmd_moveToFolderAgain"
+                      key="key_moveToFolderAgain"
                       label="&moveToFolderAgain.label;"/>
             <menuseparator id="appmenu_messageMenuAfterMoveCommandsSeparator"/>
             <menuitem id="appmenu_createFilter"
                       label="&createFilter.label;"
                       command="cmd_createFilterFromMenu"/>
             <menuseparator id="appmenu_threadItemsSeparator"/>
             <menuitem label="&killThreadMenu.label;"
                       id="appmenu_killThread"
+                      key="key_killThread"
                       command="cmd_killThread"/>
             <menuitem label="&killSubthreadMenu.label;"
                       id="appmenu_killSubthread"
+                      key="key_killSubthread"
                       command="cmd_killSubthread"/>
             <menuitem label="&watchThreadMenu.label;"
                       id="appmenu_watchThread"
+                      key="key_watchThread"
                       command="cmd_watchThread"/>
           </menupopup>
         </menu>
         <!-- Tools menu -->
         <menu id="appmenu_tasksMenu"
               label="&tasksMenu.label;">
           <menupopup id="appmenu_taskPopup">
             <menuitem hidden="true"
                       id="appmenu_tasksMenuMail"
                       class="menuitem-iconic menu-iconic"
                       label="&messengerCmd.label;"
+                      key="key_mail"
                       oncommand="toMessengerWindow();"/>
             <menuitem id="appmenu_addressBook"
                       label="&addressBookCmd.label;"
+                      key="key_addressbook"
                       oncommand="toOpenWindowByType('mail:addressbook', 'chrome://messenger/content/addressbook/addressbook.xul');"/>
             <menuseparator id="devToolsSeparator"/>
             <menuitem id="appmenu_openSavedFilesWnd"
                       label="&savedFiles.label;"
+                      key="key_savedFiles"
                       oncommand="openSavedFilesWnd();"/>
             <menu id="appmenu_imAccountsStatus"
                   label="&imAccountsStatus.label;"
                   oncommand="chatHandler.setStatusMenupopupCommand(event);">
               <menupopup id="appmenu_imStatusMenupopup">
                 <menuitem id="appmenu_imStatusAvailable"
                           status="available"
                           label="&imStatus.available;"
@@ -2030,30 +2077,32 @@
                       label="&deleteJunk.label;"
                       command="cmd_deleteJunk"/>
             <menuseparator id="tasksMenuAfterDeleteSeparator"/>
             <menuitem id="appmenu_import"
                       label="&importCmd.label;"
                       oncommand="toImport();"/>
             <menuitem id="appmenu_javascriptConsole"
                       label="&errorConsoleCmd.label;"
+                      key="key_errorConsole"
                       oncommand="toJavaScriptConsole();"/>
             <menuitem id="appmenu_sanitizeHistory"
                       label="&clearRecentHistory.label;"
                       oncommand="toSanitize();"/>
           </menupopup>
         </menu>
         <!-- Help menu -->
         <splitmenu id="appmenu_help"
                    label="&helpMenuWin.label;"
                    oncommand="openSupportURL();">
             <menupopup id="appmenu_helpMenupopup">
               <menuitem id="appmenu_openHelp"
-                  label="&openHelp.label;"
-                  oncommand="openSupportURL();"/>
+                        label="&openHelp.label;"
+                        key="key_openHelp"
+                        oncommand="openSupportURL();"/>
               <menuitem id="appmenu_whatsNew"
                         label="&whatsNewCmd.label;"
                         oncommand="openWhatsNew();"/>
               <menuitem id="appmenu_releaseNotes"
                         label="&releaseCmd2.label;"
                         oncommand="openFormattedURL('app.releaseNotesURL');"/>
               <menuseparator/>
               <menuitem id="appmenu_troubleshootingInfo"