From: Robert Kaiser <robert@notebook.(none)>
Date: Fri, 31 Jul 2009 17:30:06 +0000 (+0200)
Subject: Merge branch 'master' of linz:/srv/git/mandelbrot
X-Git-Url: https://git-public.kairo.at/?p=mandelbrot.git;a=commitdiff_plain;h=ce7319c992c5bb86f414ad5dfe47d2daa6502466;hp=-c

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

ce7319c992c5bb86f414ad5dfe47d2daa6502466
diff --combined xulapp/chrome/mandelbrot/content/mandelbrot.xul
index c5c2cc6,9f7c258..596a4e7
--- a/xulapp/chrome/mandelbrot/content/mandelbrot.xul
+++ b/xulapp/chrome/mandelbrot/content/mandelbrot.xul
@@@ -60,9 -60,6 +60,9 @@@
      <stringbundle id="mbrotBundle" src="chrome://mandelbrot/locale/mandelbrot.properties"/>
    </stringbundleset>
  
 +  <commandset id="mainCommands">
 +  </commandset>
 +
    <toolbox>
      <menubar>
        <menu id="fileMenu" label="&fileMenu.label;">
@@@ -73,6 -70,15 +73,15 @@@
            <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;">
@@@ -111,7 -117,10 +120,10 @@@
    </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>