Bug 1458207 - Don't show the "Open in Conversation" in stand-alone window. r=jorgk
authorRichard Marti <richard.marti@gmail.com>
Sat, 06 Oct 2018 22:26:31 +0200
changeset 33323 fb92a1a67492327d7a3c0f5d38c2c28ac47fc523
parent 33322 0a609462906ffbf758142d5c8416e561b511f814
child 33324 bf1c31c2f2b2f7357a25bc1db582607c6d214cd4
push id387
push userclokep@gmail.com
push dateMon, 10 Dec 2018 21:30:47 +0000
reviewersjorgk
bugs1458207
Bug 1458207 - Don't show the "Open in Conversation" in stand-alone window. r=jorgk
mail/base/content/mainKeySet.inc
mail/base/content/mainNavigationToolbox.inc
mail/base/content/mainPopupSet.inc
mail/base/content/msgHdrView.inc
mail/locales/en-US/chrome/messenger/messenger.dtd
--- a/mail/base/content/mainKeySet.inc
+++ b/mail/base/content/mainKeySet.inc
@@ -79,17 +79,17 @@
   <key id="key_replylist" key="&replyToListMsgCmd.key;"              oncommand="goDoCommand('cmd_replylist')" modifiers="accel, shift"/>
   <key id="key_forward" key="&forwardMsgCmd.key;"                    oncommand="goDoCommand('cmd_forward')" modifiers="accel"/>
   <key id="key_editAsNew" key="&editAsNewMsgCmd.key;"                oncommand="goDoCommand('cmd_editAsNew')" modifiers="accel"/>
   <key id="key_newMsgFromTemplate" keycode="&newMsgFromTemplateCmd.keycode;"/><!-- for display on menus only -->
   <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_openConversation" key="&openConversationCmd.key;"     oncommand="goDoCommand('cmd_openConversation')" modifiers="accel, shift"/>
+  <key id="key_openConversation" key="&openInConversationCmd.key;"   oncommand="goDoCommand('cmd_openConversation')" modifiers="accel, shift"/>
 #ifdef XP_MACOSX
   <key id="key_moveToFolderAgain" key="&moveToFolderAgainCmd.key;"   oncommand="goDoCommand('cmd_moveToFolderAgain')" modifiers="alt, accel"/>
 #else
   <key id="key_moveToFolderAgain" key="&moveToFolderAgainCmd.key;"   oncommand="goDoCommand('cmd_moveToFolderAgain')" modifiers="accel, shift"/>
 #endif
   <key id="key_print" key="&printCmd.key;"                           oncommand="goDoCommand('cmd_print')" modifiers="accel"/>
   <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"/>
--- a/mail/base/content/mainNavigationToolbox.inc
+++ b/mail/base/content/mainNavigationToolbox.inc
@@ -650,20 +650,22 @@
                       label="&editTemplateMsgCmd.label;"
                       accesskey="&editTemplateMsgCmd.accesskey;"
                       command="cmd_editTemplateMsg"/>
             <menuseparator id="messageMenuAfterCompositionCommandsSeparator"/>
             <menuitem id="openMessageWindowMenuitem" label="&openMessageWindowCmd.label;"
                       command="cmd_openMessage"
                       accesskey="&openMessageWindowCmd.accesskey;"
                       key="key_openMessage"/>
-            <menuitem id="openConversationMenuitem" label="&openConversationCmd.label;"
+#ifdef MAIN_WINDOW
+            <menuitem id="openConversationMenuitem" label="&openInConversationCmd.label;"
                       command="cmd_openConversation"
-                      accesskey="&openConversationCmd.accesskey;"
+                      accesskey="&openInConversationCmd.accesskey;"
                       key="key_openConversation"/>
+#endif
             <menu id="openFeedMessage"
                   label="&openFeedMessage1.label;"
                   accesskey="&openFeedMessage1.accesskey;">
               <menupopup id="menu_openFeedMessage">
                 <menuitem id="menu_openFeedWebPage"
                           type="radio"
                           name="openFeedGroup"
                           label="&openFeedWebPage.label;"
@@ -678,17 +680,19 @@
                 <menuitem id="menu_openFeedWebPageInMessagePane"
                           type="radio"
                           name="openFeedGroup"
                           label="&openFeedWebPageInMP.label;"
                           accesskey="&openFeedWebPageInMP.accesskey;"
                           oncommand="FeedMessageHandler.onOpenPref = 2"/>
               </menupopup>
             </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);"/>
             </menu>
             <menuseparator id="messageAfterAttachmentMenuSeparator"/>
             <menu id="tagMenu" label="&tagMenu.label;" accesskey="&tagMenu.accesskey;" command="cmd_tag">
--- a/mail/base/content/mainPopupSet.inc
+++ b/mail/base/content/mainPopupSet.inc
@@ -891,20 +891,22 @@
             <menuitem id="appmenu_editTemplateMsgCmd"
                       label="&editTemplateMsgCmd.label;"
                       command="cmd_editTemplateMsg"/>
             <menuseparator id="appmenu_messageMenuAfterCompositionCommandsSeparator"/>
             <menuitem id="appmenu_openMessageWindowMenuitem"
                       label="&openMessageWindowCmd.label;"
                       key="key_openMessage"
                       command="cmd_openMessage"/>
+#ifdef MAIN_WINDOW
             <menuitem id="appmenu_openConversationMenuitem"
-                      label="&openConversationCmd.label;"
+                      label="&openInConversationCmd.label;"
                       key="key_openConversation"
                       command="cmd_openConversation"/>
+#endif
             <menu id="appmenu_openFeedMessage"
                   label="&openFeedMessage1.label;">
               <menupopup id="appmenu_openFeedMessagePopup">
                 <menuitem id="appmenu_openFeedWebPage"
                           type="radio"
                           name="openFeedGroup"
                           label="&openFeedWebPage.label;"
                           oncommand="FeedMessageHandler.onOpenPref = 0"/>
@@ -915,17 +917,19 @@
                           oncommand="FeedMessageHandler.onOpenPref = 1"/>
                 <menuitem id="appmenu_openFeedWebPageInMessagePane"
                           type="radio"
                           name="openFeedGroup"
                           label="&openFeedWebPageInMP.label;"
                           oncommand="FeedMessageHandler.onOpenPref = 2"/>
               </menupopup>
             </menu>
+#ifdef MAIN_WINDOW
             <menuseparator id="appmenu_messageAfterOpenMsgSeparator"/>
+#endif
             <menu id="appmenu_tagMenu"
                   label="&tagMenu.label;"
                   command="cmd_tag">
               <menupopup id="appmenu_tagMenu-tagpopup"
                          onpopupshowing="InitMessageTags(this);">
                 <menuitem id="appmenu_addNewTag"
                           label="&addNewTag.label;"
                           command="cmd_addTag"/>
--- a/mail/base/content/msgHdrView.inc
+++ b/mail/base/content/msgHdrView.inc
@@ -204,20 +204,22 @@
                                     </toolbarbutton>
                                     <toolbarbutton type="menu"
                                                    id="otherActionsButton"
                                                    label="&otherActionsButton2.label;"
                                                    tooltiptext="&otherActionsButton.tooltip;"
                                                    class="toolbarbutton-1 msgHeaderView-button">
                                       <menupopup id="otherActionsPopup"
                                                  onpopupshowing="onShowOtherActionsPopup();">
+#ifdef MAIN_WINDOW
                                         <menuitem id="otherActionsOpenConversation"
                                                   label="&otherActionsOpenConversation1.label;"
                                                   accesskey="&otherActionsOpenConversation1.accesskey;"
                                                   oncommand="gConversationOpener.openConversationForMessages(gFolderDisplay.selectedMessages);"/>
+#endif
                                         <menuitem id="otherActionsOpenInNewWindow"
                                                   label="&otherActionsOpenInNewWindow1.label;"
                                                   accesskey="&otherActionsOpenInNewWindow1.accesskey;"
                                                   observes="otherActionsOpenIn"
                                                   oncommand="MsgOpenNewWindowForMessage();"/>
                                         <menuitem id="otherActionsOpenInNewTab"
                                                   label="&otherActionsOpenInNewTab1.label;"
                                                   accesskey="&otherActionsOpenInNewTab1.accesskey;"
--- a/mail/locales/en-US/chrome/messenger/messenger.dtd
+++ b/mail/locales/en-US/chrome/messenger/messenger.dtd
@@ -435,19 +435,19 @@
 <!ENTITY markAsNotJunkCmd.label "As Not Junk">
 <!ENTITY markAsNotJunkCmd.accesskey "N">
 <!ENTITY markAsNotJunkCmd.key "j">
 <!ENTITY recalculateJunkScoreCmd.label "Run Junk Mail Controls">
 <!ENTITY recalculateJunkScoreCmd.accesskey "C">
 <!ENTITY openMessageWindowCmd.label "Open Message">
 <!ENTITY openMessageWindowCmd.accesskey "O">
 <!ENTITY openMessageWindowCmd.key "o">
-<!ENTITY openConversationCmd.label "Open in Conversation">
-<!ENTITY openConversationCmd.accesskey "s">
-<!ENTITY openConversationCmd.key "o">
+<!ENTITY openInConversationCmd.label "Open in Conversation">
+<!ENTITY openInConversationCmd.accesskey "s">
+<!ENTITY openInConversationCmd.key "o">
 <!ENTITY openAttachmentListCmd.label "Attachments">
 <!ENTITY openAttachmentListCmd.accesskey "h">
 <!ENTITY openFeedMessage1.label "When Opening Feed Messages">
 <!ENTITY openFeedMessage1.accesskey "O">
 <!ENTITY openFeedWebPage.label "Open as Web Page">
 <!ENTITY openFeedWebPage.accesskey "W">
 <!ENTITY openFeedSummary.label "Open as Summary">
 <!ENTITY openFeedSummary.accesskey "S">