From: Robert Kaiser Date: Thu, 27 May 2010 12:24:49 +0000 (+0200) Subject: make mandelbrot build and roughly work as an extension X-Git-Url: https://git-public.kairo.at/?p=mandelbrot.git;a=commitdiff_plain;h=920e1feaae452ddcc01e9a08b51beca27452f334;hp=7e4a97763df3c87de84f26e740fbdaadbeb48b93;ds=sidebyside make mandelbrot build and roughly work as an extension --- diff --git a/Makefile.in b/Makefile.in new file mode 100644 index 0000000..51a4f0d --- /dev/null +++ b/Makefile.in @@ -0,0 +1,71 @@ +# ***** 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-Mandelbrot. +# +# The Initial Developer of the Original Code is +# Robert Kaiser. +# Portions created by the Initial Developer are Copyright (C) 2010 +# the Initial Developer. All Rights Reserved. +# +# Contributor(s): +# Robert Kaiser +# +# 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 GPL or the LGPL. 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 ***** + +DEPTH = ../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ +relativesrcdir = extensions/mandelbrot + +include $(DEPTH)/config/autoconf.mk + +MODULE = mandelbrot + +EXTENSION_VERSION = 4.0b1 + +XPI_NAME = mandelbrot +USE_EXTENSION_MANIFEST = 1 +NO_JAR_AUTO_REG = 1 +INSTALL_EXTENSION_ID = mandelbrot@kairo.at +XPI_PKGNAME = mandelbrot-$(EXTENSION_VERSION) + +DIST_FILES = extension/install.rdf + +PREF_JS_EXPORTS = $(srcdir)/xulapp/defaults/preferences/prefs.js + +# include config.mk before using the AB_CD var +include $(topsrcdir)/config/config.mk + +DEFINES += -DAB_CD=en-US \ + -DINSTALL_EXTENSION_ID=$(INSTALL_EXTENSION_ID) \ + -DEXTENSION_VERSION=$(EXTENSION_VERSION) + +include $(topsrcdir)/config/rules.mk + +export:: + $(NSINSTALL) -D $(FINAL_TARGET)/chrome/icons/default + $(INSTALL) $(srcdir)/xulapp/chrome/icons/default/mandelbrotWindow* $(FINAL_TARGET)/chrome/icons/default diff --git a/extension/fxOverlay.xul b/extension/fxOverlay.xul new file mode 100644 index 0000000..8d1c8b6 --- /dev/null +++ b/extension/fxOverlay.xul @@ -0,0 +1 @@ + diff --git a/extension/install.rdf b/extension/install.rdf new file mode 100644 index 0000000..a09bdef --- /dev/null +++ b/extension/install.rdf @@ -0,0 +1,44 @@ + +#filter substitution + + + @INSTALL_EXTENSION_ID@ + @EXTENSION_VERSION@ + KaiRo-Mandelbrot + Mandelbrot browser, based on highschool final thesis work of Robert Kaiser, but completely rewritten + Robert Kaiser + + + + {ec8030f7-c20a-464f-9b0e-13a3a9e97384} + 3.0 + 3.7a5pre + + + + + + {92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a} + 2.0a1pre + 2.1a2 + + + + + + {a23983c0-fd0e-11dc-95ff-0800200c9a66} + 0.1 + 1.1a1 + + + + + + toolkit@mozilla.org + 1.9.0 + 1.9.3.* + + + + \ No newline at end of file diff --git a/extension/mobileOverlay.xul b/extension/mobileOverlay.xul new file mode 100644 index 0000000..8d1c8b6 --- /dev/null +++ b/extension/mobileOverlay.xul @@ -0,0 +1 @@ + diff --git a/extension/smOverlay.xul b/extension/smOverlay.xul new file mode 100644 index 0000000..623e9a7 --- /dev/null +++ b/extension/smOverlay.xul @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + diff --git a/jar.mn b/jar.mn new file mode 100644 index 0000000..4a64683 --- /dev/null +++ b/jar.mn @@ -0,0 +1,22 @@ +#filter substitution + +mandelbrot.jar: +% content mandelbrot %content/mandelbrot/ +% skin mandelbrot classic/1.0 %skin/classic/mandelbrot/ +% locale mandelbrot @AB_CD@ %locale/@AB_CD@/mandelbrot/ +% overlay chrome://browser/content/browser.xul chrome://mandelbrot/content/fxOverlay.xul application={ec8030f7-c20a-464f-9b0e-13a3a9e97384} +% overlay chrome://browser/content/browser.xul chrome://mandelbrot/content/mobileOverlay.xul application={a23983c0-fd0e-11dc-95ff-0800200c9a66} +% overlay chrome://communicator/content/tasksOverlay.xul chrome://mandelbrot/content/smOverlay.xul application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a} + content/mandelbrot/mandelbrot.js (xulapp/chrome/mandelbrot/content/mandelbrot.js) + content/mandelbrot/mandelbrot.xul (xulapp/chrome/mandelbrot/content/mandelbrot.xul) + content/mandelbrot/image-settings.js (xulapp/chrome/mandelbrot/content/image-settings.js) + content/mandelbrot/image-settings.xul (xulapp/chrome/mandelbrot/content/image-settings.xul) + content/mandelbrot/fxOverlay.xul (extension/fxOverlay.xul) + 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/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) + locale/@AB_CD@/mandelbrot/mandelbrot-overlay.dtd (xulapp/chrome/mandelbrot/locales/@AB_CD@/mandelbrot-overlay.dtd) + locale/@AB_CD@/mandelbrot/image-settings.dtd (xulapp/chrome/mandelbrot/locales/@AB_CD@/image-settings.dtd) diff --git a/mandelbrot b/mandelbrot index 3a58794..f332251 100755 --- a/mandelbrot +++ b/mandelbrot @@ -58,6 +58,14 @@ if test -z "$xulrunner"; then fi done fi +if test -z "$xulrunner"; then + # catch the last one of those in versioned directories + for xrbin in /opt/mozilla/xulrunner-*/xulrunner; do + if test -e "$xrbin"; then + xulrunner="$xrbin" + fi + done +fi if test -z "$xulrunner"; then xulrunner=`which xulrunner` fi diff --git a/xulapp/chrome/branding/locales/en-US/brand.dtd b/xulapp/chrome/branding/locales/en-US/brand.dtd index 65ef1c9..9833e08 100644 --- a/xulapp/chrome/branding/locales/en-US/brand.dtd +++ b/xulapp/chrome/branding/locales/en-US/brand.dtd @@ -35,8 +35,12 @@ - - ***** END LICENSE BLOCK ***** --> - - - - + + +%mandelOverlayDTD; + + + + + diff --git a/xulapp/chrome/icons/default/mandelbrotWindow.ico b/xulapp/chrome/icons/default/mandelbrotWindow.ico new file mode 100755 index 0000000..568aeaf Binary files /dev/null and b/xulapp/chrome/icons/default/mandelbrotWindow.ico differ diff --git a/xulapp/chrome/icons/default/mandelbrotWindow.png b/xulapp/chrome/icons/default/mandelbrotWindow.png new file mode 100644 index 0000000..3cfd60b Binary files /dev/null and b/xulapp/chrome/icons/default/mandelbrotWindow.png differ diff --git a/xulapp/chrome/mandelbrot/content/mandelbrot.js b/xulapp/chrome/mandelbrot/content/mandelbrot.js index e4c7d9a..212e188 100644 --- a/xulapp/chrome/mandelbrot/content/mandelbrot.js +++ b/xulapp/chrome/mandelbrot/content/mandelbrot.js @@ -45,6 +45,7 @@ var gCurrentImageData; function Startup() { updateIterMenu(); + updateAlgoMenu(); updatePaletteMenu(); gMbrotBundle = document.getElementById("mbrotBundle"); document.getElementById("statusLabel").value = gMbrotBundle.getString("statusEmpty"); diff --git a/xulapp/chrome/mandelbrot/content/mandelbrot.xul b/xulapp/chrome/mandelbrot/content/mandelbrot.xul index 5115ed0..936bf3d 100644 --- a/xulapp/chrome/mandelbrot/content/mandelbrot.xul +++ b/xulapp/chrome/mandelbrot/content/mandelbrot.xul @@ -41,6 +41,8 @@ + %mandelOverlayDTD; %brandDTD; diff --git a/xulapp/chrome/mandelbrot/locales/en-US/mandelbrot-overlay.dtd b/xulapp/chrome/mandelbrot/locales/en-US/mandelbrot-overlay.dtd new file mode 100644 index 0000000..422a623 --- /dev/null +++ b/xulapp/chrome/mandelbrot/locales/en-US/mandelbrot-overlay.dtd @@ -0,0 +1,44 @@ + + + + + + + + + diff --git a/xulapp/chrome/mandelbrot/locales/en-US/mandelbrot.dtd b/xulapp/chrome/mandelbrot/locales/en-US/mandelbrot.dtd index 1a9ff9f..2147523 100644 --- a/xulapp/chrome/mandelbrot/locales/en-US/mandelbrot.dtd +++ b/xulapp/chrome/mandelbrot/locales/en-US/mandelbrot.dtd @@ -35,7 +35,7 @@ - - ***** END LICENSE BLOCK ***** --> - +