X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosuilib%2FAltosUIEnable.java;h=7bb80bc100d127ead14be817e832ba26197fc651;hp=55486dea1214a064c5a1d013c2d639bd361fce71;hb=21d176f161b90f18f236ef887cef9676d712eee3;hpb=bf88c5f829ea5d32043431945e862a9f6c96740a

diff --git a/altosuilib/AltosUIEnable.java b/altosuilib/AltosUIEnable.java
index 55486dea..7bb80bc1 100644
--- a/altosuilib/AltosUIEnable.java
+++ b/altosuilib/AltosUIEnable.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_1;
+package org.altusmetrum.altosuilib_10;
 
 import java.awt.*;
 import java.awt.event.*;
@@ -23,7 +23,7 @@ import javax.swing.*;
 import java.io.*;
 import java.util.concurrent.*;
 import java.util.*;
-import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altoslib_10.*;
 
 import org.jfree.ui.*;
 import org.jfree.chart.*;
@@ -37,13 +37,22 @@ import org.jfree.data.*;
 
 public class AltosUIEnable extends Container {
 
-	Insets	il, ir;
-	int	y;
+	Insets		il, ir;
+	int		y;
+	int		x;
+	JCheckBox	imperial_units;
+
+	static final int max_rows = 14;
+
+	public void units_changed(boolean imperial_units) {
+		if (this.imperial_units != null) {
+			this.imperial_units.setSelected(imperial_units);
+		}
+	}
 
 	class GraphElement implements ActionListener {
 		AltosUIGrapher	grapher;
-		JLabel		label;
-		JRadioButton	enable;
+		JCheckBox	enable;
 		String		name;
 
 		public void actionPerformed(ActionEvent ae) {
@@ -53,9 +62,8 @@ public class AltosUIEnable extends Container {
 		GraphElement (String name, AltosUIGrapher grapher, boolean enabled) {
 			this.name = name;
 			this.grapher = grapher;
-			label = new JLabel(name);
-			enable = new JRadioButton("Enable", enabled);
-			grapher.set_enable(enabled);			  
+			enable = new JCheckBox(name, enabled);
+			grapher.set_enable(enabled);
 			enable.addActionListener(this);
 		}
 	}
@@ -63,18 +71,11 @@ public class AltosUIEnable extends Container {
 	public void add(String name, AltosUIGrapher grapher, boolean enabled) {
 
 		GraphElement	e = new GraphElement(name, grapher, enabled);
-
-		/* Add label */
 		GridBagConstraints c = new GridBagConstraints();
-		c.gridx = 0; c.gridy = y;
-		c.fill = GridBagConstraints.NONE;
-		c.anchor = GridBagConstraints.LINE_START;
-		c.insets = il;
-		add(e.label, c);
 
-		/* Add radio button */
+		/* Add element */
 		c = new GridBagConstraints();
-		c.gridx = 1; c.gridy = y;
+		c.gridx = x; c.gridy = y;
 		c.fill = GridBagConstraints.HORIZONTAL;
 		c.anchor = GridBagConstraints.CENTER;
 		c.insets = ir;
@@ -82,29 +83,27 @@ public class AltosUIEnable extends Container {
 
 		/* Next row */
 		y++;
+		if (y == max_rows) {
+			x++;
+			y = 0;
+		}
 	}
 
 	public void add_units() {
 		/* Imperial units setting */
-		/* Add label */
-		GridBagConstraints c = new GridBagConstraints();
-		c.gridx = 0; c.gridy = 1000;
-		c.fill = GridBagConstraints.NONE;
-		c.anchor = GridBagConstraints.LINE_START;
-		c.insets = il;
-		add(new JLabel("Imperial Units"), c);
 
-		JRadioButton imperial_units = new JRadioButton("Enable", AltosUIPreferences.imperial_units());
+		/* Add label */
+		imperial_units = new JCheckBox("Imperial Units", AltosUIPreferences.imperial_units());
 		imperial_units.addActionListener(new ActionListener() {
 				public void actionPerformed(ActionEvent e) {
-					JRadioButton item = (JRadioButton) e.getSource();
+					JCheckBox item = (JCheckBox) e.getSource();
 					boolean enabled = item.isSelected();
 					AltosUIPreferences.set_imperial_units(enabled);
 				}
 			});
 		imperial_units.setToolTipText("Use Imperial units instead of metric");
-		c = new GridBagConstraints();
-		c.gridx = 1; c.gridy = 1000;
+		GridBagConstraints c = new GridBagConstraints();
+		c.gridx = 0; c.gridy = 1000;
 		c.fill = GridBagConstraints.NONE;
 		c.anchor = GridBagConstraints.LINE_START;
 		c.insets = il;
@@ -114,6 +113,7 @@ public class AltosUIEnable extends Container {
 	public AltosUIEnable() {
 		il = new Insets(4,4,4,4);
 		ir = new Insets(4,4,4,4);
+		x = 0;
 		y = 0;
 		setLayout(new GridBagLayout());
 		add_units();