Author: kmorin Date: 2013-04-17 12:20:07 +0200 (Wed, 17 Apr 2013) New Revision: 815 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/815 Log: layout Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.jaxx Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.jaxx 2013-04-17 09:48:13 UTC (rev 814) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.jaxx 2013-04-17 10:20:07 UTC (rev 815) @@ -77,22 +77,16 @@ <JMenuItem id='removeAccidentalBatchMenu'/> </JPopupMenu> - <Table id='form' fill='both' constraints='BorderLayout.NORTH'> + <JPanel id='tableToolbar' + constraints='BorderLayout.NORTH' + layout='{new BorderLayout()}'> + <JPanel layout='{new GridLayout(1,0)}' + constraints='BorderLayout.WEST'> + <JButton id='createAccidentalBatchButton' + onActionPerformed='handler.createBatch()'/> + </JPanel> + </JPanel> - <!-- Toolbar / Filter --> - <row> - <cell columns="2"> - <JPanel id='tableToolbar' layout='{new BorderLayout()}'> - <JPanel layout='{new GridLayout(1,0)}' - constraints='BorderLayout.WEST'> - <JButton id='createAccidentalBatchButton' - onActionPerformed='handler.createBatch()'/> - </JPanel> - </JPanel> - </cell> - </row> - </Table> - <JScrollPane id='tableScrollPane' constraints='BorderLayout.CENTER'> <JXTable id='table' onMouseClicked='handler.autoSelectRowInTable(event, tablePopup)' Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.jaxx 2013-04-17 09:48:13 UTC (rev 814) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.jaxx 2013-04-17 10:20:07 UTC (rev 815) @@ -76,22 +76,16 @@ <JMenuItem id='removeIndividualObservationBatchMenu'/> </JPopupMenu> - <Table id='form' fill='both' constraints='BorderLayout.NORTH'> + <JPanel id='tableToolbar' + constraints='BorderLayout.NORTH' + layout='{new BorderLayout()}'> + <JPanel layout='{new GridLayout(1,0)}' + constraints='BorderLayout.WEST'> + <JButton id='createIndividualObservationBatchButton' + onActionPerformed='handler.createBatch()' /> + </JPanel> + </JPanel> - <!-- Toolbar / Filter --> - <row> - <cell columns="2"> - <JPanel id='tableToolbar' layout='{new BorderLayout()}'> - <JPanel layout='{new GridLayout(1,0)}' - constraints='BorderLayout.WEST'> - <JButton id='createIndividualObservationBatchButton' - onActionPerformed='handler.createBatch()'/> - </JPanel> - </JPanel> - </cell> - </row> - </Table> - <JScrollPane id='tableScrollPane' constraints='BorderLayout.CENTER'> <JXTable id='table' onMouseClicked='handler.autoSelectRowInTable(event, tablePopup)'