diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/res/menu/cache_list_options.xml | 53 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/CacheListActivity.java | 10 |
2 files changed, 23 insertions, 40 deletions
diff --git a/main/res/menu/cache_list_options.xml b/main/res/menu/cache_list_options.xml index 1198d5b..8e337a4 100644 --- a/main/res/menu/cache_list_options.xml +++ b/main/res/menu/cache_list_options.xml @@ -34,42 +34,19 @@ android:title="@string/caches_select_invert"> </item> <item - android:id="@+id/submenu_manage" - android:icon="@drawable/ic_menu_save" - android:title="@string/caches_manage"> - <menu> - <item - android:id="@+id/menu_refresh_stored" - android:title="@string/cache_offline_refresh"> - </item> - <item - android:id="@+id/menu_move_to_list" - android:title="@string/cache_menu_move_list"> - </item> - <item - android:id="@+id/menu_drop_caches" - android:title="@string/caches_remove_all"> - </item> - <item - android:id="@+id/menu_delete_events" - android:title="@string/caches_delete_events"> - </item> - <item - android:id="@+id/menu_clear_offline_logs" - android:title="@string/caches_clear_offlinelogs"> - </item> - <item - android:id="@+id/menu_remove_from_history" - android:title="@string/cache_clear_history"> - </item> - </menu> - </item> - <item - android:id="@+id/menu_refresh_stored_top" + android:id="@+id/menu_refresh_stored" android:icon="@drawable/ic_menu_set_as" android:title="@string/cache_offline_refresh"> </item> <item + android:id="@+id/menu_move_to_list" + android:title="@string/cache_menu_move_list"> + </item> + <item + android:id="@+id/menu_drop_caches" + android:title="@string/caches_remove_all"> + </item> + <item android:id="@+id/menu_cache_list_app" android:icon="@drawable/ic_menu_mapmode" android:title="@null" @@ -129,5 +106,17 @@ </item> </menu> </item> + <item + android:id="@+id/menu_delete_events" + android:title="@string/caches_delete_events"> + </item> + <item + android:id="@+id/menu_clear_offline_logs" + android:title="@string/caches_clear_offlinelogs"> + </item> + <item + android:id="@+id/menu_remove_from_history" + android:title="@string/cache_clear_history"> + </item> </menu>
\ No newline at end of file diff --git a/main/src/cgeo/geocaching/CacheListActivity.java b/main/src/cgeo/geocaching/CacheListActivity.java index 9d15e47..611d17e 100644 --- a/main/src/cgeo/geocaching/CacheListActivity.java +++ b/main/src/cgeo/geocaching/CacheListActivity.java @@ -595,8 +595,6 @@ public class CacheListActivity extends AbstractListActivity implements FilteredA menu.findItem(R.id.menu_invert_selection).setVisible(adapter.isSelectMode()); setVisible(menu, R.id.menu_switch_select_mode, !isEmpty); - setVisible(menu, R.id.submenu_manage, (isHistory && !isEmpty) || isOffline); - setVisible(menu, R.id.menu_create_list, isOffline); setVisible(menu, R.id.menu_sort, !isEmpty && !isHistory); @@ -605,15 +603,14 @@ public class CacheListActivity extends AbstractListActivity implements FilteredA setVisible(menu, R.id.menu_delete_events, isConcrete && !isEmpty && containsPastEvents()); setVisible(menu, R.id.menu_move_to_list, isOffline && !isEmpty); setVisible(menu, R.id.menu_remove_from_history, !isEmpty && isHistory); - setVisible(menu, R.id.menu_clear_offline_logs, !isEmpty && containsOfflineLogs() && (isHistory || isOffline)); + setVisible(menu, R.id.menu_clear_offline_logs, !isEmpty && (isHistory || isOffline) && containsOfflineLogs()); setVisible(menu, R.id.menu_import, isOffline); setVisible(menu, R.id.menu_import_web, isOffline); setVisible(menu, R.id.menu_import_gpx, isOffline); setVisible(menu, R.id.menu_export, !isEmpty); - setVisible(menu, R.id.menu_refresh_stored_top, !isOffline && !isEmpty); if (!isOffline && !isHistory) { - menu.findItem(R.id.menu_refresh_stored_top).setTitle(R.string.caches_store_offline); + menu.findItem(R.id.menu_refresh_stored).setTitle(R.string.caches_store_offline); } final boolean isNonDefaultList = isConcrete && listId != StoredList.STANDARD_LIST_ID; @@ -629,8 +626,6 @@ public class CacheListActivity extends AbstractListActivity implements FilteredA menu.findItem(R.id.menu_drop_list).setVisible(isNonDefaultList); menu.findItem(R.id.menu_rename_list).setVisible(isNonDefaultList); - menu.findItem(R.id.menu_move_to_list).setVisible(!isEmpty); - setMenuItemLabel(menu, R.id.menu_remove_from_history, R.string.cache_remove_from_history, R.string.cache_clear_history); menu.findItem(R.id.menu_import_android).setVisible(Compatibility.isStorageAccessFrameworkAvailable() && isOffline); } catch (final RuntimeException e) { @@ -684,7 +679,6 @@ public class CacheListActivity extends AbstractListActivity implements FilteredA adapter.switchSelectMode(); invalidateOptionsMenuCompatible(); return true; - case R.id.menu_refresh_stored_top: case R.id.menu_refresh_stored: refreshStored(adapter.getCheckedOrAllCaches()); invalidateOptionsMenuCompatible(); |