branch develop updated (9d98426 -> 7897fb6)
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 9d98426 correction du séparateur qui se positionne mal au démarrage new a472081 fix test new 47caf2a correction de la position du separateur de l'arbre et la liste new 7897fb6 fixes #9104 ouvrir la PJ en edition au double clique The 3 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 7897fb68895d0d41e4f94ff1d4646eb2f5651080 Author: Kevin Morin <morin@codelutin.com> Date: Fri Apr 7 16:26:59 2017 +0200 fixes #9104 ouvrir la PJ en edition au double clique commit 47caf2a72cef4bb2994a5e4f9e6ad0997222c81f Author: Kevin Morin <morin@codelutin.com> Date: Fri Apr 7 16:16:23 2017 +0200 correction de la position du separateur de l'arbre et la liste commit a4720816fb3aaff8b44e166d54689ee9f6ead635 Author: Kevin Morin <morin@codelutin.com> Date: Fri Apr 7 16:15:58 2017 +0200 fix test Summary of changes: .../services/service/EmailServiceTest.java | 2 +- .../faxtomail/ui/swing/RunFaxToMail.java | 9 +++++---- .../swing/content/attachment/ButtonAttachment.java | 4 ++++ .../content/demande/DemandeListUIHandler.java | 10 ++++++++++ .../faxtomail/ui/swing/util/FaxToMailUIUtil.java | 22 ++++++++++++---------- 5 files changed, 32 insertions(+), 15 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 a4720816fb3aaff8b44e166d54689ee9f6ead635 Author: Kevin Morin <morin@codelutin.com> Date: Fri Apr 7 16:15:58 2017 +0200 fix test --- .../com/franciaflex/faxtomail/services/service/EmailServiceTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java b/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java index 71d3acc..8d0d64f 100644 --- a/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java +++ b/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java @@ -181,7 +181,7 @@ public class EmailServiceTest extends AbstractFaxToMailServiceTest { // tests fetch + pagination - PaginationParameter page = PaginationParameter.of(0, 4, Email.PROPERTY_RECEPTION_DATE, false); + PaginationParameter page = PaginationParameter.of(0, 4, EmailTopiaDao.EMAIL_IDENTIFIER + "." + Email.PROPERTY_RECEPTION_DATE, false); MailFolderTopiaDao mailFolderDao = getServiceContext().getPersistenceContext().getMailFolderDao(); MailFolder cyril = mailFolderDao.forNameEquals("Cyril").findUnique(); -- 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 47caf2a72cef4bb2994a5e4f9e6ad0997222c81f Author: Kevin Morin <morin@codelutin.com> Date: Fri Apr 7 16:16:23 2017 +0200 correction de la position du separateur de l'arbre et la liste --- .../java/com/franciaflex/faxtomail/ui/swing/RunFaxToMail.java | 9 +++++---- .../ui/swing/content/demande/DemandeListUIHandler.java | 10 ++++++++++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/RunFaxToMail.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/RunFaxToMail.java index e3ecc13..a2809ad 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/RunFaxToMail.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/RunFaxToMail.java @@ -31,10 +31,13 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.widgets.extra.SplashScreen; -import javax.swing.*; +import javax.swing.SwingUtilities; +import javax.swing.UIManager; import javax.swing.plaf.BorderUIResource; import javax.swing.plaf.FontUIResource; -import java.awt.*; +import java.awt.Color; +import java.awt.Font; +import java.awt.Point; import java.io.IOException; import java.io.InputStream; import java.util.Arrays; @@ -147,8 +150,6 @@ public class RunFaxToMail { @Override public void run() { mainUI.setVisible(true); - // on réajoute l'ui à la session sinon le séparateur entre l'arbre et la liste se positionne mal - context.getSwingSession().add(mainUI); } }); } diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java index 33dc05d..201b907 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java @@ -91,6 +91,7 @@ import java.awt.Component; import java.awt.Dimension; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.awt.event.ComponentEvent; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; import java.awt.event.MouseAdapter; @@ -189,6 +190,15 @@ public class DemandeListUIHandler extends AbstractFaxToMailDemandListHandler<Dem initUI(ui); + ui.getMainSplitPane().addComponentListener(new java.awt.event.ComponentAdapter() { + + @Override + public void componentResized(ComponentEvent e) { + // on réajoute l'ui à la session sinon le séparateur entre l'arbre et la liste se positionne mal + getContext().getSwingSession().add(getUI().getMainSplitPane(), true); + } + }); + final DemandeListUIModel model = getModel(); // init table -- 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 7897fb68895d0d41e4f94ff1d4646eb2f5651080 Author: Kevin Morin <morin@codelutin.com> Date: Fri Apr 7 16:26:59 2017 +0200 fixes #9104 ouvrir la PJ en edition au double clique --- .../swing/content/attachment/ButtonAttachment.java | 4 ++++ .../faxtomail/ui/swing/util/FaxToMailUIUtil.java | 22 ++++++++++++---------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/ButtonAttachment.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/ButtonAttachment.java index 20a64d2..daf6274 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/ButtonAttachment.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/ButtonAttachment.java @@ -122,4 +122,8 @@ public class ButtonAttachment extends AbstractToolbarPopupButton<AttachmentEdito super.onCloseUI(); popup.getModel().removePropertyChangeListener(AttachmentModelAware.PROPERTY_ATTACHMENT, listener); } + + public void editAttachment(Attachment attachment) { + popup.getHandler().editAttachment(attachment); + } } 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 5df1307..7a245dc 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 @@ -96,6 +96,8 @@ import java.awt.Graphics; import java.awt.Image; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; import java.awt.image.BufferedImage; import java.awt.image.RenderedImage; import java.awt.print.PageFormat; @@ -879,7 +881,7 @@ public final class FaxToMailUIUtil extends ApplicationUIUtil { protected static void addAttachmentPane(final DemandeUIHandler handler, JPanel textPanePanel, - Attachment attachment) { + final Attachment attachment) { if (isFileTypeEditable(attachment.getOriginalFileName())) { forceAttachmentFileLoading(handler.getContext(), attachment); @@ -888,15 +890,15 @@ public final class FaxToMailUIUtil extends ApplicationUIUtil { Box box = Box.createVerticalBox(); box.setBorder(BorderFactory.createTitledBorder(attachment.getOriginalFileName())); -// box.addMouseListener(new MouseAdapter() { -// -// @Override -// public void mouseClicked(MouseEvent e) { -// if (SwingUtilities.isLeftMouseButton(e) && e.getClickCount() == 2) { -// openFile(handler.getContext(), originalAttachmentFile); -// } -// } -// }); + box.addMouseListener(new MouseAdapter() { + + @Override + public void mouseClicked(MouseEvent e) { + if (SwingUtilities.isLeftMouseButton(e) && e.getClickCount() == 2) { + handler.getUI().getAttachmentsButton().editAttachment(attachment); + } + } + }); PDDocument pdDocument = null; try { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm