X-Git-Url: http://gitweb.fperrin.net/?p=GpsPrune.git;a=blobdiff_plain;f=src%2Ftim%2Fprune%2Fconfig%2FConfig.java;h=8c6eefec498706d0c789ad1ae3b4302a8e4022ac;hp=84e5fd7dc6b4a248bb1d2bef51f18be225f90425;hb=HEAD;hpb=2302358503c38817e19f6e529f6c9e530aac0e86

diff --git a/src/tim/prune/config/Config.java b/src/tim/prune/config/Config.java
index 84e5fd7..a5226b3 100644
--- a/src/tim/prune/config/Config.java
+++ b/src/tim/prune/config/Config.java
@@ -55,6 +55,8 @@ public abstract class Config
 	public static final String KEY_POVRAY_FONT = "prune.povrayfont";
 	/** Key for the selected unit set */
 	public static final String KEY_UNITSET_KEY  = "prune.unitsetkey";
+	/** Key for the selected coordinate display format */
+	public static final String KEY_COORD_DISPLAY_FORMAT  = "prune.coorddisplay";
 	/** Key for index of map source */
 	public static final String KEY_MAPSOURCE_INDEX = "prune.mapsource";
 	/** Key for number of fixed map sources */
@@ -87,6 +89,8 @@ public abstract class Config
 	public static final String KEY_ANTIALIAS = "prune.antialias";
 	/** Key for kml track colour */
 	public static final String KEY_KML_TRACK_COLOUR = "prune.kmltrackcolour";
+	/** Key for window style (name of look-and-feel) */
+	public static final String KEY_WINDOW_STYLE = "prune.windowstyle";
 	/** Key for autosaving settings */
 	public static final String KEY_AUTOSAVE_SETTINGS = "prune.autosavesettings";
 	/** Key for recently used files */
@@ -105,6 +109,8 @@ public abstract class Config
 	public static final String KEY_WAYPOINT_ICON_SIZE = "prune.waypointiconsize";
 	/** Id of selected timezone */
 	public static final String KEY_TIMEZONE_ID = "prune.timezoneid";
+	/** Last used latlon range */
+	public static final String KEY_LATLON_RANGE = "prune.latlonrange";
 
 
 	/** Initialise the default properties */
@@ -170,6 +176,8 @@ public abstract class Config
 		_unitSet = UnitSetLibrary.getUnitSet(_configValues.getProperty(KEY_UNITSET_KEY));
 		// Adjust map source index if necessary
 		adjustSelectedMap();
+		// Reset coord display format
+		setConfigInt(KEY_COORD_DISPLAY_FORMAT, 0);
 
 		if (loadFailed) {
 			throw new ConfigException();
@@ -188,15 +196,16 @@ public abstract class Config
 		props.put(KEY_GPS_DEVICE, "usb:");
 		props.put(KEY_GPS_FORMAT, "garmin");
 		props.put(KEY_POVRAY_FONT, "crystal.ttf"); // alternative: DejaVuSans-Bold.ttf
-		props.put(KEY_SHOW_MAP, "0"); // hide by default
+		props.put(KEY_SHOW_MAP, "1"); // show by default
 		props.put(KEY_EXIFTOOL_PATH, "exiftool");
 		props.put(KEY_GNUPLOT_PATH, "gnuplot");
 		props.put(KEY_GPSBABEL_PATH, "gpsbabel");
 		props.put(KEY_IMPORT_FILE_FORMAT, "-1"); // no file format selected
 		props.put(KEY_KMZ_IMAGE_SIZE, "240");
 		props.put(KEY_ANTIALIAS, "1"); // antialias on by default
-		props.put(KEY_AUTOSAVE_SETTINGS, "0"); // autosave false by default
+		props.put(KEY_AUTOSAVE_SETTINGS, "1"); // autosave by default
 		props.put(KEY_UNITSET_KEY, "unitset.kilometres"); // metric by default
+		props.put(KEY_COORD_DISPLAY_FORMAT, "0"); // original
 		props.put(KEY_HEIGHT_EXAGGERATION, "100"); // 100%, no exaggeration
 		props.put(KEY_TERRAIN_GRID_SIZE, "50");
 		props.put(KEY_ALTITUDE_TOLERANCE, "0"); // 0, all exact as before
@@ -246,6 +255,14 @@ public abstract class Config
 		return _configFile;
 	}
 
+	/**
+	 * Set the file to which config was saved
+	 */
+	public static void setConfigFile(File inFile)
+	{
+		_configFile = inFile;
+	}
+
 	/**
 	 * @return config Properties object to allow all config values to be saved
 	 */
@@ -379,7 +396,7 @@ public abstract class Config
 	public static void updatePointColourer(PointColourer inColourer)
 	{
 		_pointColourer = inColourer;
-		setConfigString(KEY_POINT_COLOURER, ColourerFactory.PointColourerToString(_pointColourer));
+		setConfigString(KEY_POINT_COLOURER, ColourerFactory.pointColourerToString(_pointColourer));
 	}
 
 	/**