branch develop-4.x updated (154f829 -> ef33f41)
This is an automated email from the git hooks/post-receive script. New change to branch develop-4.x in repository tutti. See http://git.codelutin.com/tutti.git from 154f829 Fixes #7819 Merge branch 'feature/7819' into develop-4.x new 61959cf Ajout d'un action dans le menu contextuel pour ajouter une nouvelle caractéristique (See #7921) new ef33f41 Fixes #7921 Merge branch 'feature/7921' into develop-4.x The 2 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 ef33f41c70f2ee4e79203846e3de0978c98520ae Merge: 154f829 61959cf Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Mar 7 08:25:30 2016 +0100 Fixes #7921 Merge branch 'feature/7921' into develop-4.x commit 61959cf9a522b7e8da6323f557ffb6e5feac1754 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Mar 7 08:25:09 2016 +0100 Ajout d'un action dans le menu contextuel pour ajouter une nouvelle caractéristique (See #7921) Summary of changes: .../ui/content/table/impl/longline/GearUseFeaturesLonglineUI.css | 6 ++++++ .../content/table/impl/longline/GearUseFeaturesLonglineUI.jaxx | 1 + .../table/impl/longline/GearUseFeaturesLonglineUIHandler.java | 9 +++++++++ .../ui/content/table/impl/seine/GearUseFeaturesSeineUI.css | 6 ++++++ .../ui/content/table/impl/seine/GearUseFeaturesSeineUI.jaxx | 1 + .../content/table/impl/seine/GearUseFeaturesSeineUIHandler.java | 9 +++++++++ .../src/main/resources/i18n/observe-swing_en_GB.properties | 4 ++++ .../src/main/resources/i18n/observe-swing_es_ES.properties | 4 ++++ .../src/main/resources/i18n/observe-swing_fr_FR.properties | 4 ++++ 9 files changed, 44 insertions(+) -- 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 develop-4.x in repository tutti. See http://git.codelutin.com/tutti.git commit 61959cf9a522b7e8da6323f557ffb6e5feac1754 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Mar 7 08:25:09 2016 +0100 Ajout d'un action dans le menu contextuel pour ajouter une nouvelle caractéristique (See #7921) --- .../ui/content/table/impl/longline/GearUseFeaturesLonglineUI.css | 6 ++++++ .../content/table/impl/longline/GearUseFeaturesLonglineUI.jaxx | 1 + .../table/impl/longline/GearUseFeaturesLonglineUIHandler.java | 9 +++++++++ .../ui/content/table/impl/seine/GearUseFeaturesSeineUI.css | 6 ++++++ .../ui/content/table/impl/seine/GearUseFeaturesSeineUI.jaxx | 1 + .../content/table/impl/seine/GearUseFeaturesSeineUIHandler.java | 9 +++++++++ .../src/main/resources/i18n/observe-swing_en_GB.properties | 4 ++++ .../src/main/resources/i18n/observe-swing_es_ES.properties | 4 ++++ .../src/main/resources/i18n/observe-swing_fr_FR.properties | 4 ++++ 9 files changed, 44 insertions(+) diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.css b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.css index 6b55ed7..b0c279e 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.css +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.css @@ -90,6 +90,12 @@ 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-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.jaxx b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.jaxx index bcd4a6d..52c47c0 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.jaxx +++ b/observe-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-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java index 5380406..41f22d0 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java @@ -361,6 +361,13 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip } + public void addMeasurement() { + + GearUseFeaturesMeasurementLonglinesTableModel tableModel = getUi().getMeasurementsTableModel(); + tableModel.addNewRow(); + + } + public void deleteSelectedMeasurement() { GearUseFeaturesMeasurementLonglinesTableModel tableModel = getUi().getMeasurementsTableModel(); @@ -569,6 +576,7 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip EditableTableModelSupport model = (EditableTableModelSupport) getTable().getModel(); + boolean canAdd = model.isValid(); boolean canDelete = !model.isSelectionEmpty(); if (canDelete) { @@ -579,6 +587,7 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip } + ui.getAddMeasurement().setEnabled(canAdd); ui.getDeleteSelectedMeasurement().setEnabled(canDelete); } diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUI.css b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUI.css index d2f186b..1214bf5 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUI.css +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUI.css @@ -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-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jaxx b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jaxx index bcac11b..8391847 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jaxx +++ b/observe-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-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java index 5fa35cc..bbcbe9c 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java @@ -359,6 +359,13 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei } + public void addMeasurement() { + + GearUseFeaturesMeasurementSeinesTableModel tableModel = getUi().getMeasurementsTableModel(); + tableModel.addNewRow(); + + } + public void deleteSelectedMeasurement() { GearUseFeaturesMeasurementSeinesTableModel tableModel = getUi().getMeasurementsTableModel(); @@ -568,6 +575,7 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei EditableTableModelSupport model = (EditableTableModelSupport) getTable().getModel(); + boolean canAdd = model.isValid(); boolean canDelete = !model.isSelectionEmpty(); if (canDelete) { @@ -578,6 +586,7 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei } + ui.getAddMeasurement().setEnabled(canAdd); ui.getDeleteSelectedMeasurement().setEnabled(canDelete); } diff --git a/observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties b/observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties index c086d7d..394d009 100644 --- a/observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties +++ b/observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties @@ -1060,6 +1060,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=measurement +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 @@ -1081,6 +1083,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-swing/src/main/resources/i18n/observe-swing_es_ES.properties b/observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties index 9722464..4c035fa 100644 --- a/observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties +++ b/observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties @@ -1060,6 +1060,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= @@ -1081,6 +1083,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-swing/src/main/resources/i18n/observe-swing_fr_FR.properties b/observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties index 6c7d853..84a822f 100644 --- a/observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties +++ b/observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties @@ -1060,6 +1060,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 @@ -1081,6 +1083,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>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop-4.x in repository tutti. See http://git.codelutin.com/tutti.git commit ef33f41c70f2ee4e79203846e3de0978c98520ae Merge: 154f829 61959cf Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Mar 7 08:25:30 2016 +0100 Fixes #7921 Merge branch 'feature/7921' into develop-4.x .../ui/content/table/impl/longline/GearUseFeaturesLonglineUI.css | 6 ++++++ .../content/table/impl/longline/GearUseFeaturesLonglineUI.jaxx | 1 + .../table/impl/longline/GearUseFeaturesLonglineUIHandler.java | 9 +++++++++ .../ui/content/table/impl/seine/GearUseFeaturesSeineUI.css | 6 ++++++ .../ui/content/table/impl/seine/GearUseFeaturesSeineUI.jaxx | 1 + .../content/table/impl/seine/GearUseFeaturesSeineUIHandler.java | 9 +++++++++ .../src/main/resources/i18n/observe-swing_en_GB.properties | 4 ++++ .../src/main/resources/i18n/observe-swing_es_ES.properties | 4 ++++ .../src/main/resources/i18n/observe-swing_fr_FR.properties | 4 ++++ 9 files changed, 44 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm