X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosConfigureUI.java;h=ace245a0231d1e349d0082a971db8c6802b52a94;hp=980068c0076fa4b867cb992269518f248fa48918;hb=75d6aa6f798606f1a6c5a46542065dda81e63b2a;hpb=cf72c2f5a69a736c28a9b63e124d510ef41a9f5d

diff --git a/altosui/AltosConfigureUI.java b/altosui/AltosConfigureUI.java
index 980068c0..ace245a0 100644
--- a/altosui/AltosConfigureUI.java
+++ b/altosui/AltosConfigureUI.java
@@ -19,6 +19,7 @@ package altosui;
 
 import java.awt.*;
 import java.awt.event.*;
+import java.beans.*;
 import javax.swing.*;
 import javax.swing.filechooser.FileNameExtensionFilter;
 import javax.swing.table.*;
@@ -28,9 +29,52 @@ import java.util.*;
 import java.text.*;
 import java.util.prefs.*;
 import java.util.concurrent.LinkedBlockingQueue;
+import javax.swing.plaf.basic.*;
+import org.altusmetrum.AltosLib.*;
+
+class DelegatingRenderer implements ListCellRenderer {
+
+	// ...
+	public static void install(JComboBox comboBox) {
+		DelegatingRenderer renderer = new DelegatingRenderer(comboBox);
+		renderer.initialise();
+		comboBox.setRenderer(renderer);
+	}
+
+	// ...
+	private final JComboBox comboBox;
+
+	// ...
+	private ListCellRenderer delegate;
+
+	// ...
+	private DelegatingRenderer(JComboBox comboBox) {
+		this.comboBox = comboBox;
+	}
+
+	// ...
+	private void initialise() {
+		delegate = new JComboBox().getRenderer();
+		comboBox.addPropertyChangeListener("UI", new PropertyChangeListener() {
+
+				public void propertyChange(PropertyChangeEvent evt) {
+					delegate = new JComboBox().getRenderer();
+				}
+			});
+	}
+
+	// ...
+	public Component getListCellRendererComponent(JList list,
+						      Object value, int index, boolean isSelected, boolean cellHasFocus) {
+
+		return delegate.getListCellRendererComponent(list,
+							     ((UIManager.LookAndFeelInfo) value).getName(),
+							     index, isSelected, cellHasFocus);
+	}
+}
 
 public class AltosConfigureUI
-	extends JDialog
+	extends AltosDialog
 	implements DocumentListener
 {
 	JFrame		owner;
@@ -50,6 +94,9 @@ public class AltosConfigureUI
 	JLabel		font_size_label;
 	JComboBox	font_size_value;
 
+	JLabel		look_and_feel_label;
+	JComboBox	look_and_feel_value;
+
 	JRadioButton	serial_debug;
 
 	JButton		manage_bluetooth;
@@ -59,7 +106,7 @@ public class AltosConfigureUI
 
 	/* DocumentListener interface methods */
 	public void changedUpdate(DocumentEvent e) {
-		AltosPreferences.set_callsign(callsign_value.getText());
+		AltosUIPreferences.set_callsign(callsign_value.getText());
 	}
 
 	public void insertUpdate(DocumentEvent e) {
@@ -112,12 +159,12 @@ public class AltosConfigureUI
 		c.anchor = GridBagConstraints.WEST;
 		pane.add(new JLabel("Voice"), c);
 
-		enable_voice = new JRadioButton("Enable", AltosPreferences.voice());
+		enable_voice = new JRadioButton("Enable", AltosUIPreferences.voice());
 		enable_voice.addActionListener(new ActionListener() {
 				public void actionPerformed(ActionEvent e) {
 					JRadioButton item = (JRadioButton) e.getSource();
 					boolean enabled = item.isSelected();
-					AltosPreferences.set_voice(enabled);
+					AltosUIPreferences.set_voice(enabled);
 					if (enabled)
 						voice.speak_always("Enable voice.");
 					else
@@ -156,11 +203,11 @@ public class AltosConfigureUI
 		c.anchor = GridBagConstraints.WEST;
 		pane.add(new JLabel("Log Directory"), c);
 
-		configure_log = new JButton(AltosPreferences.logdir().getPath());
+		configure_log = new JButton(AltosUIPreferences.logdir().getPath());
 		configure_log.addActionListener(new ActionListener() {
 				public void actionPerformed(ActionEvent e) {
-					AltosPreferences.ConfigureLog();
-					configure_log.setText(AltosPreferences.logdir().getPath());
+					AltosUIPreferences.ConfigureLog();
+					configure_log.setText(AltosUIPreferences.logdir().getPath());
 				}
 			});
 		c.gridx = 1;
@@ -179,7 +226,7 @@ public class AltosConfigureUI
 		c.anchor = GridBagConstraints.WEST;
 		pane.add(new JLabel("Callsign"), c);
 
-		callsign_value = new JTextField(AltosPreferences.callsign());
+		callsign_value = new JTextField(AltosUIPreferences.callsign());
 		callsign_value.getDocument().addDocumentListener(this);
 		c.gridx = 1;
 		c.gridy = row++;
@@ -198,13 +245,13 @@ public class AltosConfigureUI
 		pane.add(new JLabel("Font size"), c);
 
 		font_size_value = new JComboBox(font_size_names);
-		int font_size = AltosPreferences.font_size();
+		int font_size = AltosUIPreferences.font_size();
 		font_size_value.setSelectedIndex(font_size - Altos.font_size_small);
 		font_size_value.addActionListener(new ActionListener() {
 				public void actionPerformed(ActionEvent e) {
 					int	size = font_size_value.getSelectedIndex() + Altos.font_size_small;
 
-					AltosPreferences.set_font_size(size);
+					AltosUIPreferences.set_font_size(size);
 				}
 			});
 		c.gridx = 1;
@@ -215,6 +262,59 @@ public class AltosConfigureUI
 		pane.add(font_size_value, c);
 		font_size_value.setToolTipText("Font size used in telemetry window");
 
+		/* Look & Feel setting */
+		c.gridx = 0;
+		c.gridy = row;
+		c.gridwidth = 1;
+		c.fill = GridBagConstraints.NONE;
+		c.anchor = GridBagConstraints.WEST;
+		pane.add(new JLabel("Look & feel"), c);
+
+		class LookAndFeelRenderer extends BasicComboBoxRenderer implements ListCellRenderer {
+
+			public LookAndFeelRenderer() {
+				super();
+			}
+
+			public Component getListCellRendererComponent(
+				JList list,
+				Object value,
+				int index,
+				boolean isSelected,
+				boolean cellHasFocus)
+			{
+				super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
+				setText(((UIManager.LookAndFeelInfo) value).getName());
+				return this;
+			}
+		}
+
+		final UIManager.LookAndFeelInfo[] look_and_feels = UIManager.getInstalledLookAndFeels();
+
+		look_and_feel_value = new JComboBox(look_and_feels);
+
+		DelegatingRenderer.install(look_and_feel_value);
+
+		String look_and_feel  = AltosUIPreferences.look_and_feel();
+		for (int i = 0; i < look_and_feels.length; i++)
+			if (look_and_feel.equals(look_and_feels[i].getClassName()))
+				look_and_feel_value.setSelectedIndex(i);
+
+		look_and_feel_value.addActionListener(new ActionListener() {
+				public void actionPerformed(ActionEvent e) {
+					int	id = look_and_feel_value.getSelectedIndex();
+
+					AltosUIPreferences.set_look_and_feel(look_and_feels[id].getClassName());
+				}
+			});
+		c.gridx = 1;
+		c.gridy = row++;
+		c.gridwidth = 2;
+		c.fill = GridBagConstraints.BOTH;
+		c.anchor = GridBagConstraints.WEST;
+		pane.add(look_and_feel_value, c);
+		look_and_feel_value.setToolTipText("Look&feel used for new windows");
+
 		/* Serial debug setting */
 		c.gridx = 0;
 		c.gridy = row;
@@ -223,12 +323,12 @@ public class AltosConfigureUI
 		c.anchor = GridBagConstraints.WEST;
 		pane.add(new JLabel("Serial Debug"), c);
 
-		serial_debug = new JRadioButton("Enable", AltosPreferences.serial_debug());
+		serial_debug = new JRadioButton("Enable", AltosUIPreferences.serial_debug());
 		serial_debug.addActionListener(new ActionListener() {
 				public void actionPerformed(ActionEvent e) {
 					JRadioButton item = (JRadioButton) e.getSource();
 					boolean enabled = item.isSelected();
-					AltosPreferences.set_serial_debug(enabled);
+					AltosUIPreferences.set_serial_debug(enabled);
 				}
 			});
 		serial_debug.setToolTipText("Enable/Disable USB I/O getting sent to the console");
@@ -243,7 +343,7 @@ public class AltosConfigureUI
 		manage_bluetooth = new JButton("Manage Bluetooth");
 		manage_bluetooth.addActionListener(new ActionListener() {
 				public void actionPerformed(ActionEvent e) {
-					AltosBTManage.show(owner, Altos.bt_known);
+					AltosBTManage.show(owner, AltosBTKnown.bt_known());
 				}
 			});
 		c.gridx = 0;