Merge branch 'master' of linz:/srv/git/mandelbrot

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

diff --git a/xulapp/chrome/mandelbrot/content/mandelbrot.xul b/xulapp/chrome/mandelbrot/content/mandelbrot.xul
index c5c2cc60594e351a6e252539759ffb7c56cee586..596a4e7bbe07d676bcdd5e14cadeeec0dfa47342 100644 (file)
--- a/xulapp/chrome/mandelbrot/content/mandelbrot.xul
+++ b/xulapp/chrome/mandelbrot/content/mandelbrot.xul
@@ -73,6 +73,15 @@
           <menuitem id="fileQuit" label="&fileQuit.label;" oncommand="quitApp(false);"/>
         </menupopup>
       </menu>
           <menuitem id="fileQuit" label="&fileQuit.label;" oncommand="quitApp(false);"/>
         </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;">
         <menupopup id="menu_prefPopup">
           <menu id="iterMenu" label="&iterMenu.label;">
       <menu id="prefMenu" label="&prefMenu.label;">
         <menupopup id="menu_prefPopup">
           <menu id="iterMenu" label="&iterMenu.label;">


@@ -111,7 +120,10 @@
   </toolbox>
   <hbox flex="1" pack="center" align="center">
     <stack>
   </toolbox>
   <hbox flex="1" pack="center" align="center">
     <stack>

-      <html:canvas id="mbrotImage" width="300" height="300"></html:canvas>
+      <html:canvas id="mbrotImage" width="300" height="300"
+                   onmousedown="mouseevent('down', event);"
+                   onmouseup="mouseevent('up',event);">
+      </html:canvas>

       <button id="drawButton" label="&fileDraw.label;" oncommand="drawImage();"/>
     </stack>
   </hbox>
       <button id="drawButton" label="&fileDraw.label;" oncommand="drawImage();"/>
     </stack>
   </hbox>