]> gitweb.fperrin.net Git - GpsPrune.git/blobdiff - tim/prune/GpsPruner.java
Version 11.1, August 2010
[GpsPrune.git] / tim / prune / GpsPruner.java
index f8e36ad06650109bec383bfee6824e04555ce293..5e0c591b76f82e94173c381c3d991e5b10747337 100644 (file)
@@ -2,36 +2,48 @@ package tim.prune;
 
 import java.awt.event.WindowAdapter;
 import java.awt.BorderLayout;
+import java.awt.Component;
 import java.awt.event.WindowEvent;
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.util.Locale;
+import java.util.ArrayList;
 import javax.swing.JFrame;
 import javax.swing.JSplitPane;
 import javax.swing.JToolBar;
 import javax.swing.WindowConstants;
 
+import tim.prune.config.Config;
+import tim.prune.config.ConfigException;
 import tim.prune.gui.DetailsDisplay;
+import tim.prune.gui.SidebarController;
 import tim.prune.gui.IconManager;
 import tim.prune.gui.MenuManager;
-import tim.prune.gui.ProfileChart;
 import tim.prune.gui.SelectorDisplay;
 import tim.prune.gui.StatusBar;
+import tim.prune.gui.Viewport;
 import tim.prune.gui.map.MapCanvas;
+import tim.prune.gui.profile.ProfileChart;
 
 /**
- * Tool to visualize, edit, convert and prune GPS data
+ * Prune 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 and made available through the Gnu GPL
+ * This software is copyright activityworkshop.net 2006-2010 and made available through the Gnu GPL version 2.
+ * For license details please see the included license.txt.
+ * GpsPruner is the main entry point to the application, including initialisation and launch
  */
 public class GpsPruner
 {
        /** Version number of application, used in about screen and for version check */
-       public static final String VERSION_NUMBER = "7";
+       public static final String VERSION_NUMBER = "11.1";
        /** Build number, just used for about screen */
-       public static final String BUILD_NUMBER = "136";
+       public static final String BUILD_NUMBER = "205";
        /** Static reference to App object */
        private static App APP = null;
 
+       /** Program name, used for Frame title and for Macs also on the system bar */
+       private static final String PROGRAM_NAME = "Prune";
+
 
        /**
         * Main method
@@ -40,19 +52,30 @@ public class GpsPruner
        public static void main(String[] args)
        {
                Locale locale = null;
+               String localeCode = null;
                String langFilename = null;
                String configFilename = null;
+               ArrayList<File> dataFiles = new ArrayList<File>();
                boolean showUsage = false;
+
+               // Mac OSX - specific properties (Mac insists that this is done as soon as possible)
+               if (System.getProperty("mrj.version") != null) {
+                       System.setProperty("apple.laf.useScreenMenuBar", "true"); // menu at top of screen
+                       System.setProperty("com.apple.mrj.application.apple.menu.about.name", PROGRAM_NAME);
+               }
+               // Loop over given arguments, if any
                for (int i=0; i<args.length; i++)
                {
                        String arg = args[i];
                        if (arg.startsWith("--locale="))
                        {
-                               locale = getLanguage(arg.substring(9));
+                               localeCode = arg.substring(9);
+                               locale = getLanguage(localeCode);
                        }
                        else if (arg.startsWith("--lang="))
                        {
-                               locale = getLanguage(arg.substring(7));
+                               localeCode = arg.substring(7);
+                               locale = getLanguage(localeCode);
                        }
                        else if (arg.startsWith("--langfile="))
                        {
@@ -62,12 +85,20 @@ public class GpsPruner
                        {
                                configFilename = arg.substring(13);
                        }
+                       else if (arg.startsWith("--help")) {
+                               showUsage = true;
+                       }
                        else
                        {
-                               if (!arg.startsWith("--help")) {
+                               // Check if a data file has been given
+                               File f = new File(arg);
+                               if (f.exists() && f.canRead()) {
+                                       dataFiles.add(f);
+                               }
+                               else {
                                        System.out.println("Unknown parameter '" + arg + "'.");
+                                       showUsage = true;
                                }
-                               showUsage = true;
                        }
                }
                if (showUsage) {
@@ -89,18 +120,36 @@ public class GpsPruner
                catch (ConfigException ce) {
                        System.err.println("Failed to load config file: " + configFilename);
                }
-               // Set locale according to Config's language property
-               String langCode = Config.getLanguageCode();
-               if (locale == null && langCode != null) {
-                       Locale configLocale = getLanguage(langCode);
-                       if (configLocale != null) {locale = configLocale;}
+               boolean overrideLang = (locale != null);
+               if (overrideLang) {
+                       // Make sure Config holds chosen language
+                       Config.setConfigString(Config.KEY_LANGUAGE_CODE, localeCode);
+               }
+               else {
+                       // Set locale according to Config's language property
+                       String configLang = Config.getConfigString(Config.KEY_LANGUAGE_CODE);
+                       if (configLang != null) {
+                               Locale configLocale = getLanguage(configLang);
+                               if (configLocale != null) {locale = configLocale;}
+                       }
                }
                I18nManager.init(locale);
-               if (langFilename != null) {
-                       I18nManager.addLanguageFile(langFilename);
+               // Load the external language file, either from config file or from command line params
+               if (langFilename == null && !overrideLang) {
+                       // If langfilename is blank on command line parameters then don't use setting from config
+                       langFilename = Config.getConfigString(Config.KEY_LANGUAGE_FILE);
+               }
+               if (langFilename != null && !langFilename.equals("")) {
+                       try {
+                               I18nManager.addLanguageFile(langFilename);
+                               Config.setConfigString(Config.KEY_LANGUAGE_FILE, langFilename);
+                       }
+                       catch (FileNotFoundException fnfe) {
+                               System.err.println("Failed to load language file: " + langFilename);
+                       }
                }
                // Set up the window and go
-               launch();
+               launch(dataFiles);
        }
 
 
@@ -127,10 +176,12 @@ public class GpsPruner
 
        /**
         * Launch the main application
+        * @param inDataFiles list of data files to load on startup
         */
-       private static void launch()
+       private static void launch(ArrayList<File> inDataFiles)
        {
-               JFrame frame = new JFrame("Prune");
+               // Initialise Frame
+               JFrame frame = new JFrame(PROGRAM_NAME);
                APP = new App(frame);
 
                // make menu
@@ -148,6 +199,8 @@ public class GpsPruner
                UpdateMessageBroker.addSubscriber(rightPanel);
                MapCanvas mapDisp = new MapCanvas(APP, APP.getTrackInfo());
                UpdateMessageBroker.addSubscriber(mapDisp);
+               Viewport viewport = new Viewport(mapDisp);
+               APP.setViewport(viewport);
                ProfileChart profileDisp = new ProfileChart(APP.getTrackInfo());
                UpdateMessageBroker.addSubscriber(profileDisp);
                StatusBar statusBar = new StatusBar();
@@ -155,15 +208,15 @@ public class GpsPruner
                UpdateMessageBroker.informSubscribers("Prune v" + VERSION_NUMBER);
 
                // Arrange in the frame using split panes
-               JSplitPane midPane = new JSplitPane(JSplitPane.VERTICAL_SPLIT, mapDisp, profileDisp);
-               midPane.setResizeWeight(1.0); // allocate as much space as poss to map
-               JSplitPane triplePane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, midPane, rightPanel);
-               triplePane.setResizeWeight(1.0); // allocate as much space as poss to map
+               JSplitPane midSplit = new JSplitPane(JSplitPane.VERTICAL_SPLIT, mapDisp, profileDisp);
+               midSplit.setResizeWeight(1.0); // allocate as much space as poss to map
+               JSplitPane rightSplit = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, midSplit, rightPanel);
+               rightSplit.setResizeWeight(1.0); // allocate as much space as poss to map
 
                frame.getContentPane().setLayout(new BorderLayout());
                frame.getContentPane().add(toolbar, BorderLayout.NORTH);
-               frame.getContentPane().add(new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, leftPanel,
-                       triplePane), BorderLayout.CENTER);
+               JSplitPane leftSplit = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, leftPanel, rightSplit);
+               frame.getContentPane().add(leftSplit, BorderLayout.CENTER);
                frame.getContentPane().add(statusBar, BorderLayout.SOUTH);
 
                // add closing listener
@@ -186,6 +239,13 @@ public class GpsPruner
                frame.setSize(650, 450);
                frame.setVisible(true);
                // Set position of map/profile splitter
-               midPane.setDividerLocation(0.75);
+               midSplit.setDividerLocation(0.75);
+
+               // Make a full screen toggler
+               SidebarController fsc = new SidebarController(new Component[] {leftPanel, profileDisp, rightPanel},
+                       new JSplitPane[] {leftSplit, midSplit, rightSplit});
+               APP.setSidebarController(fsc);
+               // Finally, give the files to load to the App
+               APP.loadDataFiles(inDataFiles);
        }
 }