X-Git-Url: https://git-public.kairo.at/?p=mandelbrot.git;a=blobdiff_plain;f=content%2Fmandelbrot.xul;fp=xulapp%2Fchrome%2Fmandelbrot%2Fcontent%2Fmandelbrot.xul;h=47f8c597b1a6bc4a09004194df75a85187b25e38;hp=1663d188d97a4d8aeee94126cf4558d27bda1c61;hb=3fd66836e6c5fbd25dd8f90dd50914cabeb7a9a7;hpb=ad2faff87132f18ada1b47149ca76678c1289ad1

diff --git a/xulapp/chrome/mandelbrot/content/mandelbrot.xul b/content/mandelbrot.xul
similarity index 86%
rename from xulapp/chrome/mandelbrot/content/mandelbrot.xul
rename to content/mandelbrot.xul
index 1663d18..47f8c59 100644
--- a/xulapp/chrome/mandelbrot/content/mandelbrot.xul
+++ b/content/mandelbrot.xul
@@ -17,7 +17,7 @@
    -
    - The Initial Developer of the Original Code is
    - Robert Kaiser <kairo@kairo.at>.
-   - Portions created by the Initial Developer are Copyright (C) 2008
+   - Portions created by the Initial Developer are Copyright (C) 2008-2011
    - the Initial Developer. All Rights Reserved.
    -
    - Contributor(s):
@@ -40,7 +40,7 @@
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://mandelbrot/skin/" type="text/css"?>
 
-<!DOCTYPE window [
+<!DOCTYPE page [
   <!ENTITY % mandelOverlayDTD SYSTEM "chrome://mandelbrot/locale/mandelbrot-overlay.dtd">
   %mandelOverlayDTD;
   <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
@@ -49,11 +49,14 @@
   %mandelbrotDTD;
 ]>
 
-<window id="mandelbrotWindow" title="&windowTitle;"
-        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">
+<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      xmlns:html="http://www.w3.org/1999/xhtml"
+      id="mandelbrotWindow" title="&windowTitle;"
+      disablefastfind="true"
+      onload="Startup();">
+
+  <html:link rel="shortcut icon"
+              href="chrome://mandelbrot/skin/mandelbrotIcon16.png"/>
 
   <script type="application/x-javascript"
           src="chrome://mandelbrot/content/mandelbrot.js"/>
@@ -66,16 +69,15 @@
   </commandset>
 
   <toolbox>
-    <menubar id="mandelbrotMenubar">
-      <menu id="fileMenu" label="&fileMenu.label;">
-        <menupopup id="menu_filePopup">
-          <menuitem id="fileDraw" label="&fileDraw.label;" oncommand="drawImage();"/>
-          <menuitem id="fileSave" label="&fileSave.label;" oncommand="saveImage();"/>
-          <menuseparator/>
-          <menuitem id="fileQuit" label="&fileQuit.label;" oncommand="exitMandelbrot();"/>
-        </menupopup>
-      </menu>
-      <menu id="bookmarkMenu" label="&bookmarkMenu.label;">
+    <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="bookmarkMenu"
+                     type="menu"
+                     class="tabbable"
+                     label="&bookmarkMenu.label;">
         <menupopup id="menu_bookmarkPopup"
                    onpopupshowing="updateBookmarkMenu(event.target);"
                    oncommand="callBookmark(event.target);">
@@ -83,8 +85,11 @@
           <menuitem id="bookmarkSave" label="&bookmarkSave.label;" oncommand="saveBookmark();"/>
           <menuseparator id="bookmarkSeparator"/>
         </menupopup>
-      </menu>
-      <menu id="prefMenu" label="&prefMenu.label;">
+      </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);">
@@ -106,8 +111,11 @@
           </menu>
           <menuitem id="imgSettings" label="&imgSettings.label;" oncommand="imgSettings();"/>
         </menupopup>
-      </menu>
-      <menu id="debugMenu" label="&debugMenu.label;">
+      </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');"/>
@@ -118,13 +126,9 @@
               <menuitem type="radio" name="algorithm" value="oo" label="&algoOO.label;"/>
             </menupopup>
           </menu>
-          <menuitem id="errorConsole" label="&errorConsole.label;"
-                    oncommand="errorConsole();"/>
-          <menuitem id="addonsMgr" label="&addonsManager.label;"
-                    oncommand="addonsManager();"/>
         </menupopup>
-      </menu>
-    </menubar>
+      </toolbarbutton>
+    </toolbar>
   </toolbox>
   <panel id="imgSettingsPanel"
          onpopupshowing="initImgSettings();"
@@ -201,10 +205,7 @@
   </panel>
   <hbox flex="1" pack="center" align="center">
     <stack>
-      <html:canvas id="mbrotImage" width="300" height="300"
-                   onmousedown="mouseevent('down', event);"
-                   onmouseup="mouseevent('up',event);"
-                   onmousemove="mouseevent('move',event);">
+      <html:canvas id="mbrotImage" width="300" height="300">
       </html:canvas>
       <button id="drawButton" label="&fileDraw.label;" oncommand="drawImage();"/>
     </stack>
@@ -212,4 +213,4 @@
   <hbox pack="end" align="end">
     <description id="statusLabel"/>
   </hbox>
-</window>
+</page>