From e24c3a302fcdbc8f5781f447c17369a4b285367f Mon Sep 17 00:00:00 2001 From: Calixte DENIZET Date: Thu, 21 Jun 2012 12:36:39 +0200 Subject: [PATCH] Prefs: add a function preferences() Change-Id: I394684a8cc4623ab27427f045bc9b96bddde42b5 --- scilab/CHANGES_5.4.X | 5 + scilab/modules/helptools/etc/MAIN_CHAPTERS | 1 + scilab/modules/preferences/Makefile.am | 3 +- scilab/modules/preferences/Makefile.in | 14 ++- .../modules/preferences/help/en_US/addchapter.sce | 10 ++ .../modules/preferences/help/en_US/preferences.xml | 38 ++++++++ .../preferences/help/en_US/prefs_SciNotes.xml | 103 ++++++++++++++++++++ .../preferences/help/images/scinotes/editor.png | Bin 0 -> 12200 bytes .../images/scinotes/scinotes_general_settings.png | Bin 0 -> 18041 bytes .../modules/preferences/includes/gw_preferences.h | 5 +- .../preferences/sci_gateway/c/gw_preferences.c | 7 +- .../sci_gateway/cpp/sci_preferences.cpp | 46 +++++++++ .../sci_gateway/preferences_gateway.xml | 11 ++- .../modules/preferences/src/c/preferences.vcxproj | 1 + .../preferences/src/c/preferences.vcxproj.filters | 3 + .../modules/preferences/Component/PreviewCode.java | 1 + .../modules/preferences/ComponentFactory.java | 5 + .../modules/preferences/ScilabPreferences.java | 14 ++- .../scilab/modules/preferences/XCommonManager.java | 12 ++- .../scilab/modules/preferences/XConfigManager.java | 12 ++- .../preferences/src/jni/ScilabPreferences.cpp | 22 ++++- .../preferences/src/jni/ScilabPreferences.giws.xml | 21 ++-- .../preferences/src/jni/ScilabPreferences.hxx | 5 +- 23 files changed, 304 insertions(+), 35 deletions(-) create mode 100644 scilab/modules/preferences/help/en_US/addchapter.sce create mode 100644 scilab/modules/preferences/help/en_US/preferences.xml create mode 100644 scilab/modules/preferences/help/en_US/prefs_SciNotes.xml create mode 100644 scilab/modules/preferences/help/images/scinotes/editor.png create mode 100644 scilab/modules/preferences/help/images/scinotes/scinotes_general_settings.png create mode 100644 scilab/modules/preferences/sci_gateway/cpp/sci_preferences.cpp diff --git a/scilab/CHANGES_5.4.X b/scilab/CHANGES_5.4.X index 21b95c4..d1dba72 100644 --- a/scilab/CHANGES_5.4.X +++ b/scilab/CHANGES_5.4.X @@ -8,6 +8,11 @@ Xcos * Bug #9496 fixed - Xcos flag 5 (ending) was not called if simulation is stopped from user interface. +Preferences +=========== + +* Add a function preferences() to open the Preferences window. + Bug Fixes ========= diff --git a/scilab/modules/helptools/etc/MAIN_CHAPTERS b/scilab/modules/helptools/etc/MAIN_CHAPTERS index f4f0edc..6a8b31a 100644 --- a/scilab/modules/helptools/etc/MAIN_CHAPTERS +++ b/scilab/modules/helptools/etc/MAIN_CHAPTERS @@ -72,3 +72,4 @@ intersci graph commons types +preferences \ No newline at end of file diff --git a/scilab/modules/preferences/Makefile.am b/scilab/modules/preferences/Makefile.am index 9bfcff5..6ca5677 100644 --- a/scilab/modules/preferences/Makefile.am +++ b/scilab/modules/preferences/Makefile.am @@ -53,7 +53,8 @@ PREFERENCES_C_SOURCES = src/c/getScilabPreference.c GATEWAY_C_SOURCES = sci_gateway/c/gw_preferences.c GATEWAY_CXX_SOURCES = sci_gateway/cpp/sci_addModulePreferences.cpp \ - sci_gateway/cpp/sci_removeModulePreferences.cpp + sci_gateway/cpp/sci_removeModulePreferences.cpp \ + sci_gateway/cpp/sci_preferences.cpp libscipreferences_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \ -I$(srcdir)/includes/ \ diff --git a/scilab/modules/preferences/Makefile.in b/scilab/modules/preferences/Makefile.in index 771a768..3c1f3c1 100644 --- a/scilab/modules/preferences/Makefile.in +++ b/scilab/modules/preferences/Makefile.in @@ -144,7 +144,8 @@ libscipreferences_cli_la_OBJECTS = \ libscipreferences_la_DEPENDENCIES = libscipreferences-algo.la am__objects_3 = libscipreferences_la-gw_preferences.lo am__objects_4 = libscipreferences_la-sci_addModulePreferences.lo \ - libscipreferences_la-sci_removeModulePreferences.lo + libscipreferences_la-sci_removeModulePreferences.lo \ + libscipreferences_la-sci_preferences.lo am__objects_5 = libscipreferences_la-ScilabPreferences.lo am_libscipreferences_la_OBJECTS = $(am__objects_3) $(am__objects_4) \ $(am__objects_5) @@ -484,7 +485,8 @@ PREFERENCES_JNI_SOURCES = src/jni/ScilabPreferences.cpp PREFERENCES_C_SOURCES = src/c/getScilabPreference.c GATEWAY_C_SOURCES = sci_gateway/c/gw_preferences.c GATEWAY_CXX_SOURCES = sci_gateway/cpp/sci_addModulePreferences.cpp \ - sci_gateway/cpp/sci_removeModulePreferences.cpp + sci_gateway/cpp/sci_removeModulePreferences.cpp \ + sci_gateway/cpp/sci_preferences.cpp libscipreferences_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \ -I$(srcdir)/includes/ \ @@ -701,6 +703,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscipreferences_la-ScilabPreferences.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscipreferences_la-gw_preferences.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscipreferences_la-sci_addModulePreferences.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscipreferences_la-sci_preferences.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscipreferences_la-sci_removeModulePreferences.Plo@am__quote@ .c.o: @@ -780,6 +783,13 @@ libscipreferences_la-sci_removeModulePreferences.lo: sci_gateway/cpp/sci_removeM @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscipreferences_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscipreferences_la-sci_removeModulePreferences.lo `test -f 'sci_gateway/cpp/sci_removeModulePreferences.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_removeModulePreferences.cpp +libscipreferences_la-sci_preferences.lo: sci_gateway/cpp/sci_preferences.cpp +@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscipreferences_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscipreferences_la-sci_preferences.lo -MD -MP -MF $(DEPDIR)/libscipreferences_la-sci_preferences.Tpo -c -o libscipreferences_la-sci_preferences.lo `test -f 'sci_gateway/cpp/sci_preferences.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_preferences.cpp +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscipreferences_la-sci_preferences.Tpo $(DEPDIR)/libscipreferences_la-sci_preferences.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='sci_gateway/cpp/sci_preferences.cpp' object='libscipreferences_la-sci_preferences.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscipreferences_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscipreferences_la-sci_preferences.lo `test -f 'sci_gateway/cpp/sci_preferences.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_preferences.cpp + libscipreferences_la-ScilabPreferences.lo: src/jni/ScilabPreferences.cpp @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscipreferences_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscipreferences_la-ScilabPreferences.lo -MD -MP -MF $(DEPDIR)/libscipreferences_la-ScilabPreferences.Tpo -c -o libscipreferences_la-ScilabPreferences.lo `test -f 'src/jni/ScilabPreferences.cpp' || echo '$(srcdir)/'`src/jni/ScilabPreferences.cpp @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscipreferences_la-ScilabPreferences.Tpo $(DEPDIR)/libscipreferences_la-ScilabPreferences.Plo diff --git a/scilab/modules/preferences/help/en_US/addchapter.sce b/scilab/modules/preferences/help/en_US/addchapter.sce new file mode 100644 index 0000000..dbe8a8a --- /dev/null +++ b/scilab/modules/preferences/help/en_US/addchapter.sce @@ -0,0 +1,10 @@ +// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab +// Copyright (C) 2012 - Scilab Enterprises +// +// This file must be used under the terms of the CeCILL. +// This source file is licensed as described in the file COPYING, which +// you should have received as part of this distribution. The terms +// are also available at +// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + +add_help_chapter("Preferences",SCI+"/modules/preferences/help/en_US",%T); \ No newline at end of file diff --git a/scilab/modules/preferences/help/en_US/preferences.xml b/scilab/modules/preferences/help/en_US/preferences.xml new file mode 100644 index 0000000..8d46967 --- /dev/null +++ b/scilab/modules/preferences/help/en_US/preferences.xml @@ -0,0 +1,38 @@ + + + + + preferences + Open the Scilab Preferences window + + + Calling Sequence + + preferences() + + + + Description + + Open Scilab Preferences window. + + + + See Also + + + scinotes + + + + diff --git a/scilab/modules/preferences/help/en_US/prefs_SciNotes.xml b/scilab/modules/preferences/help/en_US/prefs_SciNotes.xml new file mode 100644 index 0000000..7c66710 --- /dev/null +++ b/scilab/modules/preferences/help/en_US/prefs_SciNotes.xml @@ -0,0 +1,103 @@ + + + + + SciNotes preferences + SciNotes general preferences + + + Editor + + + + + + + + + SciNotes is the default Scilab code editor. It is now possible to use an external editor using a system dependant command or a Scilab macro name. + + + + + + Use SciNotes: check this box if you want to use SciNotes in using commands such like editor or edit. + + + + + External editor: check this radio button to use an external system editor, e.g. it is possible to enter "/usr/bin/gedit". + + + + + Scilab command: check this radio button to use an editor which is callable via a Scilab macro. This macro should take the same kind of argument as the editor command. + + + + + + + SciNotes General settings + + + + + + + + + + + + Restore previous session on start-up: check this box to be able to restore the previous Scilab session as it was before quiting Scilab. + + + + + Add carriage return at the end of the file: check this box to automatically add a CR, if none, at the end of the file. + + + + + Number of recently opened files to display: modify this value to fix how many files must appears in the last opened section. + + + + + Default file enconding: fix the default encoding to use to save a file. No more encodings are proposed since Scilab handles only these ones at execution. + + + + + Default End-Of-Line: fix the default end-of-line chars to use when saving the file. + + + + + + + See Also + + + scinotes + + + editor + + + edit + + + + diff --git a/scilab/modules/preferences/help/images/scinotes/editor.png b/scilab/modules/preferences/help/images/scinotes/editor.png new file mode 100644 index 0000000000000000000000000000000000000000..e48c4adbfa5e5271f7843a92b6ad759e12e74b32 GIT binary patch literal 12200 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 T-xvS^Jw#4QNwPxRDCmCxPhO4p literal 0 HcmV?d00001 diff --git a/scilab/modules/preferences/help/images/scinotes/scinotes_general_settings.png b/scilab/modules/preferences/help/images/scinotes/scinotes_general_settings.png new file mode 100644 index 0000000000000000000000000000000000000000..3a52f648d2f3332a6d1b4c6dc27afc92ab644b1d GIT binary patch literal 18041 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 R8(|QlucTgn7kvHhe*tShz0Uvu literal 0 HcmV?d00001 diff --git a/scilab/modules/preferences/includes/gw_preferences.h b/scilab/modules/preferences/includes/gw_preferences.h index 6dfb0c2..76d97e9 100644 --- a/scilab/modules/preferences/includes/gw_preferences.h +++ b/scilab/modules/preferences/includes/gw_preferences.h @@ -1,11 +1,11 @@ /* * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab * Copyright (C) 2011 - DIGITEO - Calixte DENIZET -* +* * This file must be used under the terms of the CeCILL. * This source file is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms -* are also available at +* are also available at * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt * */ @@ -18,6 +18,7 @@ PREFERENCES_SCILAB_IMPEXP int gw_preferences(void); int sci_addModulePreferences(char * fname, unsigned long l); int sci_removeModulePreferences(char * fname, unsigned long l); +int sci_preferences(char * fname, unsigned long l); /*--------------------------------------------------------------------------*/ #endif /* __GW_PREFERENCES__ */ /*--------------------------------------------------------------------------*/ diff --git a/scilab/modules/preferences/sci_gateway/c/gw_preferences.c b/scilab/modules/preferences/sci_gateway/c/gw_preferences.c index 1c355a3..265d0c2 100644 --- a/scilab/modules/preferences/sci_gateway/c/gw_preferences.c +++ b/scilab/modules/preferences/sci_gateway/c/gw_preferences.c @@ -22,10 +22,11 @@ /*--------------------------------------------------------------------------*/ static BOOL loadedDep = FALSE; /*--------------------------------------------------------------------------*/ -static gw_generic_table Tab[]= +static gw_generic_table Tab[] = { {sci_addModulePreferences, "addModulePreferences"}, - {sci_removeModulePreferences, "removeModulePreferences"} + {sci_removeModulePreferences, "removeModulePreferences"}, + {sci_preferences, "preferences"} }; /*--------------------------------------------------------------------------*/ int gw_preferences(void) @@ -34,7 +35,7 @@ int gw_preferences(void) if ( getScilabMode() == SCILAB_NWNI) { - Scierror(999,_("Scilab '%s' module disabled in -nogui or -nwni mode.\n"), "preferences"); + Scierror(999, _("Scilab '%s' module disabled in -nogui or -nwni mode.\n"), "preferences"); return 0; } diff --git a/scilab/modules/preferences/sci_gateway/cpp/sci_preferences.cpp b/scilab/modules/preferences/sci_gateway/cpp/sci_preferences.cpp new file mode 100644 index 0000000..d3544ae --- /dev/null +++ b/scilab/modules/preferences/sci_gateway/cpp/sci_preferences.cpp @@ -0,0 +1,46 @@ +/* + * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab + * Copyright (C) 2011 - DIGITEO - Calixte DENIZET + * + * This file must be used under the terms of the CeCILL. + * This source file is licensed as described in the file COPYING, which + * you should have received as part of this distribution. The terms + * are also available at + * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + * + */ + +#include "ScilabPreferences.hxx" +#include "GiwsException.hxx" + +extern "C" +{ +#include "gw_preferences.h" +#include "Scierror.h" +#include "api_scilab.h" +#include "localization.h" +#include "getScilabJavaVM.h" +} + +using namespace org_scilab_modules_preferences; + +/*--------------------------------------------------------------------------*/ +int sci_preferences(char * fname, unsigned long fname_len) +{ + CheckRhs(0, 0); + CheckLhs(0, 1); + + try + { + ScilabPreferences::openPreferences(getScilabJavaVM()); + } + catch (const GiwsException::JniException & e) + { + Scierror(999, _("An error occurend in opening Preferences window: "), fname, e.getJavaDescription().c_str()); + } + + LhsVar(1) = 0; + PutLhsVar(); + + return 0; +} diff --git a/scilab/modules/preferences/sci_gateway/preferences_gateway.xml b/scilab/modules/preferences/sci_gateway/preferences_gateway.xml index 6a14972..648e396 100644 --- a/scilab/modules/preferences/sci_gateway/preferences_gateway.xml +++ b/scilab/modules/preferences/sci_gateway/preferences_gateway.xml @@ -2,8 +2,8 @@ - - + - - - + + + + diff --git a/scilab/modules/preferences/src/c/preferences.vcxproj b/scilab/modules/preferences/src/c/preferences.vcxproj index 49f255e..2f3e368 100644 --- a/scilab/modules/preferences/src/c/preferences.vcxproj +++ b/scilab/modules/preferences/src/c/preferences.vcxproj @@ -273,6 +273,7 @@ + diff --git a/scilab/modules/preferences/src/c/preferences.vcxproj.filters b/scilab/modules/preferences/src/c/preferences.vcxproj.filters index a3c2f3d..6968f75 100644 --- a/scilab/modules/preferences/src/c/preferences.vcxproj.filters +++ b/scilab/modules/preferences/src/c/preferences.vcxproj.filters @@ -54,6 +54,9 @@ Source Files + + Source Files + diff --git a/scilab/modules/preferences/src/java/org/scilab/modules/preferences/Component/PreviewCode.java b/scilab/modules/preferences/src/java/org/scilab/modules/preferences/Component/PreviewCode.java index 11e5e41..83d50b6 100644 --- a/scilab/modules/preferences/src/java/org/scilab/modules/preferences/Component/PreviewCode.java +++ b/scilab/modules/preferences/src/java/org/scilab/modules/preferences/Component/PreviewCode.java @@ -24,6 +24,7 @@ import javax.swing.text.DefaultCaret; import org.w3c.dom.Node; import org.w3c.dom.NodeList; +import org.scilab.modules.commons.ScilabCommonsUtils; import org.scilab.modules.preferences.XChooser; import org.scilab.modules.preferences.XComponent; import org.scilab.modules.preferences.XConfigManager; diff --git a/scilab/modules/preferences/src/java/org/scilab/modules/preferences/ComponentFactory.java b/scilab/modules/preferences/src/java/org/scilab/modules/preferences/ComponentFactory.java index e4dc051..dc24670 100644 --- a/scilab/modules/preferences/src/java/org/scilab/modules/preferences/ComponentFactory.java +++ b/scilab/modules/preferences/src/java/org/scilab/modules/preferences/ComponentFactory.java @@ -30,6 +30,7 @@ import javax.swing.border.TitledBorder; import org.w3c.dom.Node; +import org.scilab.modules.commons.ScilabCommonsUtils; import org.scilab.modules.preferences.Component.Scroll; /** @@ -84,6 +85,10 @@ class ComponentFactory { Constructor constructor = cache.get(tag); if (constructor == null) { + if ("PreviewCode".equals(tag)) { + ScilabCommonsUtils.loadOnUse("SciNotes"); + } + Class componentClass; try { componentClass = (Class) Class.forName(X_PACKAGE + tag); diff --git a/scilab/modules/preferences/src/java/org/scilab/modules/preferences/ScilabPreferences.java b/scilab/modules/preferences/src/java/org/scilab/modules/preferences/ScilabPreferences.java index db2d2e8..ad0b9af 100644 --- a/scilab/modules/preferences/src/java/org/scilab/modules/preferences/ScilabPreferences.java +++ b/scilab/modules/preferences/src/java/org/scilab/modules/preferences/ScilabPreferences.java @@ -18,10 +18,11 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import javax.swing.SwingUtilities; + import org.scilab.modules.localization.Messages; /** - * Class to get the toolboxes informations * @author Calixte DENIZET */ public class ScilabPreferences { @@ -29,6 +30,17 @@ public class ScilabPreferences { private static Map tbxs = new HashMap(); /** + * Open the preferences window + */ + public static void openPreferences() { + SwingUtilities.invokeLater(new Runnable() { + public void run() { + XConfigManager.openPreferences(); + } + }); + } + + /** * @param name the toolbox name * @param path the toolbox path * @param prefFile the toolbox preference file path diff --git a/scilab/modules/preferences/src/java/org/scilab/modules/preferences/XCommonManager.java b/scilab/modules/preferences/src/java/org/scilab/modules/preferences/XCommonManager.java index e5968d1..e95f195 100644 --- a/scilab/modules/preferences/src/java/org/scilab/modules/preferences/XCommonManager.java +++ b/scilab/modules/preferences/src/java/org/scilab/modules/preferences/XCommonManager.java @@ -299,7 +299,7 @@ public abstract class XCommonManager { StringBuilder buffer = new StringBuilder("\n"); buffer.append("\n"); - buffer.append("\n"); + buffer.append("\n"); buffer.append("\n"); FilenameFilter filter = new FilenameFilter() { @@ -358,7 +358,7 @@ public abstract class XCommonManager { try { StreamSource source = new StreamSource(new StringReader(createXSLFile())); transformer = factory.newTransformer(source); - transformer.setParameter("OS", OS.getVersionName()); + transformer.setParameter("OS", OS.getVersionName()); } catch (TransformerConfigurationException e1) { System.err.println(ERROR_READ + address); } catch (TransformerFactoryConfigurationError e1) { @@ -721,8 +721,12 @@ public abstract class XCommonManager { * @return top-level frame. */ public static Frame getTopLevel() { - Container main = (Container) ScilabConsole.getConsole().getAsSimpleConsole(); - return (Frame) SwingUtilities.getAncestorOfClass(Frame.class, main); + if (ScilabConsole.isExistingConsole()) { + Container main = (Container) ScilabConsole.getConsole().getAsSimpleConsole(); + return (Frame) SwingUtilities.getAncestorOfClass(Frame.class, main); + } + + return null; } /** diff --git a/scilab/modules/preferences/src/java/org/scilab/modules/preferences/XConfigManager.java b/scilab/modules/preferences/src/java/org/scilab/modules/preferences/XConfigManager.java index 8beb468..345fda0 100644 --- a/scilab/modules/preferences/src/java/org/scilab/modules/preferences/XConfigManager.java +++ b/scilab/modules/preferences/src/java/org/scilab/modules/preferences/XConfigManager.java @@ -87,9 +87,10 @@ public final class XConfigManager extends XCommonManager { XWizardManager.active = false; reloadTransformer(SCILAB_CONFIG_XSL); + Frame topWindow = XCommonManager.getTopLevel(); // Set up Swing Side - dialog = new JDialog(getTopLevel(), "Scilab Preferences", true); + dialog = new JDialog(topWindow, "Scilab Preferences", true); topSwing = dialog.getContentPane(); topSwing.setLayout(new BorderLayout()); // AWT implies to set layout at construction time. @@ -127,10 +128,11 @@ public final class XConfigManager extends XCommonManager { // Let the show begin! if (refreshDisplay()) { // Center the dialog on the parent window - Frame topWindow = XCommonManager.getTopLevel(); - int x = topWindow.getX() + (topWindow.getWidth() - dialog.getWidth()) / 2; - int y = topWindow.getY() + (topWindow.getHeight() - dialog.getHeight()) / 2; - dialog.setLocation(x, y); + if (topWindow != null) { + int x = topWindow.getX() + (topWindow.getWidth() - dialog.getWidth()) / 2; + int y = topWindow.getY() + (topWindow.getHeight() - dialog.getHeight()) / 2; + dialog.setLocation(x, y); + } dialog.setVisible(true); } diff --git a/scilab/modules/preferences/src/jni/ScilabPreferences.cpp b/scilab/modules/preferences/src/jni/ScilabPreferences.cpp index ee6b79a..b14062b 100644 --- a/scilab/modules/preferences/src/jni/ScilabPreferences.cpp +++ b/scilab/modules/preferences/src/jni/ScilabPreferences.cpp @@ -1,6 +1,6 @@ #include "ScilabPreferences.hxx" /* Generated by GIWS (version 2.0.1) with command: -giws --disable-return-size-array --output-dir src/jni/ --throws-exception-on-error --description-file src/jni/ScilabPreferences.giws.xml +giws -e -r -f ScilabPreferences.giws.xml */ /* @@ -106,6 +106,7 @@ curEnv->DeleteLocalRef(localInstance); /* Methods ID set to NULL */ voidaddToolboxInfosjstringjava_lang_Stringjstringjava_lang_Stringjstringjava_lang_StringID=NULL; voidremoveToolboxInfosjstringjava_lang_StringID=NULL; +voidopenPreferencesID=NULL; } @@ -130,6 +131,7 @@ throw GiwsException::JniObjectCreationException(curEnv, this->className()); /* Methods ID set to NULL */ voidaddToolboxInfosjstringjava_lang_Stringjstringjava_lang_Stringjstringjava_lang_StringID=NULL; voidremoveToolboxInfosjstringjava_lang_StringID=NULL; +voidopenPreferencesID=NULL; } @@ -217,4 +219,22 @@ throw GiwsException::JniCallMethodException(curEnv); } } +void ScilabPreferences::openPreferences (JavaVM * jvm_){ + +JNIEnv * curEnv = NULL; +jvm_->AttachCurrentThread(reinterpret_cast(&curEnv), NULL); +jclass cls = curEnv->FindClass( className().c_str() ); + +jmethodID voidopenPreferencesID = curEnv->GetStaticMethodID(cls, "openPreferences", "()V" ) ; +if (voidopenPreferencesID == NULL) { +throw GiwsException::JniMethodNotFoundException(curEnv, "openPreferences"); +} + + curEnv->CallStaticVoidMethod(cls, voidopenPreferencesID ); + curEnv->DeleteLocalRef(cls); +if (curEnv->ExceptionCheck()) { +throw GiwsException::JniCallMethodException(curEnv); +} +} + } diff --git a/scilab/modules/preferences/src/jni/ScilabPreferences.giws.xml b/scilab/modules/preferences/src/jni/ScilabPreferences.giws.xml index e9b9f39..29df6d4 100644 --- a/scilab/modules/preferences/src/jni/ScilabPreferences.giws.xml +++ b/scilab/modules/preferences/src/jni/ScilabPreferences.giws.xml @@ -1,12 +1,13 @@ - - - - - - - - - - + + + + + + + + + + + diff --git a/scilab/modules/preferences/src/jni/ScilabPreferences.hxx b/scilab/modules/preferences/src/jni/ScilabPreferences.hxx index 6f2036a..44e152b 100644 --- a/scilab/modules/preferences/src/jni/ScilabPreferences.hxx +++ b/scilab/modules/preferences/src/jni/ScilabPreferences.hxx @@ -1,5 +1,5 @@ /* Generated by GIWS (version 2.0.1) with command: -giws --disable-return-size-array --output-dir src/jni/ --throws-exception-on-error --description-file src/jni/ScilabPreferences.giws.xml +giws -e -r -f ScilabPreferences.giws.xml */ /* @@ -78,6 +78,7 @@ JavaVM * jvm; protected: jmethodID voidaddToolboxInfosjstringjava_lang_Stringjstringjava_lang_Stringjstringjava_lang_StringID; // cache method id jmethodID voidremoveToolboxInfosjstringjava_lang_StringID; // cache method id +jmethodID voidopenPreferencesID; // cache method id @@ -141,6 +142,8 @@ static void addToolboxInfos(JavaVM * jvm_, char const* name, char const* path, c static void removeToolboxInfos(JavaVM * jvm_, char const* path); +static void openPreferences(JavaVM * jvm_); + /** * Get class name to use for static methods -- 1.7.9.5