bug 147670

wrong (last or empty) tooltip text displayed for dropdown list menu items
r=louie.zhao@sun.com
sr=henry.jia@sun.com
patch=sandy.sun@sun.com

editor/ui/composer/content/editorOverlay.xul

@@ -682,13 +682,17 @@
               tooltiptext="&AlignPopupButton.tooltip;">
     <menupopup id="AlignPopup">
       <menuitem id="AlignLeftItem" class="menuitem-iconic" label="&alignLeft.label;"
-                oncommand="doStatefulCommand('cmd_align', 'left')"/>
+                oncommand="doStatefulCommand('cmd_align', 'left')"
+                tooltiptext="&alignLeftButton.tooltip;"    />
       <menuitem id="AlignCenterItem" class="menuitem-iconic" label="&alignCenter.label;"
-                oncommand="doStatefulCommand('cmd_align', 'center')"/>
+                oncommand="doStatefulCommand('cmd_align', 'center')"
+                tooltiptext="&alignCenterButton.tooltip;"  />
       <menuitem id="AlignRightItem" class="menuitem-iconic" label="&alignRight.label;"
-                oncommand="doStatefulCommand('cmd_align', 'right')"/>
+                oncommand="doStatefulCommand('cmd_align', 'right')"
+                tooltiptext="&alignRightButton.tooltip;"   />
       <menuitem id="AlignJustifyItem" class="menuitem-iconic" label="&alignJustify.label;"
-                oncommand="doStatefulCommand('cmd_align', 'justify')"/>
+                oncommand="doStatefulCommand('cmd_align', 'justify')"
+                tooltiptext="&alignjustifyButton.tooltip;" />
     </menupopup>
   </toolbarbutton>
 
@@ -697,15 +701,20 @@
               tooltiptext="&InsertPopupButton.tooltip;">
     <menupopup id="InsertPopup">
       <menuitem id="InsertLinkItem" class="menuitem-iconic" observes="cmd_link"
-                oncommand="goDoCommand('cmd_link')" label="&linkToolbarCmd.label;"/>
+                oncommand="goDoCommand('cmd_link')" label="&linkToolbarCmd.label;"
+                tooltiptext="&linkToolbarCmd.tooltip;"   />
       <menuitem id="InsertAnchorItem" class="menuitem-iconic" observes="cmd_anchor"
-                oncommand="goDoCommand('cmd_anchor')" label="&anchorToolbarCmd.label;"/>
+                oncommand="goDoCommand('cmd_anchor')" label="&anchorToolbarCmd.label;"
+                tooltiptext="&anchorToolbarCmd.tooltip;" />
       <menuitem id="InsertImageItem"  class="menuitem-iconic" observes="cmd_image"
-                oncommand="goDoCommand('cmd_image')" label="&imageToolbarCmd.label;"/>
+                oncommand="goDoCommand('cmd_image')" label="&imageToolbarCmd.label;"
+                tooltiptext="&imageToolbarCmd.tooltip;"  />
       <menuitem id="InsertHRuleItem"  class="menuitem-iconic" observes="cmd_hline"
-                oncommand="goDoCommand('cmd_hline')" label="&hruleToolbarCmd.label;"/>
+                oncommand="goDoCommand('cmd_hline')" label="&hruleToolbarCmd.label;"
+                tooltiptext="&hruleToolbarCmd.tooltip;"  />
       <menuitem id="InsertTableItem"  class="menuitem-iconic" observes="cmd_table"
-                oncommand="goDoCommand('cmd_table')" label="&tableToolbarCmd.label;"/>
+                oncommand="goDoCommand('cmd_table')" label="&tableToolbarCmd.label;"
+                tooltiptext="&tableToolbarCmd.tooltip;"  />
     </menupopup>
   </toolbarbutton>
 

editor/ui/composer/content/editorSmileyOverlay.xul

@@ -45,37 +45,53 @@
                  tooltiptext="&SmileButton.tooltip;">
     <menupopup id="smilyPopup">
       <menuitem class="smiley insert-smile menuitem-iconic"       label="&smiley1Cmd.label;" 
-                oncommand="doStatefulCommand('cmd_smiley', ':-)'  )"  />
+                oncommand="doStatefulCommand('cmd_smiley', ':-)'  )"  
+                tooltiptext="&smiley1Cmd.tooltip;"  />
       <menuitem class="smiley insert-frown menuitem-iconic"       label="&smiley2Cmd.label;"
-                oncommand="doStatefulCommand('cmd_smiley', ':-('  )" />                                              
+                oncommand="doStatefulCommand('cmd_smiley', ':-('  )" 
+                tooltiptext="&smiley2Cmd.tooltip;"  />                                              
       <menuitem class="smiley insert-wink menuitem-iconic"        label="&smiley3Cmd.label;"
-                oncommand="doStatefulCommand('cmd_smiley', ';-)'  )"  />                       
+                oncommand="doStatefulCommand('cmd_smiley', ';-)'  )"  
+                tooltiptext="&smiley3Cmd.tooltip;"  />                       
       <menuitem class="smiley insert-tongue menuitem-iconic"      label="&smiley4Cmd.label;"
-                oncommand="doStatefulCommand('cmd_smiley', ':-P'  )" />
+                oncommand="doStatefulCommand('cmd_smiley', ':-P'  )" 
+                tooltiptext="&smiley4Cmd.tooltip;"  />
       <menuitem class="smiley insert-laughing menuitem-iconic"    label="&smiley5Cmd.label;"
-                oncommand="doStatefulCommand('cmd_smiley', ':-D'  )" />
+                oncommand="doStatefulCommand('cmd_smiley', ':-D'  )" 
+                tooltiptext="&smiley5Cmd.tooltip;"  />
       <menuitem class="smiley insert-embarrassed menuitem-iconic" label="&smiley6Cmd.label;"
-                oncommand="doStatefulCommand('cmd_smiley', ':-['  )" />
+                oncommand="doStatefulCommand('cmd_smiley', ':-['  )" 
+                tooltiptext="&smiley6Cmd.tooltip;"  />
       <menuitem class="smiley insert-undecided menuitem-iconic"   label="&smiley7Cmd.label;"
-                oncommand="doStatefulCommand('cmd_smiley', ':-\\' )" />
+                oncommand="doStatefulCommand('cmd_smiley', ':-\\' )" 
+                tooltiptext="&smiley7Cmd.tooltip;"  />
       <menuitem class="smiley insert-surprise menuitem-iconic"   label="&smiley8Cmd.label;"
-                oncommand="doStatefulCommand('cmd_smiley', '=-O' )" />           
+                oncommand="doStatefulCommand('cmd_smiley', '=-O' )" 
+                tooltiptext="&smiley8Cmd.tooltip;"  />           
       <menuitem class="smiley insert-kiss menuitem-iconic"   label="&smiley9Cmd.label;"
-                oncommand="doStatefulCommand('cmd_smiley', ':-*' )" />           
+                oncommand="doStatefulCommand('cmd_smiley', ':-*' )" 
+                tooltiptext="&smiley9Cmd.tooltip;"  />           
       <menuitem class="smiley insert-yell menuitem-iconic"   label="&smiley10Cmd.label;"
-                oncommand="doStatefulCommand('cmd_smiley', '>:o' )" />           
+                oncommand="doStatefulCommand('cmd_smiley', '>:o' )" 
+                tooltiptext="&smiley10Cmd.tooltip;" />           
       <menuitem class="smiley insert-cool menuitem-iconic"   label="&smiley11Cmd.label;"
-                oncommand="doStatefulCommand('cmd_smiley', '8-)' )" />           
+                oncommand="doStatefulCommand('cmd_smiley', '8-)' )" 
+                tooltiptext="&smiley11Cmd.tooltip;" />           
       <menuitem class="smiley insert-money menuitem-iconic"   label="&smiley12Cmd.label;"
-                oncommand="doStatefulCommand('cmd_smiley', ':-$' )" />           
+                oncommand="doStatefulCommand('cmd_smiley', ':-$' )" 
+                tooltiptext="&smiley12Cmd.tooltip;" />           
       <menuitem class="smiley insert-foot menuitem-iconic"   label="&smiley13Cmd.label;"
-                oncommand="doStatefulCommand('cmd_smiley', ':-!' )" />           
+                oncommand="doStatefulCommand('cmd_smiley', ':-!' )" 
+                tooltiptext="&smiley13Cmd.tooltip;" />           
       <menuitem class="smiley insert-innocent menuitem-iconic"   label="&smiley14Cmd.label;"
-                oncommand="doStatefulCommand('cmd_smiley', 'O:-)' )" />           
+                oncommand="doStatefulCommand('cmd_smiley', 'O:-)' )"
+                tooltiptext="&smiley14Cmd.tooltip;" />           
       <menuitem class="smiley insert-cry menuitem-iconic"   label="&smiley15Cmd.label;"
-                oncommand="doStatefulCommand('cmd_smiley', ':\'(' )" />
+                oncommand="doStatefulCommand('cmd_smiley', ':\'(' )"
+                tooltiptext="&smiley15Cmd.tooltip;" />
       <menuitem class="smiley insert-sealed menuitem-iconic"   label="&smiley16Cmd.label;"
-                oncommand="doStatefulCommand('cmd_smiley', ':-X' )" />           
+                oncommand="doStatefulCommand('cmd_smiley', ':-X' )"
+                tooltiptext="&smiley16Cmd.tooltip;" />           
           
     </menupopup>
   </toolbarbutton>

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

@@ -1,75 +0,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 ***** -->
-
-<!-- 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 smiley8Cmd.label "Surprise">
-<!ENTITY smiley8Cmd.accesskey "p">
-<!ENTITY smiley9Cmd.label "Kiss">
-<!ENTITY smiley9Cmd.accesskey "K">
-<!ENTITY smiley10Cmd.label "Yell">
-<!ENTITY smiley10Cmd.accesskey "Y">
-<!ENTITY smiley11Cmd.label "Cool">
-<!ENTITY smiley11Cmd.accesskey "C">
-<!ENTITY smiley12Cmd.label "Money-Mouth">
-<!ENTITY smiley12Cmd.accesskey "M">
-<!ENTITY smiley13Cmd.label "Foot-in-Mouth">
-<!ENTITY smiley13Cmd.accesskey "o">
-<!ENTITY smiley14Cmd.label "Innocent">
-<!ENTITY smiley14Cmd.accesskey "I">
-<!ENTITY smiley15Cmd.label "Cry">
-<!ENTITY smiley15Cmd.accesskey "r">
-<!ENTITY smiley16Cmd.label "Lips-are-Sealed">
-<!ENTITY smiley16Cmd.accesskey "a">
-<!ENTITY SmileButton.tooltip "Insert a smiley face">
-