AdvancedConfig extended

3 files changed, 34 insertions, 9 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 94474c66..4b32f59f 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
@@ -371,11 +371,12 @@ public class AdvancedConfigurationComposite extends BaseConfigurationComposite {
 		GridLayout gl_grpSpeicherort = new GridLayout(3, false);
 		grpSpeicherort.setLayout(gl_grpSpeicherort);
 		FormData fd_grpSpeicherort = new FormData();
-		fd_grpSpeicherort.left = new FormAttachment(100, -499);
+		fd_grpSpeicherort.left = new FormAttachment(0,5);
 		fd_grpSpeicherort.top = new FormAttachment(this.grpBkuAuswahl, 5);
 		fd_grpSpeicherort.right = new FormAttachment(100, -5);
 		this.grpSpeicherort.setLayoutData(fd_grpSpeicherort);
 
+
 		FontData[] fD_grpSpeicherort = this.grpSpeicherort.getFont().getFontData();
 		fD_grpSpeicherort[0].setHeight(Constants.TEXT_SIZE_NORMAL);
 		this.grpSpeicherort.setFont(new Font(Display.getCurrent(), fD_grpSpeicherort[0]));
@@ -388,10 +389,10 @@ public class AdvancedConfigurationComposite extends BaseConfigurationComposite {
 
 		this.txtOutputFolder = new Text(this.grpSpeicherort, SWT.BORDER);
 		GridData gd_txtOutputFolder = new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1);
-		gd_txtOutputFolder.widthHint = 291;
 		txtOutputFolder.setLayoutData(gd_txtOutputFolder);
 
 		FontData[] fD_txtOutputFolder = this.txtOutputFolder.getFont().getFontData();
+		fD_txtOutputFolder[0].setHeight(Constants.TEXT_SIZE_NORMAL);
 		this.txtOutputFolder.setFont(new Font(Display.getCurrent(), fD_txtOutputFolder[0]));
 
 		this.txtOutputFolder.addFocusListener(new FocusAdapter() {
@@ -402,14 +403,13 @@ public class AdvancedConfigurationComposite extends BaseConfigurationComposite {
 			}
 		});
 		fD_txtOutputFolder[0].setHeight(Constants.TEXT_SIZE_NORMAL);
-		// fD_btnBrowse[0].setHeight(Constants.TEXT_SIZE_BUTTON);
 
 		this.btnBrowse = new Button(this.grpSpeicherort, SWT.NONE);
 		btnBrowse.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1));
 
 		FontData[] fD_btnBrowse = this.btnBrowse.getFont().getFontData();
+		fD_btnBrowse[0].setHeight(Constants.TEXT_SIZE_BUTTON);
 		this.btnBrowse.setFont(new Font(Display.getCurrent(), fD_btnBrowse[0]));
-
 		this.btnBrowse.addSelectionListener(new SelectionAdapter() {
 
 			@Override
@@ -446,18 +446,18 @@ public class AdvancedConfigurationComposite extends BaseConfigurationComposite {
 
 		this.txtSaveFilePostFix = new Text(this.grpSpeicherort, SWT.BORDER);
 		GridData gd_txtSaveFilePostFix = new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1);
-//		gd_txtSaveFilePostFix.widthHint = 256;
+
 		txtSaveFilePostFix.setLayoutData(gd_txtSaveFilePostFix);
 
 		FontData[] fD_txtPostFix = this.txtSaveFilePostFix.getFont().getFontData();
+		fD_txtPostFix[0].setHeight(Constants.TEXT_SIZE_NORMAL);
 		this.txtSaveFilePostFix.setFont(new Font(Display.getCurrent(), fD_txtPostFix[0]));
 
 		this.txtSaveFilePostFix.addFocusListener(new FocusAdapter() {
 
 			@Override
 			public void focusLost(FocusEvent e) {
-				// performOutputFolderChanged(AdvancedConfigurationComposite.this.txtSaveFilePostFix
-				// .getText());
+				performPostFixChanged(AdvancedConfigurationComposite.this.txtSaveFilePostFix.getText());
 			}
 		});
 		new Label(grpSpeicherort, SWT.NONE);
@@ -649,6 +649,13 @@ public class AdvancedConfigurationComposite extends BaseConfigurationComposite {
 		reloadResources();
 	}
 
+	private void performPostFixChanged(String postfix) {
+
+		log.debug("Save file postfix changed to : {}", postfix); //$NON-NLS-1$
+		this.configurationContainer.setSaveFilePostFix(postfix);
+		AdvancedConfigurationComposite.this.txtSaveFilePostFix.setText(postfix);
+	}
+
 	/*
 	 * (non-Javadoc)
 	 * 
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 bed44da1..4c634fd6 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
@@ -421,4 +421,9 @@ public interface ConfigurationContainer {
 	 * @return selected signature profile as string
 	 */
 	public Profile getSignatureProfile();
+
+
+	public void setSaveFilePostFix(String postFix);
+
+	public String getSaveFilePostFix();
 }
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 e00e04d6..47094aa7 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
@@ -149,6 +149,8 @@ public class ConfigurationContainerImpl implements ConfigurationContainer {
 	/**	The Signature Profile */
 	protected Profile signatureProfile = null;
 
+	protected String saveFilePostFix = "_signed";
+
 	/* (non-Javadoc)
 	 * @see at.asit.pdfover.gui.composites.ConfigurationContainer#getEmblem()
 	 */
@@ -735,8 +737,19 @@ public class ConfigurationContainerImpl implements ConfigurationContainer {
 		}
 		return this.signatureProfile; 
 	}
-	
-	@Override
+
+    @Override
+    public String getSaveFilePostFix() {
+        return this.saveFilePostFix;
+    }
+
+    @Override
+	public void setSaveFilePostFix(String postfix){
+		this.saveFilePostFix = postfix;
+	}
+
+
+    @Override
 	public void setSignatureProfile(Profile profile) {
 		this.signatureProfile = profile;
 	}