Modifications to use new features in globalOverlay.xul

mailnews/compose/resources/content/messengercompose.xul

@@ -57,16 +57,22 @@ Rights Reserved.
 	<key id="xcmdkey" disabled="false" shift="false" command="true" alt="false" key="x" onkeypress="EditorCut()" />
 	<key id="ycmdkey" disabled="false" shift="false" command="true" alt="false" key="y" onkeypress="EditorRedo()" />
 	<key id="zcmdkey" disabled="false" shift="false" command="true" alt="false" key="z" onkeypress="EditorUndo()" />
+</keyset>
 
 	<!-- how to handle return, enter, tab, function keys, arrow keys, others? -->
-</keyset>
 
 <broadcaster id="args" value="editorType=default"/>
 
-<!-- Broadcasters get added as children here from the overlay-->
 <broadcasterset id="broadcasterset">
+	<broadcaster id="cmd_close" oncommand="CloseWindow()"/>
+ 	<broadcaster id="cmd_quit"/>
 </broadcasterset>
 
+<keyset id="keyset">
+	<key id="key_close"/>
+	<key id="key_quit"/>
+</keyset>
+
 <!-- Interim hack to transition from nsIXULWindowCallbacks/ShowWindowWithArgs -->
 <broadcaster id="dialog.start" ready="false"/>
 <observes element="dialog.start" attribute="ready" onchange="ComposeStartup()"/>
@@ -74,8 +80,8 @@ Rights Reserved.
 <!-- box id="toolbar" align="vertical" style="width:100%;height:100%" -->
 <toolbox>
   <menubar>
-	<menu value="&fileMenu.label;">
-	    <menupopup id="fileMenuPopup">
+	<menu id="menu_File">
+	    <menupopup id="menu_FilePopup">
 		<menuitem value="&newCmd.label;" cmd="nsCmd:ComposeNew"/>
 		<menuitem value="&saveCmd.label;" cmd="nsCmd:ComposeSave"/>
 		<menuitem value="&saveAsCmd.label;" oncommand="SaveAsDraft()"/>
@@ -95,14 +101,14 @@ Rights Reserved.
 		<menuitem value="&quoteOrigCmd.label;" cmd="nsCmd:ComposeQuote"/>
 		<menuitem value="&selectAddressCmd.label;" oncommand="SelectAddress()"/>
 		<menuseparator/>
-		<menuitem id="pageSetup"/>
+		<menuitem id="menu_pageSetup"/>
 		<menuitem value="&printPreviewCmd.label;" cmd="nsCmd:BrowserPrintPreview"/>
 		<menuitem value="&printCmd.label;" cmd="nsCmd:BrowserPrint"/>
 		<menuseparator/>
-		<menuitem value="&closeCmd.label;" oncommand="CloseWindow();"/>
+		<menuitem id="menu_close"/>
 		</menupopup>
 	</menu>
-	<menu value="&editMenu.label;">
+	<menu id="menu_Edit">
 		<menupopup>
 		<menuitem value="&undoCmd.label;" cmd="nsCmd:ComposeNYI"/>
 		<menuseparator/>
@@ -122,7 +128,7 @@ Rights Reserved.
 		<menuitem value="&prefsCmd.label;" cmd="nsCmd:ComposeNYI"/>
 		</menupopup>
 	</menu>
-	<menu value="&viewMenu.label;">
+	<menu id="menu_View">
 		<menupopup>
 		<menuitem value="&showCmd.label;" cmd="nsCmd:ComposeNYI"/>
 		<menuseparator/>
@@ -230,7 +236,7 @@ Rights Reserved.
     </menu>
     <menu id="debugMenu"/>
 	<menu id="tasksMenu"/>
-	<menu id="helpMenu"/>
+	<menu id="menu_Help"/>
 	<spring flex="100%"/>
   </menubar>