branch develop updated (1c28b096 -> 9e45a567)
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 1c28b096 fixes #9670 : Pouvoir régler le zoom des impressions new 2ce622a1 fixes #9671 : Pouvoir paramétrer l'impression de la page de détail par défaut new 8c083719 fixes #9672 : Paramétrage du nombre de caractères mini dans la liste des clients new 9e45a567 Revert Jaxx update to fix client combobox filtering glitches 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 9e45a56796c1ed8bb1a35c00c1d34f7ff8ab7226 Author: Jean Couteau <jean.couteau@gmail.com> Date: Fri Feb 2 11:04:02 2018 +0100 Revert Jaxx update to fix client combobox filtering glitches commit 8c08371947ebc20b9561bb0c9aadfbdf1796fedd Author: Jean Couteau <jean.couteau@gmail.com> Date: Fri Feb 2 10:43:20 2018 +0100 fixes #9672 : Paramétrage du nombre de caractères mini dans la liste des clients commit 2ce622a1e47b39783394c176176114fb0a79f333 Author: Jean Couteau <jean.couteau@gmail.com> Date: Fri Feb 2 10:25:50 2018 +0100 fixes #9671 : Pouvoir paramétrer l'impression de la page de détail par défaut Summary of changes: .../com/franciaflex/faxtomail/FaxToMailConfiguration.java | 8 ++++++++ .../faxtomail/FaxToMailConfigurationOption.java | 14 ++++++++++++++ .../resources/i18n/faxtomail-persistence_fr_FR.properties | 2 ++ .../ui/swing/content/demande/DemandeListUIHandler.java | 4 +++- .../ui/swing/content/demande/DemandeUIHandler.java | 13 ++++++++----- pom.xml | 2 +- 6 files changed, 36 insertions(+), 7 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 2ce622a1e47b39783394c176176114fb0a79f333 Author: Jean Couteau <jean.couteau@gmail.com> Date: Fri Feb 2 10:25:50 2018 +0100 fixes #9671 : Pouvoir paramétrer l'impression de la page de détail par défaut --- .../java/com/franciaflex/faxtomail/FaxToMailConfiguration.java | 4 ++++ .../com/franciaflex/faxtomail/FaxToMailConfigurationOption.java | 7 +++++++ .../src/main/resources/i18n/faxtomail-persistence_fr_FR.properties | 1 + .../faxtomail/ui/swing/content/demande/DemandeListUIHandler.java | 4 +++- 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java index 5bc0c19f..f47337e6 100644 --- a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java +++ b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java @@ -458,4 +458,8 @@ public class FaxToMailConfiguration extends ApplicationConfiguration { public int getDefaultPrintMargin() { return applicationConfig.getOptionAsInt(FaxToMailConfigurationOption.DEFAULT_PRINT_MARGIN.getKey()); } + + public boolean getPrintDetailPage() { + return applicationConfig.getOptionAsBoolean(FaxToMailConfigurationOption.PRINT_DETAIL_PAGE.getKey()); + } } diff --git a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java index 2a86df0e..bc6f3605 100644 --- a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java +++ b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java @@ -347,6 +347,13 @@ defaults.put("Table.alternateRowColor", new Color(217, 217, 217)); n("faxtomail.config.option.ui.defaultPrintMargin.description"), "15", Integer.class + ), + + PRINT_DETAIL_PAGE( + "faxtomail.ui.printDetailPage", + n("faxtomail.config.option.ui.printDetailPage.description"), + "true", + Boolean.class ); /** Configuration key. */ diff --git a/faxtomail-persistence/src/main/resources/i18n/faxtomail-persistence_fr_FR.properties b/faxtomail-persistence/src/main/resources/i18n/faxtomail-persistence_fr_FR.properties index 2f4ddc23..bdf6acc4 100644 --- a/faxtomail-persistence/src/main/resources/i18n/faxtomail-persistence_fr_FR.properties +++ b/faxtomail-persistence/src/main/resources/i18n/faxtomail-persistence_fr_FR.properties @@ -21,6 +21,7 @@ faxtomail.config.option.ui.dateFormat.description= faxtomail.config.option.ui.defaultPrintMargin.description=Marges par défaut pour l'impression faxtomail.config.option.ui.defaultZoomStepSize.description= faxtomail.config.option.ui.defaultZoomValue.description= +faxtomail.config.option.ui.printDetailPage.description=Impression de la page de détail d'une demande lors de l'impression depuis un dossier faxtomail.config.option.ui.refreshListInterval.description= faxtomail.config.option.ui.resultPerPage.description= faxtomail.config.option.ui.shortcut.closePopup.description= 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 7dd1c0c6..885a5f14 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 @@ -910,11 +910,13 @@ public class DemandeListUIHandler extends AbstractFaxToMailDemandListHandler<Dem } } + Boolean printDemandDetails = getContext().getConfig().getPrintDetailPage(); + PrintOnDefaultPrinterAction action = new PrintOnDefaultPrinterAction(this, attachmentToPrints, take, takeOnlyIfNotTaken, - true); + printDemandDetails); getContext().getActionEngine().runAction(action); } -- 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 8c08371947ebc20b9561bb0c9aadfbdf1796fedd Author: Jean Couteau <jean.couteau@gmail.com> Date: Fri Feb 2 10:43:20 2018 +0100 fixes #9672 : Paramétrage du nombre de caractères mini dans la liste des clients --- .../com/franciaflex/faxtomail/FaxToMailConfiguration.java | 4 ++++ .../franciaflex/faxtomail/FaxToMailConfigurationOption.java | 7 +++++++ .../resources/i18n/faxtomail-persistence_fr_FR.properties | 1 + .../ui/swing/content/demande/DemandeUIHandler.java | 13 ++++++++----- 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java index f47337e6..1c7b57a2 100644 --- a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java +++ b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java @@ -462,4 +462,8 @@ public class FaxToMailConfiguration extends ApplicationConfiguration { public boolean getPrintDetailPage() { return applicationConfig.getOptionAsBoolean(FaxToMailConfigurationOption.PRINT_DETAIL_PAGE.getKey()); } + + public int getClientComboBoxFilterStartChars() { + return applicationConfig.getOptionAsInt(FaxToMailConfigurationOption.CLIENT_COMBOBOX_FILTER_START_CHARS.getKey()); + } } diff --git a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java index bc6f3605..9098d932 100644 --- a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java +++ b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java @@ -354,6 +354,13 @@ defaults.put("Table.alternateRowColor", new Color(217, 217, 217)); n("faxtomail.config.option.ui.printDetailPage.description"), "true", Boolean.class + ), + + CLIENT_COMBOBOX_FILTER_START_CHARS( + "faxtomail.ui.clientComboBoxFilterStartChars", + n("faxtomail.config.option.ui.clientComboBoxFilterStartChars.description"), + "3", + Integer.class ); /** Configuration key. */ diff --git a/faxtomail-persistence/src/main/resources/i18n/faxtomail-persistence_fr_FR.properties b/faxtomail-persistence/src/main/resources/i18n/faxtomail-persistence_fr_FR.properties index bdf6acc4..ff7c5cb5 100644 --- a/faxtomail-persistence/src/main/resources/i18n/faxtomail-persistence_fr_FR.properties +++ b/faxtomail-persistence/src/main/resources/i18n/faxtomail-persistence_fr_FR.properties @@ -13,6 +13,7 @@ faxtomail.config.option.site.url.description= faxtomail.config.option.startActionFile.description= faxtomail.config.option.tmp.directory.description= faxtomail.config.option.ui.autoPopupNumberEditor.description= +faxtomail.config.option.ui.clientComboBoxFilterStartChars.description=Nombre de caractères avant de déclencher le filtre des clients sur une demande faxtomail.config.option.ui.color.alternateRow.description= faxtomail.config.option.ui.color.blockingLayer.description= faxtomail.config.option.ui.color.selectedRow.description= diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java index 0cbfdae2..b8f0bd61 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java @@ -440,17 +440,20 @@ public class DemandeUIHandler extends AbstractFaxToMailUIHandler<DemandeUIModel, public void keyTyped(KeyEvent e) { String text = clientComboBox.getComboBoxModel().getFilterText(); text+=e.getKeyChar(); - if (text.length()==3){ - //init list when 3 chars entered + + int filterStartChars = getConfig().getClientComboBoxFilterStartChars(); + + if (text.length()==filterStartChars){ + //init list when x chars entered FaxToMailServiceContext serviceContext = getContext().newServiceContext(); List<Client> clients = serviceContext.getClientService().getClientsForFolder(getContext().getCurrentMailFolder(),text); clientComboBox.getComboBoxModel().removeAllElements(); clientComboBox.getComboBoxModel().addAllElements(clients); - } else if (text.length()<3){ - //empty list if less than 3 chars + } else if (text.length()<filterStartChars){ + //empty list if less than x chars clientComboBox.getComboBoxModel().removeAllElements(); } else { - // do nothing if more than 3 chars entered + // do nothing if more than x chars entered } } }; -- 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 9e45a56796c1ed8bb1a35c00c1d34f7ff8ab7226 Author: Jean Couteau <jean.couteau@gmail.com> Date: Fri Feb 2 11:04:02 2018 +0100 Revert Jaxx update to fix client combobox filtering glitches --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a937a8a4..93922066 100644 --- a/pom.xml +++ b/pom.xml @@ -109,7 +109,7 @@ <h2Version>1.3.176</h2Version> <guavaVersion>18.0</guavaVersion> - <jaxxVersion>2.44</jaxxVersion> + <jaxxVersion>2.43</jaxxVersion> <!-- do not upgrade to 1.6.5-1 --> <swingXVersion>1.6.4</swingXVersion> <xworkVersion>2.3.16.3</xworkVersion> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm