Author: kmorin Date: 2013-04-16 15:43:20 +0200 (Tue, 16 Apr 2013) New Revision: 802 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/802 Log: fixes #2309 [OBSERVATION INDIVIDUELLE] saisie des autres caract?\195?\169ristiques, impossible de supprimer une ligne (clic droit ne fonctionne pas) Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/caracteristics/CaracteristicMapEditorUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/caracteristics/CaracteristicMapEditorUIHandler.java trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 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/operation/catches/individualobservation/caracteristics/CaracteristicMapEditorUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/caracteristics/CaracteristicMapEditorUI.css 2013-04-16 13:39:58 UTC (rev 801) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/caracteristics/CaracteristicMapEditorUI.css 2013-04-16 13:43:20 UTC (rev 802) @@ -41,6 +41,14 @@ sortable: false; } +#removeCaracteristicMenu { + actionIcon: batch-delete; + text: "tutti.editIndividualObservationCaracteristics.action.removeCaracteristic"; + toolTipText: "tutti.editIndividualObservationCaracteristics.action.removeCaracteristic.tip"; + i18nMnemonic: "tutti.editIndividualObservationCaracteristics.action.removeCaracteristic.mnemonic"; + enabled: {model.isRemoveCaracteristicEnabled()}; +} + #cancelButton { actionIcon: cancel; text: "tutti.editIndividualObservationCaracteristics.action.cancel"; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/caracteristics/CaracteristicMapEditorUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/caracteristics/CaracteristicMapEditorUIHandler.java 2013-04-16 13:39:58 UTC (rev 801) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/caracteristics/CaracteristicMapEditorUIHandler.java 2013-04-16 13:43:20 UTC (rev 802) @@ -94,6 +94,12 @@ } @Override + protected void onAfterSelectedRowChanged(int oldRowIndex, CaracteristicMapEditorRowModel oldRow, int newRowIndex, CaracteristicMapEditorRowModel newRow) { + super.onAfterSelectedRowChanged(oldRowIndex, oldRow, newRowIndex, newRow); + getModel().setRemoveCaracteristicEnabled(newRowIndex >= 0); + } + + @Override protected void saveSelectedRowIfRequired(TuttiBeanMonitor<CaracteristicMapEditorRowModel> rowMonitor, CaracteristicMapEditorRowModel row) { if (row.isValid()) { Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-04-16 13:39:58 UTC (rev 801) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-04-16 13:43:20 UTC (rev 802) @@ -574,6 +574,9 @@ tutti.editIndividualObservationCaracteristics.action.cancel= tutti.editIndividualObservationCaracteristics.action.cancel.mnemonic= tutti.editIndividualObservationCaracteristics.action.cancel.tip= +tutti.editIndividualObservationCaracteristics.action.removeCaracteristic= +tutti.editIndividualObservationCaracteristics.action.removeCaracteristic.mnemonic= +tutti.editIndividualObservationCaracteristics.action.removeCaracteristic.tip= tutti.editIndividualObservationCaracteristics.action.save= tutti.editIndividualObservationCaracteristics.action.save.mnemonic= tutti.editIndividualObservationCaracteristics.action.save.tip= 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-04-16 13:39:58 UTC (rev 801) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-04-16 13:43:20 UTC (rev 802) @@ -576,6 +576,9 @@ tutti.editIndividualObservationCaracteristics.action.cancel=Annuler tutti.editIndividualObservationCaracteristics.action.cancel.mnemonic=A tutti.editIndividualObservationCaracteristics.action.cancel.tip=Annuler l'édition des caractéristiques de l'observation +tutti.editIndividualObservationCaracteristics.action.removeCaracteristic=Supprimer la caractéristique sélectionnée +tutti.editIndividualObservationCaracteristics.action.removeCaracteristic.mnemonic=S +tutti.editIndividualObservationCaracteristics.action.removeCaracteristic.tip=Supprimer la caractéristique sélectionnée tutti.editIndividualObservationCaracteristics.action.save=Enregistrer tutti.editIndividualObservationCaracteristics.action.save.mnemonic=E tutti.editIndividualObservationCaracteristics.action.save.tip=Enregistrer les caractéristiques de l'observation @@ -816,7 +819,7 @@ tutti.error.errorpane.htmlmessage=<html><body><b>Une erreur s'est produite</b>\:<br/>%s</body></html> tutti.error.ui.business.error=Erreur tutti.error.ui.other.error=Erreur -tutti.fishingOperations.action.newFishingOperation.mnemonic=C +tutti.fishingOperations.action.newFishingOperation.mnemonic=N tutti.fishingOperations.action.newFishingOperation.tip=Créer une nouvelle opération de pêche tutti.fishingOperations.info.no.fishingOperation.selected=< Aucun trait sélectionné > tutti.fishingOperations.title.edit.operations=Saisie des opérations de pêches (%s)