summaryrefslogtreecommitdiff
path: root/pdf-over-gui/src
diff options
context:
space:
mode:
authorAndreas Abraham <andreas.abraham@egiz.gv.at>2020-11-09 16:18:42 +0100
committerAndreas Abraham <andreas.abraham@egiz.gv.at>2020-11-09 16:18:42 +0100
commit01f5b6348cdd84ce765b2235e60f309ebe7fac0c (patch)
tree4d52cbed5ac8794d25529438106452b83a3c700d /pdf-over-gui/src
parentad8cccc8a24e8238dba18f636a138d72f5d77057 (diff)
downloadpdf-over-01f5b6348cdd84ce765b2235e60f309ebe7fac0c.tar.gz
pdf-over-01f5b6348cdd84ce765b2235e60f309ebe7fac0c.tar.bz2
pdf-over-01f5b6348cdd84ce765b2235e60f309ebe7fac0c.zip
Extending GUI (profiles) + configf
Diffstat (limited to 'pdf-over-gui/src')
-rw-r--r--pdf-over-gui/src/main/java/at/asit/pdfover/gui/Constants.java22
-rw-r--r--pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/SimpleConfigurationComposite.java97
-rw-r--r--pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigurationContainerImpl.java1
3 files changed, 72 insertions, 48 deletions
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/Constants.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/Constants.java
index 5c74b78e..98fac033 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/Constants.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/Constants.java
@@ -56,8 +56,26 @@ public class Constants {
/** Supported locales */
public static final Locale[] SUPPORTED_LOCALES = { Locale.GERMAN, Locale.ENGLISH };
- public static final String[] SUPPORTED_PROFILES = {"Signaturblock Normal", "Signaturblock Klein", "Amtssignaturblock", "Nur Bildmarke"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-
+ public static final String[] SUPPORTED_PROFILES_STRINGS = {"Signaturblock Normal", "Signaturblock Klein", "Amtssignaturblock", "Nur Bildmarke"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+
+ public static enum PROFILE {
+ SIGNATUREBLOCK_NORMAL("Signaturblock Normal"), //$NON-NLS-1$
+ SIGNATUREBLOCK_SMALL("Signaturblock Klein"), //$NON-NLS-1$
+ AMTSSIGNATUREBLOCK("Amtssignaturblock"), //$NON-NLS-1$
+ LOGO_ONLY("Nur Bildmarke"); //$NON-NLS-1$
+
+ public static int length = 4;
+ private String name;
+
+ PROFILE(String profile){
+ this.name = profile;
+ }
+
+ public String getName() {
+ return this.name;
+ }
+ }
+
/** Configuration directory */
public static final String CONFIG_DIRECTORY = System.getProperty("user.home") + File.separator + ".pdf-over"; //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/SimpleConfigurationComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/SimpleConfigurationComposite.java
index c3e4a138..b3925775 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/SimpleConfigurationComposite.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/SimpleConfigurationComposite.java
@@ -62,6 +62,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import at.asit.pdfover.gui.Constants;
+import at.asit.pdfover.gui.Constants.PROFILE;
import at.asit.pdfover.gui.controls.Dialog.BUTTONS;
import at.asit.pdfover.gui.controls.ErrorDialog;
import at.asit.pdfover.gui.controls.ErrorMarker;
@@ -114,9 +115,10 @@ public class SimpleConfigurationComposite extends BaseConfigurationComposite {
Image sigPreview = null;
Image logo = null;
- private final Group grpSingnatureProfile;
- private final Label lblSignatureProfile;
+ private final Group grpSignatureProfile;
+// private final Label lblSignatureProfile;
private final Combo cmbSingatureProfiles;
+
/**
@@ -207,63 +209,66 @@ public class SimpleConfigurationComposite extends BaseConfigurationComposite {
//-----------------------------------------------------------------------
- this.grpSingnatureProfile = new Group(this, SWT.NONE);
+ this.grpSignatureProfile = new Group(this, SWT.NONE);
FormData fd_grpSingnatureProfile = new FormData();
fd_grpSingnatureProfile.right = new FormAttachment(100, -5);
fd_grpSingnatureProfile.left = new FormAttachment(0, 5);
fd_grpSingnatureProfile.top = new FormAttachment(this.grpHandySignatur, 5);
- this.grpSingnatureProfile.setLayoutData(fd_grpSingnatureProfile);
- this.grpSingnatureProfile.setLayout(new GridLayout(2, false));
- this.grpSingnatureProfile.setText("Signature Profile");
-
+ this.grpSignatureProfile.setLayoutData(fd_grpSingnatureProfile);
+ //this.grpSignatureProfile.setLayout(new GridLayout(2, false));
+ this.grpSignatureProfile.setText("Signature Profile"); //$NON-NLS-1$
- this.lblSignatureProfile = new Label(this.grpSingnatureProfile, SWT.NONE);
- FontData[] fD_grpSingnatureProfile = this.grpSingnatureProfile.getFont()
+// this.lblSignatureProfile = new Label(this.grpSignatureProfile, SWT.NONE);
+//
+ FontData[] fD_grpSignatureProfile = this.grpSignatureProfile.getFont()
.getFontData();
- fD_grpSingnatureProfile[0].setHeight(Constants.TEXT_SIZE_NORMAL);
- this.grpSingnatureProfile.setFont(new Font(Display.getCurrent(),
- fD_grpSingnatureProfile[0]));
+ fD_grpSignatureProfile[0].setHeight(Constants.TEXT_SIZE_NORMAL);
+ this.grpSignatureProfile.setFont(new Font(Display.getCurrent(),
+ fD_grpSignatureProfile[0]));
// TODO create text for each language
- this.lblSignatureProfile.setText("Profile"); //$NON-NLS-1$
+// this.lblSignatureProfile.setText("Profile"); //$NON-NLS-1$
+//
+// FontData[] fD_lblSignatureProfile = this.lblSignatureProfile.getFont()
+// .getFontData();
+// fD_lblSignatureProfile[0].setHeight(Constants.TEXT_SIZE_NORMAL);
+// this.lblSignatureProfile.setFont(new Font(Display.getCurrent(),
+// fD_lblSignatureProfile[0]));
- FontData[] fD_lblSignatureProfile = this.lblSignatureProfile.getFont()
- .getFontData();
- fD_lblSignatureProfile[0].setHeight(Constants.TEXT_SIZE_NORMAL);
- this.lblSignatureProfile.setFont(new Font(Display.getCurrent(),
- fD_lblSignatureProfile[0]));
+ this.cmbSingatureProfiles = new Combo(this.grpSignatureProfile, SWT.READ_ONLY);
- this.cmbSingatureProfiles = new Combo(this.grpSingnatureProfile, SWT.READ_ONLY);
FormData fd_cmbSingatureProfiles = new FormData();
- fd_cmbSingatureProfiles.left = new FormAttachment(this.grpSingnatureProfile, 10);
+ fd_cmbSingatureProfiles.left = new FormAttachment(0, 10);
fd_cmbSingatureProfiles.right = new FormAttachment(100, -10);
fd_cmbSingatureProfiles.top = new FormAttachment(0, 10);
fd_cmbSingatureProfiles.bottom = new FormAttachment(100, -10);
- this.grpSingnatureProfile.setLayoutData(fd_cmbSingatureProfiles);
+ this.cmbSingatureProfiles.setLayoutData(fd_cmbSingatureProfiles);
- FontData[] fD_cmbSignatureLang = this.grpSingnatureProfile.getFont()
- .getFontData();
- fD_cmbSignatureLang[0].setHeight(Constants.TEXT_SIZE_NORMAL);
- this.grpSingnatureProfile.setFont(new Font(Display.getCurrent(),
- fD_cmbSignatureLang[0]));
- String[] profiles = new String[Constants.SUPPORTED_PROFILES.length];
- for (int i = 0; i < Constants.SUPPORTED_PROFILES.length; ++i) {
- profiles[i] = Constants.SUPPORTED_PROFILES[i];
+ FontData[] fD_cmbSignatureProfile = this.grpSignatureProfile.getFont()
+ .getFontData();
+ fD_cmbSignatureProfile[0].setHeight(Constants.TEXT_SIZE_NORMAL);
+ this.grpSignatureProfile.setFont(new Font(Display.getCurrent(),
+ fD_cmbSignatureProfile[0]));
+
+ String[] profiles = new String[PROFILE.length];
+ int i = 0;
+ for (PROFILE profile : PROFILE.values()) {
+ profiles[i] = profile.name();
+ i++;
}
- this.cmbSignatureLang.setItems(profiles);
- this.cmbSignatureLang.addSelectionListener(new SelectionAdapter() {
+
+ this.cmbSingatureProfiles.setItems(profiles);
+ this.cmbSingatureProfiles.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
- Locale currentLocale = SimpleConfigurationComposite.this.configurationContainer
- .getSignatureLocale();
- String selectedLocale = Constants.
- SUPPORTED_PROFILES[SimpleConfigurationComposite.this.cmbSignatureLang
+ String current = SimpleConfigurationComposite.this.configurationContainer.getSignatureProfile();
+ String selected = profiles[SimpleConfigurationComposite.this.cmbSingatureProfiles
.getSelectionIndex()];
- if (!currentLocale.equals(selectedLocale)) {
- performSignatureLangSelectionChanged(selectedLocale, currentLocale);
+ if (!current.equals(selected)) {
+ preformProfileSelectionChanged(selected, current);
}
}
});
@@ -276,7 +281,7 @@ public class SimpleConfigurationComposite extends BaseConfigurationComposite {
FormData fd_grpBildmarke = new FormData();
fd_grpBildmarke.left = new FormAttachment(0, 5);
fd_grpBildmarke.right = new FormAttachment(100, -5);
- fd_grpBildmarke.top = new FormAttachment(this.grpSingnatureProfile, 5);
+ fd_grpBildmarke.top = new FormAttachment(this.grpSignatureProfile, 5);
this.grpLogo.setLayoutData(fd_grpBildmarke);
this.grpLogo.setLayout(new FormLayout());
@@ -484,16 +489,16 @@ public class SimpleConfigurationComposite extends BaseConfigurationComposite {
fd_cmbSignatureLang.bottom = new FormAttachment(100, -10);
this.cmbSignatureLang.setLayoutData(fd_cmbSignatureLang);
-// FontData[] fD_cmbSignatureLang = this.cmbSignatureLang.getFont()
-// .getFontData();
-// fD_cmbSignatureLang[0].setHeight(Constants.TEXT_SIZE_NORMAL);
+ FontData[] fD_cmbSignatureLang = this.cmbSignatureLang.getFont()
+ .getFontData();
+ fD_cmbSignatureLang[0].setHeight(Constants.TEXT_SIZE_NORMAL);
this.cmbSignatureLang.setFont(new Font(Display.getCurrent(),
fD_cmbSignatureLang[0]));
-// String[] localeSignStrings = new String[Constants.SUPPORTED_LOCALES.length];
-// for (int i = 0; i < Constants.SUPPORTED_LOCALES.length; ++i) {
-// localeSignStrings[i] = Constants.SUPPORTED_LOCALES[i].getDisplayLanguage();
-// }
+ String[] localeSignStrings = new String[Constants.SUPPORTED_LOCALES.length];
+ for (int idx = 0; idx < Constants.SUPPORTED_LOCALES.length; ++idx) {
+ localeSignStrings[idx] = Constants.SUPPORTED_LOCALES[idx].getDisplayLanguage();
+ }
this.cmbSignatureLang.setItems(localeSignStrings);
this.cmbSignatureLang.addSelectionListener(new SelectionAdapter() {
@Override
@@ -778,8 +783,8 @@ public class SimpleConfigurationComposite extends BaseConfigurationComposite {
}
}
}
-
private void preformProfileSelectionChanged(String selected, String previous) {
+
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 e6b168dc..be2444a0 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
@@ -726,6 +726,7 @@ public class ConfigurationContainerImpl implements ConfigurationContainer {
return this.enabledPlaceholderUsage;
}
+
@Override
public String getSignatureProfile() {
return this.signatureProfile;