This is an automated email from the git hooks/post-receive script. New commit to branch feature/9526 in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit a676570a2717d60d1aabfd932e815cc4fdd6984c Author: Jean Couteau <jean.couteau@gmail.com> Date: Wed Nov 29 09:19:38 2017 +0100 refs #9526 - Pris par sur le clic droit des demandes sélectionnées - Ajout de l'entrée de menu au clic droit (toujours visible pour le moment) --- .../faxtomail/persistence/entities/MailAction.java | 3 ++- .../faxtomail/ui/swing/content/demande/DemandeListUI.css | 7 +++++++ .../faxtomail/ui/swing/content/demande/DemandeListUI.jaxx | 1 + .../ui/swing/content/demande/DemandeListUIHandler.java | 4 ++++ .../ui/swing/content/demande/DemandeListUIModel.java | 13 +++++++++++++ .../main/resources/i18n/faxtomail-ui-swing_fr_FR.properties | 2 ++ 6 files changed, 29 insertions(+), 1 deletion(-) diff --git a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailAction.java b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailAction.java index a6bfc542..24071735 100644 --- a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailAction.java +++ b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailAction.java @@ -34,5 +34,6 @@ public enum MailAction { ARCHIVE, REPLY, FORWARD, - GROUP + GROUP, + TAKENBY } diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUI.css b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUI.css index 12cb8247..5185c3ae 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUI.css +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUI.css @@ -118,6 +118,13 @@ _applicationAction: { com.franciaflex.faxtomail.ui.swing.content.demande.actions.OpenForwardFormAction.class }; } +#takenByMenu { + text: "faxtomail.demandeList.action.takenBy"; + toolTipText: "faxtomail.demandeList.action.takenBy.tip"; + enabled: { model.isTakenByEnabled() }; +/* _applicationAction: { com.franciaflex.faxtomail.ui.swing.content.demande.actions.OpenTakenByFormAction.class };*/ +} + #archiveMenu { actionIcon: archive; text: "faxtomail.demandeList.action.archive"; diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUI.jaxx b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUI.jaxx index 6f516731..235adf4a 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUI.jaxx +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUI.jaxx @@ -64,6 +64,7 @@ <JMenuItem id='forwardMenu'/> <JMenuItem id='archiveMenu'/> <JMenuItem id='moveMenu'/> + <JMenuItem id='takenByMenu'/> </JPopupMenu> <JSplitPane constraints='BorderLayout.CENTER' id="mainSplitPane" name="demandeListUIMainSplitPane"> 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 201b9074..d781ca57 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 @@ -778,6 +778,10 @@ public class DemandeListUIHandler extends AbstractFaxToMailDemandListHandler<Dem && model.getSelectedEmails().get(0).isEditable() && isActionEnabled(model.getSelectedEmails().get(0), MailAction.FORWARD)); + model.setTakenByEnabled(selectedRowCount == 1 + && model.getSelectedEmails().get(0).isEditable() + && isActionEnabled(model.getSelectedEmails().get(0), MailAction.TAKENBY)); + model.setArchiveEnabled(selectedRowCount > 0); model.setTransmitEnabled(selectedRowCount > 0); model.setPrintEnabled(selectedRowCount > 0); diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIModel.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIModel.java index c38cee47..22471232 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIModel.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIModel.java @@ -53,6 +53,7 @@ public class DemandeListUIModel extends AbstractSerializableBean { public static final String PROPERTY_REPLY_ENABLED = "replyEnabled"; public static final String PROPERTY_FORWARD_ACTIVATED = "forwardActivated"; public static final String PROPERTY_FORWARD_ENABLED = "forwardEnabled"; + public static final String PROPERTY_TAKENBY_ENABLED = "takenByEnabled"; public static final String PROPERTY_ARCHIVE_ENABLED = "archiveEnabled"; public static final String PROPERTY_TRANSMIT_ENABLED = "transmitEnabled"; public static final String PROPERTY_PRINT_ENABLED = "printEnabled"; @@ -97,6 +98,8 @@ public class DemandeListUIModel extends AbstractSerializableBean { protected boolean forwardEnabled; + protected boolean takenByEnabled; + protected boolean archiveEnabled; protected boolean transmitEnabled; @@ -264,6 +267,16 @@ public class DemandeListUIModel extends AbstractSerializableBean { firePropertyChange(PROPERTY_FORWARD_ENABLED, oldValue, forwardEnabled); } + public boolean isTakenByEnabled() { + return takenByEnabled; + } + + public void setTakenByEnabled(boolean takenByEnabled) { + Object oldValue = isTakenByEnabled(); + this.takenByEnabled = takenByEnabled; + firePropertyChange(PROPERTY_TAKENBY_ENABLED, oldValue, takenByEnabled); + } + public boolean isArchiveEnabled() { return archiveEnabled; } diff --git a/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties b/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties index 19836555..59e4fc5d 100644 --- a/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties +++ b/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties @@ -172,6 +172,8 @@ faxtomail.demandeList.action.print=Imprimer faxtomail.demandeList.action.print.tip=Imprimer faxtomail.demandeList.action.reply=Répondre faxtomail.demandeList.action.reply.tip=Répondre +faxtomail.demandeList.action.takenBy=Pris par +faxtomail.demandeList.action.takenBy.tip=Modifier la personne prenant l'élément faxtomail.demandeList.action.transmit=Déplacer faxtomail.demandeList.action.transmit.tip=Déplacer faxtomail.demandeList.demandNbLabel=Nombre de demandes -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.