summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/ConfigurationComposite.java14
-rw-r--r--pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/AboutComposite.java6
-rw-r--r--pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/AdvancedConfigurationComposite.java3
3 files changed, 17 insertions, 6 deletions
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/ConfigurationComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/ConfigurationComposite.java
index 3fea9f87..44fa4391 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/ConfigurationComposite.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/ConfigurationComposite.java
@@ -73,6 +73,11 @@ public class ConfigurationComposite extends StateComposite {
ConfigurationCompositeBase keystoreConfigComposite = null;
/**
+ * about page composite
+ */
+ ConfigurationCompositeBase aboutConfigComposite;
+
+ /**
* The TabFolder
*/
TabFolder tabFolder;
@@ -157,7 +162,7 @@ public class ConfigurationComposite extends StateComposite {
ScrolledComposite aboutCompositeScr = new ScrolledComposite(this.tabFolder, (SWT.H_SCROLL | SWT.V_SCROLL));
this.aboutTabItem.setControl(aboutCompositeScr);
- AboutComposite aboutConfigComposite = new AboutComposite(aboutCompositeScr, SWT.NONE);
+ this.aboutConfigComposite = new AboutComposite(aboutCompositeScr, SWT.NONE, state, configurationContainer);
aboutCompositeScr.setContent(aboutConfigComposite);
aboutCompositeScr.setExpandHorizontal(true);
aboutCompositeScr.setExpandVertical(true);
@@ -251,11 +256,17 @@ public class ConfigurationComposite extends StateComposite {
// Initialize Configuration Container
this.simpleConfigComposite.initConfiguration(this.configProvider);
this.advancedConfigComposite.initConfiguration(this.configProvider);
+ this.aboutConfigComposite.initConfiguration(this.configProvider);
this.simpleConfigComposite.loadConfiguration();
this.advancedConfigComposite.loadConfiguration();
+ this.aboutConfigComposite.loadConfiguration();
+
if (this.keystoreConfigComposite != null)
+ {
+ this.keystoreConfigComposite.initConfiguration(this.configProvider);
this.keystoreConfigComposite.loadConfiguration();
+ }
}
}
@@ -366,6 +377,7 @@ public class ConfigurationComposite extends StateComposite {
// Write current Configuration
this.simpleConfigComposite.storeConfiguration(this.configProvider);
this.advancedConfigComposite.storeConfiguration(this.configProvider);
+ this.aboutConfigComposite.storeConfiguration(this.configProvider);
if (this.keystoreConfigComposite != null)
this.keystoreConfigComposite.storeConfiguration(this.configProvider);
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/AboutComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/AboutComposite.java
index af3911bf..01f4e885 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/AboutComposite.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/AboutComposite.java
@@ -21,7 +21,9 @@ import org.slf4j.LoggerFactory;
import at.asit.pdfover.commons.Constants;
import at.asit.pdfover.commons.Messages;
import at.asit.pdfover.gui.utils.SWTUtils;
+import at.asit.pdfover.gui.workflow.config.ConfigurationDataInMemory;
import at.asit.pdfover.gui.workflow.config.ConfigurationManager;
+import at.asit.pdfover.gui.workflow.states.State;
public class AboutComposite extends ConfigurationCompositeBase {
static final Logger log = LoggerFactory.getLogger(AboutComposite.class);
@@ -34,8 +36,8 @@ public class AboutComposite extends ConfigurationCompositeBase {
* @param parent
* @param style
*/
- public AboutComposite(Composite parent, int style) {
- super(parent, style, null, null);
+ public AboutComposite(Composite parent, int style, State state, ConfigurationDataInMemory container) {
+ super(parent, style, state, container);
setLayout(new FormLayout());
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/AdvancedConfigurationComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/AdvancedConfigurationComposite.java
index 38933819..1983206f 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/AdvancedConfigurationComposite.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/AdvancedConfigurationComposite.java
@@ -25,8 +25,6 @@ import java.util.stream.Collectors;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.FocusAdapter;
import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.layout.FormData;
import org.eclipse.swt.layout.FormLayout;
import org.eclipse.swt.layout.GridData;
@@ -37,7 +35,6 @@ import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.DirectoryDialog;
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Scale;
import org.eclipse.swt.widgets.Text;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;