From tchemit@users.forge.codelutin.com Sat Dec 29 22:09:26 2012
From: tchemit@users.forge.codelutin.com
To: tutti-commits@list.forge.codelutin.com
Subject: [Tutti-commits] r130 -	=?utf-8?q?trunk/tutti-ui-swing/src/main/java?=
 =?utf-8?q?/fr/ifremer/tutti/ui/swing/content/operation/catches?=
Date: Sat, 29 Dec 2012 22:09:26 +0100
Message-ID: <20121229210926.68B6416196@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4323452520611438735=="

--===============4323452520611438735==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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/opera=
tion/catches/EditCatchesUI.jaxx

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/conten=
t/operation/catches/EditCatchesUI.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/oper=
ation/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/oper=
ation/catches/EditCatchesUI.jaxx	2012-12-29 21:09:26 UTC (rev 130)
@@ -101,7 +101,7 @@
             <Table id=3D"catchesForm" fill=3D'both' weightx=3D'1'
                    constraints=3D'BorderLayout.NORTH'>
               <row>
-                <cell>
+                <cell columns=3D'2'>
                   <Table id=3D'catchTable' fill=3D'both'>
=20
                     <!-- Poids total capture -->
@@ -125,10 +125,10 @@
                         <NumberEditor id=3D'catchTotalSortedTremisWeightFiel=
d'
                                       constructorParams=3D'this'/>
                       </cell>
-                      <cell>
+                      <cell anchor=3D'west'>
                         <JLabel id=3D'catchTotalSortedCarousselWeightLabel'/>
                       </cell>
-                      <cell>
+                      <cell weightx=3D'1.0'>
                         <NumberEditor id=3D'catchTotalSortedCarousselWeightF=
ield'
                                       constructorParams=3D'this'/>
                       </cell>
@@ -157,7 +157,7 @@
                 <cell>
                   <Table id=3D'speciesTable' fill=3D'both'>
=20
-                    <!-- Poids total capture / Poids total vrac -->
+                    <!-- Poids total capture -->
                     <row>
                       <cell anchor=3D'west'>
                         <JLabel id=3D'speciesTotalWeightLabel'/>
@@ -166,6 +166,9 @@
                         <NumberEditor id=3D'speciesTotalWeightField'
                                       constructorParams=3D'this'/>
                       </cell>
+                    </row>
+                    <!-- Poids total vrac -->
+                    <row>
                       <cell anchor=3D'west'>
                         <JLabel id=3D'speciesTotalSortedWeightLabel'/>
                       </cell>
@@ -175,7 +178,7 @@
                       </cell>
                     </row>
=20
-                    <!-- Poids total =C3=A9chantillonn=C3=A9 vrac / Poids to=
tal hors vrac -->
+                    <!-- Poids total =C3=A9chantillonn=C3=A9 vrac -->
                     <row>
                       <cell>
                         <JLabel id=3D'speciesTotalSampleSortedWeightLabel'/>
@@ -184,6 +187,9 @@
                         <NumberEditor id=3D'speciesTotalSampleSortedWeightFi=
eld'
                                       constructorParams=3D'this'/>
                       </cell>
+                    </row>
+                    <!-- Poids total hors vrac -->
+                    <row>
                       <cell>
                         <JLabel id=3D'speciesTotalUnsortedWeightLabel'/>
                       </cell>
@@ -193,12 +199,9 @@
                     </row>
                   </Table>
                 </cell>
-              </row>
-              <row>
                 <cell>
                   <Table id=3D'benthosTable' fill=3D'both'>
-
-                    <!-- Poids total capture / Poids total vrac -->
+                    <!-- Poids total capture -->
                     <row>
                       <cell anchor=3D'west'>
                         <JLabel id=3D'benthosTotalWeightLabel'/>
@@ -207,6 +210,9 @@
                         <NumberEditor id=3D'benthosTotalWeightField'
                                       constructorParams=3D'this'/>
                       </cell>
+                    </row>
+                    <!-- Poids total vrac -->
+                    <row>
                       <cell anchor=3D'west'>
                         <JLabel id=3D'benthosTotalSortedWeightLabel'/>
                       </cell>
@@ -216,7 +222,7 @@
                       </cell>
                     </row>
=20
-                    <!-- Poids total =C3=A9chantillonn=C3=A9 vrac / Poids to=
tal hors vrac -->
+                    <!-- Poids total =C3=A9chantillonn=C3=A9 vrac -->
                     <row>
                       <cell>
                         <JLabel id=3D'benthosTotalSampleSortedWeightLabel'/>
@@ -225,6 +231,9 @@
                         <NumberEditor id=3D'benthosTotalSampleSortedWeightFi=
eld'
                                       constructorParams=3D'this'/>
                       </cell>
+                    </row>
+                    <!-- Poids total hors vrac -->
+                    <row>
                       <cell>
                         <JLabel id=3D'benthosTotalUnsortedWeightLabel'/>
                       </cell>
@@ -236,7 +245,7 @@
                 </cell>
               </row>
               <row>
-                <cell>
+                <cell columns=3D'2'>
                   <Table id=3D'macroWasteTable' fill=3D'both'>
=20
                     <!-- Poids total Macro dechet -->
@@ -257,7 +266,7 @@
=20
               <!-- Actions d'import -->
               <row>
-                <cell>
+                <cell columns=3D'2'>
                   <JPanel layout=3D'{new GridLayout(1,0)}'>
                     <JButton id=3D'importPupitriButton'
                              onActionPerformed=3D'handler.importPupitri()'/>


--===============4323452520611438735==--