Changed UI component for signature from button to link

Changed signature data messages

git-svn-id: https://joinup.ec.europa.eu/svn/pdf-over/trunk@379 174cde9d-5d70-4d2a-aa98-46368bc2aaf7

3 files changed, 8 insertions, 7 deletions

diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUEnterTANComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUEnterTANComposite.java
index bcf6108d..51ea61e7 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUEnterTANComposite.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUEnterTANComposite.java
@@ -28,7 +28,6 @@ import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.TraverseEvent;
 import org.eclipse.swt.events.TraverseListener;
-import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.ImageData;
 import org.eclipse.swt.graphics.Rectangle;
@@ -38,10 +37,12 @@ import org.eclipse.swt.layout.FormLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Link;
 import org.eclipse.swt.widgets.Text;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import at.asit.pdfover.gui.Constants;
 import at.asit.pdfover.gui.utils.Messages;
 import at.asit.pdfover.gui.workflow.states.State;
 
@@ -250,7 +251,7 @@ public class MobileBKUEnterTANComposite extends StateComposite {
 				Rectangle clientArea = containerComposite.getClientArea();
 
 				// e.gc.setForeground();
-				e.gc.setForeground(new Color(getDisplay(), 0x6B, 0xA5, 0xD9));
+				e.gc.setForeground(Constants.MAINBAR_ACTIVE_BACK_DARK);
 				e.gc.setLineWidth(3);
 				e.gc.setLineStyle(SWT.LINE_SOLID);
 				e.gc.drawRoundRectangle(clientArea.x, clientArea.y,
@@ -345,11 +346,11 @@ public class MobileBKUEnterTANComposite extends StateComposite {
 
 		Button btn_ok = new Button(containerComposite, SWT.NATIVE);
 
-		Button lnk_sig_data = new Button(containerComposite, SWT.NATIVE | SWT.RESIZE);
+		Link lnk_sig_data = new Link(containerComposite, SWT.NATIVE | SWT.RESIZE);
 
 		FormData fd_lnk_data = new FormData();
 		fd_lnk_data.right = new FormAttachment(100, -20);
-		fd_lnk_data.bottom = new FormAttachment(100, -20);
+		fd_lnk_data.bottom = new FormAttachment(btn_ok, -5);
 		lnk_sig_data.setEnabled(true);
 		lnk_sig_data.setLayoutData(fd_lnk_data);
 		lnk_sig_data.addSelectionListener(new ShowSignatureDataListener());
@@ -366,7 +367,7 @@ public class MobileBKUEnterTANComposite extends StateComposite {
 
 		FormData fd_btn_ok = new FormData();
 		// fd_btn_ok.left = new FormAttachment(95, 0);
-		fd_btn_ok.right = new FormAttachment(lnk_sig_data, -10);
+		fd_btn_ok.right = new FormAttachment(100, -20);
 		//fd_btn_ok.left = new FormAttachment(100, -70);
 		fd_btn_ok.bottom = new FormAttachment(100, -20);
 
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 f4b7898e..dd7c3fb7 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
@@ -100,7 +100,7 @@ main.signature=Signing
 main.title=PDF-Over
 mobileBKU.number=Number:
 mobileBKU.password=Password:
-mobileBKU.show=Show
+mobileBKU.show=<a>Show signature data</a>
 mobileBKU.show_tooltip=Show signature data
 output.file_ask_overwrite=File %s already exists, do you want to overwrite it?
 output.link_open_message=You can open the signed file <a>here</a>
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 7bcbef5b..4ac22972 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
@@ -100,7 +100,7 @@ main.signature=Signatur
 main.title=PDF-Over
 mobileBKU.number=Nummer:
 mobileBKU.password=Passwort:
-mobileBKU.show=Show
+mobileBKU.show=<a>Signaturdaten anzeigen</a>
 mobileBKU.show_tooltip=Zeigt die Signaturdaten an
 output.file_ask_overwrite=Datei %s existiert bereits, wollen Sie sie überschreiben?
 output.link_open_message=Sie können das signierte Dokument <a>hier</a> öffnen