From: Robert Kaiser <kairo@kairo.at>
Date: Sat, 29 May 2010 12:38:25 +0000 (+0200)
Subject: really make mandelbrot ready for add-on release
X-Git-Url: https://git-public.kairo.at/?a=commitdiff_plain;h=474b436c32a22fe875097a3cc6bc61fb4823ddf1;p=mandelbrot.git

really make mandelbrot ready for add-on release
---

diff --git a/Makefile.in b/Makefile.in
index 51a4f0d..26ee514 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -55,7 +55,8 @@ XPI_PKGNAME            = mandelbrot-$(EXTENSION_VERSION)
 
 DIST_FILES = extension/install.rdf
 
-PREF_JS_EXPORTS = $(srcdir)/xulapp/defaults/preferences/prefs.js
+# this interferes with e.g. Firefox prefs
+#PREF_JS_EXPORTS = $(srcdir)/xulapp/defaults/preferences/prefs.js
 
 # include config.mk before using the AB_CD var
 include $(topsrcdir)/config/config.mk
diff --git a/extension/fxOverlay.xul b/extension/fxOverlay.xul
index 8d1c8b6..4293022 100644
--- a/extension/fxOverlay.xul
+++ b/extension/fxOverlay.xul
@@ -1 +1,58 @@
- 
+<?xml version="1.0"?>
+<!-- ***** BEGIN LICENSE BLOCK *****
+   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
+   -
+   - The contents of this file are subject to the Mozilla Public License Version
+   - 1.1 (the "License"); you may not use this file except in compliance with
+   - the License. You may obtain a copy of the License at
+   - http://www.mozilla.org/MPL/
+   -
+   - Software distributed under the License is distributed on an "AS IS" basis,
+   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+   - for the specific language governing rights and limitations under the
+   - License.
+   -
+   - The Original Code is KaiRo.at Mandelbrot, XULRunner version.
+   -
+   - The Initial Developer of the Original Code is
+   - Robert Kaiser <kairo@kairo.at>.
+   - Portions created by the Initial Developer are Copyright (C) 2010
+   - the Initial Developer. All Rights Reserved.
+   -
+   - Contributor(s):
+   -   Robert Kaiser <kairo@kairo.at> (original author)
+   -
+   - Alternatively, the contents of this file may be used under the terms of
+   - either the GNU General Public License Version 2 or later (the "GPL"), or
+   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+   - in which case the provisions of the GPL or the LGPL are applicable instead
+   - of those above. If you wish to allow use of your version of this file only
+   - under the terms of either the GPL or the LGPL, and not to allow others to
+   - use your version of this file under the terms of the MPL, indicate your
+   - decision by deleting the provisions above and replace them with the notice
+   - and other provisions required by the LGPL or the GPL. If you do not delete
+   - the provisions above, a recipient may use your version of this file under
+   - the terms of any one of the MPL, the GPL or the LGPL.
+   -
+   - ***** END LICENSE BLOCK ***** -->
+
+<?xml-stylesheet href="chrome://mandelbrot/skin/mandelbrot.css" type="text/css"?>
+
+<!DOCTYPE overlay SYSTEM "chrome://mandelbrot/locale/mandelbrot-overlay.dtd" >
+
+<overlay id="mandelbrotOverlay"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+  <commandset id="mainCommandSet">
+    <command id="Tools:Mandelbrot"
+             oncommand="window.openDialog('chrome://mandelbrot/content/mandelbrot.xul', '_blank', 'all,dialog=no');"/>
+  </commandset>
+
+  <menupopup id="menu_ToolsPopup">
+    <menuitem id="menu_openMandelbrot" class="menuitem-iconic"
+              label="&mandelbrotCmd.label;" accesskey="&mandelbrotCmd.accesskey;"
+              command="Tools:Mandelbrot"
+              insertafter="devToolsSeparator"/>
+  </menupopup>
+
+</overlay>
diff --git a/extension/install.rdf b/extension/install.rdf
index a09bdef..3d2700f 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -5,7 +5,7 @@
   <Description about="urn:mozilla:install-manifest">
     <em:id>@INSTALL_EXTENSION_ID@</em:id>
     <em:version>@EXTENSION_VERSION@</em:version>
-    <em:name>KaiRo-Mandelbrot</em:name>
+    <em:name>KaiRo.at Mandelbrot</em:name>
     <em:description>Mandelbrot browser, based on highschool final thesis work of Robert Kaiser, but completely rewritten</em:description>
     <em:creator>Robert Kaiser</em:creator>
     <!-- Firefox -->
diff --git a/extension/mobileOverlay.xul b/extension/mobileOverlay.xul
index 8d1c8b6..070f2ff 100644
--- a/extension/mobileOverlay.xul
+++ b/extension/mobileOverlay.xul
@@ -1 +1,57 @@
- 
+<?xml version="1.0"?>
+<!-- ***** BEGIN LICENSE BLOCK *****
+   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
+   -
+   - The contents of this file are subject to the Mozilla Public License Version
+   - 1.1 (the "License"); you may not use this file except in compliance with
+   - the License. You may obtain a copy of the License at
+   - http://www.mozilla.org/MPL/
+   -
+   - Software distributed under the License is distributed on an "AS IS" basis,
+   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+   - for the specific language governing rights and limitations under the
+   - License.
+   -
+   - The Original Code is KaiRo.at Mandelbrot, XULRunner version.
+   -
+   - The Initial Developer of the Original Code is
+   - Robert Kaiser <kairo@kairo.at>.
+   - Portions created by the Initial Developer are Copyright (C) 2010
+   - the Initial Developer. All Rights Reserved.
+   -
+   - Contributor(s):
+   -   Robert Kaiser <kairo@kairo.at> (original author)
+   -
+   - Alternatively, the contents of this file may be used under the terms of
+   - either the GNU General Public License Version 2 or later (the "GPL"), or
+   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+   - in which case the provisions of the GPL or the LGPL are applicable instead
+   - of those above. If you wish to allow use of your version of this file only
+   - under the terms of either the GPL or the LGPL, and not to allow others to
+   - use your version of this file under the terms of the MPL, indicate your
+   - decision by deleting the provisions above and replace them with the notice
+   - and other provisions required by the LGPL or the GPL. If you do not delete
+   - the provisions above, a recipient may use your version of this file under
+   - the terms of any one of the MPL, the GPL or the LGPL.
+   -
+   - ***** END LICENSE BLOCK ***** -->
+
+<?xml-stylesheet href="chrome://mandelbrot/skin/mandelbrot.css" type="text/css"?>
+
+<!DOCTYPE overlay SYSTEM "chrome://mandelbrot/locale/mandelbrot-overlay.dtd" >
+
+<overlay id="mandelbrotOverlay"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+  <commandset id="mainCommandSet">
+    <command id="Tools:Mandelbrot"
+             oncommand="window.openDialog('chrome://mandelbrot/content/mandelbrot.xul', '_blank', 'all,dialog=no');"/>
+  </commandset>
+
+  <box id="panel-controls">
+    <toolbarbutton id="tool-mandelbrot" class="panel-button button-image"
+                   command="Tools:Mandelbrot"
+                   insertbefore="tool-addons"/>
+  </box>
+
+</overlay>
diff --git a/extension/smOverlay.xul b/extension/smOverlay.xul
index 623e9a7..573f671 100644
--- a/extension/smOverlay.xul
+++ b/extension/smOverlay.xul
@@ -36,6 +36,8 @@
    -
    - ***** END LICENSE BLOCK ***** -->
 
+<?xml-stylesheet href="chrome://mandelbrot/skin/mandelbrot.css" type="text/css"?>
+
 <!DOCTYPE overlay SYSTEM "chrome://mandelbrot/locale/mandelbrot-overlay.dtd" >
 
 <overlay id="mandelbrotOverlay"
diff --git a/jar.mn b/jar.mn
index 4a64683..361b7eb 100644
--- a/jar.mn
+++ b/jar.mn
@@ -15,6 +15,8 @@ mandelbrot.jar:
   content/mandelbrot/mobileOverlay.xul             (extension/mobileOverlay.xul)
   content/mandelbrot/smOverlay.xul                 (extension/smOverlay.xul)
   skin/classic/mandelbrot/mandelbrot.css           (xulapp/chrome/mandelbrot/skin/classic/mandelbrot.css)
+  skin/classic/mandelbrot/mandelbrotIcon16.png     (xulapp/chrome/mandelbrot/skin/classic/mandelbrotIcon16.png)
+  skin/classic/mandelbrot/mandelbrotIcon32.png     (xulapp/chrome/mandelbrot/skin/classic/mandelbrotIcon32.png)
   skin/classic/mandelbrot/image-settings.css       (xulapp/chrome/mandelbrot/skin/classic/image-settings.css)
   locale/@AB_CD@/mandelbrot/mandelbrot.dtd         (xulapp/chrome/mandelbrot/locales/@AB_CD@/mandelbrot.dtd)
   locale/@AB_CD@/mandelbrot/mandelbrot.properties  (xulapp/chrome/mandelbrot/locales/@AB_CD@/mandelbrot.properties)
diff --git a/xulapp/application.ini b/xulapp/application.ini
index 0d3f65c..5de928c 100644
--- a/xulapp/application.ini
+++ b/xulapp/application.ini
@@ -38,14 +38,14 @@
 [App]
 Vendor=KaiRo.at
 Name=Mandelbrot
-Version=4.0pre
-BuildID=2009080300
-Copyright=Copyright (c) 2008-2009 KaiRo.at
+Version=4.0b2pre
+BuildID=2010052900
+Copyright=Copyright (c) 2008-2010 KaiRo.at
 ID=mandelbrot@kairo.at
 
 [Gecko]
 MinVersion=1.9.0
-MaxVersion=1.9.2.*
+MaxVersion=1.9.3.*
 
 [XRE]
 EnableExtensionManager=0
diff --git a/xulapp/chrome/mandelbrot/content/mandelbrot.js b/xulapp/chrome/mandelbrot/content/mandelbrot.js
index 212e188..5533f22 100644
--- a/xulapp/chrome/mandelbrot/content/mandelbrot.js
+++ b/xulapp/chrome/mandelbrot/content/mandelbrot.js
@@ -485,6 +485,15 @@ function saveImage() {
   }
 }
 
+function exitMandelbrot() {
+  var appInfo = Components.classes["@mozilla.org/xre/app-info;1"]
+                          .getService(Components.interfaces.nsIXULAppInfo);
+  if (appInfo.ID == "mandelbrot@kairo.at")
+    quitApp(false);
+  else
+    window.close();
+}
+
 function updateBookmarkMenu(aParent) {
   document.getElementById("bookmarkSave").disabled =
     (!document.getElementById("drawButton").hidden || (gStartTime > 0));
diff --git a/xulapp/chrome/mandelbrot/content/mandelbrot.xul b/xulapp/chrome/mandelbrot/content/mandelbrot.xul
index 936bf3d..188592e 100644
--- a/xulapp/chrome/mandelbrot/content/mandelbrot.xul
+++ b/xulapp/chrome/mandelbrot/content/mandelbrot.xul
@@ -72,7 +72,7 @@
           <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;">
diff --git a/xulapp/chrome/mandelbrot/skin/classic/mandelbrot.css b/xulapp/chrome/mandelbrot/skin/classic/mandelbrot.css
index d28d888..488bdca 100644
--- a/xulapp/chrome/mandelbrot/skin/classic/mandelbrot.css
+++ b/xulapp/chrome/mandelbrot/skin/classic/mandelbrot.css
@@ -35,3 +35,10 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+#tasksMenuMandelbrot, #menu_openMandelbrot {
+  list-style-image: url("chrome://mandelbrot/skin/mandelbrotIcon16.png");
+}
+
+#tool-mandelbrot {
+  list-style-image: url("chrome://mandelbrot/skin/mandelbrotIcon32.png");
+}
diff --git a/xulapp/chrome/mandelbrot/skin/classic/mandelbrotIcon16.png b/xulapp/chrome/mandelbrot/skin/classic/mandelbrotIcon16.png
new file mode 100644
index 0000000..4e22313
Binary files /dev/null and b/xulapp/chrome/mandelbrot/skin/classic/mandelbrotIcon16.png differ
diff --git a/xulapp/chrome/mandelbrot/skin/classic/mandelbrotIcon32.png b/xulapp/chrome/mandelbrot/skin/classic/mandelbrotIcon32.png
new file mode 100644
index 0000000..3cfd60b
Binary files /dev/null and b/xulapp/chrome/mandelbrot/skin/classic/mandelbrotIcon32.png differ