From 60e048b29facde0026b5fac74fdf88f60d2e12cd Mon Sep 17 00:00:00 2001
From: Robert Kaiser <kairo@kairo.at>
Date: Sun, 16 Jan 2011 17:29:06 +0100
Subject: [PATCH] convert image settings to a panel in windowed version as well
 and kill separate files for image-settings

---
 jar.mn                                        |   4 -
 .../mandelbrot/content/image-settings.js      | 144 ------------------
 .../mandelbrot/content/image-settings.xul     | 144 ------------------
 .../mandelbrot/content/mandelbrot-tab.xul     |  13 +-
 .../chrome/mandelbrot/content/mandelbrot.js   |  14 +-
 .../chrome/mandelbrot/content/mandelbrot.xul  |  77 +++++++++-
 .../locales/en-US/image-settings.dtd          |  57 -------
 .../mandelbrot/locales/en-US/mandelbrot.dtd   |  22 +++
 .../skin/classic/image-settings.css           |  37 -----
 9 files changed, 111 insertions(+), 401 deletions(-)
 delete mode 100644 xulapp/chrome/mandelbrot/content/image-settings.js
 delete mode 100644 xulapp/chrome/mandelbrot/content/image-settings.xul
 delete mode 100644 xulapp/chrome/mandelbrot/locales/en-US/image-settings.dtd
 delete mode 100644 xulapp/chrome/mandelbrot/skin/classic/image-settings.css

diff --git a/jar.mn b/jar.mn
index 472bd94..69628f4 100644
--- a/jar.mn
+++ b/jar.mn
@@ -15,8 +15,6 @@ mandelbrot.jar:
   content/mandelbrot/mandelbrot.js                 (xulapp/chrome/mandelbrot/content/mandelbrot.js)
   content/mandelbrot/mandelbrot.xul                (xulapp/chrome/mandelbrot/content/mandelbrot.xul)
   content/mandelbrot/mandelbrot-tab.xul            (xulapp/chrome/mandelbrot/content/mandelbrot-tab.xul)
-  content/mandelbrot/image-settings.js             (xulapp/chrome/mandelbrot/content/image-settings.js)
-  content/mandelbrot/image-settings.xul            (xulapp/chrome/mandelbrot/content/image-settings.xul)
   content/mandelbrot/fxOverlay.xul                 (extension/fxOverlay.xul)
   content/mandelbrot/mobileOverlay.xul             (extension/mobileOverlay.xul)
   content/mandelbrot/smOverlay.xul                 (extension/smOverlay.xul)
@@ -24,8 +22,6 @@ mandelbrot.jar:
   skin/classic/mandelbrot/mandelbrotIcon16.png     (xulapp/chrome/mandelbrot/skin/classic/mandelbrotIcon16.png)
   skin/classic/mandelbrot/mandelbrotIcon32.png     (xulapp/chrome/mandelbrot/skin/classic/mandelbrotIcon32.png)
   skin/classic/mandelbrot/mobileUI.css             (xulapp/chrome/mandelbrot/skin/classic/mobileUI.css)
-  skin/classic/mandelbrot/image-settings.css       (xulapp/chrome/mandelbrot/skin/classic/image-settings.css)
   locale/@AB_CD@/mandelbrot/mandelbrot.dtd         (xulapp/chrome/mandelbrot/locales/@AB_CD@/mandelbrot.dtd)
   locale/@AB_CD@/mandelbrot/mandelbrot.properties  (xulapp/chrome/mandelbrot/locales/@AB_CD@/mandelbrot.properties)
   locale/@AB_CD@/mandelbrot/mandelbrot-overlay.dtd (xulapp/chrome/mandelbrot/locales/@AB_CD@/mandelbrot-overlay.dtd)
-  locale/@AB_CD@/mandelbrot/image-settings.dtd     (xulapp/chrome/mandelbrot/locales/@AB_CD@/image-settings.dtd)
diff --git a/xulapp/chrome/mandelbrot/content/image-settings.js b/xulapp/chrome/mandelbrot/content/image-settings.js
deleted file mode 100644
index a025bde..0000000
--- a/xulapp/chrome/mandelbrot/content/image-settings.js
+++ /dev/null
@@ -1,144 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is KaiRo.at Mandelbrot, XULRunner version.
- *
- * The Initial Developer of the Original Code is
- * Robert Kaiser <kairo@kairo.at>.
- * Portions created by the Initial Developer are Copyright (C) 2008
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Robert Kaiser <kairo@kairo.at>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-var gColorPalette = [];
-
-function initSettings() {
-  recalcCoord('Cr', 'scale');
-  recalcCoord('Ci', 'scale');
-  if (!window.opener)
-    window.getButton('extra1').disabled = true;
-}
-
-function drawPreview() {
-  let canvas = document.getElementById("mbrotPreview");
-  let context = canvas.getContext("2d");
-
-  if (document.getElementById("imgWidth").value /
-      document.getElementById("imgHeight").value
-        < 80 / 50) {
-    canvas.height = 50;
-    canvas.width = canvas.height *
-      document.getElementById("imgWidth").value /
-      document.getElementById("imgHeight").value;
-  }
-  else {
-    canvas.width = 80;
-    canvas.height = canvas.width *
-      document.getElementById("imgHeight").value /
-      document.getElementById("imgWidth").value;
-  }
-
-  let Cr_min = parseFloat(document.getElementById("Cr_min").value);
-  let Cr_max = parseFloat(document.getElementById("Cr_max").value);
-  if ((Cr_min < -2) || (Cr_min > 2) ||
-      (Cr_max < -2) || (Cr_max > 2) || (Cr_min >= Cr_max)) {
-    Cr_min = -2.0; Cr_max = 1.0;
-  }
-
-  let Ci_min = parseFloat(document.getElementById("Ci_min").value);
-  let Ci_max = parseFloat(document.getElementById("Ci_max").value);
-  if ((Ci_min < -2) || (Ci_min > 2) ||
-      (Ci_max < -2) || (Ci_max > 2) || (Ci_min >= Ci_max)) {
-    Ci_min = -2.0; Ci_max = 1.0;
-  }
-
-  let iterMax = gPref.getIntPref("mandelbrot.iteration_max");
-  let algorithm = gPref.getCharPref("mandelbrot.use_algorithm");
-
-  context.fillStyle = "rgba(255, 255, 255, 127)";
-  context.fillRect(0, 0, canvas.width, canvas.height);
-
-  try {
-    var currentPalette = gPref.getCharPref("mandelbrot.color_palette");
-  }
-  catch(e) {
-    var currentPalette = '';
-  }
-  if (!currentPalette.length) {
-    currentPalette = 'kairo';
-  }
-  gColorPalette = getColorPalette(currentPalette);
-
-  drawLine(0, [Cr_min, Cr_max, Ci_min, Ci_max],
-              canvas, context, iterMax, algorithm);
-}
-
-function recalcCoord(coord, target) {
-  let othercoord = (coord == 'Ci') ? 'Cr' : 'Ci';
-  let owndim = (coord == 'Ci') ? 'height' : 'width';
-  let otherdim = (coord == 'Ci') ? 'width' : 'height';
-  if (target == 'scale') {
-    var myscale =
-      parseFloat(document.getElementById(coord + '_max').value) -
-      parseFloat(document.getElementById(coord + '_min').value);
-    document.getElementById(coord + '_scale').value = roundCoord(myscale);
-  }
-  else if (target == 'max') {
-    let mymax =
-      parseFloat(document.getElementById(coord + '_min').value) +
-      parseFloat(document.getElementById(coord + '_scale').value);
-    document.getElementById('mandelbrot.last_image.' + coord + '_max').value = roundCoord(mymax);
-    var myscale = document.getElementById(coord + '_scale').value;
-  }
-  if (document.getElementById('syncProp').checked) {
-    let otherscale = myscale *
-      document.getElementById('mandelbrot.image.' + otherdim).value /
-      document.getElementById('mandelbrot.image.' + owndim).value;
-    document.getElementById(othercoord + '_scale').value = roundCoord(otherscale);
-    let othermax =
-      parseFloat(document.getElementById(othercoord + '_min').value) +
-      parseFloat(document.getElementById(othercoord + '_scale').value);
-    document.getElementById('mandelbrot.last_image.' + othercoord + '_max').value = roundCoord(othermax);
-  }
-}
-
-function checkProportions() {
-  if (!document.getElementById('syncProp').checked) {
-    recalcCoord('Cr', 'scale');
-  }
-}
-
-function roundCoord(floatval) {
-  // We should round to 10 decimals here or so
-  return floatval;
-}
-
-function callDrawImage() {
-  window.opener.drawImage();
-  window.close();
-}
\ No newline at end of file
diff --git a/xulapp/chrome/mandelbrot/content/image-settings.xul b/xulapp/chrome/mandelbrot/content/image-settings.xul
deleted file mode 100644
index 605aac2..0000000
--- a/xulapp/chrome/mandelbrot/content/image-settings.xul
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is KaiRo.at Mandelbrot, XULRunner version.
-   -
-   - The Initial Developer of the Original Code is
-   - Robert Kaiser <kairo@kairo.at>.
-   - Portions created by the Initial Developer are Copyright (C) 2008
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Robert Kaiser <kairo@kairo.at>
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the LGPL or the GPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://mandelbrot/skin/image-settings.css" type="text/css"?>
-
-<!DOCTYPE prefwindow SYSTEM "chrome://mandelbrot/locale/image-settings.dtd">
-
-<prefwindow id="imgSettingsDlg"
-            xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-            xmlns:html="http://www.w3.org/1999/xhtml"
-            title="&imageSettings.title;"
-            buttons="accept,cancel,extra1"
-            ondialogextra1="callDrawImage();"
-            buttonlabelextra1="&DrawImageButton.label;">
-
-  <prefpane id="imgSettingsPane" onpaneload="initSettings();">
-    <script type="application/x-javascript"
-            src="chrome://mandelbrot/content/mandelbrot.js"/>
-    <script type="application/x-javascript"
-            src="chrome://mandelbrot/content/image-settings.js"/>
-
-    <preferences id="mandelbrotPreferences">
-      <preference id="mandelbrot.image.width" name="mandelbrot.image.width"
-                  type="int"/>
-      <preference id="mandelbrot.image.height" name="mandelbrot.image.height"
-                  type="int"/>
-      <preference id="mandelbrot.last_image.Cr_min" name="mandelbrot.last_image.Cr_min"
-                  type="string"/>
-      <preference id="mandelbrot.last_image.Cr_max" name="mandelbrot.last_image.Cr_max"
-                  type="string"/>
-      <preference id="mandelbrot.last_image.Ci_min" name="mandelbrot.last_image.Ci_min"
-                  type="string"/>
-      <preference id="mandelbrot.last_image.Ci_max" name="mandelbrot.last_image.Ci_max"
-                  type="string"/>
-      <preference id="mandelbrot.syncProportions" name="mandelbrot.syncProportions"
-                  type="bool"/>
-    </preferences>
-
-    <groupbox>
-      <caption label="&coord.title;"/>
-      <description value="&coord.real.label;"/>
-      <hbox align="center">
-        <label value="&coord.min.label;" control="Cr_min"/>
-        <textbox id="Cr_min" size="10"
-                 preference="mandelbrot.last_image.Cr_min"
-                 onchange="recalcCoord('Cr', 'scale');"/>
-        <label value="&coord.max.label;" control="Cr_max"/>
-        <textbox id="Cr_max" size="10"
-                 preference="mandelbrot.last_image.Cr_max"
-                 onchange="recalcCoord('Cr', 'scale');"/>
-        <label value="&coord.scale.label;" control="Cr_scale"/>
-        <textbox id="Cr_scale" size="10"
-                 onchange="recalcCoord('Cr', 'max');"/>
-      </hbox>
-      <description value="&coord.imag.label;"/>
-      <hbox align="center">
-        <label value="&coord.min.label;" control="Ci_min"/>
-        <textbox id="Ci_min" size="10"
-                 preference="mandelbrot.last_image.Ci_min"
-                 onchange="recalcCoord('Ci', 'scale');"/>
-        <label value="&coord.max.label;" control="Ci_max"/>
-        <textbox id="Ci_max" size="10"
-                 preference="mandelbrot.last_image.Ci_max"
-                 onchange="recalcCoord('Ci', 'scale');"/>
-        <label value="&coord.scale.label;" control="Ci_scale"/>
-        <textbox id="Ci_scale" size="10"
-                 onchange="recalcCoord('Ci', 'max');"/>
-      </hbox>
-    </groupbox>
-
-    <hbox flex="1">
-      <groupbox>
-        <caption label="&img.size.title;"/>
-        <hbox align="center">
-          <label value="&img.width.label;" control="imgWidth"/>
-          <textbox id="imgWidth" size="4"
-                   preference="mandelbrot.image.width"
-                   onchange="recalcCoord('Ci', 'scale');"/>
-        </hbox>
-        <hbox align="center">
-          <label value="&img.height.label;" control="imgHeight"/>
-          <textbox id="imgHeight" size="4"
-                   preference="mandelbrot.image.height"
-                   onchange="recalcCoord('Cr', 'scale');"/>
-        </hbox>
-      </groupbox>
-
-      <groupbox>
-        <caption label="&preview.title;"/>
-        <hbox flex="1" pack="center" align="center">
-          <html:canvas id="mbrotPreview" width="50" height="50"></html:canvas>
-        </hbox>
-        <button id="previewButton" label="&previewDraw.label;" oncommand="drawPreview();"/>
-      </groupbox>
-
-      <groupbox>
-        <caption label="&options.title;"/>
-        <hbox align="center">
-          <checkbox id="syncProp"
-                    preference="mandelbrot.syncProportions"
-                    onclick="checkProportions();"/>
-          <label value="&syncProp.label;" control="syncProp"/>
-        </hbox>
-      </groupbox>
-    </hbox>
-  </prefpane>
-</prefwindow>
diff --git a/xulapp/chrome/mandelbrot/content/mandelbrot-tab.xul b/xulapp/chrome/mandelbrot/content/mandelbrot-tab.xul
index 1f15fb3..b525e10 100644
--- 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">
diff --git a/xulapp/chrome/mandelbrot/content/mandelbrot.js b/xulapp/chrome/mandelbrot/content/mandelbrot.js
index 95c0e14..24f9a0c 100644
--- a/xulapp/chrome/mandelbrot/content/mandelbrot.js
+++ b/xulapp/chrome/mandelbrot/content/mandelbrot.js
@@ -683,10 +683,16 @@ function setPalette(aPaletteID) {
 }
 
 function imgSettings() {
-  if (document.getElementById("mandelbrotWindow").nodeName == "page")
-    document.getElementById("imgSettingsPanel").showPopup(null, "before_start");
-  else
-    window.openDialog("chrome://mandelbrot/content/image-settings.xul");
+  let anchor = null;
+  let position = "before_start";
+  if (document.getElementById("mandelbrotWindow").nodeName == "page") {
+    anchor = document.getElementById("mandelbrotToolbar");
+  }
+  else {
+    anchor = document.getElementById("mandelbrotMenubar");
+    position = "after_start";
+  }
+  document.getElementById("imgSettingsPanel").showPopup(anchor, position);
 }
 
 function updateDebugMenu() {
diff --git a/xulapp/chrome/mandelbrot/content/mandelbrot.xul b/xulapp/chrome/mandelbrot/content/mandelbrot.xul
index d864fef..a9cb1e4 100644
--- a/xulapp/chrome/mandelbrot/content/mandelbrot.xul
+++ b/xulapp/chrome/mandelbrot/content/mandelbrot.xul
@@ -50,7 +50,7 @@
 ]>
 
 <window id="mandelbrotWindow" title="&windowTitle;"
-        width="350" height="450"
+        width="650" height="750"
         onload="Startup()"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml">
@@ -66,7 +66,7 @@
   </commandset>
 
   <toolbox>
-    <menubar>
+    <menubar id="mandelbrotMenubar">
       <menu id="fileMenu" label="&fileMenu.label;">
         <menupopup id="menu_filePopup">
           <menuitem id="fileDraw" label="&fileDraw.label;" oncommand="drawImage();"/>
@@ -125,6 +125,79 @@
       </menu>
     </menubar>
   </toolbox>
+  <panel id="imgSettingsPanel"
+         onpopupshowing="initImgSettings();"
+         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;"/>
+      <description value="&coord.real.label;" class="coord-caption"/>
+      <hbox align="center">
+        <label value="&coord.min.label;" control="is_Cr_min"/>
+        <textbox id="is_Cr_min" size="10"
+                 onchange="checkISValue(this, 'coord'); recalcCoord('Cr', 'scale');"/>
+        <label value="&coord.max.label;" control="is_Cr_max"/>
+        <textbox id="is_Cr_max" size="10"
+                 onchange="checkISValue(this, 'coord'); recalcCoord('Cr', 'scale');"/>
+        <label value="&coord.scale.label;" control="is_Cr_scale"/>
+        <textbox id="is_Cr_scale" size="10"
+                 onchange="checkISValue(this, 'coord'); recalcCoord('Cr', 'max');"/>
+      </hbox>
+      <separator class="thin"/>
+      <description value="&coord.imag.label;" class="coord-caption"/>
+      <hbox align="center">
+        <label value="&coord.min.label;" control="is_Ci_min"/>
+        <textbox id="is_Ci_min" size="10"
+                 onchange="checkISValue(this, 'coord'); recalcCoord('Ci', 'scale');"/>
+        <label value="&coord.max.label;" control="is_Ci_max"/>
+        <textbox id="is_Ci_max" size="10"
+                 onchange="checkISValue(this, 'coord'); recalcCoord('Ci', 'scale');"/>
+        <label value="&coord.scale.label;" control="is_Ci_scale"/>
+        <textbox id="is_Ci_scale" size="10"
+                 onchange="checkISValue(this, 'coord'); recalcCoord('Ci', 'max');"/>
+      </hbox>
+    </groupbox>
+
+    <hbox flex="1">
+      <groupbox>
+        <caption label="&img.size.title;"/>
+        <hbox align="center">
+          <label value="&img.width.label;" control="is_img_width"/>
+          <textbox id="is_img_width" size="4"
+                   onchange="checkISValue(this, 'dim'); recalcCoord('Ci', 'scale');"/>
+        </hbox>
+        <hbox align="center">
+          <label value="&img.height.label;" control="is_img_height"/>
+          <textbox id="is_img_height" size="4"
+                   onchange="checkISValue(this, 'dim'); recalcCoord('Cr', 'scale');"/>
+        </hbox>
+      </groupbox>
+
+      <groupbox>
+        <caption label="&preview.title;"/>
+        <hbox flex="1" pack="center" align="center">
+          <html:canvas id="is_mbrotPreview" width="50" height="50"></html:canvas>
+        </hbox>
+        <button id="is_previewButton" label="&previewDraw.label;" oncommand="drawPreview();"/>
+      </groupbox>
+
+      <groupbox>
+        <caption label="&options.title;"/>
+        <hbox align="center">
+          <checkbox id="is_syncProp"
+                    onclick="checkProportions();"/>
+          <label value="&syncProp.label;" control="is_syncProp"/>
+        </hbox>
+      </groupbox>
+    </hbox>
+    <hbox>
+      <button id="is_closeButton" label="&closeSettings.label;" oncommand="closeImgSettings();"/>
+      <spacer flex="1"/>
+      <button id="is_drawButton" label="&drawImageButton.label;" oncommand="closeImgSettings(); drawImage();"/>
+    </hbox>
+  </panel>
   <hbox flex="1" pack="center" align="center">
     <stack>
       <html:canvas id="mbrotImage" width="300" height="300"
diff --git a/xulapp/chrome/mandelbrot/locales/en-US/image-settings.dtd b/xulapp/chrome/mandelbrot/locales/en-US/image-settings.dtd
deleted file mode 100644
index 521b3b8..0000000
--- a/xulapp/chrome/mandelbrot/locales/en-US/image-settings.dtd
+++ /dev/null
@@ -1,57 +0,0 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is KaiRo.at Mandelbrot, XULRunner version.
-   -
-   - The Initial Developer of the Original Code is
-   - Robert Kaiser <kairo@kairo.at>.
-   - Portions created by the Initial Developer are Copyright (C) 2008
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Robert Kaiser <kairo@kairo.at>
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the LGPL or the GPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<!ENTITY imageSettings.title   "Image Settings">
-<!ENTITY DrawImageButton.label "Draw Image">
-<!ENTITY closeSettings.label   "Close">
-
-<!ENTITY coord.title           "Coordinates">
-<!ENTITY coord.real.label      "Real">
-<!ENTITY coord.imag.label      "Imaginary">
-<!ENTITY coord.min.label       "From">
-<!ENTITY coord.max.label       "To">
-<!ENTITY coord.scale.label     "Scale">
-
-<!ENTITY img.size.title        "Image Size">
-<!ENTITY img.width.label       "Width">
-<!ENTITY img.height.label      "Height">
-
-<!ENTITY preview.title         "Preview">
-<!ENTITY previewDraw.label     "Preview">
-
-<!ENTITY options.title         "Options">
-<!ENTITY syncProp.label        "Proportional">
diff --git a/xulapp/chrome/mandelbrot/locales/en-US/mandelbrot.dtd b/xulapp/chrome/mandelbrot/locales/en-US/mandelbrot.dtd
index 910255e..5ce660b 100644
--- a/xulapp/chrome/mandelbrot/locales/en-US/mandelbrot.dtd
+++ b/xulapp/chrome/mandelbrot/locales/en-US/mandelbrot.dtd
@@ -69,3 +69,25 @@
 <!ENTITY algoOO.label     "Object-Oriented">
 <!ENTITY errorConsole.label "Error Console">
 <!ENTITY addonsManager.label "Add-ons Manager">
+
+<!-- Image Settings panel -->
+<!ENTITY imageSettings.title   "Image Settings">
+<!ENTITY drawImageButton.label "Draw Image">
+<!ENTITY closeSettings.label   "Close">
+
+<!ENTITY coord.title           "Coordinates">
+<!ENTITY coord.real.label      "Real">
+<!ENTITY coord.imag.label      "Imaginary">
+<!ENTITY coord.min.label       "From">
+<!ENTITY coord.max.label       "To">
+<!ENTITY coord.scale.label     "Scale">
+
+<!ENTITY img.size.title        "Image Size">
+<!ENTITY img.width.label       "Width">
+<!ENTITY img.height.label      "Height">
+
+<!ENTITY preview.title         "Preview">
+<!ENTITY previewDraw.label     "Preview">
+
+<!ENTITY options.title         "Options">
+<!ENTITY syncProp.label        "Proportional">
diff --git a/xulapp/chrome/mandelbrot/skin/classic/image-settings.css b/xulapp/chrome/mandelbrot/skin/classic/image-settings.css
deleted file mode 100644
index d28d888..0000000
--- a/xulapp/chrome/mandelbrot/skin/classic/image-settings.css
+++ /dev/null
@@ -1,37 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is KaiRo.at Mandelbrot, XULRunner version.
- *
- * The Initial Developer of the Original Code is
- * Robert Kaiser <kairo@kairo.at>.
- * Portions created by the Initial Developer are Copyright (C) 2008
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Robert Kaiser <kairo@kairo.at>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-- 
2.43.0