From chatellier@users.labs.libre-entreprise.org Mon Jun 15 00:26:12 2026
From: chatellier@users.labs.libre-entreprise.org
To: isis-fish-commits@list.isis-fish.org
Subject: [Isis-fish-commits] r2362 - in isis-fish/trunk/src/main:
	java/fr/ifremer/isisfish/ui/script resources/i18n
Date: Wed, 10 Jun 2009 17:19:07 +0200
Message-ID: <20090610151907.3AB9B461BF7@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7480429762405304462=="

--===============7480429762405304462==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Author: chatellier
Date: 2009-06-10 15:19:06 +0000 (Wed, 10 Jun 2009)
New Revision: 2362

Modified:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx
   isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties
   isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties
Log:
Fix various things on script ui

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptU=
I.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx=
	2009-06-10 15:16:58 UTC (rev 2361)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx=
	2009-06-10 15:19:06 UTC (rev 2362)
@@ -18,8 +18,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, US=
A.
  *##%*/
  -->
-
-<JPanel id=3D"script" layout=3D'{new BorderLayout()}'>
+<JPanel layout=3D'{new BorderLayout()}'>
     <script><![CDATA[
         import javax.swing.event.TreeSelectionListener;
         import javax.swing.tree.TreePath;
@@ -169,8 +168,8 @@
             if (scriptType.equals("EquationModel")){
                 equationModelType =3D (String)JOptionPane.showInputDialog(
                     this,
-                    "Select the equation model's category",
-                    "Equation model",
+                    _("isisfish.message.new.formule.category"),
+                    _("isisfish.message.new.formule.title"),
                     JOptionPane.PLAIN_MESSAGE,
                     null,
                     values.toArray(),
@@ -182,7 +181,7 @@
                 if (fileName !=3D null){
                     getContextValue(ScriptAction.class).newScript(equationMo=
delTypePath + fileName, scriptType);
                     setTreeModel();
-                    setInfoText(_("isisfish.message.creation.done", script.g=
etName()));
+                    setInfoText(_("isisfish.message.creation.done", fileName=
));
                     DefaultMutableTreeNode element =3D null;
                     element =3D findNode((DefaultMutableTreeNode) tree.getMo=
del().getRoot(), scriptType);
                     if (!equationModelTypePath.equals("")){
@@ -246,10 +245,6 @@
         protected void diffScript(){
             setInfoText(getContextValue(ScriptAction.class).diffScript(edito=
r.getText()));
         }
-        protected void editorHelp(){
-        }
-        protected void javaHelp(){
-        }
     ]]>
     </script>
=20
@@ -291,11 +286,6 @@
             <JMenuItem id=3D"miCheckSyntax" text=3D"isisfish.script.menu.che=
ckSyntax" accelerator=3D"accCheckSyntax" onActionPerformed=3D"checkScript()"/>
             <JMenuItem id=3D"miEvaluate" text=3D"isisfish.script.menu.evalua=
te" accelerator=3D"accEvaluate" onActionPerformed=3D"evaluateScript()"/>
         </JMenu>
-
-        <JMenu text=3D"isisfish.script.menu.txtHelp">
-            <JMenuItem id=3D"miEditorHelp" text=3D"isisfish.script.menu.txtE=
ditorHelp" accelerator=3D"accEditorHelp" onActionPerformed=3D"editorHelp()"/>
-            <JMenuItem id=3D"miJavaHelp" text=3D"isisfish.script.menu.txtJav=
aHelp" accelerator=3D"accJavaHelp" onActionPerformed=3D"javaHelp()"/>
-        </JMenu>
     </JMenuBar>
=20
 	<!--

Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties	2009-0=
6-10 15:16:58 UTC (rev 2361)
+++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties	2009-0=
6-10 15:19:06 UTC (rev 2362)
@@ -111,7 +111,6 @@
 isisfish.common.delete=3DDelete
 isisfish.common.ellipsis=3Dellipsis
 isisfish.common.emigration=3Demigration
-isisfish.common.empty=3Dvide
 isisfish.common.equation=3DEquation
 isisfish.common.error=3Derror
 isisfish.common.finish=3Dfinish
@@ -602,6 +601,8 @@
 isisfish.message.loading.region=3DLoading region ...
 isisfish.message.name.imported.region=3DEnter name for imported region
 isisfish.message.new.filename=3DEnter the name of the new file. (use only ch=
ars and _ and start with uppercase)
+isisfish.message.new.formule.category=3DSelect the equation model's category
+isisfish.message.new.formule.title=3DNew equation model
 isisfish.message.new.region.name=3DEnter new region name
 isisfish.message.old.simulation.loaded=3DOld simulation loaded
 isisfish.message.page.modified=3DThis page has been modified, do you want to=
 save it ?
@@ -863,11 +864,8 @@
 isisfish.script.menu.new=3DNew
 isisfish.script.menu.paste=3DPaste
 isisfish.script.menu.save=3DSave
-isisfish.script.menu.txtEditorHelp=3DOnline help
 isisfish.script.menu.txtExport=3DExport
-isisfish.script.menu.txtHelp=3DHelp
 isisfish.script.menu.txtImport=3DImport
-isisfish.script.menu.txtJavaHelp=3DJava help
 isisfish.script.menu.txtNewAnalysePlan=3DNew analyse plan
 isisfish.script.menu.txtNewEquationModel=3DNew Equation model
 isisfish.script.menu.txtNewExport=3DNew Export

Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties	2009-0=
6-10 15:16:58 UTC (rev 2361)
+++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties	2009-0=
6-10 15:19:06 UTC (rev 2362)
@@ -111,7 +111,6 @@
 isisfish.common.delete=3DSupprimer
 isisfish.common.ellipsis=3D...
 isisfish.common.emigration=3D\u00E9migration
-isisfish.common.empty=3Dvide
 isisfish.common.equation=3DEquation
 isisfish.common.error=3DErreur
 isisfish.common.finish=3DTerminer
@@ -601,7 +600,9 @@
 isisfish.message.loading.old.simulation=3DChargement d'une ancienne simulati=
on ...
 isisfish.message.loading.region=3DChargement de la r\u00E9gion
 isisfish.message.name.imported.region=3DEntrez le nom de la r\u00E9gion \u00=
E0 importer
-isisfish.message.new.filename=3DEntrer le nom du nouveau du fichier.\n\t (ut=
iliser uniquemment des caract\u00E8res et _ en commencant avec une majuscule)
+isisfish.message.new.filename=3DEntrez le nom du nouveau du fichier.\n\t (ut=
iliser uniquemment des caract\u00E8res et _ en commencant avec une majuscule)
+isisfish.message.new.formule.category=3DChoisissez le cat\u00E9gorie de la f=
ormule
+isisfish.message.new.formule.title=3DNouvelle formule
 isisfish.message.new.region.name=3DEntrer le nom de la nouvell r\u00E9gion
 isisfish.message.old.simulation.loaded=3DAncienne simulation charg\u00E9e
 isisfish.message.page.modified=3DCette page a \u00E9t\u00E9 modifi\u00E9, vo=
ulez-vous la sauvegarder ?
@@ -863,11 +864,8 @@
 isisfish.script.menu.new=3DNouveau
 isisfish.script.menu.paste=3DColler
 isisfish.script.menu.save=3DSauver
-isisfish.script.menu.txtEditorHelp=3DAide en ligne...
 isisfish.script.menu.txtExport=3DExporter
-isisfish.script.menu.txtHelp=3DAide
 isisfish.script.menu.txtImport=3DImporter
-isisfish.script.menu.txtJavaHelp=3DAide Java...
 isisfish.script.menu.txtNewAnalysePlan=3DNouveau plan d'analyse
 isisfish.script.menu.txtNewEquationModel=3DNouvelle formule
 isisfish.script.menu.txtNewExport=3DNouveau script d'export


--===============7480429762405304462==--