Merge branch 'issue/49' into 'master'

Issue/49

See merge request egiz/pdf-over!8

4 files changed, 64 insertions, 10 deletions

diff --git a/pdf-over-gui/pom.xml b/pdf-over-gui/pom.xml
index 79c19c69..14018320 100644
--- a/pdf-over-gui/pom.xml
+++ b/pdf-over-gui/pom.xml
@@ -243,7 +243,7 @@
 					<includes>
 						<include>*.jar</include>
 					</includes>
-					<verify>true</verify>
+<!--					<verify>true</verify>-->
 				</configuration>
 			</plugin>
 			<plugin>
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 0940ea67..b4626d0c 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
@@ -32,13 +32,7 @@ import org.eclipse.swt.layout.FormAttachment;
 import org.eclipse.swt.layout.FormData;
 import org.eclipse.swt.layout.FormLayout;
 import org.eclipse.swt.program.Program;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Link;
-import org.eclipse.swt.widgets.TabFolder;
-import org.eclipse.swt.widgets.TabItem;
+import org.eclipse.swt.widgets.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -297,6 +291,8 @@ public class ConfigurationComposite extends StateComposite {
 
 	private class AboutComposite extends StateComposite {
 		private Link lnkAbout;
+		private Link lnkDataProtection;
+		private Label lblDataProtection;
 		/**
 	 * @param parent
 	 * @param style
@@ -306,7 +302,7 @@ public class ConfigurationComposite extends StateComposite {
 
 			setLayout(new FormLayout());
 
-			this.lnkAbout = new Link(this, SWT.WRAP);
+			this.lnkAbout = new Link(this, SWT.NONE);
 
 			FormData fd_lnkAbout = new FormData();
 			fd_lnkAbout.right = new FormAttachment(100, -5);
@@ -340,10 +336,60 @@ public class ConfigurationComposite extends StateComposite {
 				}
 			});
 
+			this.lblDataProtection = new Label(this, SWT.NONE);
+			FormData fd_lblDataProtection = new FormData();
+			fd_lblDataProtection.top = new FormAttachment(this.lnkAbout, 15);
+			fd_lblDataProtection.right = new FormAttachment(100, -5);
+			fd_lblDataProtection.left = new FormAttachment(0, 5);
+			fd_lblDataProtection.width = 100;
+			this.lblDataProtection.setLayoutData(fd_lblDataProtection);
+
+			FontData[] fD_lblDataProtection = this.lblDataProtection.getFont().getFontData();
+			fD_lblDataProtection[0].setHeight(Constants.TEXT_SIZE_BIG);
+			this.lblDataProtection.setFont(new Font(Display.getCurrent(),
+					fD_lblDataProtection[0]));
+
+			this.lnkDataProtection = new Link(this, SWT.NONE);
+
+			FormData fd_lnkDataProtection = new FormData();
+			fd_lnkDataProtection.right = new FormAttachment(100, -5);
+			fd_lnkDataProtection.left = new FormAttachment(0, 5);
+			fd_lnkDataProtection.top = new FormAttachment(this.lblDataProtection, 10);
+			fd_lnkDataProtection.width = 100;
+			fd_lnkDataProtection.height = 120;
+			this.lnkDataProtection.setLayoutData(fd_lnkDataProtection);
+
+			FontData[] fD_lnkDataProtection = this.lnkDataProtection.getFont().getFontData();
+			fD_lnkDataProtection[0].setHeight(Constants.TEXT_SIZE_NORMAL);
+			this.lnkDataProtection.setFont(new Font(Display.getCurrent(),
+					fD_lnkDataProtection[0]));
+
+
+			this.lnkDataProtection.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					try {
+						URI url = new URI(Messages.getString("config.DataProtectionURL")); //$NON-NLS-1$
+						log.debug("Trying to open " + url.toString()); //$NON-NLS-1$
+						if (Desktop.isDesktopSupported()) {
+							Desktop.getDesktop().browse(url);
+						} else {
+							log.info("AWT Desktop is not supported on this platform"); //$NON-NLS-1$
+							Program.launch(url.toString());
+						}
+					} catch (IOException ex) {
+						log.error("AboutComposite: ", ex); //$NON-NLS-1$
+					} catch (URISyntaxException ex) {
+						log.error("AboutComposite: ", ex); //$NON-NLS-1$
+					}
+				}
+			});
+
 			// Load localized strings
 			reloadResources();
 		}
 
+
 		/* (non-Javadoc)
 		 * @see at.asit.pdfover.gui.composites.StateComposite#doLayout()
 		 */
@@ -358,6 +404,8 @@ public class ConfigurationComposite extends StateComposite {
 		@Override
 		public void reloadResources() {
 			this.lnkAbout.setText(Messages.getString("config.AboutText")); //$NON-NLS-1$
+			this.lnkDataProtection.setText(Messages.getString("config.DataProtectionStatement"));
+			this.lblDataProtection.setText(Messages.getString("config.DataProtection"));
 		}
 	}
 
diff --git a/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages.properties b/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages.properties
index 8304a2d4..b86c0a21 100644
--- a/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages.properties
+++ b/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages.properties
@@ -117,6 +117,9 @@ common.warning=Warning
 config.About=A&bout %s
 config.AboutText=This software is freely provided by A-SIT under the conditions of the EUPL.\nTerms and details at <a>https\://technology.a-sit.at/en/terms-of-a-license/</a>.\n\nNotice that components can have different licenses, partly restricting their free use to EUPL-licensed software.
 config.LicenseURL=https://technology.a-sit.at/en/terms-of-a-license/
+config.DataProtection=Data Protection Statement 
+config.DataProtectionStatement=The software PDF-Over processes the data required for the signature process locally on the installed device. The signature process with the citizen card is carried out locally. During the signature process with the Handy-Signatur, the PDF document to be signed is sent to the company A-Trust. The storage period and further data protection information on the mobile phone signature can be found in the data protection declaration of A-Trust <a>https://www.a-trust.at/MediaProvider/2357/datenschutzerklaerung.pdf</a>.
+config.DataProtectionURL=https://www.a-trust.at/MediaProvider/2357/datenschutzerklaerung.pdf
 config.Advanced=Ad&vanced
 config.Keystore=&Keystore
 config.Simple=Basi&c
diff --git a/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages_de.properties b/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages_de.properties
index 80ab21f6..48686c92 100644
--- a/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages_de.properties
+++ b/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages_de.properties
@@ -106,8 +106,11 @@ common.info=Information
 common.open=\u00D6ffnen
 common.warning=Warnung
 config.About=\u00DC&ber %s
-config.AboutText=Diese Software wird von A-SIT unter den Bedingungen der EUPL frei zur Verf�gung gestellt.\nLizenbedingungen unter <a>https://technology.a-sit.at/lizenzbedingungen/</a>.\n\nBeachten Sie, dass Komponenten unter eigenen Lizenzen zur Verf�gung gestellt werden, die teilweise nur f�r EUPL-lizensierte Software zur freien Verwendung vorgesehen sind.
+config.AboutText=Diese Software wird von A-SIT unter den Bedingungen der EUPL frei zur Verfügung gestellt.\nLizenbedingungen unter <a>https://technology.a-sit.at/lizenzbedingungen/</a>.\n\nBeachten Sie, dass Komponenten unter eigenen Lizenzen zur Verfügung gestellt werden, die teilweise nur für EUPL-lizensierte Software zur freien Verwendung vorgesehen sind.
 config.LicenseURL=https://technology.a-sit.at/lizenzbedingungen/
+config.DataProtection=Datenschutzinformation
+config.DataProtectionStatement=Die Software PDF-Over verarbeitet für den Signaturvorgang benötigte Daten lokal auf dem installierten Gerät.  Der Signaturvorgang mit der Bürgerkarte wird lokal durchgeführt.  Beim Signaturvorgang mit der Handy-Signatur wird das zu signierende PDF Dokument an die Firma A-Trust gesendet.  Die Speicherdauer sowie weitere Datenschutzinformationen zur Handy-Signatur entnehmen Sie bitte der Datenschutzerklärung der Firma A-Trust <a>https://www.a-trust.at/MediaProvider/2357/datenschutzerklaerung.pdf</a>.
+config.DataProtectionURL=https://www.a-trust.at/MediaProvider/2357/datenschutzerklaerung.pdf
 config.Advanced=Er&weitert
 config.Keystore=&Keystore
 config.Simple=&Einfach