This is an automated email from the git hooks/post-receive script. New commit to branch feature/4304_synchro_marees in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit d2813606492e0ef920fe89464d7024b3cf1c7ef9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 9 16:39:38 2016 +0200 Fix layout + add action icons --- .../src/main/filters/observe-ui.properties | 2 ++ .../ui/admin/datasynchro/DataSynchroUI.jaxx | 32 ++++++++------------- .../ui/admin/datasynchro/DataSynchroUI.jcss | 12 +++----- .../src/main/resources/icons/action-copyToLeft.png | Bin 0 -> 345 bytes .../main/resources/icons/action-copyToRight.png | Bin 0 -> 349 bytes 5 files changed, 18 insertions(+), 28 deletions(-) diff --git a/observe-application-swing/src/main/filters/observe-ui.properties b/observe-application-swing/src/main/filters/observe-ui.properties index ed76d2d..80408dd 100644 --- a/observe-application-swing/src/main/filters/observe-ui.properties +++ b/observe-application-swing/src/main/filters/observe-ui.properties @@ -99,6 +99,8 @@ icon.action.connect_creating=action-connect_creating.png icon.action.connect_untested=action-connect_untested.png icon.action.connect_no=action-connect_no.png icon.action.connect_ok=action-connect_ok.png +icon.action.copyToLeft=action-copyToLeft.png +icon.action.copyToRight=action-copyToRight.png icon.action.close=action-close.png icon.action.db-change=action-db-change.png icon.action.db-local=action-db-local.png diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/datasynchro/DataSynchroUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/datasynchro/DataSynchroUI.jaxx index 61cbf25..fea00d6 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/datasynchro/DataSynchroUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/datasynchro/DataSynchroUI.jaxx @@ -52,12 +52,14 @@ <DataSelectionModel id='leftSelectDataModel' initializer='getModel().getDataSynchroModel().getLeftSelectionDataModel()'/> <DataSelectionTreeSelectionModel id='leftSelectionModel'/> - <DataSelectionTreeCellRenderer id='leftSelectionRenderer' constraints='BorderLayout.EAST'/> <DataSelectionModel id='rightSelectDataModel' initializer='getModel().getDataSynchroModel().getRightSelectionDataModel()'/> <DataSelectionTreeSelectionModel id='rightSelectionModel'/> - <DataSelectionTreeCellRenderer id='rightSelectionRenderer' constraints='BorderLayout.EAST'/> + <JPanel id='invisiblePanel'> + <DataSelectionTreeCellRenderer id='leftSelectionRenderer'/> + <DataSelectionTreeCellRenderer id='rightSelectionRenderer'/> + </JPanel> <script><![CDATA[ public DataSynchroUI(AdminUI parentContext) { @@ -77,21 +79,10 @@ public void destroy() { ]]> </script> - <!--JPanel id='PENDING_content'> - <Table constraints='BorderLayout.CENTER' fill='both' weightx='1' - weighty='1'> - <row> - <cell> - <JButton id='startAction' onActionPerformed="getHandler().doPrepareAction()"/> - </cell> - </row> - </Table> - </JPanel--> - <JPanel id='PENDING_content'> <JSplitPane id="contentSplitPane" constraints='BorderLayout.CENTER'> - <Table fill="both"> - <row weighty="1"> + <Table id='contentNorth' fill="both" weighty="1"> + <row> <cell weightx="0.45"> <JScrollPane id='leftTreePane' decorator='boxed'> <JTree id='leftTree'/> @@ -99,7 +90,7 @@ public void destroy() { </cell> <cell weightx="0.1"> <JPanel layout="{new BorderLayout()}" border='{new TitledBorder(" ")}'> - <JPanel id="middleActions" layout="{new GridLayout(0, 1)}" constraints='BorderLayout.CENTER'> + <JPanel id="middleActions" layout="{new GridLayout(0, 2)}" constraints='BorderLayout.CENTER'> <JButton id="copyToRight" onActionPerformed="getHandler().addCopyToRightTasks()"/> <JButton id="copyToLeft" onActionPerformed="getHandler().addCopyToLeftTasks()"/> <JButton id="deleteFromLeft" onActionPerformed="getHandler().addDeleteFromLeftTasks()"/> @@ -114,18 +105,19 @@ public void destroy() { </cell> </row> </Table> - <Table fill="both"> + <Table id='contentSouth' fill="both"> <row weighty="1"> <cell weightx="1"> <JScrollPane id='actionsToConsumePane'> - <JList id="actionsToConsume" onMouseClicked="getHandler().removeTasks(event)"/> + <JList id="actionsToConsume"/> </JScrollPane> </cell> </row> <row> <cell> - <JPanel layout="{new BorderLayout()}" > - <JButton id='applyAction' constraints='BorderLayout.CENTER' onActionPerformed='getHandler().doExecuteAction()'/> + <JPanel layout="{new BorderLayout()}"> + <JButton id='applyAction' constraints='BorderLayout.CENTER' + onActionPerformed='getHandler().doExecuteAction()'/> </JPanel> </cell> </row> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/datasynchro/DataSynchroUI.jcss b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/datasynchro/DataSynchroUI.jcss index 6073115..c512d22 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/datasynchro/DataSynchroUI.jcss +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/datasynchro/DataSynchroUI.jcss @@ -20,10 +20,6 @@ * #L% */ -#NEED_FIX_content { - layout:{new BorderLayout()}; -} - #PENDING_content { layout:{new BorderLayout()}; } @@ -83,25 +79,25 @@ } #copyToLeft { - text:"observe.action.copyToLeft"; + actionIcon:copyToLeft; toolTipText:"observe.action.copyToLeft.tip"; enabled:false; } #copyToRight { - text:"observe.action.copyToRight"; + actionIcon:copyToRight; toolTipText:"observe.action.copyToRight.tip"; enabled:false; } #deleteFromLeft { - text:"observe.action.deleteFromLeft"; + actionIcon:delete; toolTipText:"observe.action.deleteFromLeft.tip"; enabled:false; } #deleteFromRight { - text:"observe.action.deleteFromRight"; + actionIcon:delete; toolTipText:"observe.action.deleteFromRight.tip"; enabled:false; } diff --git a/observe-application-swing/src/main/resources/icons/action-copyToLeft.png b/observe-application-swing/src/main/resources/icons/action-copyToLeft.png new file mode 100644 index 0000000..5dc6967 Binary files /dev/null and b/observe-application-swing/src/main/resources/icons/action-copyToLeft.png differ diff --git a/observe-application-swing/src/main/resources/icons/action-copyToRight.png b/observe-application-swing/src/main/resources/icons/action-copyToRight.png new file mode 100644 index 0000000..b1a1819 Binary files /dev/null and b/observe-application-swing/src/main/resources/icons/action-copyToRight.png differ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.