Mercurial > hg > release > icedtea-web-1.8
changeset 1256:fa9ab81405a9
Fixed to short buttons for localized text - RH1231441
* NEWS: mentioned RH1231441
* netx/net/sourceforge/jnlp/security/dialogs/AppletWarningPane.java: removed set of preferred sizes to minimal size. added debugging main method
* netx/net/sourceforge/jnlp/security/dialogs/PasswordAuthenticationPane.java: same
* netx/net/sourceforge/jnlp/security/dialogs/CertWarningPane.java: removed set of preferred sizes to minimal size.
* netx/net/sourceforge/jnlp/security/dialogs/MissingALACAttributePanel.java: same
* netx/net/sourceforge/jnlp/security/dialogs/MissingPermissionsAttributePanel.java: same
author | Jiri Vanek <jvanek@redhat.com> |
---|---|
date | Thu, 25 Jun 2015 11:17:33 +0200 |
parents | 0c37c46e9e9b |
children | 2bd186bfd9c9 |
files | ChangeLog NEWS netx/net/sourceforge/jnlp/security/dialogs/AppletWarningPane.java netx/net/sourceforge/jnlp/security/dialogs/CertWarningPane.java netx/net/sourceforge/jnlp/security/dialogs/MissingALACAttributePanel.java netx/net/sourceforge/jnlp/security/dialogs/MissingPermissionsAttributePanel.java netx/net/sourceforge/jnlp/security/dialogs/PasswordAuthenticationPane.java |
diffstat | 7 files changed, 48 insertions(+), 32 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Jun 22 20:56:06 2015 +0200 +++ b/ChangeLog Thu Jun 25 11:17:33 2015 +0200 @@ -1,4 +1,20 @@ - +2015-06-25 Jiri Vanek <jvanek@redhat.com> + + Fixed to short buttons for localized text - RH1231441 + * NEWS: mentioned RH1231441 + * netx/net/sourceforge/jnlp/security/dialogs/AppletWarningPane.java: removed + set of preferred sizes to minimal size. added debugging main method + * netx/net/sourceforge/jnlp/security/dialogs/PasswordAuthenticationPane.java + same + * netx/net/sourceforge/jnlp/security/dialogs/CertWarningPane.java: removed + set of preferred sizes to minimal size. + * netx/net/sourceforge/jnlp/security/dialogs/MissingALACAttributePanel.java: + same + * netx/net/sourceforge/jnlp/security/dialogs/MissingPermissionsAttributePanel.java: + same + +2015-06-20 Jiri Vanek <jvanek@redhat.com> + DummyJNLPFileWithJar enhanced to accept urls only, added test to UnsignedAppletTrustConfirmationTest * netx/net/sourceforge/jnlp/security/appletextendedsecurity/UnsignedAppletTrustConfirmation.java: (updateAppletAction) fixed wrong type, Class<RememberableDialog> become
--- a/NEWS Mon Jun 22 20:56:06 2015 +0200 +++ b/NEWS Thu Jun 25 11:17:33 2015 +0200 @@ -15,6 +15,7 @@ * trustAll/trustNone now processed correctly * headless no longer shows dialogues * more dialogs got remember me possibility +* RH1231441 Unable to read the text of the buttons of the security dialogue - MissingALACAttributePanel - AccessWarning - MissingPermissionsAttributePanel
--- a/netx/net/sourceforge/jnlp/security/dialogs/AppletWarningPane.java Mon Jun 22 20:56:06 2015 +0200 +++ b/netx/net/sourceforge/jnlp/security/dialogs/AppletWarningPane.java Thu Jun 25 11:17:33 2015 +0200 @@ -46,8 +46,10 @@ import javax.swing.BorderFactory; import javax.swing.BoxLayout; import javax.swing.JButton; +import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JPanel; +import net.sourceforge.jnlp.runtime.Translator; import net.sourceforge.jnlp.security.CertVerifier; import net.sourceforge.jnlp.security.SecurityDialog; import net.sourceforge.jnlp.security.dialogresults.DialogResult; @@ -90,15 +92,9 @@ //run and cancel buttons JPanel buttonPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT)); - JButton yes = new JButton("Yes"); - JButton no = new JButton("No"); - JButton cancel = new JButton("Cancel"); - int buttonWidth = cancel.getMinimumSize().width; - int buttonHeight = cancel.getMinimumSize().height; - Dimension d = new Dimension(buttonWidth, buttonHeight); - yes.setPreferredSize(d); - no.setPreferredSize(d); - cancel.setPreferredSize(d); + JButton yes = new JButton(Translator.R("ButYes")); + JButton no = new JButton(Translator.R("ButNo")); + JButton cancel = new JButton(Translator.R("ButCancel")); yes.addActionListener(SetValueHandler.createSetValueListener(parent, YesNoCancel.yes())); no.addActionListener(SetValueHandler.createSetValueListener(parent, YesNoCancel.no())); cancel.addActionListener(SetValueHandler.createSetValueListener(parent, YesNoCancel.cancel())); @@ -134,5 +130,14 @@ public String helpToStdIn() { return YesNoCancel.cancel().getAllowedValues().toString(); } + + public static void main(String[] args) { + AppletWarningPane w = new AppletWarningPane(null, null); + JFrame f = new JFrame(); + f.setSize(600, 400); + f.add(w, BorderLayout.CENTER); + f.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + f.setVisible(true); + } }
--- a/netx/net/sourceforge/jnlp/security/dialogs/CertWarningPane.java Mon Jun 22 20:56:06 2015 +0200 +++ b/netx/net/sourceforge/jnlp/security/dialogs/CertWarningPane.java Thu Jun 25 11:17:33 2015 +0200 @@ -261,17 +261,7 @@ } alwaysTrust.addActionListener(new ButtonDisableListener(sandbox)); - int buttonWidth = Math.max(run.getMinimumSize().width, - sandbox.getMinimumSize().width); - buttonWidth = Math.max(buttonWidth, cancel.getMinimumSize().width); - int buttonHeight = run.getMinimumSize().height; - Dimension d = new Dimension(buttonWidth, buttonHeight); - - run.setPreferredSize(d); - sandbox.setPreferredSize(d); - advancedOptions.setPreferredSize(new Dimension(advancedOptions.getMinimumSize().width, buttonHeight)); - cancel.setPreferredSize(d); - + sandbox.setEnabled(!alwaysTrust.isSelected()); run.addActionListener(SetValueHandler.createSetValueListener(parent, YesNoSandbox.yes()));
--- a/netx/net/sourceforge/jnlp/security/dialogs/MissingALACAttributePanel.java Mon Jun 22 20:56:06 2015 +0200 +++ b/netx/net/sourceforge/jnlp/security/dialogs/MissingALACAttributePanel.java Thu Jun 25 11:17:33 2015 +0200 @@ -136,11 +136,6 @@ JButton yes = new JButton(Translator.R("ButYes")); JButton no = new JButton(Translator.R("ButNo")); - int buttonWidth = yes.getMinimumSize().width; - int buttonHeight = yes.getMinimumSize().height; - Dimension d = new Dimension(buttonWidth, buttonHeight); - yes.setPreferredSize(d); - no.setPreferredSize(d); rememberPanel = new RememberPanel(codebase); yes.addActionListener(SetValueHandler.createSetValueListener(parent, YesNo.yes())); no.addActionListener(SetValueHandler.createSetValueListener(parent, YesNo.no()));
--- a/netx/net/sourceforge/jnlp/security/dialogs/MissingPermissionsAttributePanel.java Mon Jun 22 20:56:06 2015 +0200 +++ b/netx/net/sourceforge/jnlp/security/dialogs/MissingPermissionsAttributePanel.java Thu Jun 25 11:17:33 2015 +0200 @@ -132,11 +132,6 @@ JButton yes = new JButton(Translator.R("ButYes")); JButton no = new JButton(Translator.R("ButNo")); - int buttonWidth = yes.getMinimumSize().width; - int buttonHeight = yes.getMinimumSize().height; - Dimension d = new Dimension(buttonWidth, buttonHeight); - yes.setPreferredSize(d); - no.setPreferredSize(d); rememberPanel = new RememberPanel(codebase); yes.addActionListener(SetValueHandler.createSetValueListener(parent, YesNo.yes())); no.addActionListener(SetValueHandler.createSetValueListener(parent, YesNo.no()));
--- a/netx/net/sourceforge/jnlp/security/dialogs/PasswordAuthenticationPane.java Mon Jun 22 20:56:06 2015 +0200 +++ b/netx/net/sourceforge/jnlp/security/dialogs/PasswordAuthenticationPane.java Thu Jun 25 11:17:33 2015 +0200 @@ -37,6 +37,7 @@ package net.sourceforge.jnlp.security.dialogs; +import java.awt.BorderLayout; import static net.sourceforge.jnlp.runtime.Translator.R; import java.awt.Dimension; @@ -47,6 +48,7 @@ import java.awt.event.ActionListener; import javax.swing.JButton; +import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JPasswordField; import javax.swing.JTextField; @@ -156,7 +158,9 @@ setMaximumSize(new Dimension(1024, 150)); setSize(400, 150); - parent.setLocationRelativeTo(null); + if (parent!=null){ + parent.setLocationRelativeTo(null); + } initialFocusComponent = jtfUserName; ActionListener acceptActionListener = new ActionListener() { @@ -205,5 +209,15 @@ public String helpToStdIn() { return Translator.R("PAPstdinInfo"); } + + + public static void main(String[] args) { + PasswordAuthenticationPane w = new PasswordAuthenticationPane(null, new Object[]{"host",666,"prompt","type"}); + JFrame f = new JFrame(); + f.setSize(400, 200); + f.add(w, BorderLayout.CENTER); + f.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + f.setVisible(true); + } }