diff options
Diffstat (limited to 'main/res/menu/cache_list_options.xml')
| -rw-r--r-- | main/res/menu/cache_list_options.xml | 85 |
1 files changed, 49 insertions, 36 deletions
diff --git a/main/res/menu/cache_list_options.xml b/main/res/menu/cache_list_options.xml index 418d2de..f10ab9b 100644 --- a/main/res/menu/cache_list_options.xml +++ b/main/res/menu/cache_list_options.xml @@ -1,15 +1,27 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android" > +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:cgeo="http://schemas.android.com/apk/res-auto" > <item + android:id="@+id/menu_show_on_map" + android:icon="@drawable/ic_menu_mapmode" + android:title="@string/caches_on_map" + cgeo:showAsAction="ifRoom"> + </item> + <item android:id="@+id/menu_filter" android:icon="@drawable/ic_menu_filter" - android:title="@string/caches_filter"> + android:title="@string/caches_filter" + cgeo:showAsAction="ifRoom|withText"> </item> <item android:id="@+id/menu_sort" + android:actionProviderClass="cgeo.geocaching.sorting.SortActionProvider" android:icon="@drawable/ic_menu_sort_alphabetically" - android:title="@string/caches_sort"> + android:showAsAction="always" + android:title="@string/caches_sort" + cgeo:actionProviderClass="cgeo.geocaching.sorting.SortActionProvider" + cgeo:showAsAction="ifRoom|withText"> </item> <item android:id="@+id/menu_switch_select_mode" @@ -36,11 +48,7 @@ </item> <item android:id="@+id/menu_drop_caches" - android:title="@string/caches_drop_all"> - </item> - <item - android:id="@+id/menu_drop_caches_and_list" - android:title="@string/caches_drop_all_and_list"> + android:title="@string/caches_remove_all"> </item> <item android:id="@+id/menu_delete_events" @@ -51,22 +59,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> @@ -88,29 +80,50 @@ android:icon="@drawable/ic_menu_mapmode" android:title="@string/caches_on_map" android:visible="false"> - <menu > + <menu> </menu> </item> <item - android:id="@+id/submenu_manage_lists" - android:icon="@drawable/ic_menu_more" - android:title="@string/list_menu"> + android:id="@+id/menu_create_list" + android:title="@string/list_menu_create"> + </item> + <item + android:id="@+id/menu_drop_list" + android:title="@string/list_menu_drop"> + </item> + <item + android:id="@+id/menu_rename_list" + android:title="@string/list_menu_rename"> + </item> + <item + android:title="@string/list_menu_import" + cgeo:showAsAction="never|withText"> <menu> <item - android:id="@+id/menu_create_list" - android:title="@string/list_menu_create"> + android:id="@+id/menu_import_gpx" + android:title="@string/gpx_import_title"> </item> <item - android:id="@+id/menu_drop_list" - android:title="@string/list_menu_drop"> + 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 + android:title="@string/export" + cgeo:showAsAction="never|withText"> + <menu> <item - android:id="@+id/menu_rename_list" - android:title="@string/list_menu_rename"> + android:id="@+id/menu_export_gpx" + android:title="@string/export_gpx"> </item> <item - android:id="@+id/menu_switch_list" - android:title="@string/list_menu_change"> + android:id="@+id/menu_export_fieldnotes" + android:title="@string/export_fieldnotes"> </item> </menu> </item> |