Bug 1444598 - Inline the msgReadSMIMEOverlay.xul. r=jorgk
authorRichard Marti <richard.marti@gmail.com>
Sat, 10 Mar 2018 11:27:44 +0100
changeset 31263 fe59a7fbd3301925e6eab896dba5aa6310f9f705
parent 31262 57ed2a26e5fd5203d61d62703ac6d40a04d371f3
child 31264 0d3551ecdba7cdfbec00bc22f2606f6076012b39
push id383
push userclokep@gmail.com
push dateMon, 07 May 2018 21:52:48 +0000
reviewersjorgk
bugs1444598
Bug 1444598 - Inline the msgReadSMIMEOverlay.xul. r=jorgk
mail/base/content/mailWindowOverlay.xul
mail/extensions/smime/content/msgReadSMIMEOverlay.xul
mail/extensions/smime/jar.mn
--- a/mail/base/content/mailWindowOverlay.xul
+++ b/mail/base/content/mailWindowOverlay.xul
@@ -5,16 +5,17 @@
 
 #ifdef XP_UNIX
 #ifndef XP_MACOSX
 #define XP_GNOME 1
 #endif
 #endif
 
 <?xml-stylesheet href="chrome://messenger/skin/folderMenus.css" type="text/css"?>
+<?xml-stylesheet href="chrome://messenger/skin/smime/msgReadSMIMEOverlay.css" type="text/css"?>
 
 <!-- Overlaying utilityOverlay.xul here is a temporary band-aid for a
      hard-to-reproduce problem where File, Edit, and View menus disappear on
      Mac when certain add-ons are installed (bug 398702).  Work to find a
      better fix is ongoing.  Ultimately, utilityOverlay.xul wants to
      disappear from Thunderbird entirely (bug 359748). -->
 <?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
 
@@ -33,16 +34,18 @@
   <!ENTITY % baseMenuOverlayDTD SYSTEM "chrome://messenger/locale/baseMenuOverlay.dtd">
   %baseMenuOverlayDTD;
   <!ENTITY % utilityDTD SYSTEM "chrome://communicator/locale/utilityOverlay.dtd">
   %utilityDTD;
   <!ENTITY % charsetDTD SYSTEM "chrome://global/locale/charsetMenu.dtd">
   %charsetDTD;
   <!ENTITY % viewZoomOverlayDTD SYSTEM "chrome://messenger/locale/viewZoomOverlay.dtd">
   %viewZoomOverlayDTD;
+  <!ENTITY % msgReadSMIMEDTD SYSTEM "chrome://messenger-smime/locale/msgReadSMIMEOverlay.dtd">
+  %msgReadSMIMEDTD;
 ]>
 
 <overlay  xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
           xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <script type="application/javascript" src="chrome://messenger/content/mailCommands.js"/>
 <script type="application/javascript" src="chrome://messenger/content/junkCommands.js"/>
 <script type="application/javascript" src="chrome://messenger/content/mailWindowOverlay.js"/>
@@ -56,16 +59,17 @@
 <script type="application/javascript" src="chrome://messenger/content/plugins.js"/>
 <script type="application/javascript" src="chrome://global/content/viewZoomOverlay.js"/>
 <script type="application/javascript" src="chrome://communicator/content/utilityOverlay.js"/>
 <script type="application/javascript" src="chrome://messenger/content/mailCore.js"/>
 #ifdef XP_MACOSX
 <script type="application/javascript" src="chrome://global/content/macWindowMenu.js"/>
 #endif
 <script type="application/javascript" src="chrome://messenger/content/newmailaccount/uriListener.js"/>
+<script type="application/javascript" src="chrome://messenger-smime/content/msgReadSMIMEOverlay.js"/>
 
 <stringbundleset id="stringbundleset">
   <stringbundle id="brand_bundle" src="chrome://branding/locale/brand.properties"/>
   <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
   <stringbundle id="bundle_offlinePrompts" src="chrome://messenger/locale/offline.properties"/>
 </stringbundleset>
 
 <!-- Performance optimization...we include utilityOverlay.xul which defines some command sets
@@ -152,16 +156,19 @@
               oncommand="goDoCommand('cmd_fullZoomReduce');"/>
      <command id="cmd_fullZoomEnlarge"
               oncommand="goDoCommand('cmd_fullZoomEnlarge');"/>
      <command id="cmd_fullZoomReset"
               oncommand="goDoCommand('cmd_fullZoomReset');"/>
      <command id="cmd_fullZoomToggle"
               oncommand="goDoCommand('cmd_fullZoomToggle');"
               checked="false"/>
+     <command id="cmd_viewSecurityStatus"
+              oncommand="showMessageReadSecurityInfo();"
+              disabled="true"/>
    </commandset>
 </commandset>
 
 <commandset id="mailEditMenuItems"
             commandupdater="true"
             events="create-menu-edit"
             oncommandupdate="goUpdateMailMenuItems(this)">
 
@@ -1826,16 +1833,20 @@
               <menupopup id="appmenu_charsetPopup"
                          onpopupshowing="CharsetMenu.build(this, true, this.getAttribute('detectors') != 'false');"/>
             </menu>
             <menuseparator id="appmenu_viewAfterCharsetSeparator"/>
             <menuitem id="appmenu_pageSourceMenuItem"
                       label="&pageSourceCmd.label;"
                       key="key_viewPageSource"
                       command="cmd_viewPageSource"/>
+            <menuitem id="appmenu_securityStatus"
+                      label="&menu_securityStatus.label;"
+                      accesskey="&menu_securityStatus.accesskey;"
+                      command="cmd_viewSecurityStatus"/>
           </menupopup>
         </menu>
         <!-- Go menu -->
         <menu id="appmenu_Go"
               label="&goMenu.label;">
           <menupopup id="appmenu_GoPopup">
             <menu id="appmenu_goNextMenu"
                   label="&nextMenu.label;">
@@ -2736,16 +2747,20 @@
                         type="checkbox" command="cmd_fullZoomToggle" checked="false"/>
             </menupopup>
           </menu>
           <menu id="charsetMenu"
                 onpopupshowing="UpdateCharsetMenu(msgWindow.mailCharacterSet, this);"
                 oncommand="MailSetCharacterSet(event)"/>
           <menuseparator id="viewAfterCharsetSeparator"/>
           <menuitem id="pageSourceMenuItem" label="&pageSourceCmd.label;" key="key_viewPageSource" accesskey="&pageSourceCmd.accesskey;" command="cmd_viewPageSource"/>
+          <menuitem id="menu_securityStatus"
+                    label="&menu_securityStatus.label;"
+                    accesskey="&menu_securityStatus.accesskey;"
+                    command="cmd_viewSecurityStatus"/>
         </menupopup>
         </menu>
 
         <!-- Go -->
         <menu id="menu_Go" label="&goMenu.label;" accesskey="&goMenu.accesskey;">
           <menupopup id="menu_GoPopup" onpopupshowing="InitGoMessagesMenu();">
           <menu id="goNextMenu" label="&nextMenu.label;" accesskey="&nextMenu.accesskey;">
             <menupopup id="menu_GoNextPopup">
deleted file mode 100644
--- a/mail/extensions/smime/content/msgReadSMIMEOverlay.xul
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<?xml-stylesheet href="chrome://messenger/skin/smime/msgReadSMIMEOverlay.css" type="text/css"?>
-
-<!DOCTYPE overlay SYSTEM "chrome://messenger-smime/locale/msgReadSMIMEOverlay.dtd">
-
-<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <script type="application/javascript" src="chrome://messenger-smime/content/msgReadSMIMEOverlay.js"/>
-
-  <stringbundleset id="stringbundleset">
-    <stringbundle id="bundle_read_smime" src="chrome://messenger-smime/locale/msgReadSMIMEOverlay.properties"/>
-    <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
-  </stringbundleset>
-
-  <commandset id="mailViewMenuItems">
-    <command id="cmd_viewSecurityStatus" oncommand="showMessageReadSecurityInfo();" disabled="true"/>
-  </commandset>
-
-  <menupopup id="menu_View_Popup">
-    <menuitem id="menu_securityStatus" insertafter="pageSourceMenuItem"
-              label="&menu_securityStatus.label;" accesskey="&menu_securityStatus.accesskey;"
-              command="cmd_viewSecurityStatus"/>
-  </menupopup>
-
-</overlay>
--- a/mail/extensions/smime/jar.mn
+++ b/mail/extensions/smime/jar.mn
@@ -1,20 +1,17 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 messenger.jar:
 % content messenger-smime %content/messenger-smime/
 % overlay chrome://messenger/content/messengercompose/messengercompose.xul chrome://messenger-smime/content/msgCompSMIMEOverlay.xul
 % overlay chrome://messenger/content/msgHdrViewOverlay.xul chrome://messenger-smime/content/msgHdrViewSMIMEOverlay.xul
-% overlay chrome://messenger/content/messenger.xul chrome://messenger-smime/content/msgReadSMIMEOverlay.xul
-% overlay chrome://messenger/content/messageWindow.xul chrome://messenger-smime/content/msgReadSMIMEOverlay.xul
 % overlay chrome://messenger/content/am-identity-edit.xul chrome://messenger/content/am-smimeIdentityEditOverlay.xul
-   content/messenger-smime/msgReadSMIMEOverlay.xul                  (content/msgReadSMIMEOverlay.xul)
    content/messenger-smime/msgCompSMIMEOverlay.xul                  (content/msgCompSMIMEOverlay.xul)
    content/messenger-smime/msgCompSMIMEOverlay.js                   (content/msgCompSMIMEOverlay.js)
    content/messenger-smime/msgHdrViewSMIMEOverlay.js                (content/msgHdrViewSMIMEOverlay.js)
    content/messenger-smime/msgHdrViewSMIMEOverlay.xul               (content/msgHdrViewSMIMEOverlay.xul)
    content/messenger/am-smime.xul                                   (../../../mailnews/extensions/smime/content/am-smime.xul)
    content/messenger/am-smime.js                                    (../../../mailnews/extensions/smime/content/am-smime.js)
    content/messenger/am-smimeIdentityEditOverlay.xul                (../../../mailnews/extensions/smime/content/am-smimeIdentityEditOverlay.xul)
    content/messenger/am-smimeOverlay.xul                            (../../../mailnews/extensions/smime/content/am-smimeOverlay.xul)