This is an automated email from the git hooks/post-receive script. New commit to branch feature/9501_set_default_soom_value in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 1393ac46eff05e2aa185ae0ee70e2e6239e8c413 Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Mon Nov 20 17:35:23 2017 +0100 Make the default zoom value configurable --- .../java/com/franciaflex/faxtomail/FaxToMailConfiguration.java | 3 +++ .../com/franciaflex/faxtomail/FaxToMailConfigurationOption.java | 7 +++++++ .../main/resources/i18n/faxtomail-persistence_fr_FR.properties | 1 + .../faxtomail/ui/swing/content/pdfeditor/PDFEditorUI.jaxx | 2 +- .../faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java | 8 ++++++++ .../faxtomail/ui/swing/content/pdfeditor/PDFEditorUIModel.java | 9 +++++---- 6 files changed, 25 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 0b573e44..877bfff7 100644 --- a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java +++ b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java @@ -447,4 +447,7 @@ public class FaxToMailConfiguration extends ApplicationConfiguration { applicationConfig.setOption(FaxToMailConfigurationOption.FAXTOMAIL_I18N_LOCALE.getKey(), locale.toString()); } + public float getDefaultZoomValue() { + return applicationConfig.getOptionAsFloat(FaxToMailConfigurationOption.DEFAULT_ZOOM_VALUE.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 a99a4868..649dfcea 100644 --- a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java +++ b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java @@ -327,6 +327,13 @@ defaults.put("Table.alternateRowColor", new Color(217, 217, 217)); n("faxtomail.config.option.ui.refreshListInterval.description"), "300", Integer.class + ), + + DEFAULT_ZOOM_VALUE( + "faxtomail.ui.defaultZoomValue", + n("faxtomail.config.option.ui.defaultZoomValue.description"), + "1.0f", + Float.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 37424a8f..0a91d14e 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 @@ -18,6 +18,7 @@ faxtomail.config.option.ui.color.blockingLayer.description= faxtomail.config.option.ui.color.selectedRow.description= faxtomail.config.option.ui.config.file.description= faxtomail.config.option.ui.dateFormat.description= +faxtomail.config.option.ui.defaultZoomValue.description= 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/pdfeditor/PDFEditorUI.jaxx b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUI.jaxx index d9a43123..a7fcaa22 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUI.jaxx +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUI.jaxx @@ -45,7 +45,7 @@ ]]></script> - <PDFEditorUIModel id='model' initializer='new PDFEditorUIModel()'/> + <PDFEditorUIModel id='model' initializer='getContextValue(PDFEditorUIModel.class)'/> <JToolBar id="toolbar" constraints='BorderLayout.NORTH'> diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java index cb6c4b1f..78a327bb 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java @@ -83,6 +83,14 @@ public class PDFEditorUIHandler extends AbstractFaxToMailUIHandler<PDFEditorUIMo protected PDDocument pdDocument; @Override + public void beforeInit(PDFEditorUI ui) { + super.beforeInit(ui); + final PDFEditorUIModel model = new PDFEditorUIModel(); + model.setZoom(getConfig().getDefaultZoomValue()); + ui.setContextValue(model); + } + + @Override public void afterInit(PDFEditorUI pdfEditorUI) { initUI(pdfEditorUI); diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIModel.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIModel.java index dc47f19d..819df511 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIModel.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIModel.java @@ -268,10 +268,11 @@ public class PDFEditorUIModel extends AbstractFaxToMailBeanUIModel<Attachment, P } public void setZoom(float zoom) { - if (zoom >= 1f && zoom <= 15f) { - Object oldValue = getZoom(); - this.zoom = zoom; - firePropertyChanged(PROPERTY_ZOOM, oldValue, zoom); + float normalizedZoomValue = Math.min(Math.max(zoom, 1f), 15f); + float oldValue = getZoom(); + if (normalizedZoomValue != oldValue) { + this.zoom = normalizedZoomValue; + firePropertyChanged(PROPERTY_ZOOM, oldValue, normalizedZoomValue); } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.