From c097313bf68bdeb54a6ac1dfaa308bf45ba7e80a Mon Sep 17 00:00:00 2001 From: Andreas Abraham Date: Fri, 13 Aug 2021 09:50:59 +0200 Subject: Change label for mobile phone number --- .../composites/MobileBKUEnterNumberComposite.java | 28 ++++++++++------------ .../at/asit/pdfover/gui/messages.properties | 2 +- .../at/asit/pdfover/gui/messages_de.properties | 2 +- 3 files changed, 14 insertions(+), 18 deletions(-) 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 250cc238..5c372848 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 @@ -196,20 +196,16 @@ public class MobileBKUEnterNumberComposite extends StateComposite { setLayout(new FormLayout()); 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(Constants.MAINBAR_ACTIVE_BACK_DARK); - 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.addPaintListener(e -> { + Rectangle clientArea = containerComposite.getClientArea(); + + //e.gc.setForeground(); + 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, clientArea.width - 2, clientArea.height - 2, + 10, 10); }); containerComposite.setLayout(new FormLayout()); FormData fd_containerComposite = new FormData(); @@ -246,8 +242,8 @@ public class MobileBKUEnterNumberComposite extends StateComposite { Image mobile = new Image(getDisplay(), data); FormData fd_lbl_image = new FormData(); - fd_lbl_image.top = new FormAttachment(50, -1 * (data.width / 2)); - fd_lbl_image.bottom = new FormAttachment(50, data.width / 2); + fd_lbl_image.top = new FormAttachment(20, -1 * (data.width / 2)); + fd_lbl_image.bottom = new FormAttachment(20, data.width / 2); fd_lbl_image.left = new FormAttachment(0, 10); fd_lbl_image.width = data.width; lbl_image.setLayoutData(fd_lbl_image); 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 b86c0a21..2a60104b 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 @@ -199,7 +199,7 @@ main.signature=Signing mobileBKU.aTrustDisclaimer=This service is provided by A-Trust mobileBKU.certExpiresSoon=Since the validity of your certificate expires in the next few days, a new activation is necessary (free of charge). Press "Yes" to visit https\://www.handy-signatur.at/ now, and then sign in to your account. mobileBKU.notice=Notice from server\: -mobileBKU.number=Number\: +mobileBKU.number=Username/Phone Number\: mobileBKU.password=Password\: mobileBKU.show=Show signature data mobileBKU.show_tooltip=Shows the data to be signed 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 48686c92..2b0f4dd5 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 @@ -190,7 +190,7 @@ main.signature=Signatur mobileBKU.aTrustDisclaimer=Dieses Service wird von der Fa. A-Trust zu Verf\u00FCgung gestellt mobileBKU.certExpiresSoon=Da die G\u00FCltigkeit Ihres Zertifikats in den n\u00E4chsten Tagen endet, ist eine erneute Aktivierung erforderlich (geb\u00FChrenfrei). W\u00E4hlen Sie "Ja" um https\://www.handy-signatur.at/ zu \u00F6ffnen, und loggen Sie sich dann in Ihr Konto ein. mobileBKU.notice=Nachricht vom Server\: -mobileBKU.number=Nummer\: +mobileBKU.number=Benutzername/Telefonnummer\: mobileBKU.password=Passwort\: mobileBKU.show=Signaturdaten anzeigen mobileBKU.show_tooltip=Zeigt die zu signierenden Daten an -- cgit v1.2.3