From: Keith Packard <keithp@keithp.com>
Date: Fri, 11 Jul 2014 01:43:31 +0000 (-0700)
Subject: altosui: Don't show bluetooth UI bits on mac/windows
X-Git-Tag: 1.4.9.2~11
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=5f5b03879d9daa68a56498b45ae87a804cb1926b

altosui: Don't show bluetooth UI bits on mac/windows

This just confuses people into thinking that bluetooth is supported on
those machines.

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/altosui/AltosConfigureUI.java b/altosui/AltosConfigureUI.java
index 80d6d341..85a3f6c0 100644
--- a/altosui/AltosConfigureUI.java
+++ b/altosui/AltosConfigureUI.java
@@ -89,6 +89,8 @@ public class AltosConfigureUI
 		row++;
 	}
 
+	boolean has_bluetooth;
+
 	public void add_bluetooth() {
 		JButton manage_bluetooth = new JButton("Manage Bluetooth");
 		manage_bluetooth.addActionListener(new ActionListener() {
@@ -98,6 +100,7 @@ public class AltosConfigureUI
 			});
 		pane.add(manage_bluetooth, constraints(0, 2));
 		/* in the same row as add_frequencies, so don't bump row */
+		has_bluetooth = true;
 	}
 
 	public void add_frequencies() {
@@ -108,7 +111,10 @@ public class AltosConfigureUI
 				}
 			});
 		manage_frequencies.setToolTipText("Configure which values are shown in frequency menus");
-		pane.add(manage_frequencies, constraints(2, 1));
+		if (has_bluetooth)
+			pane.add(manage_frequencies, constraints(2, 1));
+		else
+			pane.add(manage_frequencies, constraints(0, 3));
 		row++;
 	}
 
diff --git a/altosuilib/AltosDeviceDialog.java b/altosuilib/AltosDeviceDialog.java
index 0875bea7..d2ccd5e7 100644
--- a/altosuilib/AltosDeviceDialog.java
+++ b/altosuilib/AltosDeviceDialog.java
@@ -131,7 +131,8 @@ public abstract class AltosDeviceDialog extends AltosUIDialog implements ActionL
 		buttonPane.add(cancel_button);
 		buttonPane.add(Box.createRigidArea(new Dimension(10, 0)));
 
-		add_bluetooth();
+		if (AltosUILib.has_bluetooth)
+			add_bluetooth();
 
 		buttonPane.add(select_button);
 
diff --git a/altosuilib/AltosUIConfigure.java b/altosuilib/AltosUIConfigure.java
index 5648d1df..9c0f3bc7 100644
--- a/altosuilib/AltosUIConfigure.java
+++ b/altosuilib/AltosUIConfigure.java
@@ -283,7 +283,8 @@ public class AltosUIConfigure
 		add_look_and_feel();
 		add_position();
 		add_map_cache();
-		add_bluetooth();
+		if (AltosUILib.has_bluetooth)
+			add_bluetooth();
 		add_frequencies();
 
 		/* And a close button at the bottom */
diff --git a/altosuilib/AltosUILib.java b/altosuilib/AltosUILib.java
index 0050f12c..8fa7dfe6 100644
--- a/altosuilib/AltosUILib.java
+++ b/altosuilib/AltosUILib.java
@@ -80,6 +80,7 @@ public class AltosUILib extends AltosLib {
 
 	static public boolean initialized = false;
 	static public boolean loaded_library = false;
+	static public boolean has_bluetooth = false;
 
 	static final String[] library_names = { "altos", "altos32", "altos64" };
 
@@ -96,6 +97,13 @@ public class AltosUILib extends AltosLib {
 					loaded_library = false;
 				}
 			}
+
+			String OS = System.getProperty("os.name");
+
+			if (OS.startsWith("Linux")) {
+				has_bluetooth = true;
+			}
+
 			initialized = true;
 		}
 		return loaded_library;