This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit ccbed1721184adc51202de636a038a823df880bb Author: Kevin Morin <morin@codelutin.com> Date: Fri Feb 5 15:33:23 2016 +0100 inversion des 2 arbres (refs #7929) --- .../swing/content/protocol/zones/ZoneEditorUI.jaxx | 40 ++++++++++++---------- .../swing/content/protocol/zones/ZoneEditorUI.jcss | 4 +-- .../resources/i18n/tutti-ui-swing_fr_FR.properties | 1 + 3 files changed, 24 insertions(+), 21 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/ZoneEditorUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/ZoneEditorUI.jaxx index e4b989c..bffbf34 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/ZoneEditorUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/ZoneEditorUI.jaxx @@ -34,30 +34,31 @@ <row> <cell> - <JToolBar id="zonesTreeToolBar"> - <JButton id="createZone"/> - <JButton id="expandZonesTree"/> - <JButton id="collapseZonesTree"/> + <JToolBar id="availableStratasTreeToolBar"> + <JButton id="expandAvailableStratasTree"/> + <JButton id="collapseAvailableStratasTree"/> </JToolBar> </cell> <cell> <JLabel/> </cell> <cell> - <JToolBar id="availableStratasTreeToolBar"> - <JButton id="expandAvailableStratasTree"/> - <JButton id="collapseAvailableStratasTree"/> + <JToolBar id="zonesTreeToolBar"> + <JButton id="createZone"/> + <JButton id="expandZonesTree"/> + <JButton id="collapseZonesTree"/> </JToolBar> </cell> </row> <row> + <cell weightx='0.5' weighty='1' fill='both'> - <JScrollPane onFocusGained='zonesTree.requestFocus()'> - <!-- List of the zones --> - <JTree id='zonesTree' onMouseClicked="handler.autoSelectNodeInTree(event, zonePopupMenu)"/> - <!--onFocusGained='handler.selectFirstRowIfNoSelection(event)'--> - <!--onMouseClicked='handler.onUniverseListClicked(event)'--> - <!--onKeyPressed='handler.onKeyPressedOnUniverseList(event)'--> + <JScrollPane onFocusGained='availableStratasTree.requestFocus()'> + <!-- List of the available stratas and substratas --> + <JTree id='availableStratasTree' onValueChanged="availableStratasTree.expandPath(event.getNewLeadSelectionPath())"/> + <!--onFocusGained='handler.selectFirstRowIfNoSelection(event)'--> + <!--onMouseClicked='handler.onSelectedListClicked(event)'--> + <!--onKeyPressed='handler.onKeyPressedOnSelectedList(event)'/>--> </JScrollPane> </cell> @@ -69,14 +70,15 @@ </cell> <cell weightx='0.5' weighty='1' fill='both'> - <JScrollPane onFocusGained='availableStratasTree.requestFocus()'> - <!-- List of the available stratas and substratas --> - <JTree id='availableStratasTree' onValueChanged="availableStratasTree.expandPath(event.getNewLeadSelectionPath())"/> - <!--onFocusGained='handler.selectFirstRowIfNoSelection(event)'--> - <!--onMouseClicked='handler.onSelectedListClicked(event)'--> - <!--onKeyPressed='handler.onKeyPressedOnSelectedList(event)'/>--> + <JScrollPane onFocusGained='zonesTree.requestFocus()'> + <!-- List of the zones --> + <JTree id='zonesTree' onMouseClicked="handler.autoSelectNodeInTree(event, zonePopupMenu)"/> + <!--onFocusGained='handler.selectFirstRowIfNoSelection(event)'--> + <!--onMouseClicked='handler.onUniverseListClicked(event)'--> + <!--onKeyPressed='handler.onKeyPressedOnUniverseList(event)'--> </JScrollPane> </cell> + </row> </Table> \ No newline at end of file diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/ZoneEditorUI.jcss b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/ZoneEditorUI.jcss index f4c227e..cce689c 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/ZoneEditorUI.jcss +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/ZoneEditorUI.jcss @@ -55,11 +55,11 @@ JToolBar { } #addButton { - actionIcon: left; + actionIcon: right; _simpleAction: {fr.ifremer.tutti.ui.swing.content.protocol.zones.actions.AddStratasAction.class}; } #removeButton { - actionIcon: right; + actionIcon: left; _simpleAction: {fr.ifremer.tutti.ui.swing.content.protocol.zones.actions.RemoveStratasAction.class}; } \ No newline at end of file diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties index 9a9bad0..dd9b112 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties @@ -2056,6 +2056,7 @@ tutti.splitSpeciesBatch.table.header.category=Catégorie tutti.splitSpeciesBatch.table.header.selected=Sélection tutti.splitSpeciesBatch.table.header.weight=Poids tutti.splitSpeciesBatch.title=Catégorisation du lot +tutti.test= tutti.title.openReplaceTemporaryUI.noSource=Pas de référentiel temporaire de type %s dans la base tutti.title.openReplaceTemporaryUI.noTarget=Pas de référentiel officiel de type %s dans la base tutti.todo= -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.