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/ScriptUI.jaxx =================================================================== --- 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, USA. *##%*/ --> - -<JPanel id="script" layout='{new BorderLayout()}'> +<JPanel layout='{new BorderLayout()}'> <script><![CDATA[ import javax.swing.event.TreeSelectionListener; import javax.swing.tree.TreePath; @@ -169,8 +168,8 @@ if (scriptType.equals("EquationModel")){ equationModelType = (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 != null){ getContextValue(ScriptAction.class).newScript(equationModelTypePath + fileName, scriptType); setTreeModel(); - setInfoText(_("isisfish.message.creation.done", script.getName())); + setInfoText(_("isisfish.message.creation.done", fileName)); DefaultMutableTreeNode element = null; element = findNode((DefaultMutableTreeNode) tree.getModel().getRoot(), scriptType); if (!equationModelTypePath.equals("")){ @@ -246,10 +245,6 @@ protected void diffScript(){ setInfoText(getContextValue(ScriptAction.class).diffScript(editor.getText())); } - protected void editorHelp(){ - } - protected void javaHelp(){ - } ]]> </script> @@ -291,11 +286,6 @@ <JMenuItem id="miCheckSyntax" text="isisfish.script.menu.checkSyntax" accelerator="accCheckSyntax" onActionPerformed="checkScript()"/> <JMenuItem id="miEvaluate" text="isisfish.script.menu.evaluate" accelerator="accEvaluate" onActionPerformed="evaluateScript()"/> </JMenu> - - <JMenu text="isisfish.script.menu.txtHelp"> - <JMenuItem id="miEditorHelp" text="isisfish.script.menu.txtEditorHelp" accelerator="accEditorHelp" onActionPerformed="editorHelp()"/> - <JMenuItem id="miJavaHelp" text="isisfish.script.menu.txtJavaHelp" accelerator="accJavaHelp" onActionPerformed="javaHelp()"/> - </JMenu> </JMenuBar> <!-- Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-06-10 15:16:58 UTC (rev 2361) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-06-10 15:19:06 UTC (rev 2362) @@ -111,7 +111,6 @@ isisfish.common.delete=Delete isisfish.common.ellipsis=ellipsis isisfish.common.emigration=emigration -isisfish.common.empty=vide isisfish.common.equation=Equation isisfish.common.error=error isisfish.common.finish=finish @@ -602,6 +601,8 @@ isisfish.message.loading.region=Loading region ... isisfish.message.name.imported.region=Enter name for imported region isisfish.message.new.filename=Enter the name of the new file. (use only chars and _ and start with uppercase) +isisfish.message.new.formule.category=Select the equation model's category +isisfish.message.new.formule.title=New equation model isisfish.message.new.region.name=Enter new region name isisfish.message.old.simulation.loaded=Old simulation loaded isisfish.message.page.modified=This page has been modified, do you want to save it ? @@ -863,11 +864,8 @@ isisfish.script.menu.new=New isisfish.script.menu.paste=Paste isisfish.script.menu.save=Save -isisfish.script.menu.txtEditorHelp=Online help isisfish.script.menu.txtExport=Export -isisfish.script.menu.txtHelp=Help isisfish.script.menu.txtImport=Import -isisfish.script.menu.txtJavaHelp=Java help isisfish.script.menu.txtNewAnalysePlan=New analyse plan isisfish.script.menu.txtNewEquationModel=New Equation model isisfish.script.menu.txtNewExport=New Export Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-06-10 15:16:58 UTC (rev 2361) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-06-10 15:19:06 UTC (rev 2362) @@ -111,7 +111,6 @@ isisfish.common.delete=Supprimer isisfish.common.ellipsis=... isisfish.common.emigration=\u00E9migration -isisfish.common.empty=vide isisfish.common.equation=Equation isisfish.common.error=Erreur isisfish.common.finish=Terminer @@ -601,7 +600,9 @@ isisfish.message.loading.old.simulation=Chargement d'une ancienne simulation ... isisfish.message.loading.region=Chargement de la r\u00E9gion isisfish.message.name.imported.region=Entrez le nom de la r\u00E9gion \u00E0 importer -isisfish.message.new.filename=Entrer le nom du nouveau du fichier.\n\t (utiliser uniquemment des caract\u00E8res et _ en commencant avec une majuscule) +isisfish.message.new.filename=Entrez le nom du nouveau du fichier.\n\t (utiliser uniquemment des caract\u00E8res et _ en commencant avec une majuscule) +isisfish.message.new.formule.category=Choisissez le cat\u00E9gorie de la formule +isisfish.message.new.formule.title=Nouvelle formule isisfish.message.new.region.name=Entrer le nom de la nouvell r\u00E9gion isisfish.message.old.simulation.loaded=Ancienne simulation charg\u00E9e isisfish.message.page.modified=Cette page a \u00E9t\u00E9 modifi\u00E9, voulez-vous la sauvegarder ? @@ -863,11 +864,8 @@ isisfish.script.menu.new=Nouveau isisfish.script.menu.paste=Coller isisfish.script.menu.save=Sauver -isisfish.script.menu.txtEditorHelp=Aide en ligne... isisfish.script.menu.txtExport=Exporter -isisfish.script.menu.txtHelp=Aide isisfish.script.menu.txtImport=Importer -isisfish.script.menu.txtJavaHelp=Aide Java... isisfish.script.menu.txtNewAnalysePlan=Nouveau plan d'analyse isisfish.script.menu.txtNewEquationModel=Nouvelle formule isisfish.script.menu.txtNewExport=Nouveau script d'export