branch develop updated (a401c48 -> 0505c78)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git from a401c48 sauvegarde des tammons image dans le pdf (fixes #8288) new 0505c78 La liste des éléments repasse devant quand on quitte l'éditeur de pdf (fixes #8289) 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 0505c788ee653c5c3c91bf0923f11dc57d4553b0 Author: Kevin Morin <morin@codelutin.com> Date: Wed Apr 27 17:05:41 2016 +0200 La liste des éléments repasse devant quand on quitte l'éditeur de pdf (fixes #8289) Summary of changes: .../ui/swing/content/pdfeditor/PDFEditorUIHandler.java | 7 ++++++- .../actions/GenerateAnnotatedAttachmentAction.java | 14 +++++++++++--- 2 files changed, 17 insertions(+), 4 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 faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 0505c788ee653c5c3c91bf0923f11dc57d4553b0 Author: Kevin Morin <morin@codelutin.com> Date: Wed Apr 27 17:05:41 2016 +0200 La liste des éléments repasse devant quand on quitte l'éditeur de pdf (fixes #8289) --- .../ui/swing/content/pdfeditor/PDFEditorUIHandler.java | 7 ++++++- .../actions/GenerateAnnotatedAttachmentAction.java | 14 +++++++++++--- 2 files changed, 17 insertions(+), 4 deletions(-) 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 9d55774..c41f0c9 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 @@ -266,12 +266,17 @@ public class PDFEditorUIHandler extends AbstractFaxToMailUIHandler<PDFEditorUIMo @Override public boolean quitUI() { + + GenerateAnnotatedAttachmentAction generateAnnotatedAttachmentAction = + getContext().getActionFactory().createLogicAction(this, GenerateAnnotatedAttachmentAction.class); + generateAnnotatedAttachmentAction.setCloseFrameWhenDone(false); + boolean result = quitScreen2( true, getModel().isModify(), null, t("faxtomail.pdfEditor.askSaveBeforeLeaving.save"), - getContext().getActionFactory().createLogicAction(this, GenerateAnnotatedAttachmentAction.class) + generateAnnotatedAttachmentAction ); // soit les modifs doivent etre annulées, soit elles ont été enregistrées, donc on peut reseter le model diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/actions/GenerateAnnotatedAttachmentAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/actions/GenerateAnnotatedAttachmentAction.java index fbb90fa..9394c89 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/actions/GenerateAnnotatedAttachmentAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/actions/GenerateAnnotatedAttachmentAction.java @@ -78,11 +78,17 @@ import static org.nuiton.i18n.I18n.t; */ public class GenerateAnnotatedAttachmentAction extends AbstractFaxToMailAction<PDFEditorUIModel, PDFEditorUI, PDFEditorUIHandler> { + private boolean closeFrameWhenDone = true; + public GenerateAnnotatedAttachmentAction(PDFEditorUIHandler handler) { - super(handler, true); + super(handler, false); setActionDescription(t("faxtomail.action.generateAnnotatedAttachment.tip")); } + public void setCloseFrameWhenDone(boolean closeFrameWhenDone) { + this.closeFrameWhenDone = closeFrameWhenDone; + } + @Override public void doAction() throws Exception { @@ -438,13 +444,15 @@ public class GenerateAnnotatedAttachmentAction extends AbstractFaxToMailAction<P model.setModify(false); - getHandler().closeFrame(); + if (closeFrameWhenDone) { + getHandler().closeFrame(); + } } private class Coordinates { private int x, y, width, height; - public Coordinates(int width, int height, int x, int y) { + Coordinates(int width, int height, int x, int y) { this.height = height; this.width = width; this.x = x; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm