projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.gag.com/fw/altos
[fw/altos]
/
ao-tools
/
altosui
/
AltosConfigUI.java
diff --git
a/ao-tools/altosui/AltosConfigUI.java
b/ao-tools/altosui/AltosConfigUI.java
index 1d8c579a8c66ccefbb030db35f6e5576d6fd628b..605ccc8be65e9722306d75d2213f4ddd8f1fb8ae 100644
(file)
--- a/
ao-tools/altosui/AltosConfigUI.java
+++ b/
ao-tools/altosui/AltosConfigUI.java
@@
-44,7
+44,10
@@
import altosui.AltosFlightInfoTableModel;
import libaltosJNI.*;
import libaltosJNI.*;
-public class AltosConfigUI extends JDialog implements ActionListener, ItemListener, DocumentListener {
+public class AltosConfigUI
+ extends JDialog
+ implements ActionListener, ItemListener, DocumentListener
+{
Container pane;
Box box;
Container pane;
Box box;
@@
-144,6
+147,7
@@
public class AltosConfigUI extends JDialog implements ActionListener, ItemListen
c.fill = GridBagConstraints.NONE;
c.anchor = GridBagConstraints.LINE_START;
c.insets = il;
c.fill = GridBagConstraints.NONE;
c.anchor = GridBagConstraints.LINE_START;
c.insets = il;
+ c.ipady = 5;
version_label = new JLabel("Software version:");
pane.add(version_label, c);
version_label = new JLabel("Software version:");
pane.add(version_label, c);
@@
-154,6
+158,7
@@
public class AltosConfigUI extends JDialog implements ActionListener, ItemListen
c.weightx = 1;
c.anchor = GridBagConstraints.LINE_START;
c.insets = ir;
c.weightx = 1;
c.anchor = GridBagConstraints.LINE_START;
c.insets = ir;
+ c.ipady = 5;
version_value = new JLabel("");
pane.add(version_value, c);
version_value = new JLabel("");
pane.add(version_value, c);
@@
-164,6
+169,7
@@
public class AltosConfigUI extends JDialog implements ActionListener, ItemListen
c.fill = GridBagConstraints.NONE;
c.anchor = GridBagConstraints.LINE_START;
c.insets = il;
c.fill = GridBagConstraints.NONE;
c.anchor = GridBagConstraints.LINE_START;
c.insets = il;
+ c.ipady = 5;
serial_label = new JLabel("Serial:");
pane.add(serial_label, c);
serial_label = new JLabel("Serial:");
pane.add(serial_label, c);
@@
-174,6
+180,7
@@
public class AltosConfigUI extends JDialog implements ActionListener, ItemListen
c.weightx = 1;
c.anchor = GridBagConstraints.LINE_START;
c.insets = ir;
c.weightx = 1;
c.anchor = GridBagConstraints.LINE_START;
c.insets = ir;
+ c.ipady = 5;
serial_value = new JLabel("");
pane.add(serial_value, c);
serial_value = new JLabel("");
pane.add(serial_value, c);
@@
-184,7
+191,7
@@
public class AltosConfigUI extends JDialog implements ActionListener, ItemListen
c.fill = GridBagConstraints.NONE;
c.anchor = GridBagConstraints.LINE_START;
c.insets = il;
c.fill = GridBagConstraints.NONE;
c.anchor = GridBagConstraints.LINE_START;
c.insets = il;
- c.ipady =
3
;
+ c.ipady =
5
;
main_deploy_label = new JLabel("Main Deploy Altitude(m):");
pane.add(main_deploy_label, c);
main_deploy_label = new JLabel("Main Deploy Altitude(m):");
pane.add(main_deploy_label, c);
@@
-275,7
+282,7
@@
public class AltosConfigUI extends JDialog implements ActionListener, ItemListen
/* Buttons */
c = new GridBagConstraints();
c.gridx = 0; c.gridy = 7;
/* Buttons */
c = new GridBagConstraints();
c.gridx = 0; c.gridy = 7;
- c.gridwidth =
2
;
+ c.gridwidth =
6
;
c.fill = GridBagConstraints.NONE;
c.anchor = GridBagConstraints.LINE_START;
c.insets = il;
c.fill = GridBagConstraints.NONE;
c.anchor = GridBagConstraints.LINE_START;
c.insets = il;
@@
-285,8
+292,8
@@
public class AltosConfigUI extends JDialog implements ActionListener, ItemListen
save.setActionCommand("save");
c = new GridBagConstraints();
save.setActionCommand("save");
c = new GridBagConstraints();
- c.gridx =
2
; c.gridy = 7;
- c.gridwidth =
2
;
+ c.gridx =
0
; c.gridy = 7;
+ c.gridwidth =
6
;
c.fill = GridBagConstraints.NONE;
c.anchor = GridBagConstraints.CENTER;
c.insets = il;
c.fill = GridBagConstraints.NONE;
c.anchor = GridBagConstraints.CENTER;
c.insets = il;
@@
-296,8
+303,8
@@
public class AltosConfigUI extends JDialog implements ActionListener, ItemListen
reset.setActionCommand("reset");
c = new GridBagConstraints();
reset.setActionCommand("reset");
c = new GridBagConstraints();
- c.gridx =
4
; c.gridy = 7;
- c.gridwidth =
2
;
+ c.gridx =
0
; c.gridy = 7;
+ c.gridwidth =
6
;
c.fill = GridBagConstraints.NONE;
c.anchor = GridBagConstraints.LINE_END;
c.insets = il;
c.fill = GridBagConstraints.NONE;
c.anchor = GridBagConstraints.LINE_END;
c.insets = il;