This is an automated email from the git hooks/post-receive script. New commit to branch feature/8039 in repository tutti. See http://git.codelutin.com/tutti.git commit 820547cd7005ca718463fa24228cf9f67eee8005 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Mar 1 20:29:40 2016 +0100 Amélioration des états des actions sur la page d'accueil (See #8039) --- .../ui/swing/content/home/SelectCruiseUI.jcss | 6 +++- .../swing/content/home/SelectCruiseUIHandler.java | 34 ++++++++++++++++++++-- 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.jcss b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.jcss index d73a27c..1582844 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.jcss +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.jcss @@ -95,6 +95,7 @@ BeanFilterableComboBox { #editCruiseButton { actionIcon: edit; + enabled: {model.isCruiseFound()}; text: "tutti.selectCruise.action.editCruise"; _applicationAction: {fr.ifremer.tutti.ui.swing.content.home.actions.EditCruiseAction.class}; toolTipText: "tutti.selectCruise.action.editCruise.tip"; @@ -135,7 +136,7 @@ BeanFilterableComboBox { } #protocolLabel { - text: "tutti.selectCruise.field.protocol"; + text: "tutti.selectCruise.field.protocol"; labelFor: {protocolCombobox}; actionIcon: protocol; toolTipText: "tutti.selectCruise.field.protocol.tip"; @@ -151,6 +152,7 @@ BeanFilterableComboBox { } #newProtocolComboBox { + enabled: {model.isProgramFound()}; _comboboxActions: {Arrays.asList(newProtocolButton, importProtocolButton)}; } @@ -200,6 +202,7 @@ BeanFilterableComboBox { text: "tutti.selectCruise.action.exportProtocol"; _applicationAction: {fr.ifremer.tutti.ui.swing.content.home.actions.ExportProtocolAction.class}; toolTipText: "tutti.selectCruise.action.exportProtocol.tip"; + enabled: {model.isProtocolFound()}; _help: {"tutti.selectCruise.action.exportProtocol.help"}; } @@ -208,6 +211,7 @@ BeanFilterableComboBox { text: "tutti.selectCruise.action.deleteProtocol"; _applicationAction: {fr.ifremer.tutti.ui.swing.content.home.actions.DeleteProtocolAction.class}; toolTipText: "tutti.selectCruise.action.deleteProtocol.tip"; + enabled: {model.isProtocolFound()}; _help: {"tutti.selectCruise.action.deleteProtocol.help"}; } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java index 5ef7074..b80a67d 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java @@ -34,6 +34,7 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import javax.swing.JComboBox; import javax.swing.JComponent; import java.awt.Font; import java.beans.PropertyChangeListener; @@ -128,8 +129,8 @@ public class SelectCruiseUIHandler extends AbstractTuttiUIHandler<SelectCruiseUI initUI(ui); Font font = ui.getEditCatchesButton().getFont(); - ui.getEditCatchesButton().setFont(font.deriveFont(Font.BOLD,14)); - ui.getValidateCatchesButton().setFont(font.deriveFont(Font.BOLD,14)); + ui.getEditCatchesButton().setFont(font.deriveFont(Font.BOLD, 14)); + ui.getValidateCatchesButton().setFont(font.deriveFont(Font.BOLD, 14)); SelectCruiseUIModel model = getModel(); @@ -204,6 +205,35 @@ public class SelectCruiseUIHandler extends AbstractTuttiUIHandler<SelectCruiseUI model.addPropertyChangeListener(SelectCruiseUIModel.PROPERTY_PROTOCOL, evt -> { TuttiProtocol newValue = (TuttiProtocol) evt.getNewValue(); getContext().setProtocolId(newValue == null ? null : newValue.getId()); + + JComboBox editProtocolComboBox = SelectCruiseUIHandler.this.ui.getEditProtocolComboBox(); + + if (model.isProgramFound()) { + + // can edit protocol + + if (editProtocolComboBox.getItemCount() == 2) { + + editProtocolComboBox.removeAllItems(); + editProtocolComboBox.addItem(getUI().getEditProtocolButton()); + editProtocolComboBox.addItem(getUI().getCloneProtocolButton()); + editProtocolComboBox.addItem(getUI().getExportProtocolButton()); + editProtocolComboBox.addItem(getUI().getDeleteProtocolButton()); + + } + + } else { + + // can just export and delete protocol + if (editProtocolComboBox.getItemCount() == 4) { + + editProtocolComboBox.removeItem(getUI().getEditProtocolButton()); + editProtocolComboBox.removeItem(getUI().getCloneProtocolButton()); + + } + + } + }); registerValidators(getValidator()); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.