branch develop-1.1.x updated (5a450795 -> 4fff2bdb)
This is an automated email from the git hooks/post-receive script. New change to branch develop-1.1.x in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git from 5a450795 [gitflow-maven-plugin]Update for next development version new c94fadca Force saut de ligne html en cas de saut de ligne plain texte new 4fff2bdb Set reply editor content as text/html for proper rendering The 2 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 4fff2bdb20b5e2dff53c4ea137279e54fc2ede43 Author: jcouteau <couteau@codelutin.com> Date: Wed Mar 9 11:33:18 2022 +0100 Set reply editor content as text/html for proper rendering commit c94fadca025f7fbd38922ff57621250ecb3193bd Author: jcouteau <couteau@codelutin.com> Date: Wed Mar 9 11:26:06 2022 +0100 Force saut de ligne html en cas de saut de ligne plain texte Summary of changes: .../faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java | 8 ++++---- .../com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java | 3 +++ 2 files changed, 7 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-1.1.x in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit c94fadca025f7fbd38922ff57621250ecb3193bd Author: jcouteau <couteau@codelutin.com> Date: Wed Mar 9 11:26:06 2022 +0100 Force saut de ligne html en cas de saut de ligne plain texte --- .../java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java index 54846a90..82ba0318 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java @@ -376,6 +376,9 @@ public final class FaxToMailUIUtil extends ApplicationUIUtil { for (String content : contents) { if (content != null) { + content = content.replace("\r\n", "<br>"); + content = content.replace("\n", "<br>"); + content = content.replace("\r", "<br>"); addHtmlTextPane(handler, demandeUIModel, textPanePanel, content); } } -- 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-1.1.x in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 4fff2bdb20b5e2dff53c4ea137279e54fc2ede43 Author: jcouteau <couteau@codelutin.com> Date: Wed Mar 9 11:33:18 2022 +0100 Set reply editor content as text/html for proper rendering --- .../faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java index bc0d31e2..f1ef5559 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java @@ -97,6 +97,7 @@ public class ReplyFormUIHandler extends AbstractFaxToMailUIHandler<ReplyFormUIMo initUI(ui); JTextPane editor = ui.getMessage(); + editor.setContentType("text/html"); editor.setCaretPosition(0); ReplyFormUIModel model = getModel(); @@ -106,8 +107,7 @@ public class ReplyFormUIHandler extends AbstractFaxToMailUIHandler<ReplyFormUIMo DemandeUIModel demand = (DemandeUIModel) evt.getNewValue(); ReplyFormUIModel model = (ReplyFormUIModel) evt.getSource(); - List<DemandeUIModel> models = new ArrayList<DemandeUIModel>(); - models.addAll(demand.getGroupedDemandes()); + List<DemandeUIModel> models = new ArrayList<>(demand.getGroupedDemandes()); for (DemandeUIModel demandeUIModel : models) { // remove newline character (cf #6960) @@ -139,7 +139,7 @@ public class ReplyFormUIHandler extends AbstractFaxToMailUIHandler<ReplyFormUIMo String recipient = demand.getRecipient(); // this have to be disable for read only mode (useless) if (!model.isReadonly()) { - + // attachment combo JComboBox<AttachmentFile> addAttachmentFile = ui.getAddAttachmentFile(); addAttachmentFile.setModel(SwingUtil.newComboModel(model.getAvailableAttachments().toArray())); @@ -155,7 +155,7 @@ public class ReplyFormUIHandler extends AbstractFaxToMailUIHandler<ReplyFormUIMo folder = folder.getParent(); } model.setSenderAllowedDomains(folderReplyDomains); - + List<String> replyToAddresses = Lists.newArrayList(); String selectedItem = null; if (!demand.isFax() && recipient != null) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm