X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosuilib%2FAltosUILib.java;h=704782f45feb0f4a9ce04f62fb16aef57ee3a2c4;hp=8fa7dfe69d937b1833c0452282d112aeeefeb875;hb=adf4bec88df1822031e1a8b00422de8b8b0c0cd4;hpb=4828be0ca5252ac9cd6061209385dcd6c4c57965

diff --git a/altosuilib/AltosUILib.java b/altosuilib/AltosUILib.java
index 8fa7dfe6..704782f4 100644
--- a/altosuilib/AltosUILib.java
+++ b/altosuilib/AltosUILib.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,12 +16,12 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_3;
+package org.altusmetrum.altosuilib_13;
 
 import java.awt.*;
 import libaltosJNI.*;
 
-import org.altusmetrum.altoslib_5.*;
+import org.altusmetrum.altoslib_13.*;
 
 public class AltosUILib extends AltosLib {
 
@@ -35,6 +36,7 @@ public class AltosUILib extends AltosLib {
 	final public static int font_size_small = 1;
 	final public static int font_size_medium = 2;
 	final public static int font_size_large = 3;
+	final public static int font_size_huge = 4;
 
 	final public static int position_top_left = 0;
 	final public static int position_top = 1;
@@ -68,6 +70,11 @@ public class AltosUILib extends AltosLib {
 			status_size = 30;
 			table_size = 17;
 			break;
+		case font_size_huge:
+			brief_size = 30;
+			status_size = 36;
+			table_size = 24;
+			break;
 		}
 		label_font = new Font("Dialog", Font.PLAIN, brief_size);
 		value_font = new Font("Monospaced", Font.PLAIN, brief_size);
@@ -82,11 +89,23 @@ public class AltosUILib extends AltosLib {
 	static public boolean loaded_library = false;
 	static public boolean has_bluetooth = false;
 
-	static final String[] library_names = { "altos", "altos32", "altos64" };
+	static final String[] library_names_32 = { "altos", "altos32", "altos64" };
+	static final String[] library_names_64 = { "altos", "altos64", "altos32" };
 
 	public static boolean load_library() {
 		if (!initialized) {
-			for (String name : library_names) {
+			String model = System.getProperty("sun.arch.data.model", "missing");
+			boolean is_64 = false;
+			if (model.equals("64")) {
+				is_64 = true;
+			} else if (model.equals("32")) {
+				;
+			} else {
+				String arch = System.getProperty("os.arch", "missing");
+				if (arch.endsWith("64"))
+					is_64 = true;
+			}
+			for (String name : is_64 ? library_names_64 : library_names_32) {
 				try {
 					System.loadLibrary(name);
 					libaltos.altos_init();
@@ -100,9 +119,8 @@ public class AltosUILib extends AltosLib {
 
 			String OS = System.getProperty("os.name");
 
-			if (OS.startsWith("Linux")) {
+			if (OS.startsWith("L") || OS.startsWith("W"))
 				has_bluetooth = true;
-			}
 
 			initialized = true;
 		}