X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosuilib%2FAltosUIConfigure.java;h=8ee89dd4400a72a47b9cb459a57af70888e7f76e;hp=146acda8ad139d9452d376e1f7b5270f0404ebe9;hb=52149fd81df45f37f5097850795f290f463c43ef;hpb=d6445b3739ac2c5dd040efdb97317a6b2a48044a diff --git a/altosuilib/AltosUIConfigure.java b/altosuilib/AltosUIConfigure.java index 146acda8..8ee89dd4 100644 --- a/altosuilib/AltosUIConfigure.java +++ b/altosuilib/AltosUIConfigure.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,14 +16,14 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -package org.altusmetrum.altosuilib_8; +package org.altusmetrum.altosuilib_14; import java.awt.*; import java.awt.event.*; import java.beans.*; import javax.swing.*; import javax.swing.event.*; -import org.altusmetrum.altoslib_8.*; +import org.altusmetrum.altoslib_14.*; class DelegatingRenderer implements ListCellRenderer { @@ -74,7 +75,7 @@ public class AltosUIConfigure public int row; - final static String[] font_size_names = { "Small", "Medium", "Large" }; + final static String[] font_size_names = { "Small", "Medium", "Large", "Huge" }; public GridBagConstraints constraints (int x, int width, int fill) { GridBagConstraints c = new GridBagConstraints(); @@ -239,12 +240,12 @@ public class AltosUIConfigure AltosUIPreferences.set_map_cache(size); } catch (ClassCastException ce) { - map_cache.setSelectedItem(new Integer(AltosUIPreferences.map_cache())); + map_cache.setSelectedItem(AltosUIPreferences.map_cache()); } } }); - map_cache.setSelectedItem (new Integer(AltosUIPreferences.map_cache())); + map_cache.setSelectedItem (AltosUIPreferences.map_cache()); pane.add(map_cache, constraints(1, 2, GridBagConstraints.BOTH)); row++; } @@ -269,9 +270,8 @@ public class AltosUIConfigure constraints(0, 3)); row++; - pane.add(new JLabel (String.format("AltOS version %s (%smaps key)", - AltosVersion.version, - AltosVersion.has_google_maps_api_key() ? "" : "no ")), + pane.add(new JLabel (String.format("AltOS version %s", + AltosVersion.version)), constraints(0, 3)); row++;