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/protocol/EditProtocolUI.jaxx trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx 2013-01-14 22:19:32 UTC (rev 198) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx 2013-01-15 07:18:44 UTC (rev 199) @@ -80,7 +80,7 @@ <JMenuItem id='removeSpeciesMenu' onActionPerformed='handler.removeSpecies()'/> </JPopupMenu> - + <JTabbedPane constraints='BorderLayout.CENTER'> <tab title='tutti.label.tab.protocol.info'> <Table id='protocolInfoForm' fill='both'> @@ -92,7 +92,7 @@ </cell> <cell weightx='1.0'> <JTextField id='nameField' - onKeyReleased='handler.setText(event, "name")'/> + onKeyReleased='handler.setText(event, "name")'/> </cell> </row> @@ -100,21 +100,41 @@ <row weighty='0.8'> <cell columns='2'> <JScrollPane id='commentPane' - onFocusGained='commentField.requestFocus()'> + onFocusGained='commentField.requestFocus()'> <JTextArea id='commentField' - onKeyReleased='handler.setText(event, "comment")'/> + onKeyReleased='handler.setText(event, "comment")'/> </JScrollPane> </cell> </row> </Table> </tab> + <tab title='tutti.label.tab.protocol.fishingOperation'> + <Table fill='both' weightx='1'> + <row fill='both' weighty='1'> + <cell fill='both'> + <BeanDoubleList id='gearList' genericType='Caracteristic'/> + </cell> + </row> + <row fill='both' weighty='1'> + <cell fill='both'> + <BeanDoubleList id='environmentList' genericType='Caracteristic'/> + </cell> + </row> + <row fill='both' weighty='1'> + <cell fill='both'> + <BeanDoubleList id='hydrologyList' genericType='Caracteristic'/> + </cell> + </row> + </Table> + </tab> + <tab title='tutti.label.tab.protocol.species'> <Table fill='both'> <row fill='both'> <cell fill='both' weightx='1'> <BeanComboBox id='speciesComboBox' constructorParams='this' - genericType='Species'/> + genericType='Species'/> </cell> <cell fill='both'> <JButton id='addRow' onActionPerformed='handler.addRow()'/> @@ -123,33 +143,27 @@ <row fill='both' weighty='1'> <cell fill='both' columns='2'> <JScrollPane> - <JXTable id='speciesTable' onMouseClicked='handler.autoSelectRowInTable(event, tablePopup)'/> + <JXTable id='speciesTable' + onMouseClicked='handler.autoSelectRowInTable(event, tablePopup)'/> </JScrollPane> </cell> </row> </Table> </tab> + <tab title='tutti.label.tab.protocol.benthos'> + <JLabel text='tutti.to.be.done' enabled='false' + horizontalAlignment="{JLabel.CENTER}"/> + </tab> + <tab title='tutti.label.tab.protocol.plankton'> + <JLabel text='tutti.to.be.done' enabled='false' + horizontalAlignment="{JLabel.CENTER}"/> + </tab> + <tab title='tutti.label.tab.protocol.accidental'> + <JLabel text='tutti.to.be.done' enabled='false' + horizontalAlignment="{JLabel.CENTER}"/> + </tab> - <tab title='tutti.label.tab.protocol.pmfm'> - <Table fill='both' weightx='1'> - <row fill='both' weighty='1'> - <cell fill='both'> - <BeanDoubleList id='gearList' genericType='Caracteristic'/> - </cell> - </row> - <row fill='both' weighty='1'> - <cell fill='both'> - <BeanDoubleList id='environmentList' - genericType='Caracteristic'/> - </cell> - </row> - <row fill='both' weighty='1'> - <cell fill='both'> - <BeanDoubleList id='hydrologyList' genericType='Caracteristic'/> - </cell> - </row> - </Table> - </tab> + </JTabbedPane> <JPanel layout='{new GridLayout(1, 0)}' constraints='BorderLayout.SOUTH'> Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-01-14 22:19:32 UTC (rev 198) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-01-15 07:18:44 UTC (rev 199) @@ -158,8 +158,11 @@ tutti.label.tab.macroDechet=Macro déchets tutti.label.tab.observationIndividuel=Observations individuelles tutti.label.tab.plancton=Plancton +tutti.label.tab.protocol.accidental=Accidental +tutti.label.tab.protocol.benthos=Benthos +tutti.label.tab.protocol.fishingOperation=Trait tutti.label.tab.protocol.info=Informations générales -tutti.label.tab.protocol.pmfm=PMFM +tutti.label.tab.protocol.plankton=Plancton tutti.label.tab.protocol.species=Espèces tutti.label.tab.species=Espèces tutti.label.traitReminder=Trait \: %s