This is an automated email from the git hooks/post-receive script. New change to branch feature/7921-BoutonDAjoutDansLesTableaux in repository tutti. See http://git.codelutin.com/tutti.git at 984a8fd Ajout d'un action dans le menu contextuel pour ajouter une nouvelle caractéristique (See #7921) 5.0 This branch includes the following new commits: new 984a8fd Ajout d'un action dans le menu contextuel pour ajouter une nouvelle caractéristique (See #7921) 5.0 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 984a8fd2f32cc1c59d93eac2b3457edff2be1e1b Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Mar 14 10:08:26 2016 +0100 Ajout d'un action dans le menu contextuel pour ajouter une nouvelle caractéristique (See #7921) 5.0 -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7921-BoutonDAjoutDansLesTableaux in repository tutti. See http://git.codelutin.com/tutti.git commit 984a8fd2f32cc1c59d93eac2b3457edff2be1e1b Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Mar 14 10:08:26 2016 +0100 Ajout d'un action dans le menu contextuel pour ajouter une nouvelle caractéristique (See #7921) 5.0 --- .../content/table/impl/longline/GearUseFeaturesLonglineUI.jaxx | 1 + .../content/table/impl/longline/GearUseFeaturesLonglineUI.jcss | 8 ++++++++ .../table/impl/longline/GearUseFeaturesLonglineUIHandler.java | 9 +++++++++ .../ui/content/table/impl/seine/GearUseFeaturesSeineUI.jaxx | 1 + .../ui/content/table/impl/seine/GearUseFeaturesSeineUI.jcss | 6 ++++++ .../content/table/impl/seine/GearUseFeaturesSeineUIHandler.java | 9 +++++++++ .../resources/i18n/observe-application-swing_en_GB.properties | 4 ++++ .../resources/i18n/observe-application-swing_es_ES.properties | 4 ++++ .../resources/i18n/observe-application-swing_fr_FR.properties | 4 ++++ 9 files changed, 46 insertions(+) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.jaxx index 9c9aa84..3e9d395 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.jaxx @@ -79,6 +79,7 @@ context='n1-update'/> <JPopupMenu id='measurementsTablePopup'> + <JMenuItem id='addMeasurement' onActionPerformed='getHandler().addMeasurement()'/> <JMenuItem id='deleteSelectedMeasurement' onActionPerformed='getHandler().deleteSelectedMeasurement()'/> </JPopupMenu> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.jcss b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.jcss index 61d6700..8843217 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.jcss +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.jcss @@ -90,6 +90,14 @@ text:{getStringValue(tableEditBean.getComment())}; } +#addMeasurement { + text: "observe.gearUseFeaturesLongline.action.addMeasurement"; + toolTipText: "observe.gearUseFeaturesLongline.action.addMeasurement.tip"; + actionIcon: add; +} + + + #deleteSelectedMeasurement { text: "observe.gearUseFeaturesLongline.action.deleteSelectedMeasurement"; toolTipText: "observe.gearUseFeaturesLongline.action.deleteSelectedMeasurement.tip"; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java index f356733..56d72b2 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java @@ -173,6 +173,13 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip } + public void addMeasurement() { + + GearUseFeaturesMeasurementLonglinesTableModel tableModel = getUi().getMeasurementsTableModel(); + tableModel.addNewRow(); + + } + public void deleteSelectedMeasurement() { GearUseFeaturesMeasurementLonglinesTableModel tableModel = getUi().getMeasurementsTableModel(); @@ -542,6 +549,7 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip EditableTableModelSupport model = (EditableTableModelSupport) getTable().getModel(); + boolean canAdd = model.isValid(); boolean canDelete = !model.isSelectionEmpty(); if (canDelete) { @@ -552,6 +560,7 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip } + ui.getAddMeasurement().setEnabled(canAdd); ui.getDeleteSelectedMeasurement().setEnabled(canDelete); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jaxx index c5831d7..a9ea4b4 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jaxx @@ -79,6 +79,7 @@ context='n1-update'/> <JPopupMenu id='measurementsTablePopup'> + <JMenuItem id='addMeasurement' onActionPerformed='getHandler().addMeasurement()'/> <JMenuItem id='deleteSelectedMeasurement' onActionPerformed='getHandler().deleteSelectedMeasurement()'/> </JPopupMenu> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jcss b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jcss index 355ef0f..ce7cf6e 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jcss +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jcss @@ -90,6 +90,12 @@ text:{getStringValue(tableEditBean.getComment())}; } +#addMeasurement { + text: "observe.gearUseFeaturesSeine.action.addMeasurement"; + toolTipText: "observe.gearUseFeaturesSeine.action.addMeasurement.tip"; + actionIcon: add; +} + #deleteSelectedMeasurement { text: "observe.gearUseFeaturesSeine.action.deleteSelectedMeasurement"; toolTipText: "observe.gearUseFeaturesSeine.action.deleteSelectedMeasurement.tip"; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java index d086641..20cc3b6 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java @@ -171,6 +171,13 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei } + public void addMeasurement() { + + GearUseFeaturesMeasurementSeinesTableModel tableModel = getUi().getMeasurementsTableModel(); + tableModel.addNewRow(); + + } + public void deleteSelectedMeasurement() { GearUseFeaturesMeasurementSeinesTableModel tableModel = getUi().getMeasurementsTableModel(); @@ -540,6 +547,7 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei EditableTableModelSupport model = (EditableTableModelSupport) getTable().getModel(); + boolean canAdd = model.isValid(); boolean canDelete = !model.isSelectionEmpty(); if (canDelete) { @@ -550,6 +558,7 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei } + ui.getAddMeasurement().setEnabled(canAdd); ui.getDeleteSelectedMeasurement().setEnabled(canDelete); } diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties index 2cace96..10742f3 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties @@ -1198,6 +1198,8 @@ observe.gear.selectedGearCaracteristic=Selected caracteristics observe.gear.tab.gearCaracteristic=Caracteristics of the gear observe.gear.tab.general=General caracteristics observe.gear.unit=Unit +observe.gearUseFeaturesLongline.action.addMeasurement=Add +observe.gearUseFeaturesLongline.action.addMeasurement.tip=Add a new measurement observe.gearUseFeaturesLongline.action.deleteSelectedMeasurement=Delete selected measurement observe.gearUseFeaturesLongline.action.deleteSelectedMeasurement.tip=Delete selected measurement observe.gearUseFeaturesLongline.comment=Comment @@ -1219,6 +1221,8 @@ observe.gearUseFeaturesLongline.table.value=Value observe.gearUseFeaturesLongline.table.value.tip=Caracteristic value observe.gearUseFeaturesLongline.title=Gears observe.gearUseFeaturesLongline.usedInTrip=Used in trip +observe.gearUseFeaturesSeine.action.addMeasurement=Add +observe.gearUseFeaturesSeine.action.addMeasurement.tip=Add a new measurement observe.gearUseFeaturesSeine.action.deleteSelectedMeasurement=Delete selected measurement observe.gearUseFeaturesSeine.action.deleteSelectedMeasurement.tip=Delete selected measurement observe.gearUseFeaturesSeine.comment=Comment diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties index ca509f4..b5c935e 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties @@ -1198,6 +1198,8 @@ observe.gear.selectedGearCaracteristic= observe.gear.tab.gearCaracteristic= observe.gear.tab.general= observe.gear.unit= +observe.gearUseFeaturesLongline.action.addMeasurement= +observe.gearUseFeaturesLongline.action.addMeasurement.tip= observe.gearUseFeaturesLongline.action.deleteSelectedMeasurement= observe.gearUseFeaturesLongline.action.deleteSelectedMeasurement.tip= observe.gearUseFeaturesLongline.comment= @@ -1219,6 +1221,8 @@ observe.gearUseFeaturesLongline.table.value= observe.gearUseFeaturesLongline.table.value.tip= observe.gearUseFeaturesLongline.title= observe.gearUseFeaturesLongline.usedInTrip= +observe.gearUseFeaturesSeine.action.addMeasurement= +observe.gearUseFeaturesSeine.action.addMeasurement.tip= observe.gearUseFeaturesSeine.action.deleteSelectedMeasurement= observe.gearUseFeaturesSeine.action.deleteSelectedMeasurement.tip= observe.gearUseFeaturesSeine.comment= diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties index 225acae..19d5507 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties @@ -1192,6 +1192,8 @@ observe.gear.selectedGearCaracteristic=Caractéristiques utilisées observe.gear.tab.gearCaracteristic=Caractéristiques de l'équipement observe.gear.tab.general=Caractéristiques générales observe.gear.unit=Unité +observe.gearUseFeaturesLongline.action.addMeasurement=Ajouter +observe.gearUseFeaturesLongline.action.addMeasurement.tip=Ajouter une nouvelle caractéristique observe.gearUseFeaturesLongline.action.deleteSelectedMeasurement=Supprimer observe.gearUseFeaturesLongline.action.deleteSelectedMeasurement.tip=Supprimer la caractéristique observe.gearUseFeaturesLongline.comment=Commentaire @@ -1213,6 +1215,8 @@ observe.gearUseFeaturesLongline.table.value=Valeur observe.gearUseFeaturesLongline.table.value.tip=Valeur observe.gearUseFeaturesLongline.title=Équipements observe.gearUseFeaturesLongline.usedInTrip=Utilisé dans la marée +observe.gearUseFeaturesSeine.action.addMeasurement=Ajouter +observe.gearUseFeaturesSeine.action.addMeasurement.tip=Ajouter une nouvelle caractéristique observe.gearUseFeaturesSeine.action.deleteSelectedMeasurement=Supprimer observe.gearUseFeaturesSeine.action.deleteSelectedMeasurement.tip=Supprimer la caractéristique observe.gearUseFeaturesSeine.comment=Commentaire -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm