Author: echatellier Date: 2015-06-09 13:55:33 +0000 (Tue, 09 Jun 2015) New Revision: 4253 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4253 Log: Add rule tooltip Modified: branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooser.jaxx branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/i18n/isis-fish_en_GB.properties branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/i18n/isis-fish_fr_FR.properties Modified: branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooser.jaxx =================================================================== --- branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooser.jaxx 2015-06-09 13:32:19 UTC (rev 4252) +++ branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooser.jaxx 2015-06-09 13:55:33 UTC (rev 4253) @@ -48,9 +48,12 @@ <cell> <JPanel /> </cell> - <cell fill="horizontal"> + <cell fill="horizontal" weightx="1"> <JLabel text="isisfish.params.rules.selected" enabled="{isActive()}"/> </cell> + <cell> + <JLabel icon="common/information-small.png" toolTipText="isisfish.params.rules.tooltip" enabled="{isActive()}"/> + </cell> </row> <row> <cell fill="both" rows="3" weightx="1" weighty="1"> @@ -66,7 +69,7 @@ <cell fill='horizontal'> <JButton id="addRulesButton" text="isisfish.common.add" enabled="false" onActionPerformed='handler.addSelectedRules()'/> </cell> - <cell fill="both" rows="3" weightx="1" weighty="1"> + <cell fill="both" rows="3" columns="2" weightx="1" weighty="1"> <JScrollPane enabled="{isActive()}"> <fr.ifremer.isisfish.ui.models.common.GenericListModel id="selectedRulesListModel" genericType="fr.ifremer.isisfish.rule.Rule" /> <JList id="selectedRulesList" selectionMode="{javax.swing.ListSelectionModel.MULTIPLE_INTERVAL_SELECTION}" @@ -88,7 +91,7 @@ enabled="false" onActionPerformed='handler.clearAllRules()'/> </cell> </row> - <row weightx="2" weighty="2" columns="3"> + <row weightx="2" weighty="2" columns="4"> <cell fill='both'> <JScrollPane enabled="{isActive()}"> <fr.ifremer.isisfish.ui.models.common.ScriptParametersTableModel Modified: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/i18n/isis-fish_en_GB.properties 2015-06-09 13:32:19 UTC (rev 4252) +++ branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/i18n/isis-fish_en_GB.properties 2015-06-09 13:55:33 UTC (rev 4253) @@ -620,6 +620,7 @@ isisfish.params.rules=Rules isisfish.params.rules.availables=Available rules isisfish.params.rules.selected=Selected rules +isisfish.params.rules.tooltip=Rules are executed ordered \! You can change order using drag and drop. isisfish.params.sensitivityName=Sensitivity name isisfish.params.sensitivityOnlyKeepFirstResult=Only keep results for first simulation isisfish.params.simulationLauncher=Simulation launcher Modified: branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/i18n/isis-fish_fr_FR.properties 2015-06-09 13:32:19 UTC (rev 4252) +++ branches/isis-fish-4.4.0-ui-refactoring/src/main/resources/i18n/isis-fish_fr_FR.properties 2015-06-09 13:55:33 UTC (rev 4253) @@ -620,6 +620,7 @@ isisfish.params.rules=Règles isisfish.params.rules.availables=Règles disponibles isisfish.params.rules.selected=Règles sélectionnées +isisfish.params.rules.tooltip=Les règles sont executées dans l'ordre défini \! Vous pouvez modifier l'ordre à l'aide du glisser-déposer. isisfish.params.sensitivityName=Nom de l'analyse de sensibilité isisfish.params.sensitivityOnlyKeepFirstResult=Ne conserver les résultats que pour la première simulation. isisfish.params.simulationLauncher=Lanceur de simulation