summaryrefslogtreecommitdiff
path: root/pdf-over-gui/src/main
diff options
context:
space:
mode:
authortkellner <tkellner@174cde9d-5d70-4d2a-aa98-46368bc2aaf7>2013-04-10 19:01:44 +0000
committertkellner <tkellner@174cde9d-5d70-4d2a-aa98-46368bc2aaf7>2013-04-10 19:01:44 +0000
commit669b4f93eb9cd4421e105ce2756195256c79c7c2 (patch)
tree020f5567b944f57c7aa4c4274e7e803c8f1b28a3 /pdf-over-gui/src/main
parent04b78e7f795778b14b4ac3d517bb2b19a44fb8fa (diff)
downloadmocca-669b4f93eb9cd4421e105ce2756195256c79c7c2.tar.gz
mocca-669b4f93eb9cd4421e105ce2756195256c79c7c2.tar.bz2
mocca-669b4f93eb9cd4421e105ce2756195256c79c7c2.zip
+ polishing UI :)
git-svn-id: https://joinup.ec.europa.eu/svn/pdf-over/trunk@89 174cde9d-5d70-4d2a-aa98-46368bc2aaf7
Diffstat (limited to 'pdf-over-gui/src/main')
-rw-r--r--pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/DataSourceSelectComposite.java98
-rw-r--r--pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUEnterNumberComposite.java107
-rw-r--r--pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUEnterTANComposite.java107
-rw-r--r--pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages.properties2
4 files changed, 226 insertions, 88 deletions
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/DataSourceSelectComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/DataSourceSelectComposite.java
index fd466897..af87e3c7 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/DataSourceSelectComposite.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/DataSourceSelectComposite.java
@@ -112,6 +112,32 @@ public class DataSourceSelectComposite extends StateComposite {
return this.selected;
}
+ void MarkDragEnter() {
+ this.backgroundColor = this.activeBackground;
+ this.borderColor = this.activeBorder;
+ this.redrawDrop();
+ }
+
+ void MarkDragLeave() {
+ this.backgroundColor = this.getBackground();
+ this.borderColor = this.inactiveBorder;
+ this.redrawDrop();
+ }
+
+ void redrawDrop() {
+ this.lbl_drag.setBackground(this.backgroundColor);
+ this.lbl_drag2.setBackground(this.backgroundColor);
+ this.btn_open.setBackground(this.backgroundColor);
+ this.drop_area.redraw();
+ this.drop_area.layout(true, true);
+ }
+
+ Color activeBackground;
+ Color inactiveBorder;
+ Color activeBorder;
+ Color borderColor;
+ Color backgroundColor;
+
/**
* Create the composite.
*
@@ -122,6 +148,12 @@ public class DataSourceSelectComposite extends StateComposite {
public DataSourceSelectComposite(Composite parent, int style, State state) {
super(parent, style, state);
+ this.activeBackground = new Color(getDisplay(),0xD4, 0xE7, 0xF1);
+ this.inactiveBorder = this.activeBackground;
+ this.activeBorder = new Color(getDisplay(),0x6B, 0xA5, 0xD9);
+ this.backgroundColor = this.getBackground();
+ this.borderColor = this.inactiveBorder;
+
this.setLayout(new FormLayout());
// Color back = new Color(Display.getCurrent(), 77, 190, 250);
@@ -142,8 +174,14 @@ public class DataSourceSelectComposite extends StateComposite {
Rectangle clientArea = DataSourceSelectComposite.this
.drop_area.getClientArea();
- e.gc.setForeground(new Color(getDisplay(),0x6B, 0xA5, 0xD9));
+ //e.gc.setForeground(new Color(getDisplay(),0x6B, 0xA5, 0xD9));
+ e.gc.setForeground(DataSourceSelectComposite.this.borderColor);
+ e.gc.setLineWidth(3);
e.gc.setLineStyle(SWT.LINE_DASH);
+ e.gc.setBackground(DataSourceSelectComposite.this.backgroundColor);
+ e.gc.fillRoundRectangle(clientArea.x,
+ clientArea.y, clientArea.width - 2, clientArea.height - 2,
+ 10, 10);
e.gc.drawRoundRectangle(clientArea.x,
clientArea.y, clientArea.width - 2, clientArea.height - 2,
10, 10);
@@ -193,6 +231,7 @@ public class DataSourceSelectComposite extends StateComposite {
if (event.detail == DND.DROP_DEFAULT) {
if ((event.operations & DND.DROP_COPY) != 0) {
event.detail = DND.DROP_COPY;
+ MarkDragEnter();
} else {
event.detail = DND.DROP_NONE;
}
@@ -214,22 +253,31 @@ public class DataSourceSelectComposite extends StateComposite {
}
}
}
+
+ /* (non-Javadoc)
+ * @see org.eclipse.swt.dnd.DropTargetAdapter#dragLeave(org.eclipse.swt.dnd.DropTargetEvent)
+ */
+ @Override
+ public void dragLeave(DropTargetEvent event) {
+ MarkDragLeave();
+ super.dragLeave(event);
+ }
});
- final Label lbl_drag2 = new Label(this.drop_area, SWT.NONE | SWT.RESIZE );
+ this.lbl_drag2 = new Label(this.drop_area, SWT.NONE | SWT.RESIZE );
- final Label lbl_drag = new Label(this.drop_area, SWT.NONE | SWT.RESIZE );
+ this.lbl_drag = new Label(this.drop_area, SWT.NONE | SWT.RESIZE );
this.fd_lbl_drag = new FormData();
this.fd_lbl_drag.left = new FormAttachment(0, 10);
this.fd_lbl_drag.right = new FormAttachment(100, -10);
//this.fd_lbl_drag.top = new FormAttachment(40, -10);
- this.fd_lbl_drag.bottom = new FormAttachment(lbl_drag2, -10);
- lbl_drag.setLayoutData(this.fd_lbl_drag);
- FontData[] fD = lbl_drag.getFont().getFontData();
+ this.fd_lbl_drag.bottom = new FormAttachment(this.lbl_drag2, -10);
+ this.lbl_drag.setLayoutData(this.fd_lbl_drag);
+ FontData[] fD = this.lbl_drag.getFont().getFontData();
fD[0].setHeight(TEXT_SIZE_BIG);
- lbl_drag.setFont(new Font(Display.getCurrent(), fD[0]));
- lbl_drag.setText(Messages.getString("dataSourceSelection.DropLabel")); //$NON-NLS-1$
- lbl_drag.setAlignment(SWT.CENTER);
+ this.lbl_drag.setFont(new Font(Display.getCurrent(), fD[0]));
+ this.lbl_drag.setText(Messages.getString("dataSourceSelection.DropLabel")); //$NON-NLS-1$
+ this.lbl_drag.setAlignment(SWT.CENTER);
this.fd_lbl_drag2 = new FormData();
@@ -237,19 +285,19 @@ public class DataSourceSelectComposite extends StateComposite {
this.fd_lbl_drag2.right = new FormAttachment(100, -10);
this.fd_lbl_drag2.top = new FormAttachment(50, -10);
// fd_lbl_drag.bottom = new FormAttachment(100, -10);
- lbl_drag2.setLayoutData(this.fd_lbl_drag2);
- FontData[] fD2 = lbl_drag2.getFont().getFontData();
+ this.lbl_drag2.setLayoutData(this.fd_lbl_drag2);
+ FontData[] fD2 = this.lbl_drag2.getFont().getFontData();
fD2[0].setHeight(TEXT_SIZE_NORMAL);
- lbl_drag2.setFont(new Font(Display.getCurrent(), fD2[0]));
- lbl_drag2.setText(Messages.getString("dataSourceSelection.DropLabel2")); //$NON-NLS-1$
- lbl_drag2.setAlignment(SWT.CENTER);
+ this.lbl_drag2.setFont(new Font(Display.getCurrent(), fD2[0]));
+ this.lbl_drag2.setText(Messages.getString("dataSourceSelection.DropLabel2")); //$NON-NLS-1$
+ this.lbl_drag2.setAlignment(SWT.CENTER);
- final Button btn_open = new Button(this.drop_area, SWT.NATIVE | SWT.RESIZE);
- btn_open.setText(Messages.getString("dataSourceSelection.browse")); //$NON-NLS-1$
+ this.btn_open = new Button(this.drop_area, SWT.NATIVE | SWT.RESIZE);
+ this.btn_open.setText(Messages.getString("dataSourceSelection.browse")); //$NON-NLS-1$
- FontData[] fD_open = btn_open.getFont().getFontData();
+ FontData[] fD_open = this.btn_open.getFont().getFontData();
fD_open[0].setHeight(TEXT_SIZE_BUTTON);
- btn_open.setFont(new Font(Display.getCurrent(), fD_open[0]));
+ this.btn_open.setFont(new Font(Display.getCurrent(), fD_open[0]));
/*
lbl_drag.addListener(SWT.Resize, new Listener() {
@@ -275,17 +323,17 @@ public class DataSourceSelectComposite extends StateComposite {
*/
// lbl_drag.setBackground(back);
- Point size = btn_open.computeSize(SWT.DEFAULT, SWT.DEFAULT);
+ Point size = this.btn_open.computeSize(SWT.DEFAULT, SWT.DEFAULT);
this.fd_btn_open = new FormData();
this.fd_btn_open.left = new FormAttachment(50, (size.x / 2 ) * -1);
//this.fd_btn_open.right = new FormAttachment(100, -5);
//this.fd_btn_open.top = new FormAttachment(100, size.y * -1 - 10);
- this.fd_btn_open.top = new FormAttachment(lbl_drag2, 10);
+ this.fd_btn_open.top = new FormAttachment(this.lbl_drag2, 10);
//this.fd_btn_open.bottom = new FormAttachment(100, -5);
- btn_open.setLayoutData(this.fd_btn_open);
+ this.btn_open.setLayoutData(this.fd_btn_open);
// btn_open.setBackground(back);
- btn_open.addSelectionListener(new FileBrowseDialogListener());
+ this.btn_open.addSelectionListener(new FileBrowseDialogListener());
this.drop_area.pack();
}
@@ -298,6 +346,12 @@ public class DataSourceSelectComposite extends StateComposite {
FormData fd_btn_open;
+ private Label lbl_drag2;
+
+ private Label lbl_drag;
+
+ private Button btn_open;
+
@Override
protected void checkSubclass() {
// Disable the check that prevents subclassing of SWT components
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUEnterNumberComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUEnterNumberComposite.java
index 1c7e371a..da685f62 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUEnterNumberComposite.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUEnterNumberComposite.java
@@ -17,8 +17,14 @@ package at.asit.pdfover.gui.composites;
// Imports
import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.PaintEvent;
+import org.eclipse.swt.events.PaintListener;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.events.TraverseEvent;
+import org.eclipse.swt.events.TraverseListener;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.Rectangle;
import org.eclipse.swt.layout.FormAttachment;
import org.eclipse.swt.layout.FormData;
import org.eclipse.swt.layout.FormLayout;
@@ -166,60 +172,95 @@ public class MobileBKUEnterNumberComposite extends StateComposite {
super(parent, style, state);
setLayout(new FormLayout());
- this.txt_number = new Text(this, SWT.SINGLE | SWT.NATIVE | SWT.BORDER);
+ final Composite containerComposite = new Composite(this, SWT.NATIVE);
+ containerComposite.addPaintListener(new PaintListener() {
+
+ @Override
+ public void paintControl(PaintEvent e) {
+ Rectangle clientArea = containerComposite.getClientArea();
+
+ //e.gc.setForeground();
+ e.gc.setForeground(new Color(getDisplay(),0x6B, 0xA5, 0xD9));
+ e.gc.setLineWidth(3);
+ e.gc.setLineStyle(SWT.LINE_SOLID);
+ e.gc.drawRoundRectangle(clientArea.x,
+ clientArea.y, clientArea.width - 2, clientArea.height - 2,
+ 10, 10);
+ }
+ });
+ containerComposite.setLayout(new FormLayout());
+ FormData fd_containerComposite = new FormData();
+ fd_containerComposite.top = new FormAttachment(50, -100);
+ fd_containerComposite.bottom = new FormAttachment(50, 100);
+ fd_containerComposite.left = new FormAttachment(50, -250);
+ fd_containerComposite.right = new FormAttachment(50, 250);
+ containerComposite.setLayoutData(fd_containerComposite);
+
+
+ this.txt_number = new Text(containerComposite, SWT.SINGLE | SWT.NATIVE | SWT.BORDER);
FormData fd_number = new FormData();
- fd_number.top = new FormAttachment(30, -15);
- fd_number.bottom = new FormAttachment(30, 15);
- fd_number.left = new FormAttachment(50, 0);
- fd_number.right = new FormAttachment(85, 0);
+ //fd_number.top = new FormAttachment(0, 20);
+ fd_number.bottom = new FormAttachment(50, -10);
+ fd_number.left = new FormAttachment(50, 10);
+ fd_number.right = new FormAttachment(100, -20);
this.txt_number.setLayoutData(fd_number);
this.txt_number.setEditable(true);
- Label lbl_number = new Label(this, SWT.NATIVE);
+ Label lbl_number = new Label(containerComposite, SWT.NATIVE);
lbl_number.setText(Messages.getString("mobileBKU.number")); //$NON-NLS-1$
FormData fd_lbl_number = new FormData();
- fd_lbl_number.top = new FormAttachment(30, -15);
- fd_lbl_number.bottom = new FormAttachment(30, 15);
- fd_lbl_number.left = new FormAttachment(15, 0);
- fd_lbl_number.right = new FormAttachment(45, 0);
+ //fd_lbl_number.top = new FormAttachment(30, -15);
+ fd_lbl_number.bottom = new FormAttachment(50, -10);
+ fd_lbl_number.left = new FormAttachment(0, 20);
+ fd_lbl_number.right = new FormAttachment(50, -10);
lbl_number.setLayoutData(fd_lbl_number);
- this.txt_password = new Text(this, SWT.SINGLE | SWT.PASSWORD
+ this.txt_password = new Text(containerComposite, SWT.SINGLE | SWT.PASSWORD
| SWT.BORDER | SWT.NATIVE);
FormData fd_password = new FormData();
- fd_password.top = new FormAttachment(50, -15);
- fd_password.bottom = new FormAttachment(50, 15);
- fd_password.left = new FormAttachment(50, 0);
- fd_password.right = new FormAttachment(85, 0);
+ fd_password.top = new FormAttachment(50, 10);
+ //fd_password.bottom = new FormAttachment(50, 15);
+ fd_password.left = new FormAttachment(50, 10);
+ fd_password.right = new FormAttachment(100, -20);
this.txt_password.setLayoutData(fd_password);
this.txt_password.setEditable(true);
+ this.txt_password.addTraverseListener(new TraverseListener() {
+
+ @Override
+ public void keyTraversed(TraverseEvent e) {
+ if (e.detail == SWT.TRAVERSE_RETURN) {
+ (new OkSelectionListener()).widgetSelected(null);
+ }
+ }
+ });
- Label lbl_password = new Label(this, SWT.NATIVE);
+ Label lbl_password = new Label(containerComposite, SWT.NATIVE);
lbl_password.setText(Messages.getString("mobileBKU.password")); //$NON-NLS-1$
FormData fd_lbl_password = new FormData();
- fd_lbl_password.top = new FormAttachment(50, -15);
- fd_lbl_password.bottom = new FormAttachment(50, 15);
- fd_lbl_password.left = new FormAttachment(15, 0);
- fd_lbl_password.right = new FormAttachment(45, 0);
+ fd_lbl_password.top = new FormAttachment(50, 10);
+ //fd_lbl_password.bottom = new FormAttachment(50, 15);
+ fd_lbl_password.left = new FormAttachment(0, 20);
+ fd_lbl_password.right = new FormAttachment(50, -10);
lbl_password.setLayoutData(fd_lbl_password);
- this.lbl_error = new Label(this, SWT.WRAP | SWT.NATIVE);
- FormData fd_lbl_error = new FormData();
- fd_lbl_error.top = new FormAttachment(70, -15);
- fd_lbl_error.bottom = new FormAttachment(70, 15);
- fd_lbl_error.left = new FormAttachment(15, 0);
- fd_lbl_error.right = new FormAttachment(85, 0);
- this.lbl_error.setLayoutData(fd_lbl_error);
-
- Button btn_ok = new Button(this, SWT.NATIVE);
+ Button btn_ok = new Button(containerComposite, SWT.NATIVE);
btn_ok.setText(Messages.getString("common.Ok")); //$NON-NLS-1$
FormData fd_btn_ok = new FormData();
- fd_btn_ok.top = new FormAttachment(87, 0);
- fd_btn_ok.bottom = new FormAttachment(95, 0);
- fd_btn_ok.left = new FormAttachment(75, 0);
- fd_btn_ok.right = new FormAttachment(95, 0);
+ //fd_btn_ok.top = new FormAttachment(87, 0);
+ fd_btn_ok.bottom = new FormAttachment(100, -20);
+ fd_btn_ok.right = new FormAttachment(100, -20);
+ fd_btn_ok.left = new FormAttachment(100, -70);
btn_ok.setLayoutData(fd_btn_ok);
btn_ok.addSelectionListener(new OkSelectionListener());
+
+ this.lbl_error = new Label(containerComposite, SWT.WRAP | SWT.NATIVE);
+ FormData fd_lbl_error = new FormData();
+ //fd_lbl_error.top = new FormAttachment(70, -15);
+ fd_lbl_error.bottom = new FormAttachment(100, -20);
+ //fd_lbl_error.left = new FormAttachment(15, 0);
+ fd_lbl_error.right = new FormAttachment(btn_ok, -10);
+ this.lbl_error.setLayoutData(fd_lbl_error);
+
}
@Override
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 92a3515b..683ebd12 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
@@ -19,8 +19,14 @@ package at.asit.pdfover.gui.composites;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.PaintEvent;
+import org.eclipse.swt.events.PaintListener;
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.Rectangle;
import org.eclipse.swt.layout.FormAttachment;
import org.eclipse.swt.layout.FormData;
import org.eclipse.swt.layout.FormLayout;
@@ -74,8 +80,7 @@ public class MobileBKUEnterTANComposite extends StateComposite {
/**
* SLF4J Logger instance
**/
- @SuppressWarnings("unused")
- private static final Logger log = LoggerFactory
+ static final Logger log = LoggerFactory
.getLogger(MobileBKUEnterTANComposite.class);
Text txt_tan;
@@ -103,6 +108,8 @@ public class MobileBKUEnterTANComposite extends StateComposite {
*/
public void setMessage(String msg) {
this.lbl_tries.setText(msg);
+ this.lbl_tries.redraw();
+ this.lbl_tries.getParent().layout(true, true);
}
/**
@@ -171,69 +178,105 @@ public class MobileBKUEnterTANComposite extends StateComposite {
super(parent, style, state);
setLayout(new FormLayout());
- Label lblVergleichswert = new Label(this, SWT.NATIVE);
+ final Composite containerComposite = new Composite(this, SWT.NATIVE);
+ containerComposite.addPaintListener(new PaintListener() {
+
+ @Override
+ public void paintControl(PaintEvent e) {
+ Rectangle clientArea = containerComposite.getClientArea();
+
+ //e.gc.setForeground();
+ e.gc.setForeground(new Color(getDisplay(),0x6B, 0xA5, 0xD9));
+ e.gc.setLineWidth(3);
+ e.gc.setLineStyle(SWT.LINE_SOLID);
+ e.gc.drawRoundRectangle(clientArea.x,
+ clientArea.y, clientArea.width - 2, clientArea.height - 2,
+ 10, 10);
+ }
+ });
+ containerComposite.setLayout(new FormLayout());
+ FormData fd_containerComposite = new FormData();
+ fd_containerComposite.top = new FormAttachment(50, -100);
+ fd_containerComposite.bottom = new FormAttachment(50, 100);
+ fd_containerComposite.left = new FormAttachment(50, -250);
+ fd_containerComposite.right = new FormAttachment(50, 250);
+ containerComposite.setLayoutData(fd_containerComposite);
+
+
+ Label lblVergleichswert = new Label(containerComposite, SWT.NATIVE);
FormData fd_lblVergleichswert = new FormData();
- fd_lblVergleichswert.left = new FormAttachment(15, 0);
- fd_lblVergleichswert.right = new FormAttachment(50, 0);
- fd_lblVergleichswert.top = new FormAttachment(30, -15);
- fd_lblVergleichswert.bottom = new FormAttachment(30, 15);
+ fd_lblVergleichswert.left = new FormAttachment(0, 20);
+ fd_lblVergleichswert.right = new FormAttachment(50, -10);
+ //fd_lblVergleichswert.top = new FormAttachment(30, -15);
+ fd_lblVergleichswert.bottom = new FormAttachment(50, -10);
lblVergleichswert.setLayoutData(fd_lblVergleichswert);
lblVergleichswert.setText(Messages.getString("tanEnter.ReferenceValue")); //$NON-NLS-1$
- this.lblvergleich = new Label(this, SWT.NATIVE);
+ this.lblvergleich = new Label(containerComposite, SWT.NATIVE);
FormData fd_lblvergleich = new FormData();
- fd_lblvergleich.left = new FormAttachment(50, 0);
- fd_lblvergleich.right = new FormAttachment(85, 0);
- fd_lblvergleich.top = new FormAttachment(30, -15);
- fd_lblvergleich.bottom = new FormAttachment(30, 15);
+ fd_lblvergleich.left = new FormAttachment(50, 10);
+ fd_lblvergleich.right = new FormAttachment(100, -20);
+ //fd_lblvergleich.top = new FormAttachment(30, -15);
+ fd_lblvergleich.bottom = new FormAttachment(50, -10);
this.lblvergleich.setLayoutData(fd_lblvergleich);
this.lblvergleich.setText(""); //$NON-NLS-1$
- Label lblTan = new Label(this, SWT.NATIVE);
+ Label lblTan = new Label(containerComposite, SWT.NATIVE);
FormData fd_lblTan = new FormData();
- fd_lblTan.left = new FormAttachment(15, 5);
- fd_lblTan.right = new FormAttachment(50, -5);
- fd_lblTan.top = new FormAttachment(50, -15);
- fd_lblTan.bottom = new FormAttachment(50, 15);
+ fd_lblTan.left = new FormAttachment(0, 20);
+ fd_lblTan.right = new FormAttachment(50, -10);
+ fd_lblTan.top = new FormAttachment(50, 10);
+ //fd_lblTan.bottom = new FormAttachment(50, 15);
lblTan.setLayoutData(fd_lblTan);
lblTan.setText(Messages.getString("tanEnter.TAN")); //$NON-NLS-1$
- this.txt_tan = new Text(this, SWT.BORDER | SWT.NATIVE);
+ this.txt_tan = new Text(containerComposite, SWT.BORDER | SWT.NATIVE);
FormData fd_text = new FormData();
- fd_text.left = new FormAttachment(50, 0);
- fd_text.right = new FormAttachment(85, 0);
- fd_text.top = new FormAttachment(50, -15);
- fd_text.left = new FormAttachment(50, 15);
+ fd_text.left = new FormAttachment(50, 10);
+ fd_text.right = new FormAttachment(100, -20);
+ fd_text.top = new FormAttachment(50, 10);
this.txt_tan.setEditable(true);
this.txt_tan.setLayoutData(fd_text);
+ this.txt_tan.addTraverseListener(new TraverseListener() {
+
+ @Override
+ public void keyTraversed(TraverseEvent e) {
+ if (e.detail == SWT.TRAVERSE_RETURN) {
+ (new OkSelectionListener()).widgetSelected(null);
+ }
+ }
+ });
+
this.txt_tan.addModifyListener(new ModifyListener() {
@Override
public void modifyText(ModifyEvent e) {
String text = MobileBKUEnterTANComposite.this.txt_tan.getText();
-
+ log.debug("Current TAN: " + text); //$NON-NLS-1$
if(text.length() > 3 && MobileBKUEnterTANComposite.this.getVergleichswert().startsWith(text.trim())) {
MobileBKUEnterTANComposite.this.setMessage(Messages.getString("error.EnteredReferenceValue")); //$NON-NLS-1$
}
}
});
- this.lbl_tries = new Label(this, SWT.WRAP | SWT.NATIVE);
+ Button btn_ok = new Button(containerComposite, SWT.NATIVE);
+
+ this.lbl_tries = new Label(containerComposite, SWT.WRAP | SWT.NATIVE);
FormData fd_lbl_tries = new FormData();
- fd_lbl_tries.left = new FormAttachment(15, 5);
- fd_lbl_tries.right = new FormAttachment(85, -5);
- fd_lbl_tries.top = new FormAttachment(70, -15);
- fd_lbl_tries.bottom = new FormAttachment(70, 15);
+ //fd_lbl_tries.left = new FormAttachment(15, 5);
+ fd_lbl_tries.right = new FormAttachment(btn_ok, -10);
+ //fd_lbl_tries.top = new FormAttachment(70, -15);
+ fd_lbl_tries.bottom = new FormAttachment(100, -20);
this.lbl_tries.setLayoutData(fd_lbl_tries);
- Button btn_ok = new Button(this, SWT.NATIVE);
+
FormData fd_btn_ok = new FormData();
//fd_btn_ok.left = new FormAttachment(95, 0);
- fd_btn_ok.right = new FormAttachment(95, 0);
- fd_btn_ok.top = new FormAttachment(85);
- fd_btn_ok.bottom = new FormAttachment(95);
+ fd_btn_ok.right = new FormAttachment(100, -20);
+ fd_btn_ok.left = new FormAttachment(100, -70);
+ fd_btn_ok.bottom = new FormAttachment(100,-20);
btn_ok.setLayoutData(fd_btn_ok);
btn_ok.setText(Messages.getString("common.Ok")); //$NON-NLS-1$
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 643d3cff..c32ffb0f 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
@@ -94,4 +94,4 @@ simple_config.Proxy_Title=Proxy
simple_config.UseEmblem=Use emblem
tanEnter.ReferenceValue=reference value
tanEnter.TAN=TAN\:
-tanEnter.tries=tries left\!"
+tanEnter.tries=tries left\!