From f0216d721ed13f4d3dc608bb6ad8f83732b27c0a Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sun, 25 May 2014 21:01:38 -0700 Subject: altoslib/altosuilib: Change versions to altoslib:4, altosuilib:2 API has changed for these libraries, time to bump the file versions Signed-off-by: Keith Packard --- micropeak/MicroStatsTable.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'micropeak/MicroStatsTable.java') diff --git a/micropeak/MicroStatsTable.java b/micropeak/MicroStatsTable.java index ea1609ac..268a7ff0 100644 --- a/micropeak/MicroStatsTable.java +++ b/micropeak/MicroStatsTable.java @@ -19,8 +19,8 @@ package org.altusmetrum.micropeak; import java.awt.*; import javax.swing.*; -import org.altusmetrum.altoslib_3.*; -import org.altusmetrum.altosuilib_1.*; +import org.altusmetrum.altoslib_4.*; +import org.altusmetrum.altosuilib_2.*; public class MicroStatsTable extends JComponent implements AltosFontListener { GridBagLayout layout; -- cgit v1.2.3 From 92943bf4536d4167edd097e61de5e6b4f29130f8 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sat, 14 Jun 2014 15:44:20 -0700 Subject: micropeak: Make statistics entries un-editable Otherwise you can actually type in the various fields.x Signed-off-by: Keith Packard --- micropeak/MicroStatsTable.java | 3 ++- telegps/Makefile.am | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'micropeak/MicroStatsTable.java') diff --git a/micropeak/MicroStatsTable.java b/micropeak/MicroStatsTable.java index 268a7ff0..798d6535 100644 --- a/micropeak/MicroStatsTable.java +++ b/micropeak/MicroStatsTable.java @@ -61,6 +61,7 @@ public class MicroStatsTable extends JComponent implements AltosFontListener { JTextField value = new JTextField(values[j]); value.setFont(AltosUILib.value_font); value.setHorizontalAlignment(SwingConstants.RIGHT); + value.setEditable(false); texts[j] = value; c.gridx = j+1; c.gridy = y; c.anchor = GridBagConstraints.EAST; @@ -160,4 +161,4 @@ public class MicroStatsTable extends JComponent implements AltosFontListener { this(new MicroStats()); } -} \ No newline at end of file +} diff --git a/telegps/Makefile.am b/telegps/Makefile.am index 31bcbd79..b64397c8 100644 --- a/telegps/Makefile.am +++ b/telegps/Makefile.am @@ -82,8 +82,8 @@ FIRMWARE_TD=$(FIRMWARE_TD_0_2) FIRMWARE_TBT_1_0=$(top_srcdir)/src/telebt-v1.0/telebt-v1.0-$(VERSION).ihx FIRMWARE_TBT=$(FIRMWARE_TBT_1_0) -#FIRMWARE_TG_1_0=$(top_srcdir)/src/telegps-v1.0/telegps-v1.0-$(VERSION).ihx -#FIRMWARE_TG=$(FIRMWARE_TG_1_0) +FIRMWARE_TG_1_0=$(top_srcdir)/src/telegps-v1.0/telegps-v1.0-$(VERSION).ihx +FIRMWARE_TG=$(FIRMWARE_TG_1_0) FIRMWARE=$(FIRMWARE_TG) $(FIRMWARE_TD) $(FIRMWARE_TBT) -- cgit v1.2.3 From 823ef386f9dc5c5df197936f4254921f2e0282b0 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sat, 14 Jun 2014 20:08:40 -0700 Subject: altoslib: AltosFlightStatsTable: another editable text field that shouldn't be Signed-off-by: Keith Packard --- altosuilib/AltosFlightStatsTable.java | 1 + micropeak/MicroStatsTable.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'micropeak/MicroStatsTable.java') diff --git a/altosuilib/AltosFlightStatsTable.java b/altosuilib/AltosFlightStatsTable.java index b32e92a0..703dfb9d 100644 --- a/altosuilib/AltosFlightStatsTable.java +++ b/altosuilib/AltosFlightStatsTable.java @@ -55,6 +55,7 @@ public class AltosFlightStatsTable extends JComponent implements AltosFontListen value = new JTextField[values.length]; for (int j = 0; j < values.length; j++) { value[j] = new JTextField(values[j]); + value[j].setEditable(false); value[j].setFont(AltosUILib.value_font); value[j].setHorizontalAlignment(SwingConstants.RIGHT); c.gridx = j+1; c.gridy = y; diff --git a/micropeak/MicroStatsTable.java b/micropeak/MicroStatsTable.java index 798d6535..3b17e731 100644 --- a/micropeak/MicroStatsTable.java +++ b/micropeak/MicroStatsTable.java @@ -59,9 +59,9 @@ public class MicroStatsTable extends JComponent implements AltosFontListener { texts = new JTextField[values.length]; for (int j = 0; j < values.length; j++) { JTextField value = new JTextField(values[j]); + value.setEditable(false); value.setFont(AltosUILib.value_font); value.setHorizontalAlignment(SwingConstants.RIGHT); - value.setEditable(false); texts[j] = value; c.gridx = j+1; c.gridy = y; c.anchor = GridBagConstraints.EAST; -- cgit v1.2.3