altosui: Split out UI-specific preferences

[fw/altos] / altosui / AltosUI.java

diff --git a/altosui/AltosUI.java b/altosui/AltosUI.java
index 3e5bcf434fc5b8b8276fe2074873e528d8032d74..6a0a84fa1c85953c4cbd6c352e6473f5a1b27e27 100644 (file)
--- a/altosui/AltosUI.java
+++ b/altosui/AltosUI.java
@@ -30,7 +30,7 @@ import java.util.concurrent.*;
 
 import libaltosJNI.*;
 
-public class AltosUI extends JFrame {
+public class AltosUI extends AltosFrame {
        public AltosVoice voice = new AltosVoice();
 
        public static boolean load_library(Frame frame) {
@@ -108,7 +108,7 @@ public class AltosUI extends JFrame {
                if (imgURL != null)
                        setIconImage(new ImageIcon(imgURL).getImage());
 
-               AltosPreferences.set_component(this);
+               AltosUIPreferences.set_component(this);
 
                pane = getContentPane();
                gridbag = new GridBagLayout();
@@ -253,9 +253,9 @@ public class AltosUI extends JFrame {
                String  result;
                result = JOptionPane.showInputDialog(AltosUI.this,
                                                     "Configure Callsign",
-                                                    AltosPreferences.callsign());
+                                                    AltosUIPreferences.callsign());
                if (result != null)
-                       AltosPreferences.set_callsign(result);
+                       AltosUIPreferences.set_callsign(result);
        }
 
        void ConfigureTeleMetrum() {
@@ -519,7 +519,7 @@ public class AltosUI extends JFrame {
        
        public static void main(final String[] args) {
                try {
-                       UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+                       UIManager.setLookAndFeel(AltosUIPreferences.look_and_feel());
                } catch (Exception e) {
                }
                /* Handle batch-mode */