From: Keith Packard <keithp@keithp.com>
Date: Sat, 21 Dec 2013 14:46:46 +0000 (-0800)
Subject: altosui: Switch from radio buttons to check boxes in pyro config. Add close
X-Git-Tag: 1.3.1~32
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=9cf9a67f937185c0c0bb5b2bae4f420755965799

altosui: Switch from radio buttons to check boxes in pyro config. Add close

First of (we hope) many review comments from Troj.

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/altosui/AltosConfigPyroUI.java b/altosui/AltosConfigPyroUI.java
index f59a0f0d..47b2b662 100644
--- a/altosui/AltosConfigPyroUI.java
+++ b/altosui/AltosConfigPyroUI.java
@@ -26,7 +26,7 @@ import org.altusmetrum.altosuilib_1.*;
 
 public class AltosConfigPyroUI
 	extends AltosUIDialog
-	implements ItemListener, DocumentListener, AltosUnitsListener
+	implements ItemListener, DocumentListener, AltosUnitsListener, ActionListener
 {
 	AltosConfigUI	owner;
 	Container	pane;
@@ -48,7 +48,7 @@ public class AltosConfigPyroUI
 	class PyroItem implements ItemListener, DocumentListener, AltosUnitsListener
 	{
 		public int		flag;
-		public JRadioButton	enable;
+		public JCheckBox	enable;
 		public JTextField	value;
 		public JComboBox	combo;
 		AltosConfigPyroUI	ui;
@@ -146,7 +146,7 @@ public class AltosConfigPyroUI
 			c.fill = GridBagConstraints.NONE;
 			c.anchor = GridBagConstraints.LINE_START;
 			c.insets = il;
-			enable = new JRadioButton();
+			enable = new JCheckBox();
 			enable.addItemListener(this);
 			pane.add(enable, c);
 			
@@ -309,6 +309,14 @@ public class AltosConfigPyroUI
 		}
 	}
 
+	/* Listen for events from our buttons */
+	public void actionPerformed(ActionEvent e) {
+		String	cmd = e.getActionCommand();
+
+		if (cmd.equals("Close"))
+			setVisible(false);
+	}
+
 	public AltosConfigPyroUI(AltosConfigUI in_owner, AltosPyro[] pyros) {
 
 		super(in_owner, "Configure Pyro Channels", false);
@@ -353,6 +361,17 @@ public class AltosConfigPyroUI
 			columns[i] = new PyroColumn(this, i*2 + 1, 0, i);
 			columns[i].set(pyros[i]);
 		}
+
+		c = new GridBagConstraints();
+		c.gridx = pyros.length*2-1;
+		c.fill = GridBagConstraints.HORIZONTAL;
+		c.gridwidth = 2;
+		c.gridy = 1000;
+		JButton close = new JButton("Close");
+		pane.add(close, c);
+		close.addActionListener(this);
+		close.setActionCommand("Close");
+		
 		addWindowListener(new ConfigListener(this, owner));
 		AltosPreferences.register_units_listener(this);
 	}