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>.