Version 19, May 2018

[GpsPrune.git] / tim / prune / function / AboutScreen.java

diff --git a/tim/prune/function/AboutScreen.java b/tim/prune/function/AboutScreen.java
index 0ec7ae6fc06ad1063531f605eff95ea2fe47054d..80a7983418149d97f3cf7fce1e9915cda968dae2 100644 (file)
--- a/tim/prune/function/AboutScreen.java
+++ b/tim/prune/function/AboutScreen.java
@@ -34,7 +34,6 @@ import tim.prune.ExternalTools;
 import tim.prune.GenericFunction;
 import tim.prune.GpsPrune;
 import tim.prune.I18nManager;
-import tim.prune.jpeg.ExifGateway;
 import tim.prune.threedee.WindowFactory;
 
 /**
@@ -97,9 +96,9 @@ public class AboutScreen extends GenericFunction
                descBuffer.append("<p>").append(I18nManager.getText("dialog.about.summarytext2")).append("</p>");
                descBuffer.append("<p>").append(I18nManager.getText("dialog.about.summarytext3")).append("</p>");
                descBuffer.append("<p>").append(I18nManager.getText("dialog.about.languages")).append(" : ")
-                       .append("\u010de\u0161tina, deutsch, english, espa\u00F1ol, fran\u00E7ais, italiano, magyar,<br>" +
-                               " nederlands, polski, portugu\u00EAs, \u0440\u0443\u0441\u0441\u043a\u0438\u0439 (russian), \u4e2d\u6587 (chinese), \u65E5\u672C\u8A9E (japanese),<br>" +
-                               " \uD55C\uAD6D\uC5B4/\uC870\uC120\uB9D0 (korean), schwiizerd\u00FC\u00FCtsch, t\u00FCrk\u00E7e, rom\u00E2n\u0103, afrikaans, bahasa indonesia</p>");
+                       .append("afrikaans, \u010de\u0161tina, deutsch, english, espa\u00F1ol, fran\u00E7ais, italiano,<br>" +
+                               " magyar, nederlands, polski, portugu\u00EAs, rom\u00E2n\u0103, suomi, \u0440\u0443\u0441\u0441\u043a\u0438\u0439 (russian),<br>" +
+                               " \u4e2d\u6587 (chinese), \u65E5\u672C\u8A9E (japanese), \uD55C\uAD6D\uC5B4/\uC870\uC120\uB9D0 (korean), schwiizerd\u00FC\u00FCtsch, ukrainian</p>");
                descBuffer.append("<p>").append(I18nManager.getText("dialog.about.translatedby")).append("</p>");
                JEditorPane descPane = new JEditorPane("text/html", descBuffer.toString());
                descPane.setBorder(BorderFactory.createEmptyBorder(3, 3, 3, 3));
@@ -130,7 +129,7 @@ public class AboutScreen extends GenericFunction
                        new JLabel(System.getProperty("java.runtime.version")),
                        1, 1);
                // Create install labels to be populated later
-               final int NUM_INSTALL_CHECKS = 4;
+               final int NUM_INSTALL_CHECKS = 5;
                _installedLabels = new JLabel[NUM_INSTALL_CHECKS];
                for (int i=0; i<NUM_INSTALL_CHECKS; i++) {
                        _installedLabels[i] = new JLabel("...");
@@ -151,13 +150,8 @@ public class AboutScreen extends GenericFunction
                        new JLabel(I18nManager.getText("dialog.about.systeminfo.gnuplot") + " : "),
                        0, 5);
                addToGridBagPanel(sysInfoPanel, gridBag, constraints, _installedLabels[3], 1, 5);
-               // Exif library
-               addToGridBagPanel(sysInfoPanel, gridBag, constraints,
-                       new JLabel(I18nManager.getText("dialog.about.systeminfo.exiflib") + " : "),
-                       0, 6);
-               final String exiflibkey = "dialog.about.systeminfo.exiflib." + ExifGateway.getDescriptionKey();
-               addToGridBagPanel(sysInfoPanel, gridBag, constraints,
-                       new JLabel(I18nManager.getText(exiflibkey)), 1, 6);
+               addToGridBagPanel(sysInfoPanel, gridBag, constraints, new JLabel("Xerces : "), 0, 6);
+               addToGridBagPanel(sysInfoPanel, gridBag, constraints, _installedLabels[4], 1, 6);
                _tabs.add(I18nManager.getText("dialog.about.systeminfo"), sysInfoPanel);
 
                // Third pane for credits
@@ -166,6 +160,7 @@ public class AboutScreen extends GenericFunction
                creditsPanel.setLayout(gridBag);
                constraints = new GridBagConstraints();
                constraints.weightx = 0.0; constraints.weighty = 0.0;
+               constraints.ipady = 3;
 
                addToGridBagPanel(creditsPanel, gridBag, constraints,
                        new JLabel(I18nManager.getText("dialog.about.credits.code") + " : "),
@@ -195,35 +190,38 @@ public class AboutScreen extends GenericFunction
                        new JLabel(" theYinYeti, Rothermographer, Sam, Rudolph, nazotoko,"),
                        1, 4);
                addToGridBagPanel(creditsPanel, gridBag, constraints,
-                       new JLabel(" katpatuka, R\u00E9mi, Marcus, Ali, Javier, Jeroen, prot_d, Gy\u00F6rgy,"),
+                       new JLabel(" katpatuka, R\u00E9mi, Marcus, Ali, Javier, Jeroen, prot_d,"),
                        1, 5);
                addToGridBagPanel(creditsPanel, gridBag, constraints,
-                       new JLabel(" HooAU, Sergey"),
+                       new JLabel(" Gy\u00F6rgy, HooAU, Sergey, P\u00E9ter, serhijdubyk, Peter, Cristian,"),
                        1, 6);
                addToGridBagPanel(creditsPanel, gridBag, constraints,
-                       new JLabel(I18nManager.getText("dialog.about.credits.translations") + " : "),
-                       0, 7);
-               addToGridBagPanel(creditsPanel, gridBag, constraints,
-                       new JLabel("Open Office, Gpsdrive, Babelfish, Leo, Launchpad"),
+                       new JLabel(" Roman, Erkki"),
                        1, 7);
                addToGridBagPanel(creditsPanel, gridBag, constraints,
-                       new JLabel(I18nManager.getText("dialog.about.credits.devtools") + " : "),
+                       new JLabel(I18nManager.getText("dialog.about.credits.translations") + " : "),
                        0, 8);
                addToGridBagPanel(creditsPanel, gridBag, constraints,
-                       new JLabel("Debian Linux, Sun Java, Eclipse, Svn, Gimp, Inkscape"),
+                       new JLabel("Open Office, Gpsdrive, Babelfish, Leo, Launchpad"),
                        1, 8);
                addToGridBagPanel(creditsPanel, gridBag, constraints,
-                       new JLabel(I18nManager.getText("dialog.about.credits.othertools") + " : "),
+                       new JLabel(I18nManager.getText("dialog.about.credits.devtools") + " : "),
                        0, 9);
                addToGridBagPanel(creditsPanel, gridBag, constraints,
-                       new JLabel("Openstreetmap, Povray, Exiftool, Google Earth, Gpsbabel, Gnuplot"),
+                       new JLabel("Debian Linux, Sun Java, OpenJDK, Eclipse, Svn, Gimp, Inkscape"),
                        1, 9);
                addToGridBagPanel(creditsPanel, gridBag, constraints,
-                       new JLabel(I18nManager.getText("dialog.about.credits.thanks") + " : "),
+                       new JLabel(I18nManager.getText("dialog.about.credits.othertools") + " : "),
                        0, 10);
                addToGridBagPanel(creditsPanel, gridBag, constraints,
-                       new JLabel("Friends and loved ones, for encouragement and support"),
+                       new JLabel("Openstreetmap, Povray, Exiftool, Gpsbabel, Gnuplot"),
                        1, 10);
+               addToGridBagPanel(creditsPanel, gridBag, constraints,
+                       new JLabel(I18nManager.getText("dialog.about.credits.thanks") + " : "),
+                       0, 11);
+               addToGridBagPanel(creditsPanel, gridBag, constraints,
+                       new JLabel("Friends and loved ones, for encouragement and support"),
+                       1, 11);
                _tabs.add(I18nManager.getText("dialog.about.credits"), creditsPanel);
 
                // Read me
@@ -380,7 +378,8 @@ public class AboutScreen extends GenericFunction
                String yesText = I18nManager.getText("dialog.about.yes");
                String noText = I18nManager.getText("dialog.about.no");
                _installedLabels[0].setText(WindowFactory.isJava3dEnabled()?yesText:noText);
-               final int[] tools = {ExternalTools.TOOL_EXIFTOOL, ExternalTools.TOOL_GPSBABEL, ExternalTools.TOOL_GNUPLOT};
+               final int[] tools = {ExternalTools.TOOL_EXIFTOOL, ExternalTools.TOOL_GPSBABEL,
+                       ExternalTools.TOOL_GNUPLOT, ExternalTools.TOOL_XERCES};
                for (int i=0; i<tools.length; i++) {
                        _installedLabels[i+1].setText(ExternalTools.isToolInstalled(tools[i])?yesText:noText);
                }