branch feature/9526 updated (031b8d52 -> 5c856a12)
This is an automated email from the git hooks/post-receive script. New change to branch feature/9526 in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git from 031b8d52 refs #9526 : Pris par sur le clic droit des demandes sélectionnées Tout est ok excepté la modale trop grande... new 5c856a12 refs #9526 : Pris par sur le clic droit des demandes sélectionnées - Ajout de la prise en compte de la conf 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 5c856a129de999a3c21e5ae0f94b98bd3bc95a84 Author: Jean Couteau <jean.couteau@gmail.com> Date: Wed Dec 13 16:23:20 2017 +0100 refs #9526 : Pris par sur le clic droit des demandes sélectionnées - Ajout de la prise en compte de la conf Summary of changes: .../faxtomail/ui/swing/content/demande/DemandeListUI.css | 1 + .../ui/swing/content/demande/DemandeListUIHandler.java | 8 ++++++++ .../ui/swing/content/demande/DemandeListUIModel.java | 13 +++++++++++++ 3 files changed, 22 insertions(+) -- 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/9526 in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 5c856a129de999a3c21e5ae0f94b98bd3bc95a84 Author: Jean Couteau <jean.couteau@gmail.com> Date: Wed Dec 13 16:23:20 2017 +0100 refs #9526 : Pris par sur le clic droit des demandes sélectionnées - Ajout de la prise en compte de la conf --- .../faxtomail/ui/swing/content/demande/DemandeListUI.css | 1 + .../ui/swing/content/demande/DemandeListUIHandler.java | 8 ++++++++ .../ui/swing/content/demande/DemandeListUIModel.java | 13 +++++++++++++ 3 files changed, 22 insertions(+) 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 0f3a813e..7805ff36 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 @@ -121,6 +121,7 @@ #takenByMenu { text: "faxtomail.demandeList.action.takenBy"; toolTipText: "faxtomail.demandeList.action.takenBy.tip"; + visible: { model.isTakenByActivated() }; enabled: { model.isTakenByEnabled() }; _applicationAction: { com.franciaflex.faxtomail.ui.swing.content.demande.actions.OpenTakenByFormAction.class }; } 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 43a94024..02399b93 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 @@ -369,6 +369,14 @@ public class DemandeListUIHandler extends AbstractFaxToMailDemandListHandler<Dem } getModel().setForwardActivated(Boolean.TRUE.equals(folderWithShowForwardAction.getShowForwardAction())); + //Init takenby visibility + MailFolder folderWithShowTakenByAction = folder; + while (folderWithShowTakenByAction.getParent() != null + && folderWithShowTakenByAction.getShowTakenByAction() == null) { + folderWithShowTakenByAction = folderWithShowTakenByAction.getParent(); + } + getModel().setTakenByActivated(Boolean.TRUE.equals(folderWithShowTakenByAction.getShowTakenByAction())); + DefaultMutableTreeNode node = nodesByFolder.get(folder); if (node != null) { navigationTree.setSelectionPath(new TreePath(node.getPath())); 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 22471232..167c0b93 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 @@ -54,6 +54,7 @@ public class DemandeListUIModel extends AbstractSerializableBean { 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_TAKENBY_ACTIVATED = "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"; @@ -100,6 +101,8 @@ public class DemandeListUIModel extends AbstractSerializableBean { protected boolean takenByEnabled; + protected boolean takenByActivated; + protected boolean archiveEnabled; protected boolean transmitEnabled; @@ -267,6 +270,16 @@ public class DemandeListUIModel extends AbstractSerializableBean { firePropertyChange(PROPERTY_FORWARD_ENABLED, oldValue, forwardEnabled); } + public boolean isTakenByActivated() { + return takenByActivated; + } + + public void setTakenByActivated(boolean takenByActivated) { + Object oldValue = isTakenByActivated(); + this.takenByActivated = takenByActivated; + firePropertyChange(PROPERTY_TAKENBY_ACTIVATED, oldValue, takenByActivated); + } + public boolean isTakenByEnabled() { return takenByEnabled; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm