Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

1 files changed, 30 insertions, 2 deletions

diff --git a/altosuilib/AltosUIConfigure.java b/altosuilib/AltosUIConfigure.java
index 920ed8e2..5648d1df 100644
--- a/altosuilib/AltosUIConfigure.java
+++ b/altosuilib/AltosUIConfigure.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_2;
+package org.altusmetrum.altosuilib_3;
 
 import java.awt.*;
 import java.awt.event.*;
@@ -223,6 +223,31 @@ public class AltosUIConfigure
 		row++;
 	}
 
+	static final Integer map_caches[] = { 9, 25, 100 };
+
+	public void add_map_cache() {
+		pane.add(new JLabel("Map Cache Size"), constraints(0, 1));
+
+		final JComboBox<Integer> map_cache = new JComboBox<Integer>(map_caches);
+
+		map_cache.setEditable(true);
+		map_cache.addActionListener(new ActionListener() {
+				public void actionPerformed(ActionEvent e) {
+					try {
+						int	size = (Integer) (map_cache.getSelectedItem());
+
+						AltosUIPreferences.set_map_cache(size);
+					} catch (ClassCastException ce) {
+						map_cache.setSelectedItem(new Integer(AltosUIPreferences.map_cache()));
+					}
+				}
+			});
+
+		map_cache.setSelectedItem (new Integer(AltosUIPreferences.map_cache()));
+		pane.add(map_cache, constraints(1, 2, GridBagConstraints.BOTH));
+		row++;
+	}
+
 	public void add_bluetooth() {
 	}
 
@@ -243,7 +268,9 @@ public class AltosUIConfigure
 			 constraints(0, 3));
 		row++;
 
-		pane.add(new JLabel (String.format("AltOS version %s", AltosUIVersion.version)),
+		pane.add(new JLabel (String.format("AltOS version %s (%smaps key)",
+						   AltosUIVersion.version,
+						   AltosUIVersion.has_google_maps_api_key() ? "" : "no ")),
 			 constraints(0, 3));
 		row++;
 
@@ -255,6 +282,7 @@ public class AltosUIConfigure
 		add_font_size();
 		add_look_and_feel();
 		add_position();
+		add_map_cache();
 		add_bluetooth();
 		add_frequencies();