From 8d9881707c31de1da357081701a40fe013b0f2fa Mon Sep 17 00:00:00 2001
From: Bananeweizen <bananeweizen@gmx.de>
Date: Sun, 1 Jun 2014 17:20:20 +0200
Subject: convert map settings to checkbox based menus

This avoids the confusion that is always connected with label changing
menu items (Is the label showing the current state or the state that I
get when clicking?)
---
 main/res/menu/map_activity.xml | 59 +++++++++++++++++++++---------------------
 1 file changed, 30 insertions(+), 29 deletions(-)

(limited to 'main/res/menu')

diff --git a/main/res/menu/map_activity.xml b/main/res/menu/map_activity.xml
index 8a41715..4c1dfd7 100644
--- a/main/res/menu/map_activity.xml
+++ b/main/res/menu/map_activity.xml
@@ -1,20 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:cgeo="http://schemas.android.com/apk/res-auto">
+    xmlns:cgeo="http://schemas.android.com/apk/res-auto" >
 
-    <item android:id="@+id/menu_toggle_mypos"
-        android:title="@string/menu_centerposition"
+    <item
+        android:id="@+id/menu_toggle_mypos"
         android:icon="@drawable/ic_menu_myposition"
-        cgeo:showAsAction="always"
         android:showAsAction="always"
-
-        />
-
+        android:title="@string/menu_centerposition"
+        cgeo:showAsAction="always"/>
     <item
         android:id="@+id/menu_select_mapview"
         android:icon="@drawable/ic_menu_mapmode"
-        cgeo:showAsAction="ifRoom|withText"
-        android:title="@string/map_view_map">
+        android:title="@string/map_view_map"
+        cgeo:showAsAction="ifRoom|withText">
         <menu>
             <group
                 android:id="@+id/menu_group_map_sources"
@@ -25,48 +23,51 @@
     <item
         android:id="@+id/menu_map_live"
         android:icon="@drawable/ic_menu_refresh"
-        cgeo:showAsAction="ifRoom|withText"
-        android:title="@string/map_live_disable">
+        android:title="@string/map_live_disable"
+        cgeo:showAsAction="ifRoom|withText">
     </item>
     <item
         android:id="@+id/menu_store_caches"
         android:icon="@drawable/ic_menu_set_as"
-        cgeo:showAsAction="ifRoom|withText"
-        android:title="@string/caches_store_offline">
+        android:title="@string/caches_store_offline"
+        cgeo:showAsAction="ifRoom|withText">
     </item>
     <item
         android:id="@+id/submenu_modes"
         android:icon="@drawable/ic_menu_mark"
-        cgeo:showAsAction="ifRoom|withText"
-        android:title="@string/map_modes">
+        android:title="@string/map_modes"
+        cgeo:showAsAction="ifRoom|withText">
         <menu>
             <item
                 android:id="@+id/menu_trail_mode"
+                android:checkable="true"
                 android:icon="@drawable/ic_menu_trail"
-                cgeo:showAsAction="ifRoom|withText"
-                android:title="@string/map_trail_hide">
+                android:title="@string/map_trail_show"
+                cgeo:showAsAction="ifRoom|withText">
             </item>
             <item
                 android:id="@+id/menu_circle_mode"
+                android:checkable="true"
                 android:icon="@drawable/ic_menu_circle"
-                cgeo:showAsAction="ifRoom|withText"
-                android:title="@string/map_circles_hide">
+                android:title="@string/map_circles_show"
+                cgeo:showAsAction="ifRoom|withText">
             </item>
             <item
-            	android:id="@+id/menu_mycaches_mode"
-            	android:icon="@android:drawable/ic_menu_myplaces"
-                cgeo:showAsAction="ifRoom|withText"
-            	android:title="@string/map_mycaches_hide">
-            </item>
-            <item
-                android:id="@+id/menu_theme_mode"
-                android:icon="@drawable/ic_menu_preferences"
-                cgeo:showAsAction="ifRoom|withText"
-                android:title="@string/map_theme_select">
+                android:id="@+id/menu_mycaches_mode"
+                android:checkable="true"
+                android:icon="@android:drawable/ic_menu_myplaces"
+                android:title="@string/map_mycaches_hide"
+                cgeo:showAsAction="ifRoom|withText">
             </item>
         </menu>
     </item>
     <item
+        android:id="@+id/menu_theme_mode"
+        android:icon="@drawable/ic_menu_preferences"
+        android:title="@string/map_theme_select"
+        cgeo:showAsAction="ifRoom|withText">
+    </item>
+    <item
         android:id="@+id/submenu_strategy"
         android:icon="@drawable/ic_menu_preferences"
         android:title="@string/map_strategy">
-- 
cgit v1.1