X-Git-Url: https://gitweb.fperrin.net/?p=GpsPrune.git;a=blobdiff_plain;f=tim%2Fprune%2Ffunction%2FAboutScreen.java;h=80a7983418149d97f3cf7fce1e9915cda968dae2;hp=c8985071243861bd5fe8ec3893bc4720aca02bd5;hb=92dad5df664287acb51728e9ea599f150765d34a;hpb=140e9d165f85c3d4f0435a311e091209313faa2a

diff --git a/tim/prune/function/AboutScreen.java b/tim/prune/function/AboutScreen.java
index c898507..80a7983 100644
--- a/tim/prune/function/AboutScreen.java
+++ b/tim/prune/function/AboutScreen.java
@@ -32,9 +32,8 @@ import javax.swing.JTextArea;
 import tim.prune.App;
 import tim.prune.ExternalTools;
 import tim.prune.GenericFunction;
-import tim.prune.GpsPruner;
+import tim.prune.GpsPrune;
 import tim.prune.I18nManager;
-import tim.prune.jpeg.ExifGateway;
 import tim.prune.threedee.WindowFactory;
 
 /**
@@ -81,14 +80,14 @@ public class AboutScreen extends GenericFunction
 		JPanel aboutPanel = new JPanel();
 		aboutPanel.setLayout(new BoxLayout(aboutPanel, BoxLayout.Y_AXIS));
 		aboutPanel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
-		JLabel titleLabel = new JLabel("Prune");
+		JLabel titleLabel = new JLabel("GpsPrune");
 		titleLabel.setFont(new Font("SansSerif", Font.BOLD, 24));
 		titleLabel.setAlignmentX(JLabel.CENTER_ALIGNMENT);
 		aboutPanel.add(titleLabel);
-		JLabel versionLabel = new JLabel(I18nManager.getText("dialog.about.version") + ": " + GpsPruner.VERSION_NUMBER);
+		JLabel versionLabel = new JLabel(I18nManager.getText("dialog.about.version") + ": " + GpsPrune.VERSION_NUMBER);
 		versionLabel.setAlignmentX(JLabel.CENTER_ALIGNMENT);
 		aboutPanel.add(versionLabel);
-		JLabel buildLabel = new JLabel(I18nManager.getText("dialog.about.build") + ": " + GpsPruner.BUILD_NUMBER);
+		JLabel buildLabel = new JLabel(I18nManager.getText("dialog.about.build") + ": " + GpsPrune.BUILD_NUMBER);
 		buildLabel.setAlignmentX(JLabel.CENTER_ALIGNMENT);
 		aboutPanel.add(buildLabel);
 		aboutPanel.add(new JLabel(" "));
@@ -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("deutsch, english, espa\u00F1ol, fran\u00E7ais, italiano, nederlands,<br>" +
-				" polski, portugu\u00EAs, \u4e2d\u6587 (chinese), \u65E5\u672C\u8A9E (japanese), schwiizerd\u00FC\u00FCtsch, t\u00FCrk\u00E7e, " +
-				"<br> \u010de\u0161tina, rom\u00E2n\u0103, afrikaans, bahasa indonesia, farsi").append("</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,32 +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"),
+			new JLabel(" katpatuka, R\u00E9mi, Marcus, Ali, Javier, Jeroen, prot_d,"),
 			1, 5);
+		addToGridBagPanel(creditsPanel, gridBag, constraints,
+			new JLabel(" Gy\u00F6rgy, HooAU, Sergey, P\u00E9ter, serhijdubyk, Peter, Cristian,"),
+			1, 6);
+		addToGridBagPanel(creditsPanel, gridBag, constraints,
+			new JLabel(" Roman, Erkki"),
+			1, 7);
 		addToGridBagPanel(creditsPanel, gridBag, constraints,
 			new JLabel(I18nManager.getText("dialog.about.credits.translations") + " : "),
-			0, 6);
+			0, 8);
 		addToGridBagPanel(creditsPanel, gridBag, constraints,
 			new JLabel("Open Office, Gpsdrive, Babelfish, Leo, Launchpad"),
-			1, 6);
+			1, 8);
 		addToGridBagPanel(creditsPanel, gridBag, constraints,
 			new JLabel(I18nManager.getText("dialog.about.credits.devtools") + " : "),
-			0, 7);
+			0, 9);
 		addToGridBagPanel(creditsPanel, gridBag, constraints,
-			new JLabel("Debian Linux, Sun Java, Eclipse, Svn, Gimp, Inkscape"),
-			1, 7);
+			new JLabel("Debian Linux, Sun Java, OpenJDK, Eclipse, Svn, Gimp, Inkscape"),
+			1, 9);
 		addToGridBagPanel(creditsPanel, gridBag, constraints,
 			new JLabel(I18nManager.getText("dialog.about.credits.othertools") + " : "),
-			0, 8);
+			0, 10);
 		addToGridBagPanel(creditsPanel, gridBag, constraints,
-			new JLabel("Openstreetmap, Povray, Exiftool, Google Earth, Gpsbabel, Gnuplot"),
-			1, 8);
+			new JLabel("Openstreetmap, Povray, Exiftool, Gpsbabel, Gnuplot"),
+			1, 10);
 		addToGridBagPanel(creditsPanel, gridBag, constraints,
 			new JLabel(I18nManager.getText("dialog.about.credits.thanks") + " : "),
-			0, 9);
+			0, 11);
 		addToGridBagPanel(creditsPanel, gridBag, constraints,
 			new JLabel("Friends and loved ones, for encouragement and support"),
-			1, 9);
+			1, 11);
 		_tabs.add(I18nManager.getText("dialog.about.credits"), creditsPanel);
 
 		// Read me
@@ -297,20 +298,27 @@ public class AboutScreen extends GenericFunction
 		// First, try locally-held readme.txt if available (as it normally should be)
 		// Readme file can either be in file system or packed in the same jar as code
 		String errorMessage = null;
+		String readme = null;
+		InputStream in = null;
 		try
 		{
 			// For some reason using ../readme.txt doesn't work, so need absolute path
-			InputStream in = AboutScreen.class.getResourceAsStream("/tim/prune/readme.txt");
+			in = AboutScreen.class.getResourceAsStream("/tim/prune/readme.txt");
 			if (in != null) {
 				byte[] buffer = new byte[in.available()];
 				in.read(buffer);
 				in.close();
-				return new String(buffer);
+				readme = new String(buffer);
 			}
 		}
 		catch (IOException e) {
 			errorMessage =  e.getMessage();
 		}
+		finally {
+			try {in.close();} catch (Exception e) {}
+		}
+		if (readme != null) {return readme;}
+
 		// Locally-held file failed, so try to find gz file installed on system (eg Debian)
 		try
 		{
@@ -318,7 +326,7 @@ public class AboutScreen extends GenericFunction
 			if (gzFile.exists())
 			{
 				// Copy decompressed bytes from gz file into out
-				InputStream in = new GZIPInputStream(new FileInputStream(gzFile));
+				in = new GZIPInputStream(new FileInputStream(gzFile));
 				ByteArrayOutputStream out = new ByteArrayOutputStream();
 				byte[] buffer = new byte[8 * 1024];
 				int count = 0;
@@ -328,12 +336,16 @@ public class AboutScreen extends GenericFunction
 				} while (count != -1);
 				out.close();
 				in.close();
-				return out.toString();
+				readme = out.toString();
 			}
 		}
 		catch (IOException e) {
 			System.err.println("Exception trying to get readme.gz : " + e.getMessage());
 		}
+		finally {
+			try {in.close();} catch (Exception e) {}
+		}
+		if (readme != null) {return readme;}
 		// Only show first error message if couldn't get readme from gz either
 		if (errorMessage != null) {
 			System.err.println("Exception trying to get readme: " + errorMessage);
@@ -366,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);
 		}