projects / debian / openrocket / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merged l10n branch to trunk
[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 6b8ec1ececf856c71442238a89e63d6f39c53b9b..5eb2fde972b4565e04ae4778abc491dc16100a72 100644 (file)
--- a/src/net/sf/openrocket/gui/dialogs/AboutDialog.java
+++ b/src/net/sf/openrocket/gui/dialogs/AboutDialog.java
@@ -12,7 +12,10 @@ import javax.swing.JPanel;
 import net.miginfocom.swing.MigLayout;
 import net.sf.openrocket.gui.components.DescriptionArea;
 import net.sf.openrocket.gui.components.StyledLabel;
+import net.sf.openrocket.gui.components.StyledLabel.Style;
 import net.sf.openrocket.gui.components.URLLabel;
+import net.sf.openrocket.l10n.Translator;
+import net.sf.openrocket.startup.Application;
 import net.sf.openrocket.util.Chars;
 import net.sf.openrocket.util.GUIUtil;
 import net.sf.openrocket.util.Icons;
@@ -21,11 +24,13 @@ import net.sf.openrocket.util.Prefs;
 public class AboutDialog extends JDialog {
        
        public static final String OPENROCKET_URL = "http://openrocket.sourceforge.net/";
+       private static final Translator trans = Application.getTranslator();
        
        private static final String CREDITS = "<html><center>" +
                        "<font size=\"+1\"><b>OpenRocket has been developed by:</b></font><br><br>" +
                        "Sampo Niskanen (main developer)<br>" +
-                       "Doug Pedrick (RockSim file format, printing)<br><br>" +
+                       "Doug Pedrick (RockSim file format, printing)<br>" +
+                       "Boris du Reau (internationalization, translation lead)<br><br>" +
                        "<b>OpenRocket utilizes the following libraries:</b><br><br>" +
                        "MiG Layout (http://www.miglayout.com/)<br>" +
                        "JFreeChart (http://www.jfree.org/jfreechart/)<br>" +
@@ -38,30 +43,53 @@ public class AboutDialog extends JDialog {
                final String version = Prefs.getVersion();
                
                JPanel panel = new JPanel(new MigLayout("fill"));
+               JPanel sub;
                
-               panel.add(new JLabel(Icons.loadImageIcon("pix/icon/icon-about.png", "OpenRocket")),
-                               "spany 4, top");
+
+               // OpenRocket logo
+               panel.add(new JLabel(Icons.loadImageIcon("pix/icon/icon-about.png", "OpenRocket")), "top");
+               
+
+               // OpenRocket version info + copyright
+               sub = new JPanel(new MigLayout("fill"));
                
-               panel.add(new StyledLabel("OpenRocket", 20), "ax 50%, growy, wrap para");
-               panel.add(new StyledLabel("Version " + version, 3), "ax 50%, growy, wrap rel");
+               sub.add(new StyledLabel("OpenRocket", 20), "ax 50%, growy, wrap para");
+               sub.add(new StyledLabel(trans.get("lbl.version").trim() + " " + version, 3), "ax 50%, growy, wrap rel");
+               sub.add(new StyledLabel("Copyright " + Chars.COPY + " 2007-2011 Sampo Niskanen"), "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");
-               //              }
+               sub.add(new URLLabel(OPENROCKET_URL), "ax 50%, growy, wrap para");
+               panel.add(sub, "grow");
                
-               panel.add(new StyledLabel("Copyright " + Chars.COPY + " 2007-2011 Sampo Niskanen"),
-                               "ax 50%, growy, wrap para");
+
+               // Translation information (if present)
+               String translation = trans.get("lbl.translation").trim();
+               String translator = trans.get("lbl.translator").trim();
+               String translatorWebsite = trans.get("lbl.translatorWebsite").trim();
+               String translatorIcon = trans.get("lbl.translatorIcon").trim();
                
-               panel.add(new URLLabel(OPENROCKET_URL), "ax 50%, growy, wrap para");
+               if (translator.length() > 0 || translatorWebsite.length() > 0 || translatorIcon.length() > 0) {
+                       sub = new JPanel(new MigLayout("fill"));
+                       
+                       sub.add(new StyledLabel(translation, Style.BOLD), "ax 50%, growy, wrap para");
+                       
+                       if (translatorIcon.length() > 0) {
+                               sub.add(new JLabel(Icons.loadImageIcon("pix/translators/" + translatorIcon, translator)),
+                                               "ax 50%, growy, wrap para");
+                       }
+                       if (translator.length() > 0) {
+                               sub.add(new JLabel(translator), "ax 50%, growy, wrap rel");
+                       }
+                       if (translatorWebsite.length() > 0) {
+                               sub.add(new URLLabel(translatorWebsite), "ax 50%, growy, wrap para");
+                       }
+                       
+                       panel.add(sub);
+               }
                
 
                DescriptionArea info = new DescriptionArea(5);
                info.setText(CREDITS);
-               panel.add(info, "width 10px, height 100lp, grow, spanx, wrap para");
+               panel.add(info, "newline, width 10px, height 100lp, grow, spanx, wrap para");
                
                //              JTextArea area = new JTextArea(CREATORS);
                //              area.setEditable(false);
@@ -70,7 +98,8 @@ public class AboutDialog extends JDialog {
                //              panel.add(new JScrollPane(area), "width 10px, height 100lp, grow, spanx, wrap para");
                
 
-               JButton close = new JButton("Close");
+               //Close button
+               JButton close = new JButton(trans.get("button.close"));
                close.addActionListener(new ActionListener() {
                        @Override
                        public void actionPerformed(ActionEvent e) {
@@ -88,5 +117,4 @@ public class AboutDialog extends JDialog {
                GUIUtil.setDisposableDialogOptions(this, close);
        }
        
-
 }
Debian packaging of openrocket