X-Git-Url: https://gitweb.fperrin.net/?a=blobdiff_plain;f=tim%2Fprune%2Ffunction%2FAboutScreen.java;h=109d07eaea188a0d58bf68a383efa2fdf3a27f00;hb=1ea5817da5381ceebee75ea7294ea78dffff5671;hp=2835d410c787dca4c4a77fc31f58e33fad27c8b0;hpb=112bb0c9b46894adca9a33ed8c99ea712b253185;p=GpsPrune.git

diff --git a/tim/prune/function/AboutScreen.java b/tim/prune/function/AboutScreen.java
index 2835d41..109d07e 100644
--- a/tim/prune/function/AboutScreen.java
+++ b/tim/prune/function/AboutScreen.java
@@ -11,7 +11,12 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
 import java.io.InputStream;
+import java.util.zip.GZIPInputStream;
 
 import javax.swing.BorderFactory;
 import javax.swing.BoxLayout;
@@ -27,8 +32,9 @@ 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;
 
 /**
@@ -39,6 +45,7 @@ public class AboutScreen extends GenericFunction
 	private JDialog _dialog = null;
 	private JTabbedPane _tabs = null;
 	private JButton _okButton = null;
+	private JTextArea _aboutTextArea = null;
 	/** Labels for whether tools installed or not */
 	private JLabel[] _installedLabels = null;
 
@@ -74,14 +81,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(" "));
@@ -90,8 +97,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, polski, \u4e2d\u6587; (chinese)<br>" +
-				"schwiizerd\u00FC\u00FCtsch, portugu\u00EAs, bahasa indonesia, rom\u00E2n\u0103").append("</p>");
+			.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, afrikaans, rom\u00E2n\u0103, 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));
@@ -122,7 +130,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("...");
@@ -143,6 +151,15 @@ public class AboutScreen extends GenericFunction
 			new JLabel(I18nManager.getText("dialog.about.systeminfo.gnuplot") + " : "),
 			0, 5);
 		addToGridBagPanel(sysInfoPanel, gridBag, constraints, _installedLabels[3], 1, 5);
+		addToGridBagPanel(sysInfoPanel, gridBag, constraints, new JLabel("Xerces : "), 0, 6);
+		addToGridBagPanel(sysInfoPanel, gridBag, constraints, _installedLabels[4], 1, 6);
+		// Exif library
+		addToGridBagPanel(sysInfoPanel, gridBag, constraints,
+			new JLabel(I18nManager.getText("dialog.about.systeminfo.exiflib") + " : "),
+			0, 7);
+		final String exiflibkey = "dialog.about.systeminfo.exiflib." + ExifGateway.getDescriptionKey();
+		addToGridBagPanel(sysInfoPanel, gridBag, constraints,
+			new JLabel(I18nManager.getText(exiflibkey)), 1, 7);
 		_tabs.add(I18nManager.getText("dialog.about.systeminfo"), sysInfoPanel);
 
 		// Third pane for credits
@@ -177,41 +194,53 @@ public class AboutScreen extends GenericFunction
 			new JLabel("Ramon, Miguel, In\u00E9s, Piotr, Petrovsk, Josatoc, Weehal,"),
 			1, 3);
 		addToGridBagPanel(creditsPanel, gridBag, constraints,
-			new JLabel(" theYinYeti, Rothermographer, Sam, Rudolph"),
+			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,"),
+			1, 5);
+		addToGridBagPanel(creditsPanel, gridBag, constraints,
+			new JLabel(" HooAU, Sergey, P\u00E9ter, serhijdubyk, Peter"),
+			1, 6);
 		addToGridBagPanel(creditsPanel, gridBag, constraints,
 			new JLabel(I18nManager.getText("dialog.about.credits.translations") + " : "),
-			0, 5);
+			0, 7);
 		addToGridBagPanel(creditsPanel, gridBag, constraints,
 			new JLabel("Open Office, Gpsdrive, Babelfish, Leo, Launchpad"),
-			1, 5);
+			1, 7);
 		addToGridBagPanel(creditsPanel, gridBag, constraints,
 			new JLabel(I18nManager.getText("dialog.about.credits.devtools") + " : "),
-			0, 6);
+			0, 8);
 		addToGridBagPanel(creditsPanel, gridBag, constraints,
-			new JLabel("Mandriva Linux, Sun Java, Eclipse, Svn, Gimp"),
-			1, 6);
+			new JLabel("Debian Linux, Sun Java, OpenJDK, Eclipse, Svn, Gimp, Inkscape"),
+			1, 8);
 		addToGridBagPanel(creditsPanel, gridBag, constraints,
 			new JLabel(I18nManager.getText("dialog.about.credits.othertools") + " : "),
-			0, 7);
+			0, 9);
 		addToGridBagPanel(creditsPanel, gridBag, constraints,
-			new JLabel("Kate, Povray, Exiftool, Inkscape, Google Earth, Gpsbabel, Gnuplot"),
-			1, 7);
+			new JLabel("Openstreetmap, Povray, Exiftool, Gpsbabel, Gnuplot"),
+			1, 9);
 		addToGridBagPanel(creditsPanel, gridBag, constraints,
 			new JLabel(I18nManager.getText("dialog.about.credits.thanks") + " : "),
-			0, 8);
+			0, 10);
 		addToGridBagPanel(creditsPanel, gridBag, constraints,
 			new JLabel("Friends and loved ones, for encouragement and support"),
-			1, 8);
+			1, 10);
 		_tabs.add(I18nManager.getText("dialog.about.credits"), creditsPanel);
 
 		// Read me
 		JPanel readmePanel = new JPanel();
 		readmePanel.setLayout(new BorderLayout());
-		JTextArea textArea = new JTextArea(getReadmeText());
-		textArea.setEditable(false);
-		textArea.setLineWrap(true); textArea.setWrapStyleWord(true);
-		JScrollPane scrollPane = new JScrollPane(textArea);
+		_aboutTextArea = new JTextArea(I18nManager.getText("details.photo.loading"));
+		// Set readme text in separate thread so that about screen pops up sooner
+		new Thread(new Runnable() {
+			public void run() {
+				_aboutTextArea.setText(getReadmeText());
+			}
+		}).start();
+		_aboutTextArea.setEditable(false);
+		_aboutTextArea.setLineWrap(true); _aboutTextArea.setWrapStyleWord(true);
+		JScrollPane scrollPane = new JScrollPane(_aboutTextArea);
 		scrollPane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
 		scrollPane.setPreferredSize(new Dimension(600, 130));
 		readmePanel.add(scrollPane, BorderLayout.CENTER);
@@ -242,7 +271,7 @@ public class AboutScreen extends GenericFunction
 	}
 
 	/**
-	 * Helper function to reduce complexity of gui making code
+	 * Helper function to reduce complexity of gui-making code
 	 * when adding labels to a GridBagLayout
 	 * @param inPanel panel to add to
 	 * @param inLayout GridBagLayout object
@@ -251,8 +280,8 @@ public class AboutScreen extends GenericFunction
 	 * @param inX grid x
 	 * @param inY grid y
 	 */
-	private static void addToGridBagPanel(JPanel inPanel, GridBagLayout inLayout, GridBagConstraints inConstraints,
-		JLabel inLabel, int inX, int inY)
+	private static void addToGridBagPanel(JPanel inPanel, GridBagLayout inLayout,
+		GridBagConstraints inConstraints, JLabel inLabel, int inX, int inY)
 	{
 		// set x and y in constraints
 		inConstraints.gridx = inX;
@@ -270,18 +299,60 @@ public class AboutScreen extends GenericFunction
 	 */
 	private String getReadmeText()
 	{
+		// 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);
-				return new String(buffer);
+				in.close();
+				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
+		{
+			File gzFile = new File("/usr/share/doc/gpsprune/readme.txt.gz");
+			if (gzFile.exists())
+			{
+				// Copy decompressed bytes from gz file into out
+				in = new GZIPInputStream(new FileInputStream(gzFile));
+				ByteArrayOutputStream out = new ByteArrayOutputStream();
+				byte[] buffer = new byte[8 * 1024];
+				int count = 0;
+				do {
+					out.write(buffer, 0, count);
+					count = in.read(buffer, 0, buffer.length);
+				} while (count != -1);
+				out.close();
+				in.close();
+				readme = out.toString();
 			}
 		}
-		catch (java.io.IOException e) {
-			System.err.println("Exception trying to get readme : " + e.getMessage());
+		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);
 		}
 		return I18nManager.getText("error.readme.notfound");
 	}
@@ -311,7 +382,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);
 		}