release 0.9.6

[debian/openrocket] / src / net / sf / openrocket / gui / dialogs / AboutDialog.java

diff --git a/src/net/sf/openrocket/gui/dialogs/AboutDialog.java b/src/net/sf/openrocket/gui/dialogs/AboutDialog.java
index 3cc99f5cf286f93bdc007d0da199674a7db5d4cb..88d78e5faa4e3eb9fd0185ed5ab8e02c7440389b 100644 (file)
--- a/src/net/sf/openrocket/gui/dialogs/AboutDialog.java
+++ b/src/net/sf/openrocket/gui/dialogs/AboutDialog.java
@@ -6,12 +6,15 @@ import java.awt.event.ActionListener;
 import javax.swing.JButton;
 import javax.swing.JDialog;
 import javax.swing.JFrame;
+import javax.swing.JLabel;
 import javax.swing.JPanel;
 
 import net.miginfocom.swing.MigLayout;
-import net.sf.openrocket.gui.components.ResizeLabel;
+import net.sf.openrocket.gui.components.StyledLabel;
 import net.sf.openrocket.gui.components.URLLabel;
+import net.sf.openrocket.util.Chars;
 import net.sf.openrocket.util.GUIUtil;
+import net.sf.openrocket.util.Icons;
 import net.sf.openrocket.util.Prefs;
 
 public class AboutDialog extends JDialog {
@@ -26,12 +29,24 @@ public class AboutDialog extends JDialog {
                
                JPanel panel = new JPanel(new MigLayout("fill"));
                
-               panel.add(new ResizeLabel("OpenRocket", 20), "ax 50%, wrap para");
-               panel.add(new ResizeLabel("Version " + version, 3), "ax 50%, wrap 30lp");
+               panel.add(new JLabel(Icons.loadImageIcon("pix/icon/icon-about.png", "OpenRocket")), 
+                               "spany 5, top");
                
-               panel.add(new ResizeLabel("Copyright \u00A9 2007-2009 Sampo Niskanen"), "ax 50%, wrap para");
+               panel.add(new StyledLabel("OpenRocket", 20), "ax 50%, growy, wrap para");
+               panel.add(new StyledLabel("Version " + version, 3), "ax 50%, growy, wrap rel");
                
-               panel.add(new URLLabel(OPENROCKET_URL), "ax 50%, wrap para");
+//             String source = Prefs.getBuildSource();
+//             if (!Prefs.DEFAULT_BUILD_SOURCE.equalsIgnoreCase(source)) {
+//                     panel.add(new StyledLabel("Distributed by " + source, -1), 
+//                                     "ax 50%, growy, wrap para");
+//             } else {
+//                     panel.add(new StyledLabel(" ", -1), "ax 50%, growy, wrap para");
+//             }
+               
+               panel.add(new StyledLabel("Copyright " + Chars.COPY +" 2007-2010 Sampo Niskanen"), 
+                               "ax 50%, growy, wrap para");
+               
+               panel.add(new URLLabel(OPENROCKET_URL), "ax 50%, growy, wrap para");
                
 
                JButton close = new JButton("Close");
@@ -41,15 +56,15 @@ public class AboutDialog extends JDialog {
                                AboutDialog.this.dispose();
                        }
                });
-               panel.add(close, "right");
+               panel.add(close, "spanx, right");
                
                this.add(panel);
                this.setTitle("OpenRocket " + version);
                this.pack();
                this.setResizable(false);
                this.setLocationRelativeTo(parent);
-               GUIUtil.setDefaultButton(close);
-               GUIUtil.installEscapeCloseOperation(this);
+               
+               GUIUtil.setDisposableDialogOptions(this, close);
        }