This is an automated email from the git hooks/post-receive script. New commit to branch feature/7930 in repository tutti. See http://git.codelutin.com/tutti.git commit d81f2e5c117cd83da99453e21f58ad26f16ce2df Author: Kevin Morin <morin@codelutin.com> Date: Thu Feb 11 11:27:07 2016 +0100 ajout des libellés des menus refs #7930 --- .../CalcifiedPiecesSamplingEditorUI.jcss | 10 ++++++++-- .../actions/DeleteSpeciesAction.java | 2 ++ .../main/resources/i18n/tutti-ui-swing_en_GB.properties | 6 ++++++ .../main/resources/i18n/tutti-ui-swing_fr_FR.properties | 16 +++++++++++----- .../src/main/resources/icons/action-delete2.png | Bin 0 -> 715 bytes 5 files changed, 27 insertions(+), 7 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/CalcifiedPiecesSamplingEditorUI.jcss b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/CalcifiedPiecesSamplingEditorUI.jcss index f3362f5..8d915a6 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/CalcifiedPiecesSamplingEditorUI.jcss +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/CalcifiedPiecesSamplingEditorUI.jcss @@ -22,16 +22,22 @@ BeanFilterableComboBox { #splitCpsRowMenu { actionIcon: add; + text: "tutti.editCps.splitRow"; + toolTipText: "tutti.editCps.splitRow.tip"; _simpleAction: {fr.ifremer.tutti.ui.swing.content.protocol.calcifiedpiecessampling.actions.SplitSpeciesAction.class}; } #deleteCpsRowMenu { - actionIcon: delete; + actionIcon: delete2; + text: "tutti.editCps.deleteRow"; + toolTipText: "tutti.editCps.deleteRow.tip"; _simpleAction: {fr.ifremer.tutti.ui.swing.content.protocol.calcifiedpiecessampling.actions.DeleteRowAction.class}; } #deleteSpeciesMenu { - actionIcon: delete; + actionIcon: delete2; + text: "tutti.editCps.deleteSpecies"; + toolTipText: "tutti.editCps.deleteSpecies.tip"; _simpleAction: {fr.ifremer.tutti.ui.swing.content.protocol.calcifiedpiecessampling.actions.DeleteSpeciesAction.class}; } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/actions/DeleteSpeciesAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/actions/DeleteSpeciesAction.java index 697de30..58a73aa 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/actions/DeleteSpeciesAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/actions/DeleteSpeciesAction.java @@ -63,6 +63,8 @@ public class DeleteSpeciesAction extends SimpleActionSupport<CalcifiedPiecesSamp cspRows.removeAll(rowsToDelete); tableModel.fireTableRowsDeleted(indexesToDelete.first(), indexesToDelete.last()); + + ui.getSpeciesComboBox().addItem(speciesToDelete); } } diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties index 2222078..288a20c 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties @@ -725,13 +725,19 @@ tutti.editCatchBatch.legend.marineLitter= tutti.editCatchBatch.legend.species= tutti.editCatchBatch.legend.total= tutti.editCatchBatch.svgLoading.error= +tutti.editCps.deleteRow= tutti.editCps.deleteRow.message= +tutti.editCps.deleteRow.tip= tutti.editCps.deleteRow.title= +tutti.editCps.deleteSpecies= tutti.editCps.deleteSpecies.message= +tutti.editCps.deleteSpecies.tip= tutti.editCps.deleteSpecies.title= tutti.editCps.field.maturity= tutti.editCps.field.maturity.tip= tutti.editCps.field.species.tip= +tutti.editCps.splitRow= +tutti.editCps.splitRow.tip= tutti.editCps.table.header.maturity.field= tutti.editCps.table.header.maturity.field.tip= tutti.editCps.table.header.maxSize.field= diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties index a45267e..f955aa1 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties @@ -687,21 +687,27 @@ tutti.editCatchBatch.legend.marineLitter=Macro déchets tutti.editCatchBatch.legend.species=Espèces tutti.editCatchBatch.legend.total=Capture tutti.editCatchBatch.svgLoading.error=Erreur lors du chargement du diagramme du résumé +tutti.editCps.deleteRow=Supprimer la ligne tutti.editCps.deleteRow.message=Êtes-vous sûr de vouloir supprimer la ligne %s ? +tutti.editCps.deleteRow.tip=Supprimer la ligne sélectionnée et la fusionner avec la ligne précédente tutti.editCps.deleteRow.title=Suppression de ligne +tutti.editCps.deleteSpecies=Supprimer l'espèce tutti.editCps.deleteSpecies.message=Êtes-vous sûr de vouloir supprimer toutes les lignes pour l'espèce %s ? +tutti.editCps.deleteSpecies.tip=Supprimer toutes les lignes de l'espèce tutti.editCps.deleteSpecies.title=Suppression des lignes d'une espèce tutti.editCps.field.maturity=Maturité -tutti.editCps.field.maturity.tip= +tutti.editCps.field.maturity.tip=Prendre en compte la maturité pour l'espèce sélectionnée tutti.editCps.field.species.tip=Espèce +tutti.editCps.splitRow=Ajouter un intervalle +tutti.editCps.splitRow.tip=Ajouter un intervalle tutti.editCps.table.header.maturity.field=Maturité -tutti.editCps.table.header.maturity.field.tip= +tutti.editCps.table.header.maturity.field.tip=Maturité tutti.editCps.table.header.maxSize.field=Taille max -tutti.editCps.table.header.maxSize.field.tip= +tutti.editCps.table.header.maxSize.field.tip=Taille maximale incluse tutti.editCps.table.header.minSize.field=Taille min -tutti.editCps.table.header.minSize.field.tip= +tutti.editCps.table.header.minSize.field.tip=Taille minimale incluse tutti.editCps.table.header.species.field=Espèce -tutti.editCps.table.header.species.field.tip= +tutti.editCps.table.header.species.field.tip=Espèce tutti.editCruise.action.closeEditCruise=Fermer tutti.editCruise.action.closeEditCruise.mnemonic=F tutti.editCruise.action.closeEditCruise.tip=Fermer l'écran d'édition de campagne diff --git a/tutti-ui-swing/src/main/resources/icons/action-delete2.png b/tutti-ui-swing/src/main/resources/icons/action-delete2.png new file mode 100644 index 0000000..08f2493 Binary files /dev/null and b/tutti-ui-swing/src/main/resources/icons/action-delete2.png differ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.