diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | netx/net/sourceforge/jnlp/controlpanel/AboutPanel.java | 28 | ||||
| -rw-r--r-- | netx/net/sourceforge/jnlp/resources/Messages.properties | 2 |
3 files changed, 35 insertions, 3 deletions
@@ -1,4 +1,12 @@ 2013-07-17 Jiri Vanek <[email protected]> + + about dialogue now available from itw-settings + * netx/net/sourceforge/jnlp/controlpanel/AboutPanel.java: + added button to launch about dialogue + * netx/net/sourceforge/jnlp/resources/Messages.propertie: (CPAboutInfo) + Adapted to be more accurate to select-able JVM + +2013-07-17 Jiri Vanek <[email protected]> Jacob Wisor <[email protected]> added some missing de and pl strings diff --git a/netx/net/sourceforge/jnlp/controlpanel/AboutPanel.java b/netx/net/sourceforge/jnlp/controlpanel/AboutPanel.java index 126923d..c881543 100644 --- a/netx/net/sourceforge/jnlp/controlpanel/AboutPanel.java +++ b/netx/net/sourceforge/jnlp/controlpanel/AboutPanel.java @@ -22,9 +22,14 @@ import java.awt.Component; import java.awt.Dimension; import java.awt.GridBagConstraints; import java.awt.GridBagLayout; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.io.IOException; import javax.swing.Box; +import javax.swing.JButton; import javax.swing.JLabel; +import net.sourceforge.jnlp.about.AboutDialog; import net.sourceforge.jnlp.runtime.Translator; @@ -43,7 +48,17 @@ public class AboutPanel extends NamedBorderPanel { JLabel logo = new JLabel(); JLabel aboutLabel = new JLabel("<html>" + Translator.R("CPAboutInfo") + "</html>"); - + JButton aboutButton = new JButton(Translator.R("AboutDialogueTabAbout")); + aboutButton.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + try { + AboutDialog.display(); + } catch (IOException ex) { + throw new RuntimeException(ex); + } + } + }); c.fill = GridBagConstraints.BOTH; c.gridy = 0; c.gridx = 0; @@ -53,11 +68,20 @@ public class AboutPanel extends NamedBorderPanel { c.gridx = 1; c.weightx = 1; add(aboutLabel, c); - + c.fill = GridBagConstraints.NONE; + c.weighty = 0; + c.weightx = 0; + c.gridy++; + c.gridx=1; + add(aboutButton, c); /* Keep all the elements at the top of the panel (Extra padding) */ + c.fill = GridBagConstraints.BOTH; Component filler = Box.createRigidArea(new Dimension(1, 1)); c.weighty = 1; c.gridy++; add(filler, c); + + + } } diff --git a/netx/net/sourceforge/jnlp/resources/Messages.properties b/netx/net/sourceforge/jnlp/resources/Messages.properties index 4218c85..d99a717 100644 --- a/netx/net/sourceforge/jnlp/resources/Messages.properties +++ b/netx/net/sourceforge/jnlp/resources/Messages.properties @@ -383,7 +383,7 @@ CPTabSecurity=Security CPTabJVMSettings=JVM Settings # Control Panel - AboutPanel -CPAboutInfo=This is the control panel for setting deployments.properties.<br/>Not all options will take effect until implemented.<br/>The use of multiple JREs is currently unsupported.<br/> +CPAboutInfo=This is the control panel for setting deployments.properties.<br/>Not all options will take effect until implemented.<br/>The use of multiple JREs is currently limited to OpenJDK.<br/> # Control Panel - AdvancedProxySettings APSDialogTitle=Network Settings |