X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltos.java;h=c2cf409084e1ec5b44448830d0cfaf9a10369902;hp=98af26bc3943c8e821ffb73a742dc88b6c47378b;hb=1085ec5d57e0ed5d132f2bbdac1a0b6a32c0ab4a;hpb=52d3cad4f744140e1aa06fdfc0d49a0cf8734fd4

diff --git a/altosui/Altos.java b/altosui/Altos.java
index 98af26bc..c2cf4090 100644
--- a/altosui/Altos.java
+++ b/altosui/Altos.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
@@ -20,74 +21,9 @@ package altosui;
 import java.awt.*;
 import libaltosJNI.*;
 
-import org.altusmetrum.AltosLib.*;
+import org.altusmetrum.altoslib_11.*;
+import org.altusmetrum.altosuilib_11.*;
 
-public class Altos extends AltosLib {
+public class Altos extends AltosUILib {
 
-	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;
-
-	final static int font_size_small = 1;
-	final static int font_size_medium = 2;
-	final static int font_size_large = 3;
-
-	static void set_fonts(int size) {
-		int	brief_size;
-		int	table_size;
-		int	status_size;
-
-		switch (size) {
-		case font_size_small:
-			brief_size = 16;
-			status_size = 18;
-			table_size = 11;
-			break;
-		default:
-		case font_size_medium:
-			brief_size = 22;
-			status_size = 24;
-			table_size = 14;
-			break;
-		case font_size_large:
-			brief_size = 26;
-			status_size = 30;
-			table_size = 17;
-			break;
-		}
-		label_font = new Font("Dialog", Font.PLAIN, brief_size);
-		value_font = new Font("Monospaced", Font.PLAIN, brief_size);
-		status_font = new Font("SansSerif", Font.BOLD, status_size);
-		table_label_font = new Font("SansSerif", Font.PLAIN, table_size);
-		table_value_font = new Font("Monospaced", Font.PLAIN, table_size);
-	}
-
-	static final int text_width = 20;
-
-	static public boolean initialized = false;
-	static public boolean loaded_library = false;
-
-	public static boolean load_library() {
-		if (!initialized) {
-			try {
-				System.loadLibrary("altos");
-				libaltos.altos_init();
-				loaded_library = true;
-			} catch (UnsatisfiedLinkError e) {
-				try {
-					System.loadLibrary("altos64");
-					libaltos.altos_init();
-					loaded_library = true;
-				} catch (UnsatisfiedLinkError e2) {
-					loaded_library = false;
-				}
-			}
-			initialized = true;
-		}
-		return loaded_library;
-	}
 }