Bug 1519481 - Restore Attachments submenu which got lost during overlay removal. r=jorgk
authoralta88 <alta88@gmail.com>
Fri, 11 Jan 2019 22:19:58 +0100
changeset 34168 bb6728bfe4358525d708631344c8da6638b9f7e8
parent 34167 f751be7a177924870f99fc454340791ebf6d5476
child 34169 95215e0170b63d49e9a0d626b62b8eda17acb6cd
push id389
push userclokep@gmail.com
push dateMon, 18 Mar 2019 19:01:53 +0000
reviewersjorgk
bugs1519481
Bug 1519481 - Restore Attachments submenu which got lost during overlay removal. r=jorgk
mail/base/content/mainNavigationToolbox.inc.xul
mail/base/content/mainPopupSet.inc.xul
--- a/mail/base/content/mainNavigationToolbox.inc.xul
+++ b/mail/base/content/mainNavigationToolbox.inc.xul
@@ -690,17 +690,32 @@
             </menu>
 #ifdef MAIN_WINDOW
             <menuseparator id="messageAfterOpenMsgSeparator"/>
 #endif
             <menu id="msgAttachmentMenu"
                   label="&openAttachmentListCmd.label;"
                   accesskey="&openAttachmentListCmd.accesskey;"
                   disabled="true">
-              <menupopup id="attachmentMenuList" onpopupshowing="FillAttachmentListPopup(this);"/>
+              <menupopup id="attachmentMenuList"
+                         onpopupshowing="FillAttachmentListPopup(event, this);">
+                <menuseparator/>
+                <menuitem label="&openAllAttachmentsCmd.label;"
+                          accesskey="&openAllAttachmentsCmd.accesskey;"
+                          command="cmd_openAllAttachments"/>
+                <menuitem label="&saveAllAttachmentsCmd.label;"
+                          accesskey="&saveAllAttachmentsCmd.accesskey;"
+                          command="cmd_saveAllAttachments"/>
+                <menuitem label="&detachAllAttachmentsCmd.label;"
+                          accesskey="&detachAllAttachmentsCmd.accesskey;"
+                          command="cmd_detachAllAttachments"/>
+                <menuitem label="&deleteAllAttachmentsCmd.label;"
+                          accesskey="&deleteAllAttachmentsCmd.accesskey;"
+                          command="cmd_deleteAllAttachments"/>
+              </menupopup>
             </menu>
             <menuseparator id="messageAfterAttachmentMenuSeparator"/>
             <menu id="tagMenu" label="&tagMenu.label;" accesskey="&tagMenu.accesskey;" command="cmd_tag">
               <menupopup id="tagMenu-tagpopup"
                          onpopupshowing="InitMessageTags(this);">
                 <menuitem id="tagMenu-addNewTag"
                           label="&addNewTag.label;"
                           accesskey="&addNewTag.accesskey;"
--- a/mail/base/content/mainPopupSet.inc.xul
+++ b/mail/base/content/mainPopupSet.inc.xul
@@ -45,17 +45,31 @@
                         label="&newIMContactCmd.label;"
                         command="cmd_addChatBuddy"/>
             </menupopup>
         </splitmenu>
         <menu id="appmenu_msgAttachmentMenu"
               label="&openAttachmentListCmd.label;"
               disabled="true">
           <menupopup id="appmenu_attachmentMenuList"
-                     onpopupshowing="FillAttachmentListPopup(this);"/>
+                     onpopupshowing="FillAttachmentListPopup(event, this);">
+            <menuseparator/>
+            <menuitem label="&openAllAttachmentsCmd.label;"
+                      accesskey="&openAllAttachmentsCmd.accesskey;"
+                      command="cmd_openAllAttachments"/>
+            <menuitem label="&saveAllAttachmentsCmd.label;"
+                      accesskey="&saveAllAttachmentsCmd.accesskey;"
+                      command="cmd_saveAllAttachments"/>
+            <menuitem label="&detachAllAttachmentsCmd.label;"
+                      accesskey="&detachAllAttachmentsCmd.accesskey;"
+                      command="cmd_detachAllAttachments"/>
+            <menuitem label="&deleteAllAttachmentsCmd.label;"
+                      accesskey="&deleteAllAttachmentsCmd.accesskey;"
+                      command="cmd_deleteAllAttachments"/>
+          </menupopup>
         </menu>
         <menuseparator class="appmenu-menuseparator"/>
         <hbox>
           <menuitem id="appmenu-edit-label"
                     label="&appmenuEditMenu.label;"
                     disabled="true"/>
           <toolbarbutton id="appmenu-cut"
                          class="appmenu-edit-button"