branch develop updated (ca954ab -> c0e4038)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from ca954ab fixes #6150 Merge branch 'feature/6150' into develop new c0e4038 fixes #6153: [CAPTURE] rendre plus visible le bouton pièces jointes 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 c0e4038a33ea0522311b0fb623d75764303f9f73 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Nov 25 11:15:02 2014 +0100 fixes #6153: [CAPTURE] rendre plus visible le bouton pièces jointes Summary of changes: .../swing/action/EditFishingOperationAction.java | 13 ++++++ .../content/operation/catches/EditCatchesUI.css | 1 + .../operation/catches/EditCatchesUIHandler.java | 23 ++++++++++- .../catches/accidental/AccidentalBatchUI.css | 4 ++ .../catches/accidental/AccidentalBatchUI.jaxx | 4 ++ .../accidental/AccidentalBatchUIHandler.java | 1 + .../operation/catches/benthos/BenthosBatchUI.css | 4 ++ .../operation/catches/benthos/BenthosBatchUI.jaxx | 4 ++ .../catches/benthos/BenthosBatchUIHandler.java | 47 +--------------------- .../IndividualObservationBatchUI.css | 4 ++ .../IndividualObservationBatchUI.jaxx | 4 ++ .../IndividualObservationBatchUIHandler.java | 1 + .../catches/marinelitter/MarineLitterBatchUI.css | 4 ++ .../catches/marinelitter/MarineLitterBatchUI.jaxx | 4 ++ .../marinelitter/MarineLitterBatchUIHandler.java | 2 +- .../operation/catches/species/SpeciesBatchUI.css | 4 ++ .../operation/catches/species/SpeciesBatchUI.jaxx | 4 ++ .../catches/species/SpeciesBatchUIHandler.java | 2 +- .../ui/swing/util/attachment/ButtonAttachment.java | 20 ++++++--- .../resources/i18n/tutti-ui-swing_en_GB.properties | 8 ++++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 9 ++++- 21 files changed, 111 insertions(+), 56 deletions(-) -- 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 in repository tutti. See http://git.codelutin.com/tutti.git commit c0e4038a33ea0522311b0fb623d75764303f9f73 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Nov 25 11:15:02 2014 +0100 fixes #6153: [CAPTURE] rendre plus visible le bouton pièces jointes --- .../swing/action/EditFishingOperationAction.java | 13 ++++++ .../content/operation/catches/EditCatchesUI.css | 1 + .../operation/catches/EditCatchesUIHandler.java | 23 ++++++++++- .../catches/accidental/AccidentalBatchUI.css | 4 ++ .../catches/accidental/AccidentalBatchUI.jaxx | 4 ++ .../accidental/AccidentalBatchUIHandler.java | 1 + .../operation/catches/benthos/BenthosBatchUI.css | 4 ++ .../operation/catches/benthos/BenthosBatchUI.jaxx | 4 ++ .../catches/benthos/BenthosBatchUIHandler.java | 47 +--------------------- .../IndividualObservationBatchUI.css | 4 ++ .../IndividualObservationBatchUI.jaxx | 4 ++ .../IndividualObservationBatchUIHandler.java | 1 + .../catches/marinelitter/MarineLitterBatchUI.css | 4 ++ .../catches/marinelitter/MarineLitterBatchUI.jaxx | 4 ++ .../marinelitter/MarineLitterBatchUIHandler.java | 2 +- .../operation/catches/species/SpeciesBatchUI.css | 4 ++ .../operation/catches/species/SpeciesBatchUI.jaxx | 4 ++ .../catches/species/SpeciesBatchUIHandler.java | 2 +- .../ui/swing/util/attachment/ButtonAttachment.java | 20 ++++++--- .../resources/i18n/tutti-ui-swing_en_GB.properties | 8 ++++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 9 ++++- 21 files changed, 111 insertions(+), 56 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditFishingOperationAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditFishingOperationAction.java index c4614b3..791e052 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditFishingOperationAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditFishingOperationAction.java @@ -355,6 +355,14 @@ public class EditFishingOperationAction extends AbstractTuttiAction<FishingOpera } } + if (canContinue) { + + // always close attachments + FishingOperationsUI ui = getUI(); + ui.getCatchesTabContent().getHandler().closeAttachments(); + ui.getFishingOperationTabContent().getFishingOperationAttachmentsButton().onCloseUI(); + } + return canContinue; } @@ -386,6 +394,11 @@ public class EditFishingOperationAction extends AbstractTuttiAction<FishingOpera // nothing to display + // close fishing operation ui + ui.getFishingOperationTabContent().getHandler().onCloseUI(); + // close catch ui + ui.getCatchesTabContent().getHandler().onCloseUI(); + ui.remove(form); // just display <no trait!> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css index 8a9d97b..098681d 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css @@ -48,6 +48,7 @@ ComputableDataEditor { #catchesCaracteristicsAttachmentsButton { enabled: {model.getObjectId() != null}; + toolTipText: "tutti.editCatchBatch.action.attachments.tip"; } #catchesCaracteristicsTabPane { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java index 33d2073..93ef048 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java @@ -48,7 +48,10 @@ import javax.swing.JLabel; import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JTabbedPane; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; import java.awt.Color; +import java.awt.Component; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.Set; @@ -162,6 +165,22 @@ public class EditCatchesUIHandler extends AbstractTuttiTabContainerUIHandler<Edi setCustomTab(5, ui.getAccidentalTabContent().getModel()); getTabPanel().setSelectedIndex(1); + // when internal tab change, close any attachments popup + getTabPanel().addChangeListener(new ChangeListener() { + @Override + public void stateChanged(ChangeEvent e) { + closeAttachments(); + } + }); + } + + public void closeAttachments() { + ui.getCatchesCaracteristicsAttachmentsButton().onCloseUI(); + ui.getSpeciesTabContent().getSpeciesBatchAttachmentsButton().onCloseUI(); + ui.getBenthosTabContent().getBenthosBatchAttachmentsButton().onCloseUI(); + ui.getMarineLitterTabContent().getMarineLitterBatchAttachmentsButton().onCloseUI(); + ui.getIndividualObservationTabContent().getIndividualObservationBatchAttachmentsButton().onCloseUI(); + ui.getAccidentalTabContent().getAccidentalBatchAttachmentsButton().onCloseUI(); } @Override @@ -190,6 +209,7 @@ public class EditCatchesUIHandler extends AbstractTuttiTabContainerUIHandler<Edi closeUI(ui.getBenthosTabContent()); closeUI(ui.getMarineLitterTabContent()); closeUI(ui.getAccidentalTabContent()); + closeUI(ui.getIndividualObservationTabContent()); } @Override @@ -239,7 +259,8 @@ public class EditCatchesUIHandler extends AbstractTuttiTabContainerUIHandler<Edi @Override public boolean onHideTab(int currentIndex, int newIndex) { - ui.getCatchesCaracteristicsAttachmentsButton().onCloseUI(); + closeAttachments(); + //FIXME 20130203 kmorin: cannot change tab if model is modified // (I do not even know why it is set to modified and have no time // before the demo) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.css index 0e6bbe8..2154d36 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.css @@ -37,6 +37,10 @@ NumberEditor { borderPainted: false; } +#accidentalBatchAttachmentsButton { + toolTipText: "tutti.editAccidentalBatch.action.attachments.tip"; +} + #tablePopup { label: "tutti.editAccidentalBatch.title.batchActions"; } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.jaxx index e23647e..c45ffb4 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.jaxx @@ -25,8 +25,10 @@ <import> fr.ifremer.tutti.ui.swing.TuttiHelpBroker + fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIModel fr.ifremer.tutti.ui.swing.util.TuttiUI fr.ifremer.tutti.ui.swing.util.TuttiUIUtil + fr.ifremer.tutti.ui.swing.util.attachment.ButtonAttachment org.jdesktop.swingx.JXTable @@ -57,6 +59,8 @@ public AccidentalBatchUI(TuttiUI<?,?> parentUI) { <JToolBar id='accidentalBatchTabToolBar'> <JButton id='importMultiPostButton'/> <JButton id='exportMultiPostButton'/> + <ButtonAttachment id='accidentalBatchAttachmentsButton' + constructorParams='handler.getContext(), getContextValue(EditCatchesUIModel.class)'/> </JToolBar> <JPopupMenu id='tablePopup'> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java index f9bbd9c..de8dc38 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java @@ -354,6 +354,7 @@ public class AccidentalBatchUIHandler if (log.isDebugEnabled()) { log.debug("closing: " + ui); } + ui.getAccidentalBatchAttachmentsButton().onCloseUI(); } @Override diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.css index beb6d52..5d44d45 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.css @@ -47,6 +47,10 @@ ComputableDataEditor { borderPainted: false; } +#benthosBatchAttachmentsButton { + toolTipText: "tutti.editBenthosBatch.action.attachments.tip"; +} + #benthosTotalWeightLabel { text: "tutti.editBenthosBatch.field.benthosTotalWeight"; toolTipText: "tutti.editBenthosBatch.field.benthosTotalWeight.tip"; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.jaxx index d0d4e59..2a398f4 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.jaxx @@ -25,10 +25,12 @@ <import><
codelutin.com scm