summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortkellner <tkellner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>2012-04-02 16:39:01 +0000
committertkellner <tkellner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>2012-04-02 16:39:01 +0000
commit00170b1b9a6dfa5255a85e8789992f5a499a69d5 (patch)
treea79a338513fd7734b7a5d84f0085573b60fdf5ef
parente9cfce38bb295d47459c8d976aa9a720719cfb75 (diff)
downloadmocca-00170b1b9a6dfa5255a85e8789992f5a499a69d5.tar.gz
mocca-00170b1b9a6dfa5255a85e8789992f5a499a69d5.tar.bz2
mocca-00170b1b9a6dfa5255a85e8789992f5a499a69d5.zip
@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
-rw-r--r--BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/GetCertificateGUI.java6
-rw-r--r--BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/GetHardwareInfoGUI.java5
-rw-r--r--BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/GetHardwareInfoGUIFacade.java2
-rw-r--r--BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PersonIdentityLinkGUI.java61
-rw-r--r--BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PersonIdentityLinkGUIFacade.java1
-rw-r--r--BKUGuiExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages.properties9
-rw-r--r--BKUGuiExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages_de.properties9
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=<html>Success</html>
title.change.success=<html>Success</html>
title.unblock.success=<html>Success</html>
title.identity=<html>Person Identity Link</html>
-title.certificate.save=Save certificate
-title.get.certificate=Save certificates
+title.certificate.save=<html>Save certificate</html>
+title.get.certificate=<html>Save certificates</html>
+title.hardwareinfo = <html>Hardware Information</html>
# removed message.* prefix to reuse keys as help keys
pin.mgmt=<html>{0} PINs available
@@ -73,8 +74,8 @@ label.repeat.pin=<html>Confirmation:</html>
label.hardwareinfo.cardreader = Cardreader
label.hardwareinfo.smartcard = Smartcard
-label.hardwareinfo.smartcard.type = Type:
-label.hardwareinfo.smartcard.atr = ATR:
+label.hardwareinfo.smartcard.type = <html>Type:</html>
+label.hardwareinfo.smartcard.atr = <html>ATR:</html>
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=<html>Erfolg</html>
title.change.success=<html>Erfolg</html>
title.unblock.success=<html>Erfolg</html>
title.identity=<html>Personenbindung</html>
+title.hardwareinfo=<html>Informationen zur Hardware</html>
identity.msg=<html>Informationen zur Personenbindung
identity.button=<html>Abbrechen</html>
identity.firstname=<html>Vorname</html>
identity.dateofbirth=<html>Geburtsdatum</html>
identity.lastname=<html>Nachname</html>
-title.certificate.save=Zertifikat speichern
-title.get.certificate=Zertifikate speichern
+title.certificate.save=<html>Zertifikat speichern</html>
+title.get.certificate=<html>Zertifikate speichern</html>
# removed message.* prefix to reuse keys as help keys
pin.mgmt=<html>Die Karte verf\u00FCgt \u00FCber {0} PINs</html>
@@ -73,8 +74,8 @@ label.repeat.pin=<html>Best\u00E4tigung:</html>
label.hardwareinfo.cardreader = Kartenlesegerät
label.hardwareinfo.smartcard = Chipkarte
-label.hardwareinfo.smartcard.type = Typ:
-label.hardwareinfo.smartcard.atr = ATR:
+label.hardwareinfo.smartcard.type = <html>Typ:</html>
+label.hardwareinfo.smartcard.atr = <html>ATR:</html>
file.certificate = Zertifikat