projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui: Split out UI-specific preferences
[fw/altos]
/
altosui
/
AltosUI.java
diff --git
a/altosui/AltosUI.java
b/altosui/AltosUI.java
index 6993abab92ae2e49bb03cf621f537b56e50f065a..a2816a3a6dc4cf7158e28d6273b3a7a298613f73 100644
(file)
--- a/
altosui/AltosUI.java
+++ b/
altosui/AltosUI.java
@@
-108,7
+108,7
@@
public class AltosUI extends AltosFrame {
if (imgURL != null)
setIconImage(new ImageIcon(imgURL).getImage());
if (imgURL != null)
setIconImage(new ImageIcon(imgURL).getImage());
- AltosPreferences.set_component(this);
+ Altos
UI
Preferences.set_component(this);
pane = getContentPane();
gridbag = new GridBagLayout();
pane = getContentPane();
gridbag = new GridBagLayout();
@@
-262,9
+262,9
@@
public class AltosUI extends AltosFrame {
String result;
result = JOptionPane.showInputDialog(AltosUI.this,
"Configure Callsign",
String result;
result = JOptionPane.showInputDialog(AltosUI.this,
"Configure Callsign",
- AltosPreferences.callsign());
+ Altos
UI
Preferences.callsign());
if (result != null)
if (result != null)
- AltosPreferences.set_callsign(result);
+ Altos
UI
Preferences.set_callsign(result);
}
void ConfigureTeleMetrum() {
}
void ConfigureTeleMetrum() {
@@
-365,6
+365,8
@@
public class AltosUI extends AltosFrame {
in = new FileInputStream(file);
if (filename.endsWith("eeprom"))
return new AltosEepromIterable(in);
in = new FileInputStream(file);
if (filename.endsWith("eeprom"))
return new AltosEepromIterable(in);
+ else if (filename.endsWith("mega"))
+ return new AltosEepromMegaIterable(in);
else
return new AltosTelemetryIterable(in);
} catch (FileNotFoundException fe) {
else
return new AltosTelemetryIterable(in);
} catch (FileNotFoundException fe) {
@@
-536,7
+538,7
@@
public class AltosUI extends AltosFrame {
public static void main(final String[] args) {
try {
public static void main(final String[] args) {
try {
- UIManager.setLookAndFeel(AltosPreferences.look_and_feel());
+ UIManager.setLookAndFeel(Altos
UI
Preferences.look_and_feel());
} catch (Exception e) {
}
/* Handle batch-mode */
} catch (Exception e) {
}
/* Handle batch-mode */