From 6d1d6599ed0737c66e69c1edf166242683b8d37c Mon Sep 17 00:00:00 2001
From: Bananeweizen <bananeweizen@gmx.de>
Date: Sat, 31 May 2014 10:53:24 +0200
Subject: have store/delete/refresh in action bar

---
 main/res/menu/cache_list_context.xml |  3 ++
 main/res/menu/cache_options.xml      | 59 ++++++++++++++++++++++++------------
 2 files changed, 43 insertions(+), 19 deletions(-)

(limited to 'main/res/menu')

diff --git a/main/res/menu/cache_list_context.xml b/main/res/menu/cache_list_context.xml
index 8d52654..0c14241 100644
--- a/main/res/menu/cache_list_context.xml
+++ b/main/res/menu/cache_list_context.xml
@@ -33,6 +33,7 @@
     <item
         android:id="@+id/menu_drop_cache"
         cgeo:showAsAction="ifRoom|withText"
+        android:icon="@drawable/ic_menu_delete"
         android:title="@string/cache_offline_drop">
     </item>
     <item
@@ -48,11 +49,13 @@
     <item
         android:id="@+id/menu_refresh"
         cgeo:showAsAction="ifRoom|withText"
+        android:icon="@drawable/ic_menu_refresh"
         android:title="@string/cache_menu_refresh">
     </item>
     <item
         android:id="@+id/menu_store_cache"
         cgeo:showAsAction="ifRoom|withText"
+        android:icon="@drawable/ic_menu_save"
         android:title="@string/cache_offline_store">
     </item>
 
diff --git a/main/res/menu/cache_options.xml b/main/res/menu/cache_options.xml
index 4429baf..9610836 100644
--- a/main/res/menu/cache_options.xml
+++ b/main/res/menu/cache_options.xml
@@ -1,55 +1,76 @@
 <?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_default_navigation"
         android:icon="@drawable/ic_menu_compass"
-        cgeo:showAsAction="ifRoom"
-        android:title="@string/cache_menu_navigate"> <!-- will be replaced -->
+        android:title="@string/cache_menu_navigate"
+        cgeo:showAsAction="ifRoom"> <!-- will be replaced -->
     </item>
     <item
         android:id="@+id/menu_navigate"
         android:icon="@drawable/ic_menu_mapmode"
-        cgeo:showAsAction="ifRoom"
-        android:title="@string/cache_menu_navigate">
+        android:title="@string/cache_menu_navigate"
+        cgeo:showAsAction="ifRoom">
     </item>
     <item
         android:id="@+id/menu_log_visit_offline"
         android:icon="@drawable/ic_menu_edit"
-        cgeo:showAsAction="ifRoom"
-        android:title="@string/cache_menu_visit_offline">
+        android:title="@string/cache_menu_visit_offline"
+        cgeo:showAsAction="ifRoom">
     </item>
     <item
         android:id="@+id/menu_log_visit"
         android:icon="@drawable/ic_menu_edit"
-        cgeo:showAsAction="ifRoom"
-        android:title="@string/cache_menu_visit">
+        android:title="@string/cache_menu_visit"
+        cgeo:showAsAction="ifRoom">
     </item>
     <item
         android:id="@+id/menu_calendar"
         android:icon="@drawable/ic_menu_my_calendar"
-        cgeo:showAsAction="ifRoom"
-        android:title="@string/cache_menu_event">
+        android:title="@string/cache_menu_event"
+        cgeo:showAsAction="ifRoom">
     </item>
     <item
         android:id="@+id/menu_caches_around"
         android:icon="@drawable/ic_menu_rotate"
-        cgeo:showAsAction="ifRoom"
-        android:title="@string/cache_menu_around">
+        android:title="@string/cache_menu_around"
+        cgeo:showAsAction="ifRoom">
     </item>
     <item
         android:id="@+id/menu_show_in_browser"
         android:icon="@drawable/ic_menu_info_details"
-        cgeo:showAsAction="ifRoom"
-        android:title="@string/cache_menu_browser">
+        android:title="@string/cache_menu_browser"
+        cgeo:showAsAction="ifRoom">
+    </item>
+    <item
+        android:id="@+id/menu_store"
+        android:icon="@drawable/ic_menu_save"
+        android:title="@string/cache_offline_store"
+        android:visible="false"
+        cgeo:showAsAction="ifRoom">
+    </item>
+    <item
+        android:id="@+id/menu_refresh"
+        android:icon="@drawable/ic_menu_refresh"
+        android:title="@string/cache_offline_refresh"
+        android:visible="false"
+        cgeo:showAsAction="ifRoom">
+    </item>
+    <item
+        android:id="@+id/menu_delete"
+        android:icon="@drawable/ic_menu_delete"
+        android:title="@string/cache_offline_drop"
+        android:visible="false"
+        cgeo:showAsAction="ifRoom">
     </item>
     <item
         android:id="@+id/menu_share"
         android:icon="@drawable/ic_menu_share"
-        cgeo:showAsAction="ifRoom"
+        android:title="@string/cache_menu_share"
         cgeo:actionProviderClass="android.support.v7.widget.ShareActionProvider"
-        android:title="@string/cache_menu_share">
+        cgeo:showAsAction="ifRoom">
     </item>
-    
-    
+
 </menu>
\ No newline at end of file
-- 
cgit v1.1