X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=altosui%2FAltosPreferences.java;h=7510c7c2b289e51782aef2fa8ed48df668122a4b;hb=40ee170753f4fd422c848e34a8da104683b7c8a2;hp=716559ab7e0a9dc06e7c94f5a18a225eb6baa044;hpb=cbfbaabb39f9f7709d00cf3dc63cc1bc7563062e;p=fw%2Faltos

diff --git a/altosui/AltosPreferences.java b/altosui/AltosPreferences.java
index 716559ab..7510c7c2 100644
--- a/altosui/AltosPreferences.java
+++ b/altosui/AltosPreferences.java
@@ -26,7 +26,7 @@ import javax.swing.*;
 import javax.swing.filechooser.FileSystemView;
 
 class AltosPreferences {
-	static Preferences preferences;
+	public static Preferences preferences;
 
 	/* logdir preference name */
 	final static String logdirPreference = "LOGDIR";
@@ -55,15 +55,15 @@ class AltosPreferences {
 	/* scanning telemetry preferences name */
 	final static String scanningTelemetryPreference = "SCANNING-TELEMETRY";
 
-	/* font size preferences name */
-	final static String fontSizePreference = "FONT-SIZE";
+	/* Launcher serial preference name */
+	final static String launcherSerialPreference = "LAUNCHER-SERIAL";
 
+	/* Launcher channel preference name */
+	final static String launcherChannelPreference = "LAUNCHER-CHANNEL";
+	
 	/* Default logdir is ~/TeleMetrum */
 	final static String logdirName = "TeleMetrum";
 
-	/* UI Component to pop dialogs up */
-	static Component component;
-
 	/* Log directory */
 	static File logdir;
 
@@ -91,10 +91,6 @@ class AltosPreferences {
 	/* Scanning telemetry */
 	static int scanning_telemetry;
 
-	static LinkedList<AltosFontListener> font_listeners;
-
-	static int font_size = Altos.font_size_medium;
-
 	/* List of frequencies */
 	final static String common_frequencies_node_name = "COMMON-FREQUENCIES";
 	static AltosFrequency[] common_frequencies;
@@ -143,6 +139,9 @@ class AltosPreferences {
 			node.put(String.format(description_format, i), frequencies[i].description);
 		}
 	}
+	static int launcher_serial;
+
+	static int launcher_channel;
 
 	public static void init() {
 		preferences = Preferences.userRoot().node("/org/altusmetrum/altosui");
@@ -171,10 +170,9 @@ class AltosPreferences {
 
 		scanning_telemetry = preferences.getInt(scanningTelemetryPreference,(1 << Altos.ao_telemetry_standard));
 
-		font_listeners = new LinkedList<AltosFontListener>();
+		launcher_serial = preferences.getInt(launcherSerialPreference, 0);
 
-		font_size = preferences.getInt(fontSizePreference, Altos.font_size_medium);
-		Altos.set_fonts(font_size);
+		launcher_channel = preferences.getInt(launcherChannelPreference, 0);
 
 		String firmwaredir_string = preferences.get(firmwaredirPreference, null);
 		if (firmwaredir_string != null)
@@ -186,24 +184,23 @@ class AltosPreferences {
 		AltosSerial.set_debug(serial_debug);
 
 		common_frequencies = load_common_frequencies();
+
 	}
 
 	static { init(); }
 
-	static void set_component(Component in_component) {
-		component = in_component;
-	}
-
 	static void flush_preferences() {
 		try {
 			preferences.flush();
 		} catch (BackingStoreException ee) {
+/*
 			if (component != null)
 				JOptionPane.showMessageDialog(component,
 							      preferences.absolutePath(),
 							      "Cannot save prefernces",
 							      JOptionPane.ERROR_MESSAGE);
 			else
+*/
 				System.err.printf("Cannot save preferences\n");
 		}
 	}
@@ -219,41 +216,6 @@ class AltosPreferences {
 		}
 	}
 
-	private static boolean check_dir(File dir) {
-		if (!dir.exists()) {
-			if (!dir.mkdirs()) {
-				JOptionPane.showMessageDialog(component,
-							      dir.getName(),
-							      "Cannot create directory",
-							      JOptionPane.ERROR_MESSAGE);
-				return false;
-			}
-		} else if (!dir.isDirectory()) {
-			JOptionPane.showMessageDialog(component,
-						      dir.getName(),
-						      "Is not a directory",
-						      JOptionPane.ERROR_MESSAGE);
-			return false;
-		}
-		return true;
-	}
-
-	/* Configure the log directory. This is where all telemetry and eeprom files
-	 * will be written to, and where replay will look for telemetry files
-	 */
-	public static void ConfigureLog() {
-		JFileChooser	logdir_chooser = new JFileChooser(logdir.getParentFile());
-
-		logdir_chooser.setDialogTitle("Configure Data Logging Directory");
-		logdir_chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
-
-		if (logdir_chooser.showDialog(component, "Select Directory") == JFileChooser.APPROVE_OPTION) {
-			File dir = logdir_chooser.getSelectedFile();
-			if (check_dir(dir))
-				set_logdir(dir);
-		}
-	}
-
 	public static File logdir() {
 		return logdir;
 	}
@@ -347,49 +309,45 @@ class AltosPreferences {
 		return firmwaredir;
 	}
 
-	public static int font_size() {
-		return font_size;
-	}
-
-	static void set_fonts() {
-	}
-
-	public static void set_font_size(int new_font_size) {
-		font_size = new_font_size;
+	public static void set_serial_debug(boolean new_serial_debug) {
+		serial_debug = new_serial_debug;
+		AltosSerial.set_debug(serial_debug);
 		synchronized (preferences) {
-			preferences.putInt(fontSizePreference, font_size);
+			preferences.putBoolean(serialDebugPreference, serial_debug);
 			flush_preferences();
-			Altos.set_fonts(font_size);
-			for (AltosFontListener l : font_listeners)
-				l.font_size_changed(font_size);
 		}
 	}
 
-	public static void register_font_listener(AltosFontListener l) {
-		synchronized (preferences) {
-			font_listeners.add(l);
-		}
+	public static boolean serial_debug() {
+		return serial_debug;
 	}
 
-	public static void unregister_font_listener(AltosFontListener l) {
+	public static void set_launcher_serial(int new_launcher_serial) {
+		launcher_serial = new_launcher_serial;
+		System.out.printf("set launcher serial to %d\n", new_launcher_serial);
 		synchronized (preferences) {
-			font_listeners.remove(l);
+			preferences.putInt(launcherSerialPreference, launcher_serial);
+			flush_preferences();
 		}
 	}
 
-	public static void set_serial_debug(boolean new_serial_debug) {
-		serial_debug = new_serial_debug;
-		AltosSerial.set_debug(serial_debug);
+	public static int launcher_serial() {
+		return launcher_serial;
+	}
+
+	public static void set_launcher_channel(int new_launcher_channel) {
+		launcher_channel = new_launcher_channel;
+		System.out.printf("set launcher channel to %d\n", new_launcher_channel);
 		synchronized (preferences) {
-			preferences.putBoolean(serialDebugPreference, serial_debug);
+			preferences.putInt(launcherChannelPreference, launcher_channel);
 			flush_preferences();
 		}
 	}
 
-	public static boolean serial_debug() {
-		return serial_debug;
+	public static int launcher_channel() {
+		return launcher_channel;
 	}
-
+	
 	public static Preferences bt_devices() {
 		return preferences.node("bt_devices");
 	}