branch feature/9101_disable_open_unmodified_attachment created (now 2850bc4)
This is an automated email from the git hooks/post-receive script. New change to branch feature/9101_disable_open_unmodified_attachment in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git at 2850bc4 refs #9101 ajout de l'ouverture de l'éditeur sur double click + masquage du bouton pour visualiser la version originale This branch includes the following new commits: new 2850bc4 refs #9101 ajout de l'ouverture de l'éditeur sur double click + masquage du bouton pour visualiser la version originale 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 2850bc463b363b1f5c6c0249cc4315eee016a650 Author: Kevin Morin <morin@codelutin.com> Date: Wed Mar 15 12:05:09 2017 +0100 refs #9101 ajout de l'ouverture de l'éditeur sur double click + masquage du bouton pour visualiser la version originale -- 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 feature/9101_disable_open_unmodified_attachment in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 2850bc463b363b1f5c6c0249cc4315eee016a650 Author: Kevin Morin <morin@codelutin.com> Date: Wed Mar 15 12:05:09 2017 +0100 refs #9101 ajout de l'ouverture de l'éditeur sur double click + masquage du bouton pour visualiser la version originale --- .../ui/swing/content/attachment/AttachmentEditorUIHandler.java | 9 +++++++++ .../faxtomail/ui/swing/content/attachment/AttachmentItem.css | 1 + .../faxtomail/ui/swing/content/attachment/AttachmentItem.jaxx | 4 +++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java index a8d4b0a..dc36ac0 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java @@ -52,6 +52,7 @@ import javax.swing.table.TableModel; import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.awt.event.MouseEvent; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.Collection; @@ -160,6 +161,12 @@ public class AttachmentEditorUIHandler extends AbstractToolbarPopupHandler<Attac getContext().getActionEngine().runAction(openAttachmentAction); } + public void onLabelClicked(MouseEvent event, Attachment attachment) { + if (event.getClickCount() == 2) { + editAttachment(attachment); + } + } + public void editAttachment(Attachment attachment) { OpenAttachmentAction openAttachmentAction = new OpenAttachmentAction(this); AttachmentEditorUIModel model = getModel(); @@ -287,6 +294,8 @@ public class AttachmentEditorUIHandler extends AbstractToolbarPopupHandler<Attac } attachmentItem.setEditable(getModel().isEditable()); + //TODO kmorin 20170315 get it in the folder conf + attachmentItem.setOriginalViewable(false); return attachmentItem; } diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentItem.css b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentItem.css index 55f6209..c1c1e62 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentItem.css +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentItem.css @@ -38,6 +38,7 @@ #openAttachmentButton { actionIcon: "open-file"; toolTipText: "faxtomail.attachmentEditor.action.open.tip"; + visible: { isOriginalViewable() }; } #editAttachmentButton { diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentItem.jaxx b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentItem.jaxx index 2362bf0..f6e0bf7 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentItem.jaxx +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentItem.jaxx @@ -38,7 +38,9 @@ <Boolean id="editable" javaBean='null'/> - <JLabel id='attachmentNameLabel' constraints='BorderLayout.CENTER'/> + <Boolean id="originalViewable" javaBean="null"/> + + <JLabel id='attachmentNameLabel' constraints='BorderLayout.CENTER' onMouseClicked="handler.onLabelClicked(event, attachment)"/> <JToolBar id='toolbar' constraints='BorderLayout.EAST'> <JButton id='openAttachmentButton' -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm