# HG changeset patch # User Jiri Vanek # Date 1435227476 -7200 # Node ID 1204ef8dde15d2b395b34250337f2d58eb36e8fe # Parent 548f9dccc47a02511f15f10c28751bacc2311e66 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 * netx/net/sourceforge/jnlp/security/dialogs/PasswordAuthenticationPane.java: same * netx/net/sourceforge/jnlp/security/dialogs/CertWarningPane.java: same * netx/net/sourceforge/jnlp/security/dialogs/MissingALACAttributePanel.java:same * netx/net/sourceforge/jnlp/security/dialogs/MissingPermissionsAttributePanel.java:same diff -r 548f9dccc47a -r 1204ef8dde15 ChangeLog --- a/ChangeLog Fri Apr 17 11:49:26 2015 +0200 +++ b/ChangeLog Thu Jun 25 12:17:56 2015 +0200 @@ -1,3 +1,17 @@ +2015-06-25 Jiri Vanek + + 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 + * netx/net/sourceforge/jnlp/security/dialogs/PasswordAuthenticationPane.java + same + * netx/net/sourceforge/jnlp/security/dialogs/CertWarningPane.java: same + * netx/net/sourceforge/jnlp/security/dialogs/MissingALACAttributePanel.java: + same + * netx/net/sourceforge/jnlp/security/dialogs/MissingPermissionsAttributePanel.java: + same + 2015-04-17 Jiri Vanek Added tagsoup and rhino to javadoc classpath to prevent docline errors diff -r 548f9dccc47a -r 1204ef8dde15 NEWS --- a/NEWS Fri Apr 17 11:49:26 2015 +0200 +++ b/NEWS Thu Jun 25 12:17:56 2015 +0200 @@ -9,6 +9,7 @@ CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY New in release 1.5.3 (YYYY-MM-DD): +* RH1231441 Unable to read the text of the buttons of the security dialogue New in release 1.5.2 (2014-11-26): * NetX diff -r 548f9dccc47a -r 1204ef8dde15 netx/net/sourceforge/jnlp/security/dialogs/AppletWarningPane.java --- a/netx/net/sourceforge/jnlp/security/dialogs/AppletWarningPane.java Fri Apr 17 11:49:26 2015 +0200 +++ b/netx/net/sourceforge/jnlp/security/dialogs/AppletWarningPane.java Thu Jun 25 12:17:56 2015 +0200 @@ -48,6 +48,7 @@ import javax.swing.JButton; 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; @@ -87,15 +88,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(createSetValueListener(parent, 0)); no.addActionListener(createSetValueListener(parent, 1)); cancel.addActionListener(createSetValueListener(parent, 2)); diff -r 548f9dccc47a -r 1204ef8dde15 netx/net/sourceforge/jnlp/security/dialogs/CertWarningPane.java --- a/netx/net/sourceforge/jnlp/security/dialogs/CertWarningPane.java Fri Apr 17 11:49:26 2015 +0200 +++ b/netx/net/sourceforge/jnlp/security/dialogs/CertWarningPane.java Thu Jun 25 12:17:56 2015 +0200 @@ -264,17 +264,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(createSetValueListener(parent, 0)); diff -r 548f9dccc47a -r 1204ef8dde15 netx/net/sourceforge/jnlp/security/dialogs/MissingALACAttributePanel.java --- a/netx/net/sourceforge/jnlp/security/dialogs/MissingALACAttributePanel.java Fri Apr 17 11:49:26 2015 +0200 +++ b/netx/net/sourceforge/jnlp/security/dialogs/MissingALACAttributePanel.java Thu Jun 25 12:17:56 2015 +0200 @@ -129,11 +129,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); yes.addActionListener(createSetValueListener(parent, 0)); no.addActionListener(createSetValueListener(parent, 1)); initialFocusComponent = no; diff -r 548f9dccc47a -r 1204ef8dde15 netx/net/sourceforge/jnlp/security/dialogs/MissingPermissionsAttributePanel.java --- a/netx/net/sourceforge/jnlp/security/dialogs/MissingPermissionsAttributePanel.java Fri Apr 17 11:49:26 2015 +0200 +++ b/netx/net/sourceforge/jnlp/security/dialogs/MissingPermissionsAttributePanel.java Thu Jun 25 12:17:56 2015 +0200 @@ -122,11 +122,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); yes.addActionListener(createSetValueListener(parent, 0)); no.addActionListener(createSetValueListener(parent, 1)); initialFocusComponent = no;