projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump version to 1.9.2, android 27
[fw/altos]
/
altosuilib
/
AltosUIConfigure.java
diff --git
a/altosuilib/AltosUIConfigure.java
b/altosuilib/AltosUIConfigure.java
index 9c0f3bc7af933ff9dff2f1241d5c65aadfc31d24..8ee89dd4400a72a47b9cb459a57af70888e7f76e 100644
(file)
--- 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
*
* 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
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-15,13
+16,14
@@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altosuilib_
3
;
+package org.altusmetrum.altosuilib_
14
;
import java.awt.*;
import java.awt.event.*;
import java.beans.*;
import javax.swing.*;
import javax.swing.event.*;
import java.awt.*;
import java.awt.event.*;
import java.beans.*;
import javax.swing.*;
import javax.swing.event.*;
+import org.altusmetrum.altoslib_14.*;
class DelegatingRenderer implements ListCellRenderer<Object> {
class DelegatingRenderer implements ListCellRenderer<Object> {
@@
-73,7
+75,7
@@
public class AltosUIConfigure
public int row;
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();
public GridBagConstraints constraints (int x, int width, int fill) {
GridBagConstraints c = new GridBagConstraints();
@@
-238,12
+240,12
@@
public class AltosUIConfigure
AltosUIPreferences.set_map_cache(size);
} catch (ClassCastException ce) {
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++;
}
pane.add(map_cache, constraints(1, 2, GridBagConstraints.BOTH));
row++;
}
@@
-268,9
+270,8
@@
public class AltosUIConfigure
constraints(0, 3));
row++;
constraints(0, 3));
row++;
- pane.add(new JLabel (String.format("AltOS version %s (%smaps key)",
- AltosUIVersion.version,
- AltosUIVersion.has_google_maps_api_key() ? "" : "no ")),
+ pane.add(new JLabel (String.format("AltOS version %s",
+ AltosVersion.version)),
constraints(0, 3));
row++;
constraints(0, 3));
row++;