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

diff --git a/tim/prune/config/Config.java b/tim/prune/config/Config.java
index 412f408..5a95beb 100644
--- a/tim/prune/config/Config.java
+++ b/tim/prune/config/Config.java
@@ -5,6 +5,8 @@ import java.io.FileInputStream;
 import java.util.Properties;
 
 import tim.prune.data.RecentFileList;
+import tim.prune.data.UnitSet;
+import tim.prune.data.UnitSetLibrary;
 
 
 /**
@@ -16,11 +18,13 @@ 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 */
 	public static final File DEFAULT_CONFIG_FILE = new File(".pruneconfig");
@@ -40,10 +44,12 @@ 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 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 */
@@ -74,6 +80,12 @@ public abstract class Config
 	public static final String KEY_RECENT_FILES = "prune.recentfiles";
 
 
+	/** Initialise the default properties */
+	static
+	{
+		_configValues = getDefaultProperties();
+	}
+
 	/**
 	 * Load the default configuration file
 	 */
@@ -127,6 +139,8 @@ public abstract class Config
 		_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();
 		}
@@ -151,6 +165,7 @@ public abstract class Config
 		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;
 	}
 
@@ -279,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));
 	}
 
 	/**
@@ -291,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());
+	}
 }