Bug 164131 Duplicate entities in editorOverlay.dtd and messengercompose.dtd r=brade (editor) r=ducarroz (msgcompose) sr=sspitzer

editor/ui/composer/content/editorOverlay.xul

@@ -633,29 +633,6 @@
     </menupopup>
   </menu>
 
-
-  <!-- smiley menu -->
-  <toolbarbutton type="menu" id="smileButtonMenu"
-                 observes="cmd_smiley"
-                 tooltiptext="&SmileButton.tooltip;">
-       <menupopup id="smilyPopup">
-               <menuitem class="smiley insert-smile menuitem-iconic"       label="&smiley1Cmd.label;" 
-						oncommand="doStatefulCommand('cmd_smiley', ':-)'  )"  />
-               <menuitem class="smiley insert-frown menuitem-iconic"       label="&smiley2Cmd.label;"
-						oncommand="doStatefulCommand('cmd_smiley', ':-('  )" />                                              
-               <menuitem class="smiley insert-wink menuitem-iconic"        label="&smiley3Cmd.label;"
-						oncommand="doStatefulCommand('cmd_smiley', ';-)'  )"  />                       
-               <menuitem class="smiley insert-tongue menuitem-iconic"      label="&smiley4Cmd.label;"
-						oncommand="doStatefulCommand('cmd_smiley', ':-P'  )" />
-               <menuitem class="smiley insert-laughing menuitem-iconic"    label="&smiley5Cmd.label;"
-						oncommand="doStatefulCommand('cmd_smiley', ':-D'  )" />
-               <menuitem class="smiley insert-embarrassed menuitem-iconic" label="&smiley6Cmd.label;"
-						oncommand="doStatefulCommand('cmd_smiley', ':-['  )" />
-               <menuitem class="smiley insert-undecided menuitem-iconic"   label="&smiley7Cmd.label;"
-						oncommand="doStatefulCommand('cmd_smiley', ':-\\' )" />           
-       </menupopup>
-   </toolbarbutton>
-
   <!-- this is only used in messengercompose.xul -->
   <toolbarbutton type="menu" id="AlignPopupButton" observes="cmd_align"
               tooltiptext="&AlignPopupButton.tooltip;">

editor/ui/composer/content/editorSmileyOverlay.xul

@@ -0,0 +1,86 @@
+<?xml version="1.0"?> 
+<!-- ***** BEGIN LICENSE BLOCK *****
+   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
+   -
+   - The contents of this file are subject to the Mozilla Public License Version
+   - 1.1 (the "License"); you may not use this file except in compliance with
+   - the License. You may obtain a copy of the License at
+   - http://www.mozilla.org/MPL/
+   -
+   - Software distributed under the License is distributed on an "AS IS" basis,
+   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+   - for the specific language governing rights and limitations under the
+   - License.
+   -
+   - The Original Code is Editor Smiley Overlay.
+   -
+   - The Initial Developer of the Original Code is
+   - Neil Rashbrook.
+   - Portions created by the Initial Developer are Copyright (C) 2003
+   - the Initial Developer. All Rights Reserved.
+   -
+   - Contributor(s):
+   -    Neil Rashbrook <neil@parkwaycc.co.uk>
+   -
+   - Alternatively, the contents of this file may be used under the terms of
+   - either the GNU General Public License Version 2 or later (the "GPL"), or
+   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+   - in which case the provisions of the GPL or the LGPL are applicable instead
+   - of those above. If you wish to allow use of your version of this file only
+   - under the terms of either the GPL or the LGPL, and not to allow others to
+   - use your version of this file under the terms of the MPL, indicate your
+   - decision by deleting the provisions above and replace them with the notice
+   - and other provisions required by the LGPL or the GPL. If you do not delete
+   - the provisions above, a recipient may use your version of this file under
+   - the terms of any one of the MPL, the GPL or the LGPL.
+   -
+   - ***** END LICENSE BLOCK ***** -->
+
+<!DOCTYPE overlay SYSTEM "chrome://editor/locale/editorSmileyOverlay.dtd">
+
+<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+  <!-- smiley menu -->
+  <toolbarbutton type="menu" id="smileButtonMenu"
+                 observes="cmd_smiley"
+                 tooltiptext="&SmileButton.tooltip;">
+    <menupopup id="smilyPopup">
+      <menuitem class="smiley insert-smile menuitem-iconic"       label="&smiley1Cmd.label;" 
+                oncommand="doStatefulCommand('cmd_smiley', ':-)'  )"  />
+      <menuitem class="smiley insert-frown menuitem-iconic"       label="&smiley2Cmd.label;"
+                oncommand="doStatefulCommand('cmd_smiley', ':-('  )" />                                              
+      <menuitem class="smiley insert-wink menuitem-iconic"        label="&smiley3Cmd.label;"
+                oncommand="doStatefulCommand('cmd_smiley', ';-)'  )"  />                       
+      <menuitem class="smiley insert-tongue menuitem-iconic"      label="&smiley4Cmd.label;"
+                oncommand="doStatefulCommand('cmd_smiley', ':-P'  )" />
+      <menuitem class="smiley insert-laughing menuitem-iconic"    label="&smiley5Cmd.label;"
+                oncommand="doStatefulCommand('cmd_smiley', ':-D'  )" />
+      <menuitem class="smiley insert-embarrassed menuitem-iconic" label="&smiley6Cmd.label;"
+                oncommand="doStatefulCommand('cmd_smiley', ':-['  )" />
+      <menuitem class="smiley insert-undecided menuitem-iconic"   label="&smiley7Cmd.label;"
+                oncommand="doStatefulCommand('cmd_smiley', ':-\\' )" />           
+    </menupopup>
+  </toolbarbutton>
+
+  <menu id="insertMenu">
+    <menupopup id="insertMenuPopup">
+      <menu id="insertSmiley" label="&insertSmiley.label;" accesskey="&insertSmiley.accesskey;" insertbefore="insertMenuSeparator">
+        <menupopup id="smilyPopup">
+          <menuitem class="smiley insert-smile menuitem-iconic"       label="&smiley1Cmd.label;" 
+                    oncommand="doStatefulCommand('cmd_smiley', ':-)'  )" accesskey="&smiley1Cmd.accesskey;"/>
+          <menuitem class="smiley insert-frown menuitem-iconic"       label="&smiley2Cmd.label;"
+                    oncommand="doStatefulCommand('cmd_smiley', ':-('  )" accesskey="&smiley2Cmd.accesskey;"/>                                              
+          <menuitem class="smiley insert-wink menuitem-iconic"        label="&smiley3Cmd.label;"
+                    oncommand="doStatefulCommand('cmd_smiley', ';-)'  )" accesskey="&smiley3Cmd.accesskey;"/>                       
+          <menuitem class="smiley insert-tongue menuitem-iconic"      label="&smiley4Cmd.label;"
+                    oncommand="doStatefulCommand('cmd_smiley', ':-P'  )" accesskey="&smiley4Cmd.accesskey;"/>
+          <menuitem class="smiley insert-laughing menuitem-iconic"    label="&smiley5Cmd.label;"
+                    oncommand="doStatefulCommand('cmd_smiley', ':-D'  )" accesskey="&smiley5Cmd.accesskey;"/>
+          <menuitem class="smiley insert-embarrassed menuitem-iconic" label="&smiley6Cmd.label;"
+                    oncommand="doStatefulCommand('cmd_smiley', ':-['  )" accesskey="&smiley6Cmd.accesskey;"/>
+          <menuitem class="smiley insert-undecided menuitem-iconic"   label="&smiley7Cmd.label;"
+                    oncommand="doStatefulCommand('cmd_smiley', ':-\\' )" accesskey="&smiley7Cmd.accesskey;"/>
+        </menupopup>
+      </menu>           
+    </menupopup>
+  </menu>
+</overlay>

editor/ui/composer/locale/en-US/editorOverlay.dtd

@@ -575,16 +575,6 @@
 -->
 <!ENTITY SourceTabDirection "ltr">
 
-<!-- Smiley Menu items -->
-<!ENTITY smiley1Cmd.label "Smile">
-<!ENTITY smiley2Cmd.label "Frown">
-<!ENTITY smiley3Cmd.label "Wink">
-<!ENTITY smiley4Cmd.label "Tongue-out">
-<!ENTITY smiley5Cmd.label "Laughing">
-<!ENTITY smiley6Cmd.label "Embarrassed">
-<!ENTITY smiley7Cmd.label "Undecided">
-<!ENTITY SmileButton.tooltip "Choose smiley face">
-
 <!-- Structure Toolbar Context Menu items -->
 <!ENTITY structSelect.label         "Select">
 <!ENTITY structSelect.accesskey     "s">

editor/ui/composer/locale/en-US/editorSmileyOverlay.dtd

@@ -0,0 +1,57 @@
+<!-- ***** BEGIN LICENSE BLOCK *****
+   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
+   -
+   - The contents of this file are subject to the Mozilla Public License Version
+   - 1.1 (the "License"); you may not use this file except in compliance with
+   - the License. You may obtain a copy of the License at
+   - http://www.mozilla.org/MPL/
+   -
+   - Software distributed under the License is distributed on an "AS IS" basis,
+   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+   - for the specific language governing rights and limitations under the
+   - License.
+   -
+   - The Original Code is Editor Smiley Overlay.
+   -
+   - The Initial Developer of the Original Code is
+   - Neil Rashbrook.
+   - Portions created by the Initial Developer are Copyright (C) 2003
+   - the Initial Developer. All Rights Reserved.
+   -
+   - Contributor(s):
+   -    Neil Rashbrook <neil@parkwaycc.co.uk>
+   -
+   - Alternatively, the contents of this file may be used under the terms of
+   - either the GNU General Public License Version 2 or later (the "GPL"), or
+   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+   - in which case the provisions of the GPL or the LGPL are applicable instead
+   - of those above. If you wish to allow use of your version of this file only
+   - under the terms of either the GPL or the LGPL, and not to allow others to
+   - use your version of this file under the terms of the MPL, indicate your
+   - decision by deleting the provisions above and replace them with the notice
+   - and other provisions required by the LGPL or the GPL. If you do not delete
+   - the provisions above, a recipient may use your version of this file under
+   - the terms of any one of the MPL, the GPL or the LGPL.
+   -
+   - ***** END LICENSE BLOCK ***** -->
+
+<!-- Smiley Menu items -->
+<!ENTITY insertSmiley.label "Smiley">
+<!ENTITY insertSmiley.accesskey "S">
+
+<!ENTITY smiley1Cmd.label "Smile">
+<!ENTITY smiley1Cmd.accesskey "S">
+<!ENTITY smiley2Cmd.label "Frown">
+<!ENTITY smiley2Cmd.accesskey "F">
+<!ENTITY smiley3Cmd.label "Wink">
+<!ENTITY smiley3Cmd.accesskey "W">
+<!ENTITY smiley4Cmd.label "Tongue-out">
+<!ENTITY smiley4Cmd.accesskey "T">
+<!ENTITY smiley5Cmd.label "Laughing">
+<!ENTITY smiley5Cmd.accesskey "L">
+<!ENTITY smiley6Cmd.label "Embarrassed">
+<!ENTITY smiley6Cmd.accesskey "E">
+<!ENTITY smiley7Cmd.label "Undecided">
+<!ENTITY smiley7Cmd.accesskey "U">
+<!ENTITY SmileButton.tooltip "Insert a smiley face">
+

editor/ui/jar.mn

@@ -24,6 +24,7 @@ comm.jar:
 	content/editor/pref-composer.js                          (composer/content/pref-composer.js) 
 	content/editor/pref-composer.xul                         (composer/content/pref-composer.xul) 
 	content/editor/pref-publish.xul                          (composer/content/pref-publish.xul) 
+	content/editor/editorSmileyOverlay.xul                   (composer/content/editorSmileyOverlay.xul) 
 	content/editor/editorPrefsOverlay.xul                    (composer/content/editorPrefsOverlay.xul) 
 	content/editor/editorNavigatorOverlay.xul                (composer/content/editorNavigatorOverlay.xul) 
 	content/editor/editorMailOverlay.xul                     (composer/content/editorMailOverlay.xul) 
@@ -227,6 +228,7 @@ comm.jar:
 en-US.jar:
         locale/en-US/editor/editor.dtd                   (composer/locale/en-US/editor.dtd)
         locale/en-US/editor/contents.rdf                 (composer/locale/en-US/contents.rdf)
+	locale/en-US/editor/editorSmileyOverlay.dtd      (composer/locale/en-US/editorSmileyOverlay.dtd) 
 	locale/en-US/editor/editorPrefsOverlay.dtd       (composer/locale/en-US/editorPrefsOverlay.dtd) 
 	locale/en-US/editor/editorNavigatorOverlay.dtd   (composer/locale/en-US/editorNavigatorOverlay.dtd) 
 	locale/en-US/editor/pref-editing.dtd             (composer/locale/en-US/pref-editing.dtd) 

mailnews/compose/resources/content/messengercompose.xul

@@ -37,7 +37,7 @@
 <?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
 <?xul-overlay href="chrome://editor/content/editorOverlay.xul"?>
-<?xul-overlay href="chrome://messenger/content/messengercompose/insertMenuSmileyOverlay.xul"?>
+<?xul-overlay href="chrome://editor/content/editorSmileyOverlay.xul"?>
 <?xul-overlay href="chrome://messenger/content/messengercompose/mailComposeExtrasOverlay.xul"?>
 
 <!DOCTYPE window [

mailnews/compose/resources/locale/en-US/messengercompose.dtd

@@ -93,28 +93,6 @@
 <!ENTITY dcharArmCmd.label "Armenian (ARMSCII-8)">
 <!ENTITY dcharDEFAULT.label "Set Default Mail Send Character Set">
 
-<!-- Insert menu items -->
-<!ENTITY insertSmiley.label "Smiley">
-<!ENTITY insertSmiley.accesskey "S">
-
-<!-- Insert Smiley Menu items -->
-<!ENTITY smiley1Cmd.label "Smile">
-<!ENTITY smiley1Cmd.accesskey "S">
-<!ENTITY smiley2Cmd.label "Frown">
-<!ENTITY smiley2Cmd.accesskey "F">
-<!ENTITY smiley3Cmd.label "Wink">
-<!ENTITY smiley3Cmd.accesskey "W">
-<!ENTITY smiley4Cmd.label "Tongue-out">
-<!ENTITY smiley4Cmd.accesskey "T">
-<!ENTITY smiley5Cmd.label "Laughing">
-<!ENTITY smiley5Cmd.accesskey "L">
-<!ENTITY smiley6Cmd.label "Embarrassed">
-<!ENTITY smiley6Cmd.accesskey "E">
-<!ENTITY smiley7Cmd.label "Undecided">
-<!ENTITY smiley7Cmd.accesskey "U">
-<!ENTITY SmileButton.tooltip "Insert a smiley face">
-
-
 <!-- Format menu items -->
 <!ENTITY formatMenu.label "Format">
 <!ENTITY formatMenu.accesskey "o">

mailnews/jar.mn

@@ -175,7 +175,6 @@ messenger.jar:
     content/messenger/messengercompose/MsgComposeCommands.js                   (compose/resources/content/MsgComposeCommands.js)
     content/messenger/messengercompose/addressingWidgetOverlay.js              (compose/resources/content/addressingWidgetOverlay.js)
     content/messenger/messengercompose/addressingWidgetOverlay.xul             (compose/resources/content/addressingWidgetOverlay.xul)
-    content/messenger/messengercompose/insertMenuSmileyOverlay.xul             (compose/resources/content/insertMenuSmileyOverlay.xul)
     content/messenger/messengercompose/askSendFormat.js                        (compose/resources/content/askSendFormat.js)
     content/messenger/messengercompose/askSendFormat.xul                       (compose/resources/content/askSendFormat.xul)
     content/messenger/messengercompose/sendProgress.xul                        (compose/resources/content/sendProgress.xul)