X-Git-Url: https://gitweb.fperrin.net/?p=GpsPrune.git;a=blobdiff_plain;f=tim%2Fprune%2Fconfig%2FConfig.java;h=5a95bebdebc62d52c6da4f52ec7391026781c206;hp=a822b6e34ebef38da13b798f6afa7460c288f0eb;hb=4d5796d02a15808311c09448d79e6e7d1de9d636;hpb=1ee49ae3c8ef3aa2e63eadd458531e5f8bd4f92c

diff --git a/tim/prune/config/Config.java b/tim/prune/config/Config.java
index a822b6e..5a95beb 100644
--- a/tim/prune/config/Config.java
+++ b/tim/prune/config/Config.java
@@ -4,6 +4,10 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.util.Properties;
 
+import tim.prune.data.RecentFileList;
+import tim.prune.data.UnitSet;
+import tim.prune.data.UnitSetLibrary;
+
 
 /**
  * Abstract class to hold application-wide configuration
@@ -14,12 +18,17 @@ public abstract class Config
 	private static File _configFile = null;
 
 	/** Hashtable containing all config values */
-	private static Properties _configValues = new Properties();
+	private static Properties _configValues = null;
 	/** Colour scheme object is also part of config */
 	private static ColourScheme _colourScheme = new ColourScheme();
+	/** Recently-used file list */
+	private static RecentFileList _recentFiles = new RecentFileList();
+	/** Current unit set */
+	private static UnitSet _unitSet = UnitSetLibrary.getUnitSet(null);
 
 	/** Default config file */
-	private static final File DEFAULT_CONFIG_FILE = new File(".pruneconfig");
+	public static final File DEFAULT_CONFIG_FILE = new File(".pruneconfig");
+	public static final File HOME_CONFIG_FILE = new File(System.getProperty("user.home"), ".pruneconfig");
 
 	/** Key for track directory */
 	public static final String KEY_TRACK_DIR = "prune.trackdirectory";
@@ -35,14 +44,20 @@ public abstract class Config
 	public static final String KEY_GPS_FORMAT = "prune.gpsformat";
 	/** Key for Povray font */
 	public static final String KEY_POVRAY_FONT = "prune.povrayfont";
-	/** Key for metric/imperial */
-	public static final String KEY_METRIC_UNITS = "prune.metricunits";
-	/** Key for map server index */
-	public static final String KEY_MAPSERVERINDEX = "prune.mapserverindex";
-	/** Key for map server url */
-	public static final String KEY_MAPSERVERURL = "prune.mapserverurl";
+	/** Key for the selected unit set */
+	public static final String KEY_UNITSET_KEY  = "prune.unitsetkey";
+	/** Key for index of map source */
+	public static final String KEY_MAPSOURCE_INDEX = "prune.mapsource";
+	/** Key for number of fixed map sources */
+	public static final String KEY_NUM_FIXED_MAPS = "prune.numfixedmapsources";
+	/** Key for String containing custom map sources */
+	public static final String KEY_MAPSOURCE_LIST = "prune.mapsourcelist";
 	/** Key for show map flag */
 	public static final String KEY_SHOW_MAP = "prune.showmap";
+	/** Key for path to disk cache */
+	public static final String KEY_DISK_CACHE = "prune.diskcache";
+	/** Key for working online flag */
+	public static final String KEY_ONLINE_MODE = "prune.onlinemode";
 	/** Key for width of thumbnails in kmz */
 	public static final String KEY_KMZ_IMAGE_WIDTH = "prune.kmzimagewidth";
 	/** Key for height of thumbnails in kmz */
@@ -55,20 +70,42 @@ public abstract class Config
 	public static final String KEY_EXIFTOOL_PATH = "prune.exiftoolpath";
 	/** Key for colour scheme */
 	public static final String KEY_COLOUR_SCHEME = "prune.colourscheme";
+	/** Key for line width used for drawing */
+	public static final String KEY_LINE_WIDTH = "prune.linewidth";
 	/** Key for kml track colour */
 	public static final String KEY_KML_TRACK_COLOUR = "prune.kmltrackcolour";
+	/** Key for autosaving settings */
+	public static final String KEY_AUTOSAVE_SETTINGS = "prune.autosavesettings";
+	/** Key for recently used files */
+	public static final String KEY_RECENT_FILES = "prune.recentfiles";
+
 
+	/** Initialise the default properties */
+	static
+	{
+		_configValues = getDefaultProperties();
+	}
 
 	/**
 	 * Load the default configuration file
 	 */
 	public static void loadDefaultFile()
 	{
-		try
+		if (DEFAULT_CONFIG_FILE.exists())
 		{
-			loadFile(DEFAULT_CONFIG_FILE);
+			try {
+				loadFile(DEFAULT_CONFIG_FILE);
+				return;
+			}
+			catch (ConfigException ce) {} // ignore
+		}
+		if (HOME_CONFIG_FILE.exists())
+		{
+			try {
+				loadFile(HOME_CONFIG_FILE);
+			}
+			catch (ConfigException ce) {} // ignore
 		}
-		catch (ConfigException ce) {} // ignore
 	}
 
 
@@ -101,6 +138,9 @@ public abstract class Config
 		// Save all properties from file
 		_configValues.putAll(props);
 		_colourScheme.loadFromHex(_configValues.getProperty(KEY_COLOUR_SCHEME));
+		_recentFiles = new RecentFileList(_configValues.getProperty(KEY_RECENT_FILES));
+		_unitSet = UnitSetLibrary.getUnitSet(_configValues.getProperty(KEY_UNITSET_KEY));
+
 		if (loadFailed) {
 			throw new ConfigException();
 		}
@@ -124,6 +164,8 @@ public abstract class Config
 		props.put(KEY_GPSBABEL_PATH, "gpsbabel");
 		props.put(KEY_KMZ_IMAGE_WIDTH, "240");
 		props.put(KEY_KMZ_IMAGE_HEIGHT, "240");
+		props.put(KEY_AUTOSAVE_SETTINGS, "0"); // autosave false by default
+		props.put(KEY_UNITSET_KEY, "unitset.kilometres"); // metric by default
 		return props;
 	}
 
@@ -152,6 +194,8 @@ public abstract class Config
 	 */
 	public static Properties getAllConfig()
 	{
+		// Update recently-used files
+		_configValues.setProperty(KEY_RECENT_FILES, _recentFiles.getConfigString());
 		return _configValues;
 	}
 
@@ -163,6 +207,14 @@ public abstract class Config
 		return _colourScheme;
 	}
 
+	/**
+	 * @return list of recently used files
+	 */
+	public static RecentFileList getRecentFileList()
+	{
+		return _recentFiles;
+	}
+
 	/**
 	 * Store the given configuration setting
 	 * @param inKey key (from constants)
@@ -217,7 +269,7 @@ public abstract class Config
 	/**
 	 * Get the given configuration setting as a boolean
 	 * @param inKey key
-	 * @return configuration setting as a boolean
+	 * @return configuration setting as a boolean (default to true)
 	 */
 	public static boolean getConfigBoolean(String inKey)
 	{
@@ -242,9 +294,9 @@ public abstract class Config
 	 */
 	public static boolean isKeyBoolean(String inKey)
 	{
-		// Only two boolean keys so far
+		// Only one boolean key so far (after metric flag was removed)
 		return inKey != null && (
-			inKey.equals(KEY_METRIC_UNITS) || inKey.equals(KEY_SHOW_MAP));
+			inKey.equals(KEY_SHOW_MAP));
 	}
 
 	/**
@@ -254,4 +306,18 @@ public abstract class Config
 	{
 		setConfigString(KEY_COLOUR_SCHEME, _colourScheme.toString());
 	}
+
+	/**
+	 * @return the current unit set
+	 */
+	public static UnitSet getUnitSet() {
+		return _unitSet;
+	}
+
+	public static void selectUnitSet(int inIndex)
+	{
+		_unitSet = UnitSetLibrary.getUnitSet(inIndex);
+		// Set name of set in config
+		setConfigString(KEY_UNITSET_KEY, _unitSet.getNameKey());
+	}
 }