branch develop updated (25a2cc7 -> a401c48)
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 25a2cc7 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 7f22462 oubli de report depuis la version 1.1.10 new 51468b6 - chargement de la signature à l'ouverture du formulaire de réponse depuis la liste - on ne charge pas la signature si c'est un fax (refs #8258) new 3ae620a La fenêtre de la demande ne se ferme pas après un déplacement (fixes #8287) new a401c48 sauvegarde des tammons image dans le pdf (fixes #8288) The 4 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 a401c487eef23d7bc42220472b72cb1d7fd63050 Author: Kevin Morin <morin@codelutin.com> Date: Wed Apr 27 15:14:35 2016 +0200 sauvegarde des tammons image dans le pdf (fixes #8288) commit 3ae620a20a55041eed7e49d8bf62e6f19cfd233f Author: Kevin Morin <morin@codelutin.com> Date: Wed Apr 27 14:54:16 2016 +0200 La fenêtre de la demande ne se ferme pas après un déplacement (fixes #8287) commit 51468b62a96c251fb977944b6ff436689858cff2 Author: Kevin Morin <morin@codelutin.com> Date: Wed Apr 27 13:46:35 2016 +0200 - chargement de la signature à l'ouverture du formulaire de réponse depuis la liste - on ne charge pas la signature si c'est un fax (refs #8258) commit 7f22462a86671c4e559941798944335dffff2df8 Author: Kevin Morin <morin@codelutin.com> Date: Wed Apr 27 13:46:25 2016 +0200 oubli de report depuis la version 1.1.10 Summary of changes: .../ui/swing/actions/GoToPreviousScreenAction.java | 43 -------- .../demande/actions/OpenReplyFormAction.java | 12 ++- .../content/pdfeditor/PDFEditorUIHandler.java | 6 ++ .../actions/GenerateAnnotatedAttachmentAction.java | 109 ++++++++++++++------- .../content/reply/actions/SenderChangedAction.java | 2 +- .../content/transmit/actions/TransmitAction.java | 10 +- 6 files changed, 100 insertions(+), 82 deletions(-) delete mode 100644 faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GoToPreviousScreenAction.java -- 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 7f22462a86671c4e559941798944335dffff2df8 Author: Kevin Morin <morin@codelutin.com> Date: Wed Apr 27 13:46:25 2016 +0200 oubli de report depuis la version 1.1.10 --- .../faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java | 6 ++++++ 1 file changed, 6 insertions(+) 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 c5a74c0..9d55774 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 @@ -273,6 +273,12 @@ public class PDFEditorUIHandler extends AbstractFaxToMailUIHandler<PDFEditorUIMo t("faxtomail.pdfEditor.askSaveBeforeLeaving.save"), getContext().getActionFactory().createLogicAction(this, GenerateAnnotatedAttachmentAction.class) ); + + // soit les modifs doivent etre annulées, soit elles ont été enregistrées, donc on peut reseter le model + if (result) { + getModel().setModify(false); + } + return result; } -- 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 51468b62a96c251fb977944b6ff436689858cff2 Author: Kevin Morin <morin@codelutin.com> Date: Wed Apr 27 13:46:35 2016 +0200 - chargement de la signature à l'ouverture du formulaire de réponse depuis la liste - on ne charge pas la signature si c'est un fax (refs #8258) --- .../swing/content/demande/actions/OpenReplyFormAction.java | 12 ++++++++++-- .../ui/swing/content/reply/actions/SenderChangedAction.java | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/OpenReplyFormAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/OpenReplyFormAction.java index aa5f964..545029b 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/OpenReplyFormAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/OpenReplyFormAction.java @@ -26,6 +26,7 @@ package com.franciaflex.faxtomail.ui.swing.content.demande.actions; import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.MailFolder; +import com.franciaflex.faxtomail.persistence.entities.SigningForDomain; import com.franciaflex.faxtomail.services.FaxToMailServiceContext; import com.franciaflex.faxtomail.services.FaxToMailServiceUtils; import com.franciaflex.faxtomail.ui.swing.FaxToMailUIContext; @@ -39,8 +40,9 @@ import com.franciaflex.faxtomail.ui.swing.content.reply.ReplyFormUIModel; import jaxx.runtime.JAXXUtil; import org.apache.commons.lang3.StringUtils; -import javax.swing.*; -import java.awt.*; +import javax.swing.JFrame; +import javax.swing.SwingUtilities; +import java.awt.Dimension; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; @@ -73,6 +75,12 @@ public class OpenReplyFormAction extends AbstractFaxToMailAction<DemandeListUIMo frameContent = new ReplyFormUI(getUI()); ReplyFormUIModel model = frameContent.getModel(); + SigningForDomain signingForDomain = null; + if (!demand.isFax() && demand.getRecipient() != null) { + signingForDomain = getContext().newServiceContext().getConfigurationService().getSigningForEmailAddress(demand.getRecipient()).orNull(); + } + model.setSigning(signingForDomain); + model.setOriginalDemand(demand); String sender = JAXXUtil.getStringValue(demand.getSender()); diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/actions/SenderChangedAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/actions/SenderChangedAction.java index 47ecf34..40ae4e7 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/actions/SenderChangedAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/actions/SenderChangedAction.java @@ -61,7 +61,7 @@ public class SenderChangedAction extends AbstractFaxToMailAction<ReplyFormUIMode ReplyFormUIModel model = getModel(); FaxToMailServiceContext serviceContext = getContext().newServiceContext(); signingForDomain = null; - if (model.getFrom() != null) { + if (!model.getOriginalDemand().isFax() && model.getFrom() != null) { signingForDomain = serviceContext.getConfigurationService().getSigningForEmailAddress(model.getFrom()).orNull(); } } -- 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 3ae620a20a55041eed7e49d8bf62e6f19cfd233f Author: Kevin Morin <morin@codelutin.com> Date: Wed Apr 27 14:54:16 2016 +0200 La fenêtre de la demande ne se ferme pas après un déplacement (fixes #8287) --- .../ui/swing/actions/GoToPreviousScreenAction.java | 43 ---------------------- .../content/transmit/actions/TransmitAction.java | 10 +++-- 2 files changed, 7 insertions(+), 46 deletions(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GoToPreviousScreenAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GoToPreviousScreenAction.java deleted file mode 100644 index bf7c69a..0000000 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/GoToPreviousScreenAction.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.franciaflex.faxtomail.ui.swing.actions; - -/* - * #%L - * FaxToMail :: UI - * %% - * Copyright (C) 2014 Mac-Groupe, Code Lutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import com.franciaflex.faxtomail.ui.swing.content.MainUIHandler; - -import static org.nuiton.i18n.I18n.t; - -/** - * To return on previous screen. - * - * @author kmorin - morin@codelutin.com - */ -public class GoToPreviousScreenAction extends AbstractChangeScreenAction { - - public GoToPreviousScreenAction(MainUIHandler handler) { - super(handler, - true, - PREVIOUS_SCREEN.getContextValue(handler.getUI()) - ); - setActionDescription(t("faxtomail.action.goto.previousScreen.tip")); - } -} diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/actions/TransmitAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/actions/TransmitAction.java index 267df22..bff06a6 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/actions/TransmitAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/actions/TransmitAction.java @@ -26,7 +26,6 @@ package com.franciaflex.faxtomail.ui.swing.content.transmit.actions; import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.ui.swing.actions.AbstractFaxToMailAction; -import com.franciaflex.faxtomail.ui.swing.actions.GoToPreviousScreenAction; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeListUI; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeListUIModel; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUI; @@ -41,7 +40,8 @@ import com.google.common.collect.Collections2; import jaxx.runtime.JAXXContext; import jaxx.runtime.JAXXUtil; -import javax.swing.*; +import javax.swing.JFrame; +import javax.swing.JOptionPane; import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -129,7 +129,11 @@ public class TransmitAction extends AbstractFaxToMailAction<MailFolderChooserUIM FaxToMailUI parentUI = (FaxToMailUI) getUI().getContextValue(JAXXContext.class, JAXXUtil.PARENT); if (parentUI != null) { if (DemandeUI.class.isAssignableFrom(parentUI.getClass())) { - getActionEngine().runInternalAction(handler, GoToPreviousScreenAction.class); + + JFrame frameForDemande = getContext().getFrameForDemande(getContext().getCurrentEmail()); + frameForDemande.dispose(); + + getContext().getMainUI().getHandler().reloadDemandList(); } else if (DemandeListUI.class.isAssignableFrom(parentUI.getClass())) { DemandeListUI demandeListUI = (DemandeListUI) parentUI; -- 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 a401c487eef23d7bc42220472b72cb1d7fd63050 Author: Kevin Morin <morin@codelutin.com> Date: Wed Apr 27 15:14:35 2016 +0200 sauvegarde des tammons image dans le pdf (fixes #8288) --- .../actions/GenerateAnnotatedAttachmentAction.java | 109 ++++++++++++++------- 1 file changed, 76 insertions(+), 33 deletions(-) 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 e723bd7..fbb90fa 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 @@ -32,6 +32,7 @@ import com.franciaflex.faxtomail.ui.swing.content.pdfeditor.PDFEditorCrossUI; import com.franciaflex.faxtomail.ui.swing.content.pdfeditor.PDFEditorHighlighterUI; import com.franciaflex.faxtomail.ui.swing.content.pdfeditor.PDFEditorLineUI; import com.franciaflex.faxtomail.ui.swing.content.pdfeditor.PDFEditorNoteUI; +import com.franciaflex.faxtomail.ui.swing.content.pdfeditor.PDFEditorStampImageUI; import com.franciaflex.faxtomail.ui.swing.content.pdfeditor.PDFEditorStampTextUI; import com.franciaflex.faxtomail.ui.swing.content.pdfeditor.PDFEditorUI; import com.franciaflex.faxtomail.ui.swing.content.pdfeditor.PDFEditorUIHandler; @@ -42,6 +43,7 @@ import com.itextpdf.text.DocumentException; import com.itextpdf.text.Element; import com.itextpdf.text.ExceptionConverter; import com.itextpdf.text.Font; +import com.itextpdf.text.Image; import com.itextpdf.text.Phrase; import com.itextpdf.text.pdf.BaseFont; import com.itextpdf.text.pdf.ColumnText; @@ -52,9 +54,16 @@ import com.itextpdf.text.pdf.PdfStamper; import jaxx.runtime.JAXXContext; import jaxx.runtime.JAXXUtil; -import javax.swing.*; -import java.awt.*; +import javax.imageio.ImageIO; +import javax.swing.JLabel; +import javax.swing.JTextArea; +import java.awt.Component; +import java.awt.Graphics; +import java.awt.Insets; +import java.awt.Point; +import java.awt.image.BufferedImage; import java.io.BufferedInputStream; +import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -120,7 +129,11 @@ public class GenerateAnnotatedAttachmentAction extends AbstractFaxToMailAction<P } for (PDFEditorStampTextUI panel : page.getTextStamps()) { - addStampToPdf(zoom, rotation, cb, panel); + addTextStampToPdf(zoom, rotation, cb, panel); + } + + for (PDFEditorStampImageUI panel : page.getImageStamps()) { + addImageStampToPdf(zoom, rotation, cb, panel); } } @@ -138,11 +151,7 @@ public class GenerateAnnotatedAttachmentAction extends AbstractFaxToMailAction<P } protected void addHighlightToPdf(float zoom, int rotation, PdfContentByte cb, PDFEditorHighlighterUI panel) { - int[] coordinates = computeCoordinates(panel, rotation, zoom); - int width = coordinates[0]; - int height = coordinates[1]; - int x = coordinates[2]; - int y = coordinates[3]; + Coordinates coordinates = computeCoordinates(panel, rotation, zoom); cb.saveState(); PdfGState gs1 = new PdfGState(); @@ -150,17 +159,17 @@ public class GenerateAnnotatedAttachmentAction extends AbstractFaxToMailAction<P cb.setGState(gs1); cb.setColorFill(BaseColor.YELLOW); - cb.rectangle(x, y, width, height); + cb.rectangle(coordinates.x, coordinates.y, coordinates.width, coordinates.height); cb.fill(); cb.restoreState(); } protected void addLineToPdf(float zoom, int rotation, PdfContentByte cb, PDFEditorLineUI panel) { - int[] coordinates = computeCoordinates(panel, rotation, zoom); - int width = coordinates[0]; - int height = coordinates[1]; - int x = coordinates[2]; - int y = coordinates[3]; + Coordinates coordinates = computeCoordinates(panel, rotation, zoom); + int width = coordinates.width; + int height = coordinates.height; + int x = coordinates.x; + int y = coordinates.y; if (rotation % 180 == 0 ^ !panel.isHorizontal()) { y += height / 2; @@ -181,11 +190,11 @@ public class GenerateAnnotatedAttachmentAction extends AbstractFaxToMailAction<P } protected void addCrossToPdf(float zoom, int rotation, PdfContentByte cb, PDFEditorCrossUI panel) { - int[] coordinates = computeCoordinates(panel, rotation, zoom); - int width = coordinates[0]; - int height = coordinates[1]; - int x = coordinates[2]; - int y = coordinates[3]; + Coordinates coordinates = computeCoordinates(panel, rotation, zoom); + int width = coordinates.width; + int height = coordinates.height; + int x = coordinates.x; + int y = coordinates.y; cb.saveState(); cb.setColorStroke(BaseColor.BLUE); @@ -199,11 +208,11 @@ public class GenerateAnnotatedAttachmentAction extends AbstractFaxToMailAction<P } protected void addNoteToPdf(float zoom, int rotation, PdfContentByte cb, PDFEditorNoteUI note) throws DocumentException, IOException { - int[] coordinates = computeCoordinates(note, rotation, zoom); - int width = coordinates[0]; - int height = coordinates[1]; - int x = coordinates[2]; - int y = coordinates[3]; + Coordinates coordinates = computeCoordinates(note, rotation, zoom); + int width = coordinates.width; + int height = coordinates.height; + int x = coordinates.x; + int y = coordinates.y; Insets insets = note.getInsets(); @@ -266,12 +275,12 @@ public class GenerateAnnotatedAttachmentAction extends AbstractFaxToMailAction<P cb.restoreState(); } - protected void addStampToPdf(float zoom, int rotation, PdfContentByte cb, PDFEditorStampTextUI stamp) throws DocumentException, IOException { - int[] coordinates = computeCoordinates(stamp, rotation, zoom); - int width = coordinates[0]; - int height = coordinates[1]; - int x = coordinates[2]; - int y = coordinates[3]; + protected void addTextStampToPdf(float zoom, int rotation, PdfContentByte cb, PDFEditorStampTextUI stamp) throws DocumentException, IOException { + Coordinates coordinates = computeCoordinates(stamp, rotation, zoom); + int width = coordinates.width; + int height = coordinates.height; + int x = coordinates.x; + int y = coordinates.y; Insets insets = stamp.getInsets(); @@ -326,7 +335,31 @@ public class GenerateAnnotatedAttachmentAction extends AbstractFaxToMailAction<P cb.restoreState(); } - protected int[] computeCoordinates(Component panel, int rotation, float zoom) { + protected void addImageStampToPdf(float zoom, int rotation, PdfContentByte cb, PDFEditorStampImageUI stamp) throws DocumentException, IOException { + Coordinates coordinates = computeCoordinates(stamp, rotation, zoom); + int x = coordinates.x; + int y = coordinates.y; + + cb.saveState(); + + java.awt.Image image = stamp.getImage(); + BufferedImage bufferedImage = new BufferedImage(image.getWidth(null), image.getHeight(null), 1); + Graphics gc = bufferedImage.createGraphics(); + gc.drawImage(image, 0, 0, null); + + ByteArrayOutputStream bos = new ByteArrayOutputStream(); + ImageIO.write(bufferedImage, "jpeg", bos); + byte[] imageByteArray = bos.toByteArray(); + + Image stampImage = Image.getInstance(imageByteArray); + stampImage.setAbsolutePosition(x, y); + stampImage.setRotationDegrees(rotation); + cb.addImage(stampImage); + + cb.restoreState(); + } + + protected Coordinates computeCoordinates(Component panel, int rotation, float zoom) { Point location = panel.getLocation(); int width = rotation % 180 == 0 ? panel.getWidth() : panel.getHeight(); @@ -355,8 +388,7 @@ public class GenerateAnnotatedAttachmentAction extends AbstractFaxToMailAction<P y = (int) ((getUI().getContainer().getWidth() - location.x) / zoom) - height; } - int[] result = new int[] { width, height, x, y }; - return result; + return new Coordinates(width, height, x, y); } protected void showTextAligned(PdfContentByte canvas, String text, float x, float y, float rotation, BaseFont baseFont, float fontSize) { @@ -408,4 +440,15 @@ public class GenerateAnnotatedAttachmentAction extends AbstractFaxToMailAction<P getHandler().closeFrame(); } + + private class Coordinates { + private int x, y, width, height; + + public Coordinates(int width, int height, int x, int y) { + this.height = height; + this.width = width; + this.x = x; + this.y = y; + } + } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm