Author: tchemit Date: 2013-05-23 16:12:16 +0200 (Thu, 23 May 2013) New Revision: 996 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/996 Log: fixes #2490: [ERGO] pas de raccourcis clavier pour acc?\195?\169der ?\195?\160 la saisie des mensurations Modified: trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.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/filtered-resources/tutti-help-en.properties =================================================================== --- trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties 2013-05-23 13:18:33 UTC (rev 995) +++ trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties 2013-05-23 14:12:16 UTC (rev 996) @@ -1,5 +1,5 @@ #Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo -#Tue May 21 18:54:28 CEST 2013 +#Thu May 23 15:38:00 CEST 2013 tutti.config.help=config.html tutti.createAccidentalBatch.action.cancel.help=createAccidentalBatch.html\#actions tutti.createAccidentalBatch.action.save.help=createAccidentalBatch.html\#actions @@ -47,14 +47,15 @@ tutti.dbManager.action.upgradeDb.help=dbManager.html\#actions tutti.dbManager.help=dbManager.html tutti.editAccidentalBatch.action.createBatch.help=editAccidentalBatch.html\#actions -tutti.editAccidentalBatch.action.exportMultiPost.help= -tutti.editAccidentalBatch.action.importMultiPost.help= +tutti.editAccidentalBatch.action.exportMultiPost.help=editAccidentalBatch.html\#actions +tutti.editAccidentalBatch.action.importMultiPost.help=editAccidentalBatch.html\#actions tutti.editAccidentalBatch.action.removeBatch.help=editAccidentalBatch.html\#actions tutti.editAccidentalBatch.help=editAccidentalBatch.html tutti.editBenthosBatch.action.createBatch.help=editBenthosBatch.html\#actions tutti.editBenthosBatch.action.createMelag.help=editBenthosBatch.html\#actions -tutti.editBenthosBatch.action.exportMultiPost.help= -tutti.editBenthosBatch.action.importMultiPost.help= +tutti.editBenthosBatch.action.editFrequencies.help=editBenthosBatch.html\#actions +tutti.editBenthosBatch.action.exportMultiPost.help=editBenthosBatch.html\#actions +tutti.editBenthosBatch.action.importMultiPost.help=editBenthosBatch.html\#actions tutti.editBenthosBatch.action.removeBatch.help=editBenthosBatch.html\#actions tutti.editBenthosBatch.action.removeSubBatch.help=editBenthosBatch.html\#actions tutti.editBenthosBatch.action.renameBatch.help=editBenthosBatch.html\#actions @@ -86,12 +87,11 @@ tutti.editBenthosFrequencies.field.rafaleStep.help=editBenthosFrequencies.html\#fields tutti.editBenthosFrequencies.field.simpleCounting.help=editBenthosFrequencies.html\#fields tutti.editBenthosFrequencies.field.step.help=editBenthosFrequencies.html\#fields -tutti.editBenthosFrequencies.field.totalNumber.help= -tutti.editBenthosFrequencies.field.totalWeight.help= +tutti.editBenthosFrequencies.field.totalNumber.help=editBenthosFrequencies.html\#fields +tutti.editBenthosFrequencies.field.totalWeight.help=editBenthosFrequencies.html\#fields tutti.editBenthosFrequencies.help=editBenthosFrequencies.html tutti.editCatchBatch.action.cancelEditCatchBatch.help=editCatchBatch.html\#actions tutti.editCatchBatch.action.computeWeights.help=editCatchBatch.html\#actions -tutti.editSpeciesBatch.action.importPupitri.help=editSpeciesBatch.html\#actions tutti.editCatchBatch.action.saveCatchBatch.help=editCatchBatch.html\#actions tutti.editCatchBatch.field.benthosTotalSampleSortedWeight.help=editCatchBatch.html\#fields tutti.editCatchBatch.field.benthosTotalSortedWeight.help=editCatchBatch.html\#fields @@ -103,7 +103,6 @@ tutti.editCatchBatch.field.catchTotalSortedWeight.help=editCatchBatch.html\#fields tutti.editCatchBatch.field.catchTotalUnsortedWeight.help=editCatchBatch.html\#fields tutti.editCatchBatch.field.catchTotalWeight.help=editCatchBatch.html\#fields -tutti.editCatchBatch.field.macroWasteTotalWeight.help= tutti.editCatchBatch.field.marineLitterTotalWeight.help=editCatchBatch.html\#fields tutti.editCatchBatch.field.speciesTotalSampleSortedWeight.help=editCatchBatch.html\#fields tutti.editCatchBatch.field.speciesTotalSortedWeight.help=editCatchBatch.html\#fields @@ -163,13 +162,13 @@ tutti.editFishingOperation.field.vessel.help=editFishingOperation.html\#fields tutti.editFishingOperation.help=editFishingOperation.html tutti.editIndividualObservationBatch.action.createBatch.help=editIndividualObservationBatch.html\#actions -tutti.editIndividualObservationBatch.action.exportMultiPost.help= -tutti.editIndividualObservationBatch.action.importMultiPost.help= +tutti.editIndividualObservationBatch.action.exportMultiPost.help=editIndividualObservationBatch.html\#actions +tutti.editIndividualObservationBatch.action.importMultiPost.help=editIndividualObservationBatch.html\#actions tutti.editIndividualObservationBatch.action.removeBatch.help=editIndividualObservationBatch.html\#actions tutti.editIndividualObservationBatch.help=editIndividualObservationBatch.html tutti.editMarineLitterBatch.action.createBatch.help=editIndividualObservationBatch.html\#actions -tutti.editMarineLitterBatch.action.exportMultiPost.help= -tutti.editMarineLitterBatch.action.importMultiPost.help= +tutti.editMarineLitterBatch.action.exportMultiPost.help=editIndividualObservationBatch.html\#actions +tutti.editMarineLitterBatch.action.importMultiPost.help=editIndividualObservationBatch.html\#actions tutti.editMarineLitterBatch.action.removeBatch.help=editIndividualObservationBatch.html\#actions tutti.editMarineLitterBatch.field.marineLitterTotalWeight.help=editIndividualObservationBatch.html\#fields tutti.editMarineLitterBatch.help=editMarineLitterBatch.html @@ -207,8 +206,10 @@ tutti.editProtocol.pane.caracteristic.help=editProtocol.html\#fieldsCaracteristics tutti.editSpeciesBatch.action.createBatch.help=editSpeciesBatch.html\#actions tutti.editSpeciesBatch.action.createMelag.help=editSpeciesBatch.html\#actions -tutti.editSpeciesBatch.action.exportMultiPost.help= -tutti.editSpeciesBatch.action.importMultiPost.help= +tutti.editSpeciesBatch.action.editFrequencies.help=editSpeciesBatch.html\#actions +tutti.editSpeciesBatch.action.exportMultiPost.help=editSpeciesBatch.html\#actions +tutti.editSpeciesBatch.action.importMultiPost.help=editSpeciesBatch.html\#actions +tutti.editSpeciesBatch.action.importPupitri.help=editSpeciesBatch.html\#actions tutti.editSpeciesBatch.action.removeBatch.help=editSpeciesBatch.html\#actions tutti.editSpeciesBatch.action.removeSubBatch.help=editSpeciesBatch.html\#actions tutti.editSpeciesBatch.action.renameBatch.help=editSpeciesBatch.html\#actions @@ -234,17 +235,17 @@ tutti.editSpeciesFrequencies.field.rafaleStep.help=editSpeciesFrequencies.html\#fields tutti.editSpeciesFrequencies.field.simpleCounting.help=editSpeciesFrequencies.html\#fields tutti.editSpeciesFrequencies.field.step.help=editSpeciesFrequencies.html\#fields -tutti.editSpeciesFrequencies.field.totalNumber.help= -tutti.editSpeciesFrequencies.field.totalWeight.help= +tutti.editSpeciesFrequencies.field.totalNumber.help=editSpeciesFrequencies.html\#fields +tutti.editSpeciesFrequencies.field.totalWeight.help=editSpeciesFrequencies.html\#fields tutti.editSpeciesFrequencies.help=editSpeciesFrequencies.html -tutti.fishingOperations.action.deleteFishingOperation.help= +tutti.fishingOperations.action.deleteFishingOperation.help=fishingOperations.html\#actions tutti.fishingOperations.action.newFishingOperation.help=fishingOperations.html\#actions tutti.fishingOperations.field.fishingOperation.help=fishingOperations.html\#fields tutti.fishingOperations.help=fishingOperations.html tutti.index.help=index.html -tutti.main.action.changeLocale.help= -tutti.main.action.changeLocaleFR.help= -tutti.main.action.changeLocaleUK.help= +tutti.main.action.changeLocale.help=index.html\#menu +tutti.main.action.changeLocaleFR.help=index.html\#menu +tutti.main.action.changeLocaleUK.help=index.html\#menu tutti.main.action.showHelp.help=index.html\#menu tutti.main.help=index.html tutti.main.menu.action.about.help=index.html\#menu @@ -279,9 +280,9 @@ tutti.selectCruise.action.editCruise.help=selectCruise.html\#actions tutti.selectCruise.action.editProgram.help=selectCruise.html\#actions tutti.selectCruise.action.editProtocol.help=selectCruise.html\#actions -tutti.selectCruise.action.exportCruise.help= -tutti.selectCruise.action.exportCruiseForSumatra.help= -tutti.selectCruise.action.exportProgram.help= +tutti.selectCruise.action.exportCruise.help=selectCruise.html\#actions +tutti.selectCruise.action.exportCruiseForSumatra.help=selectCruise.html\#actions +tutti.selectCruise.action.exportProgram.help=selectCruise.html\#actions tutti.selectCruise.action.exportProtocol.help=selectCruise.html\#actions tutti.selectCruise.action.importProtocol.help=selectCruise.html\#actions tutti.selectCruise.action.newCruise.help=selectCruise.html\#actions @@ -308,12 +309,7 @@ tutti.splitSpeciesBatch.field.sampleWeightField.help=splitSpeciesBatch.html\#fields tutti.splitSpeciesBatch.field.speciesField.help=splitSpeciesBatch.html\#fields tutti.splitSpeciesBatch.help=splitSpeciesBatch.html -tutti.validateCruise.navigation.action.export.all.help= -tutti.validateCruise.navigation.action.export.help= -tutti.validateCruise.navigation.action.export.operation.help= -tutti.validateCruise.navigation.action.refresh.all.help= -tuttihelp.config.help= -tuttihelp.editAccidentalBatch.help= -tuttihelp.editIndividualObservationBatch.help= -tuttihelp.editMarineLitterBatch.help= -tuttihelp.editPlanktonBatch.help= +tutti.validateCruise.navigation.action.export.all.help=validateCruise.html#actions +tutti.validateCruise.navigation.action.export.help=validateCruise.html#actions +tutti.validateCruise.navigation.action.export.operation.help=validateCruise.html#actions +tutti.validateCruise.navigation.action.refresh.all.help=validateCruise.html#actions \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties =================================================================== --- trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties 2013-05-23 13:18:33 UTC (rev 995) +++ trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties 2013-05-23 14:12:16 UTC (rev 996) @@ -1,5 +1,5 @@ #Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo -#Tue May 21 18:54:28 CEST 2013 +#Thu May 23 15:38:00 CEST 2013 tutti.config.help=config.html tutti.createAccidentalBatch.action.cancel.help=createAccidentalBatch.html\#actions tutti.createAccidentalBatch.action.save.help=createAccidentalBatch.html\#actions @@ -47,14 +47,15 @@ tutti.dbManager.action.upgradeDb.help=dbManager.html\#actions tutti.dbManager.help=dbManager.html tutti.editAccidentalBatch.action.createBatch.help=editAccidentalBatch.html\#actions -tutti.editAccidentalBatch.action.exportMultiPost.help= -tutti.editAccidentalBatch.action.importMultiPost.help= +tutti.editAccidentalBatch.action.exportMultiPost.help=editAccidentalBatch.html\#actions +tutti.editAccidentalBatch.action.importMultiPost.help=editAccidentalBatch.html\#actions tutti.editAccidentalBatch.action.removeBatch.help=editAccidentalBatch.html\#actions tutti.editAccidentalBatch.help=editAccidentalBatch.html tutti.editBenthosBatch.action.createBatch.help=editBenthosBatch.html\#actions tutti.editBenthosBatch.action.createMelag.help=editBenthosBatch.html\#actions -tutti.editBenthosBatch.action.exportMultiPost.help= -tutti.editBenthosBatch.action.importMultiPost.help= +tutti.editBenthosBatch.action.editFrequencies.help=editBenthosBatch.html\#actions +tutti.editBenthosBatch.action.exportMultiPost.help=editBenthosBatch.html\#actions +tutti.editBenthosBatch.action.importMultiPost.help=editBenthosBatch.html\#actions tutti.editBenthosBatch.action.removeBatch.help=editBenthosBatch.html\#actions tutti.editBenthosBatch.action.removeSubBatch.help=editBenthosBatch.html\#actions tutti.editBenthosBatch.action.renameBatch.help=editBenthosBatch.html\#actions @@ -86,12 +87,11 @@ tutti.editBenthosFrequencies.field.rafaleStep.help=editBenthosFrequencies.html\#fields tutti.editBenthosFrequencies.field.simpleCounting.help=editBenthosFrequencies.html\#fields tutti.editBenthosFrequencies.field.step.help=editBenthosFrequencies.html\#fields -tutti.editBenthosFrequencies.field.totalNumber.help= -tutti.editBenthosFrequencies.field.totalWeight.help= +tutti.editBenthosFrequencies.field.totalNumber.help=editBenthosFrequencies.html\#fields +tutti.editBenthosFrequencies.field.totalWeight.help=editBenthosFrequencies.html\#fields tutti.editBenthosFrequencies.help=editBenthosFrequencies.html tutti.editCatchBatch.action.cancelEditCatchBatch.help=editCatchBatch.html\#actions tutti.editCatchBatch.action.computeWeights.help=editCatchBatch.html\#actions -tutti.editSpeciesBatch.action.importPupitri.help=editSpeciesBatch.html\#actions tutti.editCatchBatch.action.saveCatchBatch.help=editCatchBatch.html\#actions tutti.editCatchBatch.field.benthosTotalSampleSortedWeight.help=editCatchBatch.html\#fields tutti.editCatchBatch.field.benthosTotalSortedWeight.help=editCatchBatch.html\#fields @@ -103,7 +103,6 @@ tutti.editCatchBatch.field.catchTotalSortedWeight.help=editCatchBatch.html\#fields tutti.editCatchBatch.field.catchTotalUnsortedWeight.help=editCatchBatch.html\#fields tutti.editCatchBatch.field.catchTotalWeight.help=editCatchBatch.html\#fields -tutti.editCatchBatch.field.macroWasteTotalWeight.help= tutti.editCatchBatch.field.marineLitterTotalWeight.help=editCatchBatch.html\#fields tutti.editCatchBatch.field.speciesTotalSampleSortedWeight.help=editCatchBatch.html\#fields tutti.editCatchBatch.field.speciesTotalSortedWeight.help=editCatchBatch.html\#fields @@ -163,13 +162,13 @@ tutti.editFishingOperation.field.vessel.help=editFishingOperation.html\#fields tutti.editFishingOperation.help=editFishingOperation.html tutti.editIndividualObservationBatch.action.createBatch.help=editIndividualObservationBatch.html\#actions -tutti.editIndividualObservationBatch.action.exportMultiPost.help= -tutti.editIndividualObservationBatch.action.importMultiPost.help= +tutti.editIndividualObservationBatch.action.exportMultiPost.help=editIndividualObservationBatch.html\#actions +tutti.editIndividualObservationBatch.action.importMultiPost.help=editIndividualObservationBatch.html\#actions tutti.editIndividualObservationBatch.action.removeBatch.help=editIndividualObservationBatch.html\#actions tutti.editIndividualObservationBatch.help=editIndividualObservationBatch.html tutti.editMarineLitterBatch.action.createBatch.help=editIndividualObservationBatch.html\#actions -tutti.editMarineLitterBatch.action.exportMultiPost.help= -tutti.editMarineLitterBatch.action.importMultiPost.help= +tutti.editMarineLitterBatch.action.exportMultiPost.help=editIndividualObservationBatch.html\#actions +tutti.editMarineLitterBatch.action.importMultiPost.help=editIndividualObservationBatch.html\#actions tutti.editMarineLitterBatch.action.removeBatch.help=editIndividualObservationBatch.html\#actions tutti.editMarineLitterBatch.field.marineLitterTotalWeight.help=editIndividualObservationBatch.html\#fields tutti.editMarineLitterBatch.help=editMarineLitterBatch.html @@ -207,8 +206,10 @@ tutti.editProtocol.pane.caracteristic.help=editProtocol.html\#fieldsCaracteristics tutti.editSpeciesBatch.action.createBatch.help=editSpeciesBatch.html\#actions tutti.editSpeciesBatch.action.createMelag.help=editSpeciesBatch.html\#actions -tutti.editSpeciesBatch.action.exportMultiPost.help= -tutti.editSpeciesBatch.action.importMultiPost.help= +tutti.editSpeciesBatch.action.editFrequencies.help=editSpeciesBatch.html\#actions +tutti.editSpeciesBatch.action.exportMultiPost.help=editSpeciesBatch.html\#actions +tutti.editSpeciesBatch.action.importMultiPost.help=editSpeciesBatch.html\#actions +tutti.editSpeciesBatch.action.importPupitri.help=editSpeciesBatch.html\#actions tutti.editSpeciesBatch.action.removeBatch.help=editSpeciesBatch.html\#actions tutti.editSpeciesBatch.action.removeSubBatch.help=editSpeciesBatch.html\#actions tutti.editSpeciesBatch.action.renameBatch.help=editSpeciesBatch.html\#actions @@ -234,17 +235,17 @@ tutti.editSpeciesFrequencies.field.rafaleStep.help=editSpeciesFrequencies.html\#fields tutti.editSpeciesFrequencies.field.simpleCounting.help=editSpeciesFrequencies.html\#fields tutti.editSpeciesFrequencies.field.step.help=editSpeciesFrequencies.html\#fields -tutti.editSpeciesFrequencies.field.totalNumber.help= -tutti.editSpeciesFrequencies.field.totalWeight.help= +tutti.editSpeciesFrequencies.field.totalNumber.help=editSpeciesFrequencies.html\#fields +tutti.editSpeciesFrequencies.field.totalWeight.help=editSpeciesFrequencies.html\#fields tutti.editSpeciesFrequencies.help=editSpeciesFrequencies.html -tutti.fishingOperations.action.deleteFishingOperation.help= +tutti.fishingOperations.action.deleteFishingOperation.help=fishingOperations.html\#actions tutti.fishingOperations.action.newFishingOperation.help=fishingOperations.html\#actions tutti.fishingOperations.field.fishingOperation.help=fishingOperations.html\#fields tutti.fishingOperations.help=fishingOperations.html tutti.index.help=index.html -tutti.main.action.changeLocale.help= -tutti.main.action.changeLocaleFR.help= -tutti.main.action.changeLocaleUK.help= +tutti.main.action.changeLocale.help=index.html\#menu +tutti.main.action.changeLocaleFR.help=index.html\#menu +tutti.main.action.changeLocaleUK.help=index.html\#menu tutti.main.action.showHelp.help=index.html\#menu tutti.main.help=index.html tutti.main.menu.action.about.help=index.html\#menu @@ -279,9 +280,9 @@ tutti.selectCruise.action.editCruise.help=selectCruise.html\#actions tutti.selectCruise.action.editProgram.help=selectCruise.html\#actions tutti.selectCruise.action.editProtocol.help=selectCruise.html\#actions -tutti.selectCruise.action.exportCruise.help= -tutti.selectCruise.action.exportCruiseForSumatra.help= -tutti.selectCruise.action.exportProgram.help= +tutti.selectCruise.action.exportCruise.help=selectCruise.html\#actions +tutti.selectCruise.action.exportCruiseForSumatra.help=selectCruise.html\#actions +tutti.selectCruise.action.exportProgram.help=selectCruise.html\#actions tutti.selectCruise.action.exportProtocol.help=selectCruise.html\#actions tutti.selectCruise.action.importProtocol.help=selectCruise.html\#actions tutti.selectCruise.action.newCruise.help=selectCruise.html\#actions @@ -308,12 +309,7 @@ tutti.splitSpeciesBatch.field.sampleWeightField.help=splitSpeciesBatch.html\#fields tutti.splitSpeciesBatch.field.speciesField.help=splitSpeciesBatch.html\#fields tutti.splitSpeciesBatch.help=splitSpeciesBatch.html -tutti.validateCruise.navigation.action.export.all.help= -tutti.validateCruise.navigation.action.export.help= -tutti.validateCruise.navigation.action.export.operation.help= -tutti.validateCruise.navigation.action.refresh.all.help= -tuttihelp.config.help= -tuttihelp.editAccidentalBatch.help= -tuttihelp.editIndividualObservationBatch.help= -tuttihelp.editMarineLitterBatch.help= -tuttihelp.editPlanktonBatch.help= +tutti.validateCruise.navigation.action.export.all.help=validateCruise.html#actions +tutti.validateCruise.navigation.action.export.help=validateCruise.html#actions +tutti.validateCruise.navigation.action.export.operation.help=validateCruise.html#actions +tutti.validateCruise.navigation.action.refresh.all.help=validateCruise.html#actions \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.css 2013-05-23 13:18:33 UTC (rev 995) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.css 2013-05-23 14:12:16 UTC (rev 996) @@ -245,4 +245,13 @@ i18nMnemonic: "tutti.editBenthosBatch.action.createBatch.mnemonic"; enabled: {model.isCreateBatchEnabled()}; _help: {"tutti.editBenthosBatch.action.createBatch.help"}; +} + +#editFrequenciesMenu { + actionIcon: show-frequency; + text: "tutti.editBenthosBatch.action.editFrequencies"; + toolTipText: "tutti.editBenthosBatch.action.editFrequencies.tip"; + i18nMnemonic: "tutti.editBenthosBatch.action.editFrequencies.mnemonic"; + enabled: {model.isTableViewModeAll() && model.isEditFrequenciesEnabled()}; + _help: {"tutti.editBenthosBatch.action.editFrequencies.help"}; } \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.jaxx 2013-05-23 13:18:33 UTC (rev 995) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.jaxx 2013-05-23 14:12:16 UTC (rev 996) @@ -81,6 +81,8 @@ <JMenuItem id='removeBenthosSubBatchMenu'/> <JMenuItem id='renameBenthosBatchMenu'/> <JMenuItem id='createBenthosMelagMenu'/> + <JMenuItem id='editFrequenciesMenu' + onActionPerformed='handler.editFrequencies()'/> </JPopupMenu> <Table id='form' fill='both' constraints='BorderLayout.NORTH'> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java 2013-05-23 13:18:33 UTC (rev 995) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java 2013-05-23 14:12:16 UTC (rev 996) @@ -54,6 +54,8 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.split.SplitBenthosBatchRowModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.split.SplitBenthosBatchUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.split.SplitBenthosBatchUIModel; +import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchTableModel; +import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyCellComponent; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import fr.ifremer.tutti.ui.swing.util.TuttiUI; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; @@ -77,6 +79,7 @@ import org.jdesktop.swingx.decorator.HighlightPredicate; import org.jdesktop.swingx.decorator.Highlighter; import org.jdesktop.swingx.table.DefaultTableColumnModelExt; +import org.jdesktop.swingx.table.TableColumnModelExt; import org.nuiton.util.decorator.Decorator; import org.nuiton.validator.NuitonValidatorResult; @@ -720,6 +723,24 @@ recomputeBatchActionEnable(); } + public void editFrequencies() { + + JXTable table = getTable(); + + int rowIndex = table.getSelectedRow(); + + TableColumnModelExt columnModel = (TableColumnModelExt) getTable().getColumnModel(); + + int columnIndex = columnModel.getColumnIndex(BenthosBatchTableModel.COMPUTED_NUMBER); + + AbstractSelectTableAction.doSelectCell(getTable(), rowIndex, columnIndex); + + BenthosFrequencyCellComponent.FrequencyCellEditor cellEditor = + (BenthosFrequencyCellComponent.FrequencyCellEditor) + columnModel.getColumnExt(columnIndex).getCellEditor(); + cellEditor.startEdit(); + } + public void splitBatch() { JXTable table = getTable(); @@ -929,11 +950,13 @@ boolean enableRemove = false; boolean enableRemoveSub = false; boolean enableCreateMelag = false; + boolean enableEditFrequencies = false; if (rowIndex != -1) { // there is a selected row + //TODO If there is some sub-batch, can remove them //TODO If there is no sub-batch, can split current batch @@ -941,12 +964,18 @@ BenthosBatchRowModel row = tableModel.getEntry(rowIndex); int selectedRowCount = getTable().getSelectedRowCount(); + // can edit frequencies on a single selected leaf row + + enableSplit = true; - enableRemove = true; - enableRemoveSub = true; - enableRename = true; - enableCreateMelag = true; + // action with single selection + enableRemove = selectedRowCount == 1; + enableRemoveSub = selectedRowCount == 1; + enableRename = selectedRowCount == 1; + enableCreateMelag = selectedRowCount == 1; + enableEditFrequencies = selectedRowCount == 1; + if (enableSplit) { // can split if selected batch is a leaf @@ -957,7 +986,6 @@ int lastSamplingId = samplingOrderIds.get(samplingOrderIds.size() - 1); SampleCategoryEnum lastCategory = categoryEnumMap.get(lastSamplingId); - // can split if selected batch is a leaf enableSplit = row.isBatchLeaf() && selectedRowCount == 1 && !lastCategory.equals(row.getFinestCategory().getCategoryType()) @@ -966,24 +994,28 @@ || row.getComputedNumber() == 0); } + if (enableEditFrequencies) { + + // can edit frequencies only on a leaf + enableEditFrequencies = row.isBatchLeaf(); + } + if (enableRename) { // can rename if selected batch is a parent - enableRename = row.isBatchRoot() - && selectedRowCount == 1; + enableRename = row.isBatchRoot(); } if (enableRemove) { // can always remove the batch - enableRemove = selectedRowCount == 1; + // no more test } if (enableRemoveSub) { // can remove sub batch if selected batch is not a leaf - enableRemoveSub = !row.isBatchLeaf() - && selectedRowCount == 1; + enableRemoveSub = !row.isBatchLeaf(); } if (enableCreateMelag) { @@ -1017,6 +1049,7 @@ model.setRemoveSubBatchEnabled(enableRemoveSub); model.setRenameBatchEnabled(enableRename); model.setCreateMelagEnabled(enableCreateMelag); + model.setEditFrequenciesEnabled(enableEditFrequencies); } public void collectChildren(BenthosBatchRowModel row, Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIModel.java 2013-05-23 13:18:33 UTC (rev 995) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIModel.java 2013-05-23 14:12:16 UTC (rev 996) @@ -59,6 +59,8 @@ public static final String PROPERTY_CREATE_MELAG_ENABLED = "createMelagEnabled"; + public static final String PROPERTY_EDIT_FREQUENCIES_ENABLED = "editFrequenciesEnabled"; + public static final String PROPERTY_TABLE_VIEW_MODE_ALL = "tableViewModeAll"; public static final String PROPERTY_TABLE_VIEW_MODE_LEAF = "tableViewModeLeaf"; @@ -112,6 +114,13 @@ protected boolean renameBatchEnabled; /** + * Can user edit frequencies for the selected species? + * + * @since 2.3 + */ + private boolean editFrequenciesEnabled; + + /** * What to show in the table. * * @since 0.3 @@ -290,9 +299,8 @@ } public void setCreateBatchEnabled(boolean createBatchEnabled) { - Object oldValue = isCreateBatchEnabled(); this.createBatchEnabled = createBatchEnabled; - firePropertyChange(PROPERTY_CREATE_BATCH_ENABLED, oldValue, createBatchEnabled); + firePropertyChange(PROPERTY_CREATE_BATCH_ENABLED, null, createBatchEnabled); } public boolean isSplitBatchEnabled() { @@ -300,9 +308,8 @@ } public void setSplitBatchEnabled(boolean splitBatchEnabled) { - Object oldValue = isSplitBatchEnabled(); this.splitBatchEnabled = splitBatchEnabled; - firePropertyChange(PROPERTY_SPLIT_BATCH_ENABLED, oldValue, splitBatchEnabled); + firePropertyChange(PROPERTY_SPLIT_BATCH_ENABLED, null, splitBatchEnabled); } public boolean isRemoveBatchEnabled() { @@ -310,9 +317,8 @@ } public void setRemoveBatchEnabled(boolean removeBatchEnabled) { - Object oldValue = isRemoveBatchEnabled(); this.removeBatchEnabled = removeBatchEnabled; - firePropertyChange(PROPERTY_REMOVE_BATCH_ENABLED, oldValue, removeBatchEnabled); + firePropertyChange(PROPERTY_REMOVE_BATCH_ENABLED, null, removeBatchEnabled); } public boolean isRemoveSubBatchEnabled() { @@ -320,29 +326,34 @@ } public void setRemoveSubBatchEnabled(boolean removeSubBatchEnabled) { - Object oldValue = isRemoveSubBatchEnabled(); this.removeSubBatchEnabled = removeSubBatchEnabled; - firePropertyChange(PROPERTY_REMOVE_SUB_BATCH_ENABLED, oldValue, removeSubBatchEnabled); + firePropertyChange(PROPERTY_REMOVE_SUB_BATCH_ENABLED, null, removeSubBatchEnabled); } + public boolean isRenameBatchEnabled() { + return renameBatchEnabled; + } + public void setRenameBatchEnabled(boolean renameBatchEnabled) { - Object oldValue = isRenameBatchEnabled(); this.renameBatchEnabled = renameBatchEnabled; - firePropertyChange(PROPERTY_RENAME_BATCH_ENABLED, oldValue, renameBatchEnabled); + firePropertyChange(PROPERTY_RENAME_BATCH_ENABLED, null, renameBatchEnabled); } - public boolean isRenameBatchEnabled() { - return renameBatchEnabled; - } - public boolean isCreateMelagEnabled() { return createMelagEnabled; } public void setCreateMelagEnabled(boolean createMelagEnabled) { - Object oldValue = isCreateMelagEnabled(); this.createMelagEnabled = createMelagEnabled; - firePropertyChange(PROPERTY_CREATE_MELAG_ENABLED, oldValue, createMelagEnabled); + firePropertyChange(PROPERTY_CREATE_MELAG_ENABLED, null, createMelagEnabled); } + public boolean isEditFrequenciesEnabled() { + return editFrequenciesEnabled; + } + + public void setEditFrequenciesEnabled(boolean editFrequenciesEnabled) { + this.editFrequenciesEnabled = editFrequenciesEnabled; + firePropertyChange(PROPERTY_EDIT_FREQUENCIES_ENABLED, null, editFrequenciesEnabled); + } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java 2013-05-23 13:18:33 UTC (rev 995) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java 2013-05-23 14:12:16 UTC (rev 996) @@ -146,7 +146,7 @@ }); } - protected void startEdit() { + public void startEdit() { Preconditions.checkNotNull(tableModel, "No table model assigned."); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.css 2013-05-23 13:18:33 UTC (rev 995) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.css 2013-05-23 14:12:16 UTC (rev 996) @@ -255,3 +255,12 @@ enabled: {model.isCreateBatchEnabled()}; _help: {"tutti.editSpeciesBatch.action.createBatch.help"}; } + +#editFrequenciesMenu { + actionIcon: show-frequency; + text: "tutti.editSpeciesBatch.action.editFrequencies"; + toolTipText: "tutti.editSpeciesBatch.action.editFrequencies.tip"; + i18nMnemonic: "tutti.editSpeciesBatch.action.editFrequencies.mnemonic"; + enabled: {model.isTableViewModeAll() && model.isEditFrequenciesEnabled()}; + _help: {"tutti.editSpeciesBatch.action.editFrequencies.help"}; +} \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx 2013-05-23 13:18:33 UTC (rev 995) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx 2013-05-23 14:12:16 UTC (rev 996) @@ -82,6 +82,8 @@ <JMenuItem id='removeSpeciesSubBatchMenu'/> <JMenuItem id='renameSpeciesBatchMenu'/> <JMenuItem id='createSpeciesMelagMenu'/> + <JMenuItem id='editFrequenciesMenu' + onActionPerformed='handler.editFrequencies()'/> </JPopupMenu> <Table id='form' fill='both' constraints='BorderLayout.NORTH'> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-05-23 13:18:33 UTC (rev 995) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-05-23 14:12:16 UTC (rev 996) @@ -75,6 +75,7 @@ import org.jdesktop.swingx.decorator.HighlightPredicate; import org.jdesktop.swingx.decorator.Highlighter; import org.jdesktop.swingx.table.DefaultTableColumnModelExt; +import org.jdesktop.swingx.table.TableColumnModelExt; import org.nuiton.util.decorator.Decorator; import org.nuiton.validator.NuitonValidatorResult; @@ -728,6 +729,24 @@ recomputeBatchActionEnable(); } + public void editFrequencies() { + + JXTable table = getTable(); + + int rowIndex = table.getSelectedRow(); + + TableColumnModelExt columnModel = (TableColumnModelExt) getTable().getColumnModel(); + + int columnIndex = columnModel.getColumnIndex(SpeciesBatchTableModel.COMPUTED_NUMBER); + + AbstractSelectTableAction.doSelectCell(getTable(), rowIndex, columnIndex); + + SpeciesFrequencyCellComponent.FrequencyCellEditor cellEditor = + (SpeciesFrequencyCellComponent.FrequencyCellEditor) + columnModel.getColumnExt(columnIndex).getCellEditor(); + cellEditor.startEdit(); + } + public void splitBatch() { JXTable table = getTable(); @@ -933,11 +952,13 @@ boolean enableRemove = false; boolean enableRemoveSub = false; boolean enableCreateMelag = false; + boolean enableEditFrequencies = false; if (rowIndex != -1) { // there is a selected row + //TODO If there is some sub-batch, can remove them //TODO If there is no sub-batch, can split current batch @@ -945,12 +966,18 @@ SpeciesBatchRowModel row = tableModel.getEntry(rowIndex); int selectedRowCount = getTable().getSelectedRowCount(); + // can edit frequencies on a single selected leaf row + + enableSplit = true; - enableRemove = true; - enableRemoveSub = true; - enableRename = true; - enableCreateMelag = true; + // action with single selection + enableRemove = selectedRowCount == 1; + enableRemoveSub = selectedRowCount == 1; + enableRename = selectedRowCount == 1; + enableCreateMelag = selectedRowCount == 1; + enableEditFrequencies = selectedRowCount == 1; + if (enableSplit) { // can split if selected batch is a leaf @@ -969,24 +996,28 @@ || row.getComputedNumber() == 0); } + if (enableEditFrequencies) { + + // can edit frequencies only on a leaf + enableEditFrequencies = row.isBatchLeaf(); + } + if (enableRename) { // can rename if selected batch is a parent - enableRename = row.isBatchRoot() - && selectedRowCount == 1; + enableRename = row.isBatchRoot(); } if (enableRemove) { // can always remove the batch - enableRemove = selectedRowCount == 1; + // no more test } if (enableRemoveSub) { // can remove sub batch if selected batch is not a leaf - enableRemoveSub = !row.isBatchLeaf() - && selectedRowCount == 1; + enableRemoveSub = !row.isBatchLeaf(); } if (enableCreateMelag) { @@ -1018,8 +1049,9 @@ model.setSplitBatchEnabled(enableSplit); model.setRemoveBatchEnabled(enableRemove); model.setRemoveSubBatchEnabled(enableRemoveSub); - model.setRenameSpeciesBatchEnabled(enableRename); - model.setCreateSpeciesMelagEnabled(enableCreateMelag); + model.setRenameBatchEnabled(enableRename); + model.setCreateMelagEnabled(enableCreateMelag); + model.setEditFrequenciesEnabled(enableEditFrequencies); } public void collectChildren(SpeciesBatchRowModel row, Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIModel.java 2013-05-23 13:18:33 UTC (rev 995) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIModel.java 2013-05-23 14:12:16 UTC (rev 996) @@ -57,6 +57,8 @@ public static final String PROPERTY_CREATE_MELAG_ENABLED = "createMelagEnabled"; + public static final String PROPERTY_EDIT_FREQUENCIES_ENABLED = "editFrequenciesEnabled"; + public static final String PROPERTY_TABLE_VIEW_MODE = "tableViewMode"; public static final String PROPERTY_TABLE_VIEW_MODE_ALL = "tableViewModeAll"; @@ -112,6 +114,13 @@ protected boolean renameBatchEnabled; /** + * Can user edit frequencies for the selected species? + * + * @since 2.3 + */ + private boolean editFrequenciesEnabled; + + /** * What to show in the table. * * @since 0.3 @@ -272,9 +281,8 @@ } public void setCreateBatchEnabled(boolean createBatchEnabled) { - Object oldValue = isCreateBatchEnabled(); this.createBatchEnabled = createBatchEnabled; - firePropertyChange(PROPERTY_CREATE_BATCH_ENABLED, oldValue, createBatchEnabled); + firePropertyChange(PROPERTY_CREATE_BATCH_ENABLED, null, createBatchEnabled); } public boolean isSplitBatchEnabled() { @@ -282,9 +290,8 @@ } public void setSplitBatchEnabled(boolean splitBatchEnabled) { - Object oldValue = isSplitBatchEnabled(); this.splitBatchEnabled = splitBatchEnabled; - firePropertyChange(PROPERTY_SPLIT_BATCH_ENABLED, oldValue, splitBatchEnabled); + firePropertyChange(PROPERTY_SPLIT_BATCH_ENABLED, null, splitBatchEnabled); } public boolean isRemoveBatchEnabled() { @@ -292,9 +299,8 @@ } public void setRemoveBatchEnabled(boolean removeBatchEnabled) { - Object oldValue = isRemoveBatchEnabled(); this.removeBatchEnabled = removeBatchEnabled; - firePropertyChange(PROPERTY_REMOVE_BATCH_ENABLED, oldValue, removeBatchEnabled); + firePropertyChange(PROPERTY_REMOVE_BATCH_ENABLED, null, removeBatchEnabled); } public boolean isRemoveSubBatchEnabled() { @@ -302,33 +308,39 @@ } public void setRemoveSubBatchEnabled(boolean removeSubBatchEnabled) { - Object oldValue = isRemoveSubBatchEnabled(); this.removeSubBatchEnabled = removeSubBatchEnabled; - firePropertyChange(PROPERTY_REMOVE_SUB_BATCH_ENABLED, oldValue, removeSubBatchEnabled); + firePropertyChange(PROPERTY_REMOVE_SUB_BATCH_ENABLED, null, removeSubBatchEnabled); } - public void setRenameSpeciesBatchEnabled(boolean renameBatchEnabled) { - Object oldValue = isRenameBatchEnabled(); - this.renameBatchEnabled = renameBatchEnabled; - firePropertyChange(PROPERTY_RENAME_BATCH_ENABLED, oldValue, renameBatchEnabled); - } - public boolean isRenameBatchEnabled() { return renameBatchEnabled; } + public void setRenameBatchEnabled(boolean renameBatchEnabled) { + this.renameBatchEnabled = renameBatchEnabled; + firePropertyChange(PROPERTY_RENAME_BATCH_ENABLED, null, renameBatchEnabled); + } + public boolean isCreateMelagEnabled() { return createMelagEnabled; } - public void setCreateSpeciesMelagEnabled(boolean createMelagEnabled) { - Object oldValue = isCreateMelagEnabled(); + public void setCreateMelagEnabled(boolean createMelagEnabled) { this.createMelagEnabled = createMelagEnabled; - firePropertyChange(PROPERTY_CREATE_MELAG_ENABLED, oldValue, createMelagEnabled); + firePropertyChange(PROPERTY_CREATE_MELAG_ENABLED, null, createMelagEnabled); } + public boolean isEditFrequenciesEnabled() { + return editFrequenciesEnabled; + } + + public void setEditFrequenciesEnabled(boolean editFrequenciesEnabled) { + this.editFrequenciesEnabled = editFrequenciesEnabled; + firePropertyChange(PROPERTY_EDIT_FREQUENCIES_ENABLED, null, editFrequenciesEnabled); + } + //------------------------------------------------------------------------// - //-- TabContentModel --// + //-- TabContentModel --// //------------------------------------------------------------------------// @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java 2013-05-23 13:18:33 UTC (rev 995) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java 2013-05-23 14:12:16 UTC (rev 996) @@ -146,7 +146,7 @@ }); } - protected void startEdit() { + public void startEdit() { Preconditions.checkNotNull(tableModel, "No table model assigned."); 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-05-23 13:18:33 UTC (rev 995) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-05-23 14:12:16 UTC (rev 996) @@ -306,6 +306,9 @@ tutti.editBenthosBatch.action.createMelag= tutti.editBenthosBatch.action.createMelag.mnemonic= tutti.editBenthosBatch.action.createMelag.tip= +tutti.editBenthosBatch.action.editFrequencies= +tutti.editBenthosBatch.action.editFrequencies.mnemonic= +tutti.editBenthosBatch.action.editFrequencies.tip= tutti.editBenthosBatch.action.exportMultiPost= tutti.editBenthosBatch.action.exportMultiPost.destinationFile.button= tutti.editBenthosBatch.action.exportMultiPost.destinationFile.title= @@ -836,6 +839,9 @@ tutti.editSpeciesBatch.action.createMelag= tutti.editSpeciesBatch.action.createMelag.mnemonic= tutti.editSpeciesBatch.action.createMelag.tip= +tutti.editSpeciesBatch.action.editFrequencies= +tutti.editSpeciesBatch.action.editFrequencies.mnemonic= +tutti.editSpeciesBatch.action.editFrequencies.tip= tutti.editSpeciesBatch.action.exportMultiPost= tutti.editSpeciesBatch.action.exportMultiPost.destinationFile.button= tutti.editSpeciesBatch.action.exportMultiPost.destinationFile.title= 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-05-23 13:18:33 UTC (rev 995) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-05-23 14:12:16 UTC (rev 996) @@ -300,6 +300,9 @@ tutti.editBenthosBatch.action.createMelag=Espèces d'un MELAG tutti.editBenthosBatch.action.createMelag.mnemonic=C tutti.editBenthosBatch.action.createMelag.tip=Calcul des poids des lots appartenant à un MELAG +tutti.editBenthosBatch.action.editFrequencies=Mensurations +tutti.editBenthosBatch.action.editFrequencies.mnemonic=M +tutti.editBenthosBatch.action.editFrequencies.tip=Éditer les mensurations tutti.editBenthosBatch.action.exportMultiPost=Exporter les lots de benthos tutti.editBenthosBatch.action.exportMultiPost.destinationFile.button=Choisir le fichier pour l'export tutti.editBenthosBatch.action.exportMultiPost.destinationFile.title=Exporter les lots du benthos @@ -807,6 +810,9 @@ tutti.editSpeciesBatch.action.createMelag=Espèces d'un MELAG tutti.editSpeciesBatch.action.createMelag.mnemonic=C tutti.editSpeciesBatch.action.createMelag.tip=Calcul des poids des lots appartenant à un MELAG +tutti.editSpeciesBatch.action.editFrequencies=Mensurations +tutti.editSpeciesBatch.action.editFrequencies.mnemonic=M +tutti.editSpeciesBatch.action.editFrequencies.tip=Éditer les mensurations tutti.editSpeciesBatch.action.exportMultiPost=Exporter les lots d'espèces tutti.editSpeciesBatch.action.exportMultiPost.destinationFile.button=Choisir le fichier pour l'export tutti.editSpeciesBatch.action.exportMultiPost.destinationFile.title=Exporter les lots d'espèces