X-Git-Url: https://git-public.kairo.at/?p=mandelbrot.git;a=blobdiff_plain;f=content%2Fmandelbrot.xul;h=720f9db60ba53531fdd8e7396c827b0a68c898f0;hp=47f8c597b1a6bc4a09004194df75a85187b25e38;hb=1b09b217b456d90777763d839d09010a4309ee78;hpb=3fd66836e6c5fbd25dd8f90dd50914cabeb7a9a7

diff --git a/content/mandelbrot.xul b/content/mandelbrot.xul
index 47f8c59..720f9db 100644
--- a/content/mandelbrot.xul
+++ b/content/mandelbrot.xul
@@ -41,17 +41,13 @@
 <?xml-stylesheet href="chrome://mandelbrot/skin/" type="text/css"?>
 
 <!DOCTYPE page [
-  <!ENTITY % mandelOverlayDTD SYSTEM "chrome://mandelbrot/locale/mandelbrot-overlay.dtd">
-  %mandelOverlayDTD;
-  <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
-  %brandDTD;
   <!ENTITY % mandelbrotDTD SYSTEM "chrome://mandelbrot/locale/mandelbrot.dtd">
   %mandelbrotDTD;
 ]>
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       xmlns:html="http://www.w3.org/1999/xhtml"
-      id="mandelbrotWindow" title="&windowTitle;"
+      id="mandelbrot-page" title="&windowTitle;"
       disablefastfind="true"
       onload="Startup();">
 
@@ -72,8 +68,12 @@
     <toolbar class="chromeclass-toolbar"
              id="mandelbrotToolbar"
              align="center">
-      <toolbarbutton id="fileDraw" label="&fileDraw.label;" oncommand="drawImage();"/>
-      <toolbarbutton id="fileSave" label="&fileSave.label;" oncommand="saveImage();"/>
+      <toolbarbutton id="fileDraw"
+                     label="&toolbarDraw.label;"
+                     oncommand="drawImage();"/>
+      <toolbarbutton id="fileSave"
+                     label="&toolbarSave.label;"
+                     oncommand="saveImage();"/>
       <toolbarbutton id="bookmarkMenu"
                      type="menu"
                      class="tabbable"
@@ -81,53 +81,21 @@
         <menupopup id="menu_bookmarkPopup"
                    onpopupshowing="updateBookmarkMenu(event.target);"
                    oncommand="callBookmark(event.target);">
-          <menuitem id="bookmarkOverview" label="&bookmarkOverview.label;"/>
-          <menuitem id="bookmarkSave" label="&bookmarkSave.label;" oncommand="saveBookmark();"/>
+          <menuitem id="bookmarkBack"
+                    label="&bookmarkBack.label;"
+                    disabled="true"
+                    oncommand="goBack();"/>
+          <menuitem id="bookmarkOverview"
+                    label="&bookmarkOverview.label;"/>
+          <menuitem id="bookmarkSave"
+                    label="&bookmarkSave.label;"
+                    oncommand="saveBookmark();"/>
           <menuseparator id="bookmarkSeparator"/>
         </menupopup>
       </toolbarbutton>
-      <toolbarbutton id="prefMenu"
-                     type="menu"
-                     class="tabbable"
-                     label="&prefMenu.label;">
-        <menupopup id="menu_prefPopup">
-          <menu id="iterMenu" label="&iterMenu.label;">
-            <menupopup id="menu_iterPopup" onpopupshowing="updateIterMenu();" oncommand="setIter(event.target.value);">
-              <menuitem type="radio" name="iter" value="50" label="&iter50.label;"/>
-              <menuitem type="radio" name="iter" value="100" label="&iter100.label;"/>
-              <menuitem type="radio" name="iter" value="500" label="&iter500.label;"/>
-              <menuitem type="radio" name="iter" value="1000" label="&iter1000.label;"/>
-            </menupopup>
-          </menu>
-          <menu id="colorMenu" label="&colorMenu.label;">
-            <menupopup id="menu_palettePopup" onpopupshowing="updatePaletteMenu();" oncommand="setPalette(event.target.value);">
-              <menuitem type="radio" name="palette" value="bw" label="&colorBW.label;"/>
-              <menuitem type="radio" name="palette" value="kairo" label="&colorKairo.label;"/>
-              <menuitem type="radio" name="palette" value="rainbow-linear1" label="&colorRBLin1.label;"/>
-              <menuitem type="radio" name="palette" value="rainbow-squared1" label="&colorRBSq1.label;"/>
-              <menuitem type="radio" name="palette" value="rainbow-linear2" label="&colorRBLin2.label;"/>
-              <menuitem type="radio" name="palette" value="rainbow-squared2" label="&colorRBSq2.label;"/>
-            </menupopup>
-          </menu>
-          <menuitem id="imgSettings" label="&imgSettings.label;" oncommand="imgSettings();"/>
-        </menupopup>
-      </toolbarbutton>
-      <toolbarbutton id="debugMenu"
-                     type="menu"
-                     class="tabbable"
-                     label="&debugMenu.label;">
-        <menupopup id="menu_debugPopup" onpopupshowing="updateDebugMenu();">
-          <menuitem type="checkbox" id="jitEnabled" label="&tracejitEnabled.label;" oncommand="toggleJITState(event.target, '');" hidden="true"/>
-          <menuitem type="checkbox" id="tracejitEnabled" label="&tracejitEnabled.label;" oncommand="toggleJITState(event.target, 'trace');"/>
-          <menuitem type="checkbox" id="methodjitEnabled" label="&methodjitEnabled.label;" oncommand="toggleJITState(event.target, 'method');"/>
-          <menu id="algoMenu" label="&algoMenu.label;">
-            <menupopup id="menu_algoPopup" onpopupshowing="updateAlgoMenu();" oncommand="setAlgorithm(event.target.value);">
-              <menuitem type="radio" name="algorithm" value="numeric" label="&algoNumeric.label;"/>
-              <menuitem type="radio" name="algorithm" value="oo" label="&algoOO.label;"/>
-            </menupopup>
-          </menu>
-        </menupopup>
-      </toolbarbutton>
+      <toolbarbutton id="imgSettings"
+                     label="&imgSettings.label;"
+                     oncommand="imgSettings();"/>
     </toolbar>
   </toolbox>
   <panel id="imgSettingsPanel"
@@ -190,10 +158,43 @@
 
       <groupbox>
         <caption label="&options.title;"/>
-        <hbox align="center">
-          <checkbox id="is_syncProp"
-                    label="&syncProp.label;"
-                    onclick="checkProportions();"/>
+        <hbox>
+          <vbox>
+            <label value="&colorList.label;" control="colorList"/>
+            <menulist id="colorList">
+              <menupopup oncommand="setPalette(event.target.value);">
+                <menuitem value="bw" label="&colorBW.label;"/>
+                <menuitem value="kairo" label="&colorKairo.label;"/>
+                <menuitem value="rainbow-linear1" label="&colorRBLin1.label;"/>
+                <menuitem value="rainbow-squared1" label="&colorRBSq1.label;"/>
+                <menuitem value="rainbow-linear2" label="&colorRBLin2.label;"/>
+                <menuitem value="rainbow-squared2" label="&colorRBSq2.label;"/>
+              </menupopup>
+            </menulist>
+            <label value="&algoList.label;" control="algoList"/>
+            <menulist id="algoList">
+              <menupopup oncommand="setAlgorithm(event.target.value);">
+                <menuitem value="numeric" label="&algoNumeric.label;"/>
+                <menuitem value="oo" label="&algoOO.label;"/>
+              </menupopup>
+            </menulist>
+          </vbox>
+          <vbox>
+            <label value="&iterList.label;" control="iterList"/>
+            <menulist id="iterList">
+              <menupopup oncommand="setIter(event.target.value);">
+                <menuitem value="50" label="&iter50.label;"/>
+                <menuitem value="100" label="&iter100.label;"/>
+                <menuitem value="500" label="&iter500.label;"/>
+                <menuitem value="1000" label="&iter1000.label;"/>
+              </menupopup>
+            </menulist>
+            <hbox align="center">
+              <checkbox id="is_syncProp"
+                        label="&syncProp.label;"
+                        onclick="checkProportions();"/>
+            </hbox>
+          </vbox>
         </hbox>
       </groupbox>
     </hbox>
@@ -207,7 +208,7 @@
     <stack>
       <html:canvas id="mbrotImage" width="300" height="300">
       </html:canvas>
-      <button id="drawButton" label="&fileDraw.label;" oncommand="drawImage();"/>
+      <button id="drawButton" label="&buttonDraw.label;" oncommand="drawImage();"/>
     </stack>
   </hbox>
   <hbox pack="end" align="end">