Author: kmorin Date: 2013-01-18 16:05:20 +0100 (Fri, 18 Jan 2013) New Revision: 224 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/224 Log: - debug comment field layout Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css 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/cruise/EditCruiseUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css 2013-01-18 14:55:04 UTC (rev 223) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css 2013-01-18 15:05:20 UTC (rev 224) @@ -178,8 +178,7 @@ } #commentPane { - columnHeaderView: {new JLabel(_("tutti.label.comment"))}; - minimumSize: {new Dimension(10,50)}; + border: {BorderFactory.createTitledBorder(_("tutti.label.comment"))}; } #commentField { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css 2013-01-18 14:55:04 UTC (rev 223) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css 2013-01-18 15:05:20 UTC (rev 224) @@ -394,8 +394,7 @@ } #commentPane { - columnHeaderView: {new JLabel(_("tutti.label.comment"))}; - /*minimumSize: {new Dimension(10,50)};*/ + border: {BorderFactory.createTitledBorder(_("tutti.label.comment"))}; } #commentField { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.jaxx 2013-01-18 14:55:04 UTC (rev 223) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.jaxx 2013-01-18 15:05:20 UTC (rev 224) @@ -85,7 +85,7 @@ <field name='fishingOperationNumber' component='fishingOperationNumberField'/> <field name='gearShootingStartDate' component='gearShootingStartDateField'/> - <field name='comment' component='commentField'/> + <field name='comment' component='commentPane'/> <field name='saisisseur' component='saisisseurList'/> <field name='vessel' component='vesselComboBox'/> <field name='gear' component='gearComboBox'/> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2013-01-18 14:55:04 UTC (rev 223) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2013-01-18 15:05:20 UTC (rev 224) @@ -158,21 +158,14 @@ } }); -// context.getConfig(). -// model.addPropertyChangeListener(EditFishingOperationUIModel.PROPERTY_USE_SEXAGECIMAL_FORMAT, new PropertyChangeListener() { -// @Override -// public void propertyChange(PropertyChangeEvent evt) { -// boolean useSexagecimalFormat = (Boolean) evt.getNewValue(); -// log.info("property PROPERTY_USE_SEXAGECIMAL_FORMAT changed " + useSexagecimalFormat); -// -// if (useSexagecimalFormat) { -// getModel().convertGearShootingCoordinatesDDToDMS(); -// } else { -// getModel().convertGearShootingCoordinatesDMSToDD(); -// } -// } -// }); + getContext().addPropertyChangeListener(TuttiUIContext.PROPERTY_VALIDATION_CONTEXT, new PropertyChangeListener() { + @Override + public void propertyChange(PropertyChangeEvent evt) { + getModel().setValidationContext((String) evt.getNewValue()); + } + }); + ui.setContextValue(model); fishingOperationMonitor.setBean(model); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.css 2013-01-18 14:55:04 UTC (rev 223) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.css 2013-01-18 15:05:20 UTC (rev 224) @@ -42,8 +42,7 @@ } #commentPane { - columnHeaderView: {new JLabel(_("tutti.label.comment"))}; - minimumSize: {new Dimension(10,50)}; + border: {BorderFactory.createTitledBorder(_("tutti.label.comment"))}; } #commentField { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.jaxx 2013-01-18 14:55:04 UTC (rev 223) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.jaxx 2013-01-18 15:05:20 UTC (rev 224) @@ -67,7 +67,7 @@ uiClass='jaxx.runtime.validator.swing.ui.ImageValidationUI'> <field name='name' component='nameField'/> <field name='zone' component='zoneComboBox'/> - <field name='comment' component='commentField'/> + <field name='comment' component='commentPane'/> </BeanValidator> <Table id='form' fill='both'> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css 2013-01-18 14:55:04 UTC (rev 223) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css 2013-01-18 15:05:20 UTC (rev 224) @@ -44,8 +44,7 @@ } #commentPane { - columnHeaderView: {new JLabel(_("tutti.label.comment"))}; - minimumSize: {new Dimension(10,50)}; + border: {BorderFactory.createTitledBorder(_("tutti.label.comment"))}; } #commentField { 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-18 14:55:04 UTC (rev 223) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx 2013-01-18 15:05:20 UTC (rev 224) @@ -73,7 +73,7 @@ <BeanValidator id='validator' bean='model' errorTableModel='errorTableModel' uiClass='jaxx.runtime.validator.swing.ui.ImageValidationUI'> <field name='name' component='nameField'/> - <field name='comment' component='commentField'/> + <field name='comment' component='commentPane'/> </BeanValidator> <JPopupMenu id='tablePopup'> 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-18 14:55:04 UTC (rev 223) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-01-18 15:05:20 UTC (rev 224) @@ -14,7 +14,7 @@ tutti.action.edit.protocol.tip=Éditer le protocole sélectionné tutti.action.editCatches=Saisir les captures tutti.action.editCatches.tip=Saisir des captures -tutti.action.editCruise=Campagne +tutti.action.editCruise=Éditer la campagne tutti.action.editCruise.tip=Éditer la campagne sélectionnée tutti.action.editProgram=Programme tutti.action.editProgram.tip=Éditer le programme sélectionné @@ -46,7 +46,7 @@ tutti.action.removeSpeciesSubBatch.tip=Supprimer tous les lots fils du lot sélectionné tutti.action.reset.fishingOperationValidState=Réinitialiser tutti.action.save=Enregistrer -tutti.action.selectCruise=Campagne +tutti.action.selectCruise=Sélectionner une campagne tutti.action.selectCruise.tip=Sélectionner la campagne à utiliser tutti.action.site=Site tutti.action.site.tip=Accéder au site du projet Tutti