").append(I18nManager.getText("dialog.about.summarytext2")).append("
"); descBuffer.append("").append(I18nManager.getText("dialog.about.summarytext3")).append("
"); descBuffer.append("").append(I18nManager.getText("dialog.about.languages")).append(" : ")
- .append("deutsch, english, espa\u00F1ol, fran\u00E7ais, italiano, polski, \u4e2d\u6587; (chinese)
" +
- "schwiizerd\u00FC\u00FCtsch, portugu\u00EAs, bahasa indonesia, rom\u00E2n\u0103").append("
").append(I18nManager.getText("dialog.about.translatedby")).append("
"); JEditorPane descPane = new JEditorPane("text/html", descBuffer.toString()); descPane.setBorder(BorderFactory.createEmptyBorder(3, 3, 3, 3)); @@ -143,6 +151,13 @@ 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); _tabs.add(I18nManager.getText("dialog.about.systeminfo"), sysInfoPanel); // Third pane for credits @@ -177,41 +192,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"), + 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, 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, Google Earth, 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 +269,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 +278,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 +297,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 (java.io.IOException e) { - System.err.println("Exception trying to get readme : " + e.getMessage()); + 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 (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"); }