X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosuilib%2FAltosUILib.java;h=8fa7dfe69d937b1833c0452282d112aeeefeb875;hp=717678bafa6d959d19df096fa317f4a0e2ec33da;hb=b1f1844aa514893228080704da3b3ccf855bda1e;hpb=03496dc47372c40f7faae1766b0e729a1feeab7c

diff --git a/altosuilib/AltosUILib.java b/altosuilib/AltosUILib.java
index 717678ba..8fa7dfe6 100644
--- a/altosuilib/AltosUILib.java
+++ b/altosuilib/AltosUILib.java
@@ -15,28 +15,38 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib;
+package org.altusmetrum.altosuilib_3;
 
 import java.awt.*;
 import libaltosJNI.*;
 
-import org.altusmetrum.AltosLib.*;
+import org.altusmetrum.altoslib_5.*;
 
 public class AltosUILib extends AltosLib {
 
-	static final int tab_elt_pad = 5;
+	public static final int tab_elt_pad = 5;
 
-	static Font label_font;
-	static Font value_font;
-	static Font status_font;
-	static Font table_label_font;
-	static Font table_value_font;
+	public static Font label_font;
+	public static Font value_font;
+	public static Font status_font;
+	public static Font table_label_font;
+	public static Font table_value_font;
 
-	final static int font_size_small = 1;
-	final static int font_size_medium = 2;
-	final static int font_size_large = 3;
+	final public static int font_size_small = 1;
+	final public static int font_size_medium = 2;
+	final public static int font_size_large = 3;
 
-	static void set_fonts(int size) {
+	final public static int position_top_left = 0;
+	final public static int position_top = 1;
+	final public static int position_top_right = 2;
+	final public static int position_left = 3;
+	final public static int position_center = 4;
+	final public static int position_right = 5;
+	final public static int position_bottom_left = 6;
+	final public static int position_bottom = 7;
+	final public static int position_bottom_right = 8;
+
+	public static void set_fonts(int size) {
 		int	brief_size;
 		int	table_size;
 		int	status_size;
@@ -66,26 +76,34 @@ public class AltosUILib extends AltosLib {
 		table_value_font = new Font("Monospaced", Font.PLAIN, table_size);
 	}
 
-	static final int text_width = 20;
+	static public final int text_width = 20;
 
 	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" };
 
 	public static boolean load_library() {
 		if (!initialized) {
-			try {
-				System.loadLibrary("altos");
-				libaltos.altos_init();
-				loaded_library = true;
-			} catch (UnsatisfiedLinkError e) {
+			for (String name : library_names) {
 				try {
-					System.loadLibrary("altos64");
+					System.loadLibrary(name);
 					libaltos.altos_init();
 					loaded_library = true;
-				} catch (UnsatisfiedLinkError e2) {
+					break;
+				} catch (UnsatisfiedLinkError e) {
+					System.out.printf("Link error %s\n", e.getMessage());
 					loaded_library = false;
 				}
 			}
+
+			String OS = System.getProperty("os.name");
+
+			if (OS.startsWith("Linux")) {
+				has_bluetooth = true;
+			}
+
 			initialized = true;
 		}
 		return loaded_library;