projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Switch from GPLv2 to GPLv2+
[fw/altos]
/
altosuilib
/
AltosUIEnable.java
diff --git
a/altosuilib/AltosUIEnable.java
b/altosuilib/AltosUIEnable.java
index 84803c0e916770af06b0fc627e040806f826cfe5..4c733b9601496f5d1b54b5d2c6ac021253a147ac 100644
(file)
--- a/
altosuilib/AltosUIEnable.java
+++ b/
altosuilib/AltosUIEnable.java
@@
-3,7
+3,8
@@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-15,7
+16,7
@@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altosuilib_1;
+package org.altusmetrum.altosuilib_1
1
;
import java.awt.*;
import java.awt.event.*;
import java.awt.*;
import java.awt.event.*;
@@
-23,7
+24,7
@@
import javax.swing.*;
import java.io.*;
import java.util.concurrent.*;
import java.util.*;
import java.io.*;
import java.util.concurrent.*;
import java.util.*;
-import org.altusmetrum.altoslib_
2
.*;
+import org.altusmetrum.altoslib_
11
.*;
import org.jfree.ui.*;
import org.jfree.chart.*;
import org.jfree.ui.*;
import org.jfree.chart.*;
@@
-37,13
+38,22
@@
import org.jfree.data.*;
public class AltosUIEnable extends Container {
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;
class GraphElement implements ActionListener {
AltosUIGrapher grapher;
- JLabel label;
- JRadioButton enable;
+ JCheckBox enable;
String name;
public void actionPerformed(ActionEvent ae) {
String name;
public void actionPerformed(ActionEvent ae) {
@@
-53,9
+63,8
@@
public class AltosUIEnable extends Container {
GraphElement (String name, AltosUIGrapher grapher, boolean enabled) {
this.name = name;
this.grapher = grapher;
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);
}
}
enable.addActionListener(this);
}
}
@@
-63,18
+72,11
@@
public class AltosUIEnable extends Container {
public void add(String name, AltosUIGrapher grapher, boolean enabled) {
GraphElement e = new GraphElement(name, grapher, enabled);
public void add(String name, AltosUIGrapher grapher, boolean enabled) {
GraphElement e = new GraphElement(name, grapher, enabled);
-
- /* Add label */
GridBagConstraints c = new GridBagConstraints();
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 = 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;
c.fill = GridBagConstraints.HORIZONTAL;
c.anchor = GridBagConstraints.CENTER;
c.insets = ir;
@@
-82,29
+84,27
@@
public class AltosUIEnable extends Container {
/* Next row */
y++;
/* Next row */
y++;
+ if (y == max_rows) {
+ x++;
+ y = 0;
+ }
}
public void add_units() {
/* Imperial units setting */
}
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) {
imperial_units.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
- J
RadioButton item = (JRadioButton
) e.getSource();
+ J
CheckBox item = (JCheckBox
) e.getSource();
boolean enabled = item.isSelected();
AltosUIPreferences.set_imperial_units(enabled);
}
});
imperial_units.setToolTipText("Use Imperial units instead of metric");
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;
c.fill = GridBagConstraints.NONE;
c.anchor = GridBagConstraints.LINE_START;
c.insets = il;
@@
-114,6
+114,7
@@
public class AltosUIEnable extends Container {
public AltosUIEnable() {
il = new Insets(4,4,4,4);
ir = new Insets(4,4,4,4);
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();
y = 0;
setLayout(new GridBagLayout());
add_units();