hackfix: use toolkit's customizeToolbar.xul to get back small icons and text-only function

navigator/components/toolbar/content/customizeToolbar.xul

@@ -5,14 +5,13 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!DOCTYPE dialog [
-  <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
-  %brandDTD;
-  <!ENTITY % customizeToolbarDTD SYSTEM "chrome://navigator/locale/toolbar/customizeToolbar.dtd">
+<!ENTITY % customizeToolbarDTD SYSTEM "chrome://global/locale/customizeToolbar.dtd">
   %customizeToolbarDTD;
 ]>
 
-<?xml-stylesheet href="chrome://communicator/skin" type="text/css"?>
-<?xml-stylesheet href="chrome://navigator/content/toolbar/customizeToolbar.css" type="text/css"?>
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://global/content/customizeToolbar.css" type="text/css"?>
+<?xml-stylesheet href="chrome://global/skin/customizeToolbar.css" type="text/css"?>
 
 <window id="CustomizeToolbarWindow"
         title="&dialog.title;"
@@ -22,43 +21,47 @@
         persist="width height"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script type="application/javascript" src="chrome://navigator/content/toolbar/customizeToolbar.js"/>
+<script type="application/javascript" src="chrome://global/content/customizeToolbar.js"/>
 
-  <stringbundle id="stringBundle" src="chrome://navigator/locale/toolbar/customizeToolbar.properties"/>
+<stringbundle id="stringBundle" src="chrome://global/locale/customizeToolbar.properties"/>
 
-  <keyset id="CustomizeToolbarKeyset">
-    <key id="cmd_close1" keycode="VK_ESCAPE" oncommand="onClose();"/>
-    <key id="cmd_close2" keycode="VK_RETURN" oncommand="onClose();"/>
-  </keyset>
+<keyset id="CustomizeToolbarKeyset">
+  <key id="cmd_close1" keycode="VK_ESCAPE" oncommand="onClose();"/>
+  <key id="cmd_close2" keycode="VK_RETURN" oncommand="onClose();"/>
+</keyset>
 
-  <dialogheader class="header-large"
-                id="header"
-                style="margin-top: 0px; margin-left: 0px;"
-                title="&brandFullName;"
-                description="&header.description;"/>
+<vbox id="main-box" flex="1">
+  <description id="instructions">
+  &instructions.description;
+  </description>
 
-  <vbox id="main-box" flex="1">
-    <vbox flex="1" id="palette-box"
-          ondragstart="onToolbarDragStart(event)"
-          ondragover="onPaletteDragOver(event)"
-          ondrop="onPaletteDrop(event)"/>
+  <vbox flex="1" id="palette-box"
+        ondragstart="onToolbarDragStart(event)"
+        ondragover="onPaletteDragOver(event)"
+        ondrop="onPaletteDrop(event)"/>
 
-    <box align="left">
-      <button id="newtoolbar" label="&addNewToolbar.label;" oncommand="addNewToolbar();" icon="add"/>
-      <button id="restoreDefault" label="&restoreDefaultSet.label;" oncommand="restoreDefaultSet();" icon="revert"/>
-    </box>
-  </vbox>
+  <box align="center">
+    <label value="&show.label;"/>
+    <menulist id="modelist" value="icons" oncommand="updateToolbarMode(this.value);">
+      <menupopup id="modelistpopup">
+        <menuitem id="modefull" value="full" label="&iconsAndText.label;"/>
+        <menuitem id="modeicons" value="icons" label="&icons.label;"/>
+        <menuitem id="modetext" value="text" label="&text.label;"/>
+      </menupopup>
+    </menulist>
+
+    <checkbox id="smallicons" oncommand="updateIconSize(this.checked ? 'small' : 'large');" label="&useSmallIcons.label;"/>
+
+    <button id="newtoolbar" label="&addNewToolbar.label;" oncommand="addNewToolbar();" icon="add"/>
+    <button id="restoreDefault" label="&restoreDefaultSet.label;" oncommand="restoreDefaultSet();" icon="revert"/>
+  </box>
 
   <separator class="groove"/>
 
-  <hbox align="end">
-    <hbox class="actionButtons" align="right" flex="1">
-      <button id="donebutton"
-              label="&saveChanges.label;"
-              oncommand="onClose();"
-              default="true"
-              icon="close"/>
-    </hbox>
-    <resizer type="window" dir="bottomend"/>
+  <hbox align="center" pack="end">
+    <button id="donebutton" label="&saveChanges.label;" oncommand="onClose();"
+            default="true" icon="close"/>
   </hbox>
+</vbox>
+
 </window>