convert image settings to a panel in windowed version as well and kill separate files...

[mandelbrot.git] / xulapp / chrome / mandelbrot / content / mandelbrot-tab.xul

diff --git a/xulapp/chrome/mandelbrot/content/mandelbrot-tab.xul b/xulapp/chrome/mandelbrot/content/mandelbrot-tab.xul
index 1f15fb3f4c93f3bd065c199e4a869746165f1833..b525e1089b60cf3f875e26377daff7c78b15820b 100644 (file)
--- a/xulapp/chrome/mandelbrot/content/mandelbrot-tab.xul
+++ b/xulapp/chrome/mandelbrot/content/mandelbrot-tab.xul
@@ -47,8 +47,6 @@
   %brandDTD;
   <!ENTITY % mandelbrotDTD SYSTEM "chrome://mandelbrot/locale/mandelbrot.dtd">
   %mandelbrotDTD;
-  <!ENTITY % imgSettingsDTD SYSTEM "chrome://mandelbrot/locale/image-settings.dtd">
-  %imgSettingsDTD;
 ]>
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@@ -139,13 +137,10 @@
     </toolbar>
   </toolbox>
   <panel id="imgSettingsPanel"
-         level="floating"
-         titlebar="normal"
-         noautohide="true"
-         close="true"
          onpopupshowing="initImgSettings();"
-         onpopuphiding="saveImgSettings();"
-         label="&imageSettings.title;">
+         onpopuphiding="saveImgSettings();">
+    <!-- |titlebar="normal" noautohide="true" close="true" label="&imageSettings.title;"|
+         doesn't seem to work on the panel, so work around with a <titlebar> instead -->
     <titlebar><label value="&imageSettings.title;"/></titlebar>
     <groupbox>
       <caption label="&coord.title;"/>
@@ -211,7 +206,7 @@
     <hbox>
       <button id="is_closeButton" label="&closeSettings.label;" oncommand="closeImgSettings();"/>
       <spacer flex="1"/>
-      <button id="is_drawButton" label="&DrawImageButton.label;" oncommand="closeImgSettings(); drawImage();"/>
+      <button id="is_drawButton" label="&drawImageButton.label;" oncommand="closeImgSettings(); drawImage();"/>
     </hbox>
   </panel>
   <hbox flex="1" pack="center" align="center">