Author: tchemit Date: 2012-12-29 22:09:26 +0100 (Sat, 29 Dec 2012) New Revision: 130 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/130 Log: refs #1804: [CAPTURE] - Mise en place de l'onglet Captures (improve layout) Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx 2012-12-29 20:50:48 UTC (rev 129) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx 2012-12-29 21:09:26 UTC (rev 130) @@ -101,7 +101,7 @@ <Table id="catchesForm" fill='both' weightx='1' constraints='BorderLayout.NORTH'> <row> - <cell> + <cell columns='2'> <Table id='catchTable' fill='both'> <!-- Poids total capture --> @@ -125,10 +125,10 @@ <NumberEditor id='catchTotalSortedTremisWeightField' constructorParams='this'/> </cell> - <cell> + <cell anchor='west'> <JLabel id='catchTotalSortedCarousselWeightLabel'/> </cell> - <cell> + <cell weightx='1.0'> <NumberEditor id='catchTotalSortedCarousselWeightField' constructorParams='this'/> </cell> @@ -157,7 +157,7 @@ <cell> <Table id='speciesTable' fill='both'> - <!-- Poids total capture / Poids total vrac --> + <!-- Poids total capture --> <row> <cell anchor='west'> <JLabel id='speciesTotalWeightLabel'/> @@ -166,6 +166,9 @@ <NumberEditor id='speciesTotalWeightField' constructorParams='this'/> </cell> + </row> + <!-- Poids total vrac --> + <row> <cell anchor='west'> <JLabel id='speciesTotalSortedWeightLabel'/> </cell> @@ -175,7 +178,7 @@ </cell> </row> - <!-- Poids total échantillonné vrac / Poids total hors vrac --> + <!-- Poids total échantillonné vrac --> <row> <cell> <JLabel id='speciesTotalSampleSortedWeightLabel'/> @@ -184,6 +187,9 @@ <NumberEditor id='speciesTotalSampleSortedWeightField' constructorParams='this'/> </cell> + </row> + <!-- Poids total hors vrac --> + <row> <cell> <JLabel id='speciesTotalUnsortedWeightLabel'/> </cell> @@ -193,12 +199,9 @@ </row> </Table> </cell> - </row> - <row> <cell> <Table id='benthosTable' fill='both'> - - <!-- Poids total capture / Poids total vrac --> + <!-- Poids total capture --> <row> <cell anchor='west'> <JLabel id='benthosTotalWeightLabel'/> @@ -207,6 +210,9 @@ <NumberEditor id='benthosTotalWeightField' constructorParams='this'/> </cell> + </row> + <!-- Poids total vrac --> + <row> <cell anchor='west'> <JLabel id='benthosTotalSortedWeightLabel'/> </cell> @@ -216,7 +222,7 @@ </cell> </row> - <!-- Poids total échantillonné vrac / Poids total hors vrac --> + <!-- Poids total échantillonné vrac --> <row> <cell> <JLabel id='benthosTotalSampleSortedWeightLabel'/> @@ -225,6 +231,9 @@ <NumberEditor id='benthosTotalSampleSortedWeightField' constructorParams='this'/> </cell> + </row> + <!-- Poids total hors vrac --> + <row> <cell> <JLabel id='benthosTotalUnsortedWeightLabel'/> </cell> @@ -236,7 +245,7 @@ </cell> </row> <row> - <cell> + <cell columns='2'> <Table id='macroWasteTable' fill='both'> <!-- Poids total Macro dechet --> @@ -257,7 +266,7 @@ <!-- Actions d'import --> <row> - <cell> + <cell columns='2'> <JPanel layout='{new GridLayout(1,0)}'> <JButton id='importPupitriButton' onActionPerformed='handler.importPupitri()'/>