Phase 3. Patching XUL files to move the menu bar into the toolbox.

editor/ui/composer/content/EditorAppShell.xul

@@ -269,7 +269,17 @@
   <broadcaster id="dialog.start" ready="false"/>
   <observes element="dialog.start" attribute="ready" onchange="EditorStartup('html')"/>
     
-  <menubar>
+  <broadcaster id="Editor:Document:Dirty" dirty="false"/>
+
+  <broadcaster id="Editor:Style:IsBold" bold="false"/>
+  <broadcaster id="Editor:Style:IsItalic" italic="false"/>
+  <broadcaster id="Editor:Style:IsUnderline" underline="false"/>
+  <broadcaster id="Editor:Paragraph:Format" format=""/>
+  <broadcaster id="Editor:Font:Face" font=""/>
+  <broadcaster id="Editor:Font:Size" size=""/>
+
+  <toolbox id="EditorToolbars">
+    <menubar>
     <menu value="&fileMenu.label;">
 	  <menupopup>
 		  <menuitem value="&newCmd.label;" onaction="EditorNew()"/>
@@ -531,18 +541,9 @@
       <menuitem value="&aboutCmd.label;" onaction=""/>
 	  </menupopup>
     </menu>
+	<spring flex="100%"/>
   </menubar>
-  
-  <broadcaster id="Editor:Document:Dirty" dirty="false"/>
 
-  <broadcaster id="Editor:Style:IsBold" bold="false"/>
-  <broadcaster id="Editor:Style:IsItalic" italic="false"/>
-  <broadcaster id="Editor:Style:IsUnderline" underline="false"/>
-  <broadcaster id="Editor:Paragraph:Format" format=""/>
-  <broadcaster id="Editor:Font:Face" font=""/>
-  <broadcaster id="Editor:Font:Size" size=""/>
-
-    <toolbox id="EditorToolbars">
       <toolbar id="EditToolbar">
 	      <titledbutton src="&newEditorIcon.url;" align="top" value="&newToolbarCmd.label;" class="popup" onclick="EditorNew()"/>
 	      <titledbutton src="&openEditorIcon.url;" align="top" value="&openToolbarCmd.label;" class="popup" onclick="EditorOpen()"/>

editor/ui/composer/content/TextEditorAppShell.xul

@@ -196,7 +196,13 @@
   <broadcaster id="dialog.start" ready="false"/>
   <observes element="dialog.start" attribute="ready" onchange="EditorStartup('text')"/>
     
-  <menubar>
+  
+  <broadcaster id="Editor:Style:IsBold" bold="false"/>
+  <broadcaster id="Editor:Style:IsItalic"/>
+  <broadcaster id="Editor:Style:IsUnderline"/>
+
+  <toolbox>
+    <menubar>
     <menu value="&fileMenu.label;">
 	  <menupopup>
       <menuitem value="&newCmd.label;" onaction="EditorNew()"/>
@@ -333,13 +339,9 @@
 	  <menuitem value="&aboutCmd.label;" onaction=""/>
 	  </menupopup>
     </menu>
+	<spring flex="100%"/>
   </menubar>
   
-  <broadcaster id="Editor:Style:IsBold" bold="false"/>
-  <broadcaster id="Editor:Style:IsItalic"/>
-  <broadcaster id="Editor:Style:IsUnderline"/>
-
-    <toolbox>
       <toolbar>
 		    <titledbutton id="ParagraphPopup" value="&paragraphToolbarMenu.label;" class="popup" align="left" popup="ParagraphMenu" popupanchor="bottomleft"/>
 		    <titledbutton id="FontFacePopup" value="&fontToolbarMenu.label;" class="popup" align="left" popup="FontFaceMenu" popupanchor="bottomleft"/>

suite/debugQA/content/debugQATextEditorShell.xul

@@ -196,7 +196,13 @@
   <broadcaster id="dialog.start" ready="false"/>
   <observes element="dialog.start" attribute="ready" onchange="EditorStartup('text')"/>
     
-  <menubar>
+  
+  <broadcaster id="Editor:Style:IsBold" bold="false"/>
+  <broadcaster id="Editor:Style:IsItalic"/>
+  <broadcaster id="Editor:Style:IsUnderline"/>
+
+  <toolbox>
+    <menubar>
     <menu value="&fileMenu.label;">
 	  <menupopup>
       <menuitem value="&newCmd.label;" onaction="EditorNew()"/>
@@ -333,13 +339,9 @@
 	  <menuitem value="&aboutCmd.label;" onaction=""/>
 	  </menupopup>
     </menu>
+	<spring flex="100%"/>
   </menubar>
   
-  <broadcaster id="Editor:Style:IsBold" bold="false"/>
-  <broadcaster id="Editor:Style:IsItalic"/>
-  <broadcaster id="Editor:Style:IsUnderline"/>
-
-    <toolbox>
       <toolbar>
 		    <titledbutton id="ParagraphPopup" value="&paragraphToolbarMenu.label;" class="popup" align="left" popup="ParagraphMenu" popupanchor="bottomleft"/>
 		    <titledbutton id="FontFacePopup" value="&fontToolbarMenu.label;" class="popup" align="left" popup="FontFaceMenu" popupanchor="bottomleft"/>