This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 21cd5b7a2a376c0c07b689461d7853f5b24f23e8 Author: Kevin Morin <morin@codelutin.com> Date: Thu Mar 16 15:08:18 2017 +0100 refs #9109 prise en compte de la conf displayHelpOnMessages dans la partie cliente --- .../ui/swing/content/demande/DemandeUIHandler.java | 40 ++++++++++------------ .../content/pdfeditor/PDFEditorUIHandler.java | 1 + .../ui/swing/util/AbstractFaxToMailUIHandler.java | 38 +++++++++++++++++--- .../i18n/faxtomail-ui-swing_fr_FR.properties | 4 +++ 4 files changed, 58 insertions(+), 25 deletions(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java index 4f21964..260698e 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java @@ -83,6 +83,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import static org.nuiton.i18n.I18n.n; import static org.nuiton.i18n.I18n.t; /** @@ -159,22 +160,6 @@ public class DemandeUIHandler extends AbstractFaxToMailUIHandler<DemandeUIModel, leftVerticalSplitPanel.setName("leftVerticalSplitPanel" + newRangePanelVisible); getContext().getSwingSession().add(leftVerticalSplitPanel, true); } - - -// if (newType != null && (oldType == null -// || !Objects.equals(FaxToMailServiceUtils.contains(oldType.getRequiredFields(), MailField.RANGE_ROW), -// FaxToMailServiceUtils.contains(newType.getRequiredFields(), MailField.RANGE_ROW)))) { -// -// if (FaxToMailServiceUtils.contains(newType.getRequiredFields(), MailField.RANGE_ROW)) { -// if (dividerLocation < 0) { -// dividerLocation = leftVerticalSplitPanel.getLeftComponent().getPreferredSize().height + 10; -// } -// leftVerticalSplitPanel.setDividerLocation(dividerLocation); -// -// } else { -// dividerLocation = leftVerticalSplitPanel.getDividerLocation(); -// } -// } } }; @@ -498,15 +483,28 @@ public class DemandeUIHandler extends AbstractFaxToMailUIHandler<DemandeUIModel, @Override public boolean quitUI() { - boolean result = quitScreen2( + MailFolder folderWithShowHelp = getModel().getMailFolder(); + while (folderWithShowHelp.getParent() != null && folderWithShowHelp.getDisplayHelpOnMessages() == null) { + folderWithShowHelp = folderWithShowHelp.getParent(); + } + boolean showHelp = Boolean.TRUE.equals(folderWithShowHelp.getDisplayHelpOnMessages()); + String askCancelEditBeforeLeavingMessage; + String askSaveBeforeLeavingMessage; + if (showHelp) { + askCancelEditBeforeLeavingMessage = n("faxtomail.demande.askCancelEditBeforeLeaving.cancelSave"); + askSaveBeforeLeavingMessage = n("faxtomail.demande.askSaveBeforeLeaving.save"); + } else { + askCancelEditBeforeLeavingMessage = n("faxtomail.demande.askCancelEditBeforeLeaving.cancelSave.noHelp"); + askSaveBeforeLeavingMessage = n("faxtomail.demande.askSaveBeforeLeaving.save.noHelp"); + } + return quitScreen2( true, getModel().isModify(), - t("faxtomail.demande.askCancelEditBeforeLeaving.cancelSave"), - t("faxtomail.demande.askSaveBeforeLeaving.save"), + t(askCancelEditBeforeLeavingMessage), + t(askSaveBeforeLeavingMessage), + showHelp, getContext().getActionFactory().createLogicAction(this, SaveDemandeAction.class) ); - - return result; } @Override diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java index 177307d..703fee7 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java @@ -272,6 +272,7 @@ public class PDFEditorUIHandler extends AbstractFaxToMailUIHandler<PDFEditorUIMo getModel().isModify(), null, t("faxtomail.pdfEditor.askSaveBeforeLeaving.save"), + true, generateAnnotatedAttachmentAction ); diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java index b69fe3a..67b9d32 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java @@ -357,20 +357,20 @@ public abstract class AbstractFaxToMailUIHandler<M, UI extends FaxToMailUI<M, ?> * @param saveAction * @return */ - protected boolean quitScreen2(boolean modelIsValid, boolean modelIsModify, String askGiveUpMessage, String askSaveMessage, - AbstractApplicationAction saveAction) { + protected boolean quitScreen2(boolean modelIsValid, boolean modelIsModify, String askGiveUpMessage, + String askSaveMessage, boolean showHelp, AbstractApplicationAction saveAction) { boolean result; if (!modelIsValid) { // model is not valid // ask user to qui or not - result = askCancelEditBeforeLeaving(askGiveUpMessage); + result = askCancelEditBeforeLeaving(askGiveUpMessage, showHelp); } else if (modelIsModify) { // something is modify ask user what to do - int answer = askSaveBeforeLeaving(askSaveMessage); + int answer = askSaveBeforeLeaving(askSaveMessage, showHelp); switch (answer) { case JOptionPane.YES_OPTION: @@ -402,6 +402,36 @@ public abstract class AbstractFaxToMailUIHandler<M, UI extends FaxToMailUI<M, ?> return result; } + public int askSaveBeforeLeaving(String message, boolean showHelp) { + int result; + if (showHelp) { + result = super.askSaveBeforeLeaving(message); + } else { + result = JOptionPane.showConfirmDialog( + getTopestUI(), + message, + t("jaxx.application.common.askSaveBeforeLeaving.title"), + JOptionPane.YES_NO_CANCEL_OPTION, + JOptionPane.QUESTION_MESSAGE); + } + return result; + } + + public boolean askCancelEditBeforeLeaving(String message, boolean showHelp) { + boolean result; + if (showHelp) { + result = super.askCancelEditBeforeLeaving(message); + } else { + result = JOptionPane.OK_OPTION == JOptionPane.showConfirmDialog( + getTopestUI(), + message, + t("jaxx.application.common.askCancelEditBeforeLeaving.title"), + JOptionPane.OK_CANCEL_OPTION, + JOptionPane.QUESTION_MESSAGE); + } + return result; + } + public void closeFrame() { JFrame frame = getParentContainer(JFrame.class); closeFrame(frame, this); diff --git a/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties b/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties index 8bb0cdc..847581e 100644 --- a/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties +++ b/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties @@ -109,7 +109,9 @@ faxtomail.demandRepliesCellRenderer.text=(%s) faxtomail.demande.archive.button.label=Archiver faxtomail.demande.archivedBy.label=Archivé par faxtomail.demande.askCancelEditBeforeLeaving.cancelSave=L'élément n'est pas valide et ne peut être sauvé. +faxtomail.demande.askCancelEditBeforeLeaving.cancelSave.noHelp=L'élément n'est pas valide et ne peut être sauvé. Les modifications ne seront pas enregistrées. faxtomail.demande.askSaveBeforeLeaving.save=Vous avez modifié l'élément mais vous n'avez pas enregistré ces modifications. +faxtomail.demande.askSaveBeforeLeaving.save.noHelp=Voulez-vous enregistrer les modifications effectuées ? faxtomail.demande.attachment.label=Pièces-jointes faxtomail.demande.back.button.label=Quitter faxtomail.demande.body.label=Corps du mail @@ -354,6 +356,8 @@ faxtomail.validator.error.reply.to.email=Le champ 'A\:' doit être une adresse e faxtomail.validator.error.reply.to.required=Le champ 'A\:' est requis \! faxtomail.validator.error.signingSettings.name.required= faxtomail.validator.error.signingSettings.text.required= +jaxx.application.common.askCancelEditBeforeLeaving.title= +jaxx.application.common.askSaveBeforeLeaving.title= jaxx.application.error.cannot.mail=Erreur lors de l'ouverture du client mail jaxx.application.error.cannot.open=Erreur lors de l'ouverture de la pièce jointe jaxx.application.error.cannot.print=Erreur lors de l'impression -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.