Version 19, May 2018

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

diff --git a/tim/prune/GpsPrune.java b/tim/prune/GpsPrune.java
index dd907653c10eec569035e6074d6c90df3565862f..67b197cde70a2efab900ec6631c2ae73c900a568 100644 (file)
--- a/tim/prune/GpsPrune.java
+++ b/tim/prune/GpsPrune.java
@@ -3,6 +3,7 @@ package tim.prune;
 import java.awt.event.WindowAdapter;
 import java.awt.BorderLayout;
 import java.awt.Component;
+import java.awt.Image;
 import java.awt.event.WindowEvent;
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -27,17 +28,17 @@ import tim.prune.gui.profile.ProfileChart;
 
 /**
  * GpsPrune is a tool to visualize, edit, convert and prune GPS data
- * Please see the included readme.txt or http://activityworkshop.net
- * This software is copyright activityworkshop.net 2006-2014 and made available through the Gnu GPL version 2.
+ * Please see the included readme.txt or https://activityworkshop.net
+ * This software is copyright activityworkshop.net 2006-2018 and made available through the Gnu GPL version 2.
  * For license details please see the included license.txt.
  * GpsPrune is the main entry point to the application, including initialisation and launch
  */
 public class GpsPrune
 {
        /** Version number of application, used in about screen and for version check */
-       public static final String VERSION_NUMBER = "16.3";
+       public static final String VERSION_NUMBER = "19";
        /** Build number, just used for about screen */
-       public static final String BUILD_NUMBER = "303c";
+       public static final String BUILD_NUMBER = "362";
        /** Static reference to App object */
        private static App APP = null;
 
@@ -228,18 +229,36 @@ public class GpsPrune
                // Avoid automatically shutting down if window closed
                frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
 
-               // set icon
-               try {
-                       frame.setIconImage(IconManager.getImageIcon(IconManager.WINDOW_ICON).getImage());
+               // set window icons of different resolutions (1.6+)
+               try
+               {
+                       ArrayList<Image> icons = new ArrayList<Image>();
+                       String[] resolutions = {"_16", "_20", "_22", "_24", "_32", "_36", "_48", "_64", "_72", "_96", "_128"};
+                       for (String r : resolutions) {
+                               icons.add(IconManager.getImageIcon(IconManager.WINDOW_ICON + r + ".png").getImage());
+                       }
+                       Class<?> d = java.awt.Window.class;
+                       // This is the same as frame.setIconImages(icons) but is compilable also for java1.5 where this isn't available
+                       d.getDeclaredMethod("setIconImages", new Class[]{java.util.List.class}).invoke(frame, icons);
+               }
+               catch (Exception e)
+               {
+                       // setting a list of icon images didn't work, so try with just one image instead
+                       try {
+                               frame.setIconImage(IconManager.getImageIcon(IconManager.WINDOW_ICON + "_16.png").getImage());
+                       }
+                       catch (Exception e2) {}
                }
-               catch (Exception e) {} // ignore
 
                // Set up drag-and-drop handler to accept dropped files
                frame.setTransferHandler(new FileDropHandler(APP));
 
                // finish off and display frame
                frame.pack();
-               frame.setSize(650, 450);
+               if (!setFrameBoundsFromConfig(frame))
+               {
+                       frame.setSize(650, 450);
+               }
                frame.setVisible(true);
                // Set position of map/profile splitter
                midSplit.setDividerLocation(0.75);
@@ -254,6 +273,38 @@ public class GpsPrune
                APP.loadDataFiles(inDataFiles);
        }
 
+
+       /**
+        * Set the frame bounds using the saved config setting
+        * @param inFrame frame to set the bounds of
+        * @return true on success
+        */
+       private static boolean setFrameBoundsFromConfig(JFrame inFrame)
+       {
+               // Try to get bounds from config
+               String bounds = Config.getConfigString(Config.KEY_WINDOW_BOUNDS);
+               try
+               {
+                       String[] boundValues = bounds.split("x");
+                       if (boundValues.length == 4)
+                       {
+                               int[] elems = new int[4];
+                               for (int i=0; i<4; i++) {
+                                       elems[i] = Integer.parseInt(boundValues[i]);
+                               }
+                               // Make sure width and height aren't stupid
+                               elems[2] = Math.max(elems[2], 400);
+                               elems[3] = Math.max(elems[3], 300);
+                               inFrame.setBounds(elems[0], elems[1], elems[2], elems[3]);
+                               return true;
+                       }
+               }
+               catch (NullPointerException npe) {}  // if no entry found in config
+               catch (NumberFormatException nfe) {} // if string couldn't be parsed
+               return false;
+       }
+
+
        /**
         * Try to guess whether it's a mistyped parameter or a mistyped filename
         * @param inParam command line argument