From 210e8778ce82fb56e0fd683d04f69b6b7ee8a6ef Mon Sep 17 00:00:00 2001
From: Bananeweizen <bananeweizen@gmx.de>
Date: Wed, 11 Jun 2014 21:22:06 +0200
Subject: new: make import/export top level menu items

---
 main/res/menu/cache_list_context.xml |  5 ----
 main/res/menu/cache_list_options.xml | 48 ++++++++++++++++++++++++------------
 main/res/values/strings.xml          |  1 +
 3 files changed, 33 insertions(+), 21 deletions(-)

(limited to 'main/res')

diff --git a/main/res/menu/cache_list_context.xml b/main/res/menu/cache_list_context.xml
index 0c14241..68a0699 100644
--- a/main/res/menu/cache_list_context.xml
+++ b/main/res/menu/cache_list_context.xml
@@ -42,11 +42,6 @@
         android:title="@string/cache_menu_move_list">
     </item>
     <item
-        android:id="@+id/menu_export"
-        cgeo:showAsAction="ifRoom|withText"
-        android:title="@string/export">
-    </item>
-    <item
         android:id="@+id/menu_refresh"
         cgeo:showAsAction="ifRoom|withText"
         android:icon="@drawable/ic_menu_refresh"
diff --git a/main/res/menu/cache_list_options.xml b/main/res/menu/cache_list_options.xml
index 8cf6f64..be45b54 100644
--- a/main/res/menu/cache_list_options.xml
+++ b/main/res/menu/cache_list_options.xml
@@ -60,22 +60,6 @@
                 android:title="@string/caches_clear_offlinelogs">
             </item>
             <item
-                android:id="@+id/menu_import_gpx"
-                android:title="@string/gpx_import_title">
-            </item>
-            <item
-                android:id="@+id/menu_import_web"
-                android:title="@string/web_import_title">
-            </item>
-            <item
-                android:id="@+id/menu_import_android"
-                android:title="@string/gpx_import_android">
-            </item>
-            <item
-                android:id="@+id/menu_export"
-                android:title="@string/export">
-            </item>
-            <item
                 android:id="@+id/menu_remove_from_history"
                 android:title="@string/cache_clear_history">
             </item>
@@ -112,4 +96,36 @@
          android:id="@+id/menu_rename_list"
          android:title="@string/list_menu_rename">
     </item>
+    <item
+        cgeo:showAsAction="never|withText"
+        android:title="@string/list_menu_import">
+        <menu>
+    		<item
+                android:id="@+id/menu_import_gpx"
+                android:title="@string/gpx_import_title">
+            </item>
+            <item
+                android:id="@+id/menu_import_web"
+                android:title="@string/web_import_title">
+            </item>
+            <item
+                android:id="@+id/menu_import_android"
+                android:title="@string/gpx_import_android">
+            </item>
+        </menu>
+    </item>
+    <item
+        cgeo:showAsAction="never|withText"
+        android:title="@string/export">
+        <menu>
+    		<item
+                android:id="@+id/menu_export_gpx"
+                android:title="@string/export_gpx">
+            </item>
+            <item
+                android:id="@+id/menu_export_fieldnotes"
+                android:title="@string/export_fieldnotes">
+            </item>
+        </menu>
+    </item>
 </menu>
\ No newline at end of file
diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml
index deba809..51b25e2 100644
--- a/main/res/values/strings.xml
+++ b/main/res/values/strings.xml
@@ -335,6 +335,7 @@
     <string name="list_menu_create">Create new list</string>
     <string name="list_menu_drop">Drop current list</string>
     <string name="list_menu_rename">Rename current list</string>
+    <string name="list_menu_import">Import</string>
     <string name="list_title">Pick a list</string>
     <string name="list_inbox">Stored</string>
     <string name="list_all_lists">All caches</string>
-- 
cgit v1.1