SafetyMutex and rocket optimization updates

[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 3b151f70947b509745f95550310d8320922003fc..88d78e5faa4e3eb9fd0185ed5ab8e02c7440389b 100644 (file)
--- a/src/net/sf/openrocket/gui/dialogs/AboutDialog.java
+++ b/src/net/sf/openrocket/gui/dialogs/AboutDialog.java
@@ -10,8 +10,9 @@ 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;
@@ -31,18 +32,18 @@ public class AboutDialog extends JDialog {
                panel.add(new JLabel(Icons.loadImageIcon("pix/icon/icon-about.png", "OpenRocket")), 
                                "spany 5, top");
                
-               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 StyledLabel("OpenRocket", 20), "ax 50%, growy, wrap para");
+               panel.add(new StyledLabel("Version " + version, 3), "ax 50%, growy, wrap rel");
                
-               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");
-               }
+//             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 ResizeLabel("Copyright \u00A9 2007-2009 Sampo Niskanen"), 
+               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");
@@ -62,8 +63,8 @@ public class AboutDialog extends JDialog {
                this.pack();
                this.setResizable(false);
                this.setLocationRelativeTo(parent);
-               GUIUtil.setDefaultButton(close);
-               GUIUtil.installEscapeCloseOperation(this);
+               
+               GUIUtil.setDisposableDialogOptions(this, close);
        }