From tchemit@users.forge.codelutin.com Tue Jan 15 08:18:44 2013
From: tchemit@users.forge.codelutin.com
To: tutti-commits@list.forge.codelutin.com
Subject: [Tutti-commits] r199 - in trunk/tutti-ui-swing/src/main:
	java/fr/ifremer/tutti/ui/swing/content/protocol resources/i18n
Date: Tue, 15 Jan 2013 08:18:44 +0100
Message-ID: <20130115071844.952091594D@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1072031367656391683=="

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

Author: tchemit
Date: 2013-01-15 08:18:44 +0100 (Tue, 15 Jan 2013)
New Revision: 199

Url: http://forge.codelutin.com/projects/tutti/repository/revisions/199

Log:
add new tabs to protocol

Modified:
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/proto=
col/EditProtocolUI.jaxx
   trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properti=
es

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/conten=
t/protocol/EditProtocolUI.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/prot=
ocol/EditProtocolUI.jaxx	2013-01-14 22:19:32 UTC (rev 198)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/prot=
ocol/EditProtocolUI.jaxx	2013-01-15 07:18:44 UTC (rev 199)
@@ -80,7 +80,7 @@
     <JMenuItem id=3D'removeSpeciesMenu'
                onActionPerformed=3D'handler.removeSpecies()'/>
   </JPopupMenu>
- =20
+
   <JTabbedPane constraints=3D'BorderLayout.CENTER'>
     <tab title=3D'tutti.label.tab.protocol.info'>
       <Table id=3D'protocolInfoForm' fill=3D'both'>
@@ -92,7 +92,7 @@
           </cell>
           <cell weightx=3D'1.0'>
             <JTextField id=3D'nameField'
-                            onKeyReleased=3D'handler.setText(event, "name")'=
/>
+                        onKeyReleased=3D'handler.setText(event, "name")'/>
           </cell>
         </row>
=20
@@ -100,21 +100,41 @@
         <row weighty=3D'0.8'>
           <cell columns=3D'2'>
             <JScrollPane id=3D'commentPane'
-                             onFocusGained=3D'commentField.requestFocus()'>
+                         onFocusGained=3D'commentField.requestFocus()'>
               <JTextArea id=3D'commentField'
-                             onKeyReleased=3D'handler.setText(event, "commen=
t")'/>
+                         onKeyReleased=3D'handler.setText(event, "comment")'=
/>
             </JScrollPane>
           </cell>
         </row>
       </Table>
     </tab>
=20
+    <tab title=3D'tutti.label.tab.protocol.fishingOperation'>
+      <Table fill=3D'both' weightx=3D'1'>
+        <row fill=3D'both' weighty=3D'1'>
+          <cell fill=3D'both'>
+            <BeanDoubleList id=3D'gearList' genericType=3D'Caracteristic'/>
+          </cell>
+        </row>
+        <row fill=3D'both' weighty=3D'1'>
+          <cell fill=3D'both'>
+            <BeanDoubleList id=3D'environmentList' genericType=3D'Caracteris=
tic'/>
+          </cell>
+        </row>
+        <row fill=3D'both' weighty=3D'1'>
+          <cell fill=3D'both'>
+            <BeanDoubleList id=3D'hydrologyList' genericType=3D'Caracteristi=
c'/>
+          </cell>
+        </row>
+      </Table>
+    </tab>
+
     <tab title=3D'tutti.label.tab.protocol.species'>
       <Table fill=3D'both'>
         <row fill=3D'both'>
           <cell fill=3D'both' weightx=3D'1'>
             <BeanComboBox id=3D'speciesComboBox' constructorParams=3D'this'
-                              genericType=3D'Species'/>
+                          genericType=3D'Species'/>
           </cell>
           <cell fill=3D'both'>
             <JButton id=3D'addRow' onActionPerformed=3D'handler.addRow()'/>
@@ -123,33 +143,27 @@
         <row fill=3D'both' weighty=3D'1'>
           <cell fill=3D'both' columns=3D'2'>
             <JScrollPane>
-              <JXTable id=3D'speciesTable' onMouseClicked=3D'handler.autoSel=
ectRowInTable(event, tablePopup)'/>
+              <JXTable id=3D'speciesTable'
+                       onMouseClicked=3D'handler.autoSelectRowInTable(event,=
 tablePopup)'/>
             </JScrollPane>
           </cell>
         </row>
       </Table>
     </tab>
+    <tab title=3D'tutti.label.tab.protocol.benthos'>
+      <JLabel text=3D'tutti.to.be.done' enabled=3D'false'
+              horizontalAlignment=3D"{JLabel.CENTER}"/>
+    </tab>
+    <tab title=3D'tutti.label.tab.protocol.plankton'>
+      <JLabel text=3D'tutti.to.be.done' enabled=3D'false'
+              horizontalAlignment=3D"{JLabel.CENTER}"/>
+    </tab>
+    <tab title=3D'tutti.label.tab.protocol.accidental'>
+      <JLabel text=3D'tutti.to.be.done' enabled=3D'false'
+              horizontalAlignment=3D"{JLabel.CENTER}"/>
+    </tab>
=20
-    <tab title=3D'tutti.label.tab.protocol.pmfm'>
-      <Table fill=3D'both' weightx=3D'1'>
-        <row fill=3D'both' weighty=3D'1'>
-          <cell fill=3D'both'>
-            <BeanDoubleList id=3D'gearList' genericType=3D'Caracteristic'/>
-          </cell>
-        </row>
-        <row fill=3D'both' weighty=3D'1'>
-          <cell fill=3D'both'>
-            <BeanDoubleList id=3D'environmentList'
-                                genericType=3D'Caracteristic'/>
-          </cell>
-        </row>
-        <row fill=3D'both' weighty=3D'1'>
-          <cell fill=3D'both'>
-            <BeanDoubleList id=3D'hydrologyList' genericType=3D'Caracteristi=
c'/>
-          </cell>
-        </row>
-      </Table>
-    </tab>
+
   </JTabbedPane>
=20
   <JPanel layout=3D'{new GridLayout(1, 0)}' constraints=3D'BorderLayout.SOUT=
H'>

Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.p=
roperties
=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/resources/i18n/tutti-ui-swing_fr_FR.propert=
ies	2013-01-14 22:19:32 UTC (rev 198)
+++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.propert=
ies	2013-01-15 07:18:44 UTC (rev 199)
@@ -158,8 +158,11 @@
 tutti.label.tab.macroDechet=3DMacro d=C3=A9chets
 tutti.label.tab.observationIndividuel=3DObservations individuelles
 tutti.label.tab.plancton=3DPlancton
+tutti.label.tab.protocol.accidental=3DAccidental
+tutti.label.tab.protocol.benthos=3DBenthos
+tutti.label.tab.protocol.fishingOperation=3DTrait
 tutti.label.tab.protocol.info=3DInformations g=C3=A9n=C3=A9rales
-tutti.label.tab.protocol.pmfm=3DPMFM
+tutti.label.tab.protocol.plankton=3DPlancton
 tutti.label.tab.protocol.species=3DEsp=C3=A8ces
 tutti.label.tab.species=3DEsp=C3=A8ces
 tutti.label.traitReminder=3DTrait \: %s


--===============1072031367656391683==--