From fd65206579086f47e23d43f593d59b6a3140e75b Mon Sep 17 00:00:00 2001
From: Andreas Abraham <andreas.abraham@egiz.gv.at>
Date: Tue, 18 Feb 2020 13:31:21 +0100
Subject: finished added checkbox to enable placeholder search
---
.../gui/composites/AdvancedConfigurationComposite.java | 7 ++++---
.../asit/pdfover/gui/workflow/config/ConfigManipulator.java | 5 +++++
.../asit/pdfover/gui/workflow/config/ConfigProviderImpl.java | 11 +++++++++++
.../pdfover/gui/workflow/config/ConfigurationContainer.java | 2 +-
.../pdfover/gui/workflow/config/PersistentConfigProvider.java | 5 +++++
5 files changed, 26 insertions(+), 4 deletions(-)
(limited to 'pdf-over-gui')
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/AdvancedConfigurationComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/AdvancedConfigurationComposite.java
index dad4abe8..03a1d1c8 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/AdvancedConfigurationComposite.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/AdvancedConfigurationComposite.java
@@ -279,8 +279,6 @@ public class AdvancedConfigurationComposite extends BaseConfigurationComposite {
fD_grpPlaceholder[0]));
- ///-----
-
this.btnEnablePlaceholderUsage = new Button(this.grpPlaceholder, SWT.CHECK);
FormData fd_btnEnablePlaceholderUsage = new FormData();
fd_btnEnablePlaceholderUsage.right = new FormAttachment(100, -5);
@@ -295,7 +293,7 @@ public class AdvancedConfigurationComposite extends BaseConfigurationComposite {
this.btnEnablePlaceholderUsage.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
- AdvancedConfigurationComposite.this.performUseMarkerSelection(
+ AdvancedConfigurationComposite.this.performEnableUsePlaceholder(
AdvancedConfigurationComposite.this.btnEnablePlaceholderUsage.getSelection());
}
});
@@ -1080,6 +1078,7 @@ public class AdvancedConfigurationComposite extends BaseConfigurationComposite {
provider.getDefaultSignaturePositionPersistent());
this.configurationContainer.setUseMarker(provider.getUseMarker());
this.configurationContainer.setUseSignatureFields(provider.getUseSignatureFields());
+ this.configurationContainer.setEnablePlaceholderUsage(provider.getEnablePlaceholderUsage());
/*this.configurationContainer.setDownloadURL(
provider.getDownloadURL());*/
this.configurationContainer.setSignaturePdfACompat(
@@ -1132,6 +1131,7 @@ public class AdvancedConfigurationComposite extends BaseConfigurationComposite {
performPositionSelection(pos != null && pos.useAutoPositioning());
performUseMarkerSelection(this.configurationContainer.getUseMarker());
performUseSignatureFieldsSelection(this.configurationContainer.getUseSignatureFields());
+ performEnableUsePlaceholder(this.configurationContainer.getEnablePlaceholderUsage());
this.sclTransparenz.setSelection(this.configurationContainer
.getPlaceholderTransparency());
performLocaleSelectionChanged(this.configurationContainer.getLocale());
@@ -1171,6 +1171,7 @@ public class AdvancedConfigurationComposite extends BaseConfigurationComposite {
this.configurationContainer.getDefaultSignaturePosition());
store.setUseMarker(this.configurationContainer.getUseMarker());
store.setUseSignatureFields(this.configurationContainer.getUseSignatureFields());
+ store.setEnablePlaceholderUsage(this.configurationContainer.getEnablePlaceholderUsage());
store.setSignaturePdfACompat(
this.configurationContainer.getSignaturePdfACompat());
store.setPlaceholderTransparency(
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigManipulator.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigManipulator.java
index fba7dd6d..abed492a 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigManipulator.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigManipulator.java
@@ -193,6 +193,11 @@ public interface ConfigManipulator {
*/
public void setEnablePlaceholderUsage(boolean bool);
+ /**
+ * @return
+ */
+ public boolean getEnablePlaceholderUsage();
+
}
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigProviderImpl.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigProviderImpl.java
index 1a9666fd..4b225aaa 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigProviderImpl.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigProviderImpl.java
@@ -380,6 +380,10 @@ public class ConfigProviderImpl implements ConfigProvider, ConfigManipulator,
if (getUseSignatureFields()) {
props.setProperty(Constants.CFG_USE_SIGNATURE_FIELDS, Constants.TRUE);
}
+
+ if (getEnablePlaceholderUsage()) {
+ props.setProperty(Constants.CFG_ENABLE_PLACEHOLDER, Constants.TRUE);
+ }
if (getSignaturePdfACompat())
props.setProperty(Constants.CFG_SIGNATURE_PDFA_COMPAT, Constants.TRUE);
@@ -1485,6 +1489,9 @@ public class ConfigProviderImpl implements ConfigProvider, ConfigManipulator,
public boolean getUseSignatureFields() {
return this.configurationOverlay.getUseSignatureFields();
}
+
+
+
/*
* (non-Javadoc)
@@ -1510,6 +1517,10 @@ public class ConfigProviderImpl implements ConfigProvider, ConfigManipulator,
this.configurationOverlay.setEnablePlaceholderUsage(bool);
}
+ public boolean getEnablePlaceholderUsage() {
+ return this.configurationOverlay.getEnablePlaceholderUsage();
+ }
+
}
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigurationContainer.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigurationContainer.java
index f149f4c4..d5976b3c 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigurationContainer.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigurationContainer.java
@@ -409,7 +409,7 @@ public interface ConfigurationContainer {
public void setEnablePlaceholderUsage(boolean bool);
/**
- * @return
+ * @return boolean
*/
public boolean getEnablePlaceholderUsage();
}
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/PersistentConfigProvider.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/PersistentConfigProvider.java
index 823de866..e217b3c8 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/PersistentConfigProvider.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/PersistentConfigProvider.java
@@ -194,4 +194,9 @@ public interface PersistentConfigProvider {
* @return boolean
*/
public boolean getUseSignatureFields();
+
+ /**
+ * @return
+ */
+ public boolean getEnablePlaceholderUsage();
}
--
cgit v1.2.3