updates for 0.9.3

[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..3b151f70947b509745f95550310d8320922003fc 100644 (file)
--- a/src/net/sf/openrocket/gui/dialogs/AboutDialog.java
+++ b/src/net/sf/openrocket/gui/dialogs/AboutDialog.java
@@ -6,12 +6,14 @@ 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.URLLabel;
 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 +28,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 ResizeLabel("OpenRocket", 20), "ax 50%, growy, wrap para");
+               panel.add(new ResizeLabel("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 ResizeLabel("Distributed by " + source, -1), 
+                                       "ax 50%, growy, wrap para");
+               } else {
+                       panel.add(new ResizeLabel(" ", -1), "ax 50%, growy, wrap para");
+               }
+               
+               panel.add(new ResizeLabel("Copyright \u00A9 2007-2009 Sampo Niskanen"), 
+                               "ax 50%, growy, wrap para");
+               
+               panel.add(new URLLabel(OPENROCKET_URL), "ax 50%, growy, wrap para");
                
 
                JButton close = new JButton("Close");
@@ -41,7 +55,7 @@ public class AboutDialog extends JDialog {
                                AboutDialog.this.dispose();
                        }
                });
-               panel.add(close, "right");
+               panel.add(close, "spanx, right");
                
                this.add(panel);
                this.setTitle("OpenRocket " + version);