X-Git-Url: https://git-public.kairo.at/?p=mandelbrot.git;a=blobdiff_plain;f=xulapp%2Fchrome%2Fmandelbrot%2Fcontent%2Fmandelbrot.xul;h=d864fef832c8d387acd88ced423ae9d5309826de;hp=183c6caf26083b3f39f58fbf45238cf23d107c9b;hb=8a2b6e174e3cd0d1d30bb48e9842c4e8bfba2827;hpb=4d8e7dcbb2fdcb51faf6e0c2f3ba4c24c8b9e7b3

diff --git a/xulapp/chrome/mandelbrot/content/mandelbrot.xul b/xulapp/chrome/mandelbrot/content/mandelbrot.xul
index 183c6ca..d864fef 100644
--- a/xulapp/chrome/mandelbrot/content/mandelbrot.xul
+++ b/xulapp/chrome/mandelbrot/content/mandelbrot.xul
@@ -41,6 +41,8 @@
 <?xml-stylesheet href="chrome://mandelbrot/skin/" type="text/css"?>
 
 <!DOCTYPE window [
+  <!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">
@@ -60,6 +62,9 @@
     <stringbundle id="mbrotBundle" src="chrome://mandelbrot/locale/mandelbrot.properties"/>
   </stringbundleset>
 
+  <commandset id="mainCommands">
+  </commandset>
+
   <toolbox>
     <menubar>
       <menu id="fileMenu" label="&fileMenu.label;">
@@ -67,7 +72,16 @@
           <menuitem id="fileDraw" label="&fileDraw.label;" oncommand="drawImage();"/>
           <menuitem id="fileSave" label="&fileSave.label;" oncommand="saveImage();"/>
           <menuseparator/>
-          <menuitem id="fileQuit" label="&fileQuit.label;" oncommand="quitApp(false);"/>
+          <menuitem id="fileQuit" label="&fileQuit.label;" oncommand="exitMandelbrot();"/>
+        </menupopup>
+      </menu>
+      <menu id="bookmarkMenu" label="&bookmarkMenu.label;">
+        <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();"/>
+          <menuseparator id="bookmarkSeparator"/>
         </menupopup>
       </menu>
       <menu id="prefMenu" label="&prefMenu.label;">
@@ -84,6 +98,10 @@
             <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();"/>
@@ -91,7 +109,8 @@
       </menu>
       <menu id="debugMenu" label="&debugMenu.label;">
         <menupopup id="menu_debugPopup" onpopupshowing="updateDebugMenu();">
-          <menuitem type="checkbox" id="jitEnabled" label="&jitEnabled.label;" oncommand="toggleJITState(event.target);"/>
+          <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;"/>
@@ -110,7 +129,8 @@
     <stack>
       <html:canvas id="mbrotImage" width="300" height="300"
                    onmousedown="mouseevent('down', event);"
-                   onmouseup="mouseevent('up',event);">
+                   onmouseup="mouseevent('up',event);"
+                   onmousemove="mouseevent('move',event);">
       </html:canvas>
       <button id="drawButton" label="&fileDraw.label;" oncommand="drawImage();"/>
     </stack>