Bug 451952: fix double ids; r=iann, sr=neil, a=iann
authorKarsten Düsterloh <mnyromyr@tprac.de>
Wed, 17 Sep 2008 01:13:37 +0200
changeset 346 6798c5a94726258fa59a8106ce1ee718be76a95f
parent 345 5048efa447abd879e388deb7a36dc6859bc21822
child 347 cb70018a34dc44107a5c212e7e8ac31713f0e231
push idunknown
push userunknown
push dateunknown
reviewersiann, neil, iann
bugs451952
Bug 451952: fix double ids; r=iann, sr=neil, a=iann
editor/ui/composer/content/editorSmileyOverlay.xul
mailnews/addrbook/resources/content/addressbook.xul
mailnews/base/resources/content/mailWindowOverlay.xul
mailnews/base/resources/content/messageWindow.xul
mailnews/base/resources/content/messenger.xul
mailnews/compose/resources/content/messengercompose.xul
mailnews/extensions/smime/resources/content/msgHdrViewSMIMEOverlay.xul
mailnews/extensions/smime/resources/content/msgReadSMIMEOverlay.xul
--- a/editor/ui/composer/content/editorSmileyOverlay.xul
+++ b/editor/ui/composer/content/editorSmileyOverlay.xul
@@ -94,17 +94,17 @@
                 tooltiptext="&smiley16Cmd.tooltip;" />           
           
     </menupopup>
   </toolbarbutton>
 
   <menu id="insertMenu">
     <menupopup id="insertMenuPopup">
       <menu id="insertSmiley" label="&insertSmiley.label;" accesskey="&insertSmiley.accesskey;" insertbefore="insertMenuSeparator">
-        <menupopup id="smilyPopup">
+        <menupopup id="smilyMenuPopup">
           <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;"/>
--- a/mailnews/addrbook/resources/content/addressbook.xul
+++ b/mailnews/addrbook/resources/content/addressbook.xul
@@ -118,21 +118,18 @@
              valueItems="&deleteItemsCmd.label;"/>
     <command id="cmd_selectAll"/>
     <command id="button_delete" oncommand="goDoCommand('button_delete');"/>
     <command id="cmd_swapFirstNameLastName" oncommand="AbSwapFirstNameLastName()"/>
     <commandset id="tasksCommands"/>
 </commandset>
 
 <broadcasterset id="abBroadcasters">
-  <!-- File Menu -->
-
   <!-- Edit Menu -->
   <broadcaster id="broadcaster-throbber" busy="false"/>
-  <broadcaster id="button_delete" disabled="true"/>
   <broadcaster id="Communicator:WorkMode"/>
 </broadcasterset>
 
 <keyset id="tasksKeys">
   <!-- File Menu -->
   <key id="key_newNavigator"/>
   <key id="key_newBlankPage"/>
   <key id="key_printCard"  key="&printCardViewCmd.key;" command="cmd_printCard"  modifiers="accel"/>
@@ -390,17 +387,17 @@
     <!-- toolbar -->
         <toolbar class="chromeclass-toolbar toolbar-primary" id="abToolbar" persist="collapsed" grippytooltiptext="&addressbookToolbar.tooltip;">
         <toolbarbutton class="toolbarbutton-1" id="button-newcard" label="&newcardButton.label;" tooltiptext="&newcardButton.tooltip;" command="cmd_newcard"/>
         <toolbarbutton class="toolbarbutton-1" id="button-newlist" label="&newlistButton.label;" tooltiptext="&newlistButton.tooltip;" command="cmd_newlist"/>
         <toolbarseparator class="toolbarseparator-primary"/>
         <toolbarbutton class="toolbarbutton-1" id="button-editcard" label="&editButton.label;" tooltiptext="&editButton.tooltip;" command="cmd_properties"/>
         <toolbarbutton class="toolbarbutton-1" id="button-newmessage" label="&newmsgButton.label;" tooltiptext="&newmsgButton.tooltip;" command="cmd_newmessage"/>
         <toolbarbutton class="toolbarbutton-1" id="button-newim" label="&newIM.label;" tooltiptext="&newIM.tooltip;" command="cmd_newim"/>
-        <toolbarbutton class="toolbarbutton-1" id="button-delete" observes="button_delete" label="&deleteButton.label;" tooltiptext="&deleteButton.tooltip;" command="button_delete"/>
+        <toolbarbutton class="toolbarbutton-1" id="button-delete" label="&deleteButton.label;" tooltiptext="&deleteButton.tooltip;" command="button_delete"/>
 
         <vbox flex="1">
           <spacer flex="1"/> 
           <!--html id="searchlabel">&showNames.label;</html>
           <textbox id="searchtext" type="text" align="bottom"/> 
           <spacer flex="1"/--> 
         </vbox>
 
--- a/mailnews/base/resources/content/mailWindowOverlay.xul
+++ b/mailnews/base/resources/content/mailWindowOverlay.xul
@@ -112,17 +112,16 @@
     <command id="cmd_getNewMessages" oncommand="goDoCommand('cmd_getNewMessages')" disabled="true"/>
     <command id="cmd_close" oncommand="goDoCommand('cmd_close')"/>
     <command id="cmd_open" oncommand="goDoCommand('cmd_open')"/>
 
     <command id="cmd_file" disabled="true"/>
 
     <command id="cmd_emptyTrash" oncommand="goDoCommand('cmd_emptyTrash')" disabled="true"/>
     <command id="cmd_compactFolder" oncommand="goDoCommand('cmd_compactFolder')" disabled="true"/>
-    <commandset id="mailDownloadCommands"/>
 
     <command id="cmd_printSetup" oncommand="goDoCommand('cmd_printSetup')" disabled="true"/>
     <command id="cmd_print" oncommand="goDoCommand('cmd_print')" disabled="true"/>
     <command id="cmd_printpreview" oncommand="goDoCommand('cmd_printpreview')" disabled="true"/>
     <command id="cmd_saveAsFile" oncommand="goDoCommand('cmd_saveAsFile')" disabled="true"/>
     <command id="cmd_saveAsTemplate" oncommand="goDoCommand('cmd_saveAsTemplate')" disabled="true"/>
     <command id="cmd_getNextNMessages" oncommand="goDoCommand('cmd_getNextNMessages')" disabled="true"/>
     <command id="cmd_renameFolder" oncommand="goDoCommand('cmd_renameFolder')" />
@@ -239,41 +238,40 @@
   <command id="cmd_replyGroup" oncommand="goDoCommand('cmd_replyGroup')"/>
   <command id="cmd_replyall" oncommand="goDoCommand('cmd_replyall')"/>
   <command id="cmd_replySenderAndGroup" oncommand="goDoCommand('cmd_replySenderAndGroup')"/>
   <command id="cmd_replyAllRecipients" oncommand="goDoCommand('cmd_replyAllRecipients')"/>
   <command id="cmd_forward" oncommand="goDoCommand('cmd_forward')"/>
   <command id="cmd_forwardInline" oncommand="goDoCommand('cmd_forwardInline')"/>
   <command id="cmd_forwardAttachment" oncommand="goDoCommand('cmd_forwardAttachment')"/>
   <command id="cmd_editAsNew" oncommand="goDoCommand('cmd_editAsNew')"/>
-  <commandset id="mailDownloadCommands"/>
   <command id="cmd_openMessage" oncommand="goDoCommand('cmd_openMessage')"/>
   <command id="cmd_createFilterFromMenu" oncommand="goDoCommand('cmd_createFilterFromMenu')"/>
   <command id="cmd_killThread" oncommand="goDoCommand('cmd_killThread')"/>
   <command id="cmd_killSubthread" oncommand="goDoCommand('cmd_killSubthread')"/>
   <command id="cmd_watchThread" oncommand="goDoCommand('cmd_watchThread')"/>
 </commandset>
 
 <commandset id="mailToolbarItems"
             commandupdater="true"
             events="mail-toolbar"
-            oncommandupdate="goUpdateMailMenuItems(this)">
-
+            oncommandupdate="goUpdateMailMenuItems(this);
+                             /* update cmd_delete manually to avoid a doubled id */
+                             goUpdateCommand('cmd_delete');">
   <command id="button_reply"/>
   <command id="button_replyall"/>
   <command id="button_forward"/>
   <command id="button_delete"/>
   <command id="button_mark"/>
   <command id="button_getNewMessages"/>
   <command id="button_print"/>
   <command id="button_next"/>
   <command id="button_goBack"/>
   <command id="button_goForward"/>
   <command id="button_file"/>
-  <command id="cmd_delete"/>
   <command id="cmd_shiftDelete" oncommand="goDoCommand('cmd_shiftDelete');"/>
   <command id="button_junk"/>
 </commandset>
 
 
 <commandset id="mailGetMsgMenuItems"
             commandupdater="true"
             events="create-menu-getMsgToolbar,create-menu-file"
@@ -1031,32 +1029,32 @@
         <menuitem id="messagePaneContext-tagCustomize"
                   label="&tagCustomize.label;"
                   accesskey="&tagCustomize.accesskey;"
                   oncommand="goPreferences('tags_pane');"/>
       </menupopup>
     </menu>
     <menu id="messagePaneContext-mark" label="&markMenu.label;" accesskey="&markMenu.accesskey;">
       <menupopup onpopupshowing="InitMessageMark()">
-        <menuitem id="threadPaneContext-markRead"
+        <menuitem id="messagePaneContext-markRead"
                   type="checkbox"
                   label="&markAsReadCmd.label;"
                   accesskey="&markAsReadCmd.accesskey;"
                   command="cmd_markAsRead"/>
         <menuitem label="&markThreadAsReadCmd.label;"
                   accesskey="&markThreadAsReadCmd.accesskey;"
                   command="cmd_markThreadAsRead"/>
         <menuitem label="&markReadByDateCmd.label;"
                   accesskey="&markReadByDateCmd.accesskey;"
                   command="cmd_markReadByDate"/>
         <menuitem label="&markAllReadCmd.label;"
                   accesskey="&markAllReadCmd.accesskey;"
                   command="cmd_markAllRead"/>
         <menuseparator/>
-        <menuitem id="threadPaneContext-markFlagged"
+        <menuitem id="messagePaneContext-markFlagged"
                   type="checkbox"
                   label="&markFlaggedCmd.label;"
                   accesskey="&markFlaggedCmd.accesskey;"
                   command="cmd_markAsFlagged"/>
         <menuseparator/>
         <menuitem label="&markAsJunkCmd.label;"
                   accesskey="&markAsJunkCmd.accesskey;"
                   command="cmd_markAsJunk"/>
--- a/mailnews/base/resources/content/messageWindow.xul
+++ b/mailnews/base/resources/content/messageWindow.xul
@@ -77,16 +77,17 @@
   <script type="application/x-javascript" src="chrome://messenger/content/mailContextMenus.js"/>
   <script type="application/x-javascript" src="chrome://messenger/content/phishingDetector.js"/>
   <script type="application/x-javascript" src="chrome://communicator/content/contentAreaClick.js"/>
   <script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
   <script type="application/x-javascript" src="chrome://messenger/content/msgViewNavigation.js"/>
 
   <commandset id="mailCommands">
     <commandset id="mailFileMenuItems"/>
+    <commandset id="mailDownloadCommands"/>
     <commandset id="mailViewMenuItems"/>
     <commandset id="mailEditMenuItems"/>
     <commandset id="mailSearchMenuItems"/>
     <commandset id="mailGoMenuItems"/>
     <commandset id="mailMessageMenuItems"/>
     <commandset id="mailToolbarItems"/>
     <commandset id="mailGetMsgMenuItems"/>
     <commandset id="mailMarkMenuItems"/>
--- a/mailnews/base/resources/content/messenger.xul
+++ b/mailnews/base/resources/content/messenger.xul
@@ -85,16 +85,17 @@
 <script type="application/x-javascript" src="chrome://messenger/content/mail-offline.js"/>
 <script type="application/x-javascript" src="chrome://messenger/content/phishingDetector.js"/>
 <script type="application/x-javascript" src="chrome://communicator/content/contentAreaClick.js"/>
 <script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
 <script type="application/x-javascript" src="chrome://messenger/content/searchBar.js"/>
 
 <commandset id="mailCommands">
   <commandset id="mailFileMenuItems"/>
+  <commandset id="mailDownloadCommands"/>
   <commandset id="mailViewMenuItems"/>
   <commandset id="mailEditMenuItems"/>
   <commandset id="mailEditContextMenuItems"/>
   <commandset id="mailSearchMenuItems"/>
   <commandset id="mailGoMenuItems"/>
   <commandset id="mailMessageMenuItems"/>
   <commandset id="mailToolbarItems"/>
   <commandset id="mailGetMsgMenuItems"/>
--- a/mailnews/compose/resources/content/messengercompose.xul
+++ b/mailnews/compose/resources/content/messengercompose.xul
@@ -113,44 +113,38 @@
 
   <commandset id="commonEditorMenuItems"/>
   <commandset id="composerMenuItems"/>
   <commandset id="composerEditMenuItems"/>
   <commandset id="composerStyleMenuItems"/>
   <commandset id="composerTableMenuItems"/>
   <commandset id="composerListMenuItems"/>
   <commandset id="tasksCommands"/>
-  <command id="cmd_quit"/>
   <!-- File Menu -->
   <command id="cmd_newNavigator"/>
   <command id="cmd_newEditor"/>
   <command id="cmd_new" oncommand="goDoCommand('cmd_newMessage')"/>
   <command id="cmd_attachFile" oncommand="goDoCommand('cmd_attachFile')"/>
   <command id="cmd_attachPage" oncommand="goDoCommand('cmd_attachPage')"/>
   <command id="cmd_attachVCard" checked="false" oncommand="ToggleAttachVCard(event.target)"/>
-  <command id="cmd_close" oncommand="goDoCommand('cmd_close')"/>
   <command id="cmd_saveDefault" oncommand="goDoCommand('cmd_saveDefault')"/>
   <command id="cmd_saveAsFile" oncommand="goDoCommand('cmd_saveAsFile')"/>
   <command id="cmd_saveAsDraft" oncommand="goDoCommand('cmd_saveAsDraft')"/>
   <command id="cmd_saveAsTemplate" oncommand="goDoCommand('cmd_saveAsTemplate')"/>
   <command id="cmd_sendButton" oncommand="goDoCommand('cmd_sendButton')"/>
   <command id="cmd_sendNow" oncommand="goDoCommand('cmd_sendNow')"/>
   <command id="cmd_sendWithCheck" oncommand="goDoCommand('cmd_sendWithCheck')"/>
   <command id="cmd_sendLater" oncommand="goDoCommand('cmd_sendLater')"/>
-  <command id="cmd_printSetup" oncommand="goDoCommand('cmd_printSetup')"/>
-  <command id="cmd_print" oncommand="goDoCommand('cmd_print')"/>
 
   <!-- Edit Menu -->
   <!--command id="cmd_pasteQuote"/  DO NOT INCLUDE THOSE COMMANDS ELSE THE EDIT MENU WILL BE BROKEN! -->
   <!--command id="cmd_find"/-->
   <!--command id="cmd_findNext"/-->
   <command id="cmd_rewrap"  oncommand="goDoCommand('cmd_rewrap')"/>
-  <command id="cmd_delete"/>
   <command id="cmd_renameAttachment" oncommand="goDoCommand('cmd_renameAttachment')" disabled="true"/>
-  <command id="cmd_selectAll"/>
   <command id="cmd_openAttachment" oncommand="goDoCommand('cmd_openAttachment')"/>
   <command id="cmd_account" oncommand="goDoCommand('cmd_account')"/>
 
   <!-- View Menu -->
   <command id="cmd_showComposeToolbar" oncommand="goDoCommand('cmd_showComposeToolbar')"/>
   <command id="cmd_showFormatToolbar" oncommand="goDoCommand('cmd_showFormatToolbar')"/>
   <command id="toggleSidebar"/>
 
@@ -163,34 +157,24 @@
 <broadcasterset id="composeBroadcasters">
   <broadcaster id="Editor:Throbber" busy="false"/>
   <broadcaster id="Communicator:WorkMode"/>
   <broadcaster id="args" value="editorType=default"/>
 </broadcasterset>
 
 <keyset id="tasksKeys">
   <!-- File Menu -->
-  <key id="key_newNavigator"/>
-  <key id="key_newBlankPage"/>
   <key id="key_close"/>
   <key id="key_save"  key="&saveCmd.key;" command="cmd_saveDefault" modifiers="accel"/>
   <key id="key_send" keycode="&sendCmd.keycode;" observes="cmd_sendWithCheck" modifiers="accel"/>
   <key id="key_sendLater" keycode="&sendLaterCmd.keycode;" observes="cmd_sendLater" modifiers="accel, shift"/>
   <key id="key_print"  key="&printCmd.key;" command="cmd_print" modifiers="accel"/>
-  <key id="key_quit"/>
 
   <!-- Edit Menu -->
-  <key id="key_undo"/>
-  <key id="key_redo"/>
-  <key id="key_cut"/>
-  <key id="key_copy"/>
-  <key id="key_paste"/>
-  <key id="key_delete"/>
   <key id="key_delete2"/>
-  <key id="key_selectAll"/>
   <key id="key_find"  key="&findCmd.key;"  command="cmd_find" modifiers="accel"/>
   <key id="key_findNext"  key="&findAgainCmd.key;" command="cmd_findNext" modifiers="accel"/>
   <key id="key_findPrev"  key="&findPrevCmd.key;"  command="cmd_findPrev" modifiers="accel, shift"/>
   <key keycode="&findAgainCmd.key2;" command="cmd_findNext"/>
   <key keycode="&findPrevCmd.key2;"  command="cmd_findPrev" modifiers="shift"/>
 
   <!-- Options Menu -->
   <!-- key id="key_selectAddresses" xulkey="true" key="&selectAddressCmd.key;" command="cmd_selectAddress"/ -->
--- a/mailnews/extensions/smime/resources/content/msgHdrViewSMIMEOverlay.xul
+++ b/mailnews/extensions/smime/resources/content/msgHdrViewSMIMEOverlay.xul
@@ -37,21 +37,22 @@
    -
    - ***** END LICENSE BLOCK ***** -->
 
 <?xml-stylesheet href="chrome://messenger/skin/smime/msgHdrViewSMIMEOverlay.css" type="text/css"?> 
 
 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <script type="application/javascript" src="chrome://messenger-smime/content/msgHdrViewSMIMEOverlay.js"/>
-
+<!-- These stringbundles are already defined in msgReadSMIMEOverlay.xul!
   <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>
+-->
 
   <hbox id="expandedHeaderView">
     <vbox id="smimeBox" insertafter="expandedHeaders" collapsed="true">
       <spacer flex="1"/>
       <image id="signedHdrIcon"
              onclick="showMessageReadSecurityInfo();" collapsed="true"/>
       <image id="encryptedHdrIcon"
              onclick="showMessageReadSecurityInfo();" collapsed="true"/>
--- a/mailnews/extensions/smime/resources/content/msgReadSMIMEOverlay.xul
+++ b/mailnews/extensions/smime/resources/content/msgReadSMIMEOverlay.xul
@@ -52,14 +52,15 @@
       accesskey="&menu_securityStatus.accesskey;" observes="cmd_viewSecurityStatus"/>
   </menupopup>
 
   <statusbar id="status-bar">
     <statusbarpanel insertbefore="offline-status" class="statusbarpanel-iconic"
       id="signed-status" collapsed="true" oncommand="showMessageReadSecurityInfo();"/>
     <statusbarpanel insertbefore="offline-status" class="statusbarpanel-iconic"
       id="encrypted-status" collapsed="true" oncommand="showMessageReadSecurityInfo();"/>
-
     <stringbundle id="bundle_read_smime" src="chrome://messenger-smime/locale/msgReadSMIMEOverlay.properties"/>
+<!-- This stringbundle is already defined on top window level!
     <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
+-->
   </statusbar>
 
 </overlay>