From 00170b1b9a6dfa5255a85e8789992f5a499a69d5 Mon Sep 17 00:00:00 2001 From: tkellner Date: Mon, 2 Apr 2012 16:39:01 +0000 Subject: @all - change to equal button names @PersonIdentityLink - scale fonts if frame is resized @HardwareInfoe - insert title label git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@1044 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4 --- .../java/at/gv/egiz/bku/gui/GetCertificateGUI.java | 6 ++- .../at/gv/egiz/bku/gui/GetHardwareInfoGUI.java | 5 +- .../gv/egiz/bku/gui/GetHardwareInfoGUIFacade.java | 2 + .../at/gv/egiz/bku/gui/PersonIdentityLinkGUI.java | 61 +++++++++++++++++++++- .../egiz/bku/gui/PersonIdentityLinkGUIFacade.java | 1 - .../gv/egiz/bku/gui/ActivationMessages.properties | 9 ++-- .../egiz/bku/gui/ActivationMessages_de.properties | 9 ++-- 7 files changed, 80 insertions(+), 13 deletions(-) diff --git a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/GetCertificateGUI.java b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/GetCertificateGUI.java index 0103bbb1..e048e877 100644 --- a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/GetCertificateGUI.java +++ b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/GetCertificateGUI.java @@ -76,7 +76,7 @@ public class GetCertificateGUI extends CardMgmtGUI implements mainPanel.removeAll(); buttonPanel.removeAll(); - + titleLabel.setText(getMessage(TITLE_GETCERTIFICATE)); getSimCertButton = new JButton(); @@ -106,7 +106,9 @@ public class GetCertificateGUI extends CardMgmtGUI implements if (windowCloseAdapter != null) { windowCloseAdapter.registerListener(cancelListener, cancelCmd); } - + + + cancelButton.requestFocus(); contentPanel.validate(); resize(); diff --git a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/GetHardwareInfoGUI.java b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/GetHardwareInfoGUI.java index bcfac512..6fce3a1e 100644 --- a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/GetHardwareInfoGUI.java +++ b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/GetHardwareInfoGUI.java @@ -85,8 +85,10 @@ public class GetHardwareInfoGUI extends CardMgmtGUI implements mainPanel.removeAll(); buttonPanel.removeAll(); + titleLabel.setText(getMessage(TITLE_HARDWAREINFO)); + backButton.setFont(backButton.getFont().deriveFont(backButton.getFont().getStyle()& ~java.awt.Font.BOLD)); - backButton.setText(getMessage(BUTTON_BACK)); + backButton.setText(getMessage(BUTTON_CLOSE)); backButton.setActionCommand(backcmd); backButton.addActionListener(hardwareinfolistener); backButton.setEnabled(true); @@ -144,6 +146,7 @@ public class GetHardwareInfoGUI extends CardMgmtGUI implements renderHardwareInfoFrame(); + backButton.requestFocus(); contentPanel.validate(); resize(); diff --git a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/GetHardwareInfoGUIFacade.java b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/GetHardwareInfoGUIFacade.java index c121417e..21b96d18 100644 --- a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/GetHardwareInfoGUIFacade.java +++ b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/GetHardwareInfoGUIFacade.java @@ -36,6 +36,8 @@ public interface GetHardwareInfoGUIFacade extends BKUGUIFacade { public static final String LABEL_SMARTCARD = "label.hardwareinfo.smartcard"; public static final String LABEL_SMARTCARD_TYPE = "label.hardwareinfo.smartcard.type"; public static final String LABEL_SMARTCARD_ATR = "label.hardwareinfo.smartcard.atr"; + + public static final String TITLE_HARDWAREINFO = "title.hardwareinfo"; public void showHardwareInfoDialog(final ActionListener hardwareinfolistener, final String backcmd, final String showcardreadername, final String showsmartcardname, final String showsmartcardATR); diff --git a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PersonIdentityLinkGUI.java b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PersonIdentityLinkGUI.java index a17a9a0f..32259746 100644 --- a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PersonIdentityLinkGUI.java +++ b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PersonIdentityLinkGUI.java @@ -108,7 +108,7 @@ public class PersonIdentityLinkGUI extends CardMgmtGUI implements activateButton.addActionListener(activateListener); activateButton.setActionCommand(actionCommand); - activateButton.setText(getMessage(PersonIdentityLinkGUIFacade.IDENTIFY_BUTTON)); + activateButton.setText(getMessage(BUTTON_CLOSE)); firstNameLabel_description = new JLabel(); firstNameLabel_description.setText(getMessage(PersonIdentityLinkGUIFacade.FIRSTNAME)); @@ -239,4 +239,63 @@ public class PersonIdentityLinkGUI extends CardMgmtGUI implements buttonPanelLayout.setVerticalGroup(buttonVertical); } + + @Override + public void resize() { + + log.debug("Resizing Personal IdentityLink Applet ..."); + + float factor = getResizeFactor(); + + + if (mgmtLabel != null) { + mgmtLabel.setFont(mgmtLabel.getFont().deriveFont( + (float) ((baseFontSize)* factor))); + } + + if (activateButton != null) { + activateButton.setFont(activateButton.getFont().deriveFont( + (float) ((baseFontSize)* factor))); + } + + if (firstNameLabel_description != null) { + firstNameLabel_description.setFont(firstNameLabel_description.getFont().deriveFont( + (float) ((baseFontSize)* factor))); + } + + if (lastNameLabel_description != null) { + lastNameLabel_description.setFont(lastNameLabel_description.getFont().deriveFont( + (float) ((baseFontSize)* factor))); + } + + if (birthdateLabel_description != null) { + birthdateLabel_description.setFont(birthdateLabel_description.getFont().deriveFont( + (float) ((baseFontSize)* factor))); + } + + if (firstNameLabel != null) { + firstNameLabel.setFont(firstNameLabel.getFont().deriveFont( + (float) ((baseFontSize)* factor))); + } + + if (lastNameLabel != null) { + lastNameLabel.setFont(lastNameLabel.getFont().deriveFont( + (float) ((baseFontSize)* factor))); + } + + if (birthdateLabel != null) { + birthdateLabel.setFont(birthdateLabel.getFont().deriveFont( + (float) ((baseFontSize)* factor))); + } + + + if (activateButton != null) { + + activateButton.setFont(activateButton.getFont().deriveFont( + (float) (baseFontSize * factor))); + + } + + super.resize(); + } } diff --git a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PersonIdentityLinkGUIFacade.java b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PersonIdentityLinkGUIFacade.java index 75163f4e..d0332284 100644 --- a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PersonIdentityLinkGUIFacade.java +++ b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PersonIdentityLinkGUIFacade.java @@ -38,7 +38,6 @@ public interface PersonIdentityLinkGUIFacade extends BKUGUIFacade { public static final String TITLE_IDENITY = "title.identity"; public static final String MESSAGE_IDENITY = "identity.msg"; - public static final String IDENTIFY_BUTTON = "identity.button"; public static final String ERR_INFOBOX_INVALID = "err.infobox.invalid"; diff --git a/BKUGuiExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages.properties b/BKUGuiExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages.properties index eefd451b..4e973e5c 100644 --- a/BKUGuiExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages.properties +++ b/BKUGuiExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages.properties @@ -29,8 +29,9 @@ title.activate.success=Success title.change.success=Success title.unblock.success=Success title.identity=Person Identity Link -title.certificate.save=Save certificate -title.get.certificate=Save certificates +title.certificate.save=Save certificate +title.get.certificate=Save certificates +title.hardwareinfo = Hardware Information # removed message.* prefix to reuse keys as help keys pin.mgmt={0} PINs available @@ -73,8 +74,8 @@ label.repeat.pin=Confirmation: label.hardwareinfo.cardreader = Cardreader label.hardwareinfo.smartcard = Smartcard -label.hardwareinfo.smartcard.type = Type: -label.hardwareinfo.smartcard.atr = ATR: +label.hardwareinfo.smartcard.type = Type: +label.hardwareinfo.smartcard.atr = ATR: file.certificate = Certificate diff --git a/BKUGuiExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages_de.properties b/BKUGuiExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages_de.properties index 30a80e6f..9bb621e2 100644 --- a/BKUGuiExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages_de.properties +++ b/BKUGuiExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages_de.properties @@ -29,14 +29,15 @@ title.activate.success=Erfolg title.change.success=Erfolg title.unblock.success=Erfolg title.identity=Personenbindung +title.hardwareinfo=Informationen zur Hardware identity.msg=Informationen zur Personenbindung identity.button=Abbrechen identity.firstname=Vorname identity.dateofbirth=Geburtsdatum identity.lastname=Nachname -title.certificate.save=Zertifikat speichern -title.get.certificate=Zertifikate speichern +title.certificate.save=Zertifikat speichern +title.get.certificate=Zertifikate speichern # removed message.* prefix to reuse keys as help keys pin.mgmt=Die Karte verf\u00FCgt \u00FCber {0} PINs @@ -73,8 +74,8 @@ label.repeat.pin=Best\u00E4tigung: label.hardwareinfo.cardreader = Kartenlesegerät label.hardwareinfo.smartcard = Chipkarte -label.hardwareinfo.smartcard.type = Typ: -label.hardwareinfo.smartcard.atr = ATR: +label.hardwareinfo.smartcard.type = Typ: +label.hardwareinfo.smartcard.atr = ATR: file.certificate = Zertifikat -- cgit v1.2.3