summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/AdvancedConfigurationComposite.java12
-rw-r--r--pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigManipulator.java2
-rw-r--r--pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigurationContainer.java9
-rw-r--r--pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigurationContainerImpl.java19
4 files changed, 41 insertions, 1 deletions
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 35cafabf..0a1f0715 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
@@ -271,6 +271,11 @@ public class AdvancedConfigurationComposite extends BaseConfigurationComposite {
fd_grpPlaceholder.right = new FormAttachment(100, -5);
fd_grpPlaceholder.left = new FormAttachment(0, 5);
this.grpPlaceholder.setLayoutData(fd_grpPlaceholder);
+
+ FontData[] fD_grpPlaceholder = this.grpPlaceholder.getFont().getFontData();
+ fD_grpPlaceholder[0].setHeight(Constants.TEXT_SIZE_NORMAL);
+ this.grpPlaceholder.setFont(new Font(Display.getCurrent(),
+ fD_grpPlaceholder[0]));
this.btnPlatzhalterVerwenden = new Button(this.grpPlaceholder, SWT.RADIO);
FormData fd_btnPlatzhalterVerwenden = new FormData();
@@ -896,7 +901,12 @@ public class AdvancedConfigurationComposite extends BaseConfigurationComposite {
void performUseMarkerSelection(boolean useMarker) {
this.configurationContainer.setUseMarker(useMarker);
- this.btnPlatzhalterVerwenden.setSelection(useMarker);
+ //this.btnPlatzhalterVerwenden.setSelection(useMarker);
+ }
+
+ void performUseSignatureFieldsSelection(boolean useFields) {
+ this.configurationContainer.setUseSignatureFields(useFields);
+ //this.btnPlatzhalterVerwenden.setSelection(useMarker);
}
void performPdfACompatSelection(boolean compat) {
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 c20cc8e2..486de462 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
@@ -180,6 +180,8 @@ public interface ConfigManipulator {
*/
public void setUseMarker(boolean useMarker);
+
+
}
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 c3142b85..546c9df4 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
@@ -389,4 +389,13 @@ public interface ConfigurationContainer {
* whether to use an existing signature marker
*/
public void setUseMarker(boolean useMarker);
+
+ /***
+ * Extension to the standard use marker implementation
+ * @param useFields
+ */
+ public void setUseSignatureFields(boolean useFields);
+
+
+ public boolean getUseSignatureFields();
}
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigurationContainerImpl.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigurationContainerImpl.java
index cc794246..558503c6 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigurationContainerImpl.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigurationContainerImpl.java
@@ -140,6 +140,9 @@ public class ConfigurationContainerImpl implements ConfigurationContainer {
/** Whether to use an existing signature marker. */
protected boolean useMarker = false;
+ /** Either QR-Code or signature fields as marker */
+ protected boolean useSignatureFields = false;
+
/* (non-Javadoc)
* @see at.asit.pdfover.gui.composites.ConfigurationContainer#getEmblem()
*/
@@ -684,5 +687,21 @@ public class ConfigurationContainerImpl implements ConfigurationContainer {
@Override
public void setUseMarker(boolean useMarker) {
this.useMarker = useMarker;
+ if (useMarker) setUseSignatureFields(false);
+ }
+
+
+ @Override
+ public void setUseSignatureFields(boolean useFields) {
+ this.useSignatureFields = useFields;
+ if (useFields) setUseMarker(false);
}
+
+
+
+ @Override
+ public boolean getUseSignatureFields() {
+ return this.useSignatureFields;
+ }
+
}