diff options
| author | Bananeweizen <bananeweizen@gmx.de> | 2013-10-19 11:25:08 +0200 |
|---|---|---|
| committer | Bananeweizen <bananeweizen@gmx.de> | 2013-10-19 11:25:08 +0200 |
| commit | 68ff55f196b492b11cae767d690e5b323bc897b7 (patch) | |
| tree | 1671cbe2b34292c126ca95563215e6824f78f24d | |
| parent | 0ebc24993c5e63c171c0d845c964a1b6d6379c20 (diff) | |
| download | cgeo-68ff55f196b492b11cae767d690e5b323bc897b7.zip cgeo-68ff55f196b492b11cae767d690e5b323bc897b7.tar.gz cgeo-68ff55f196b492b11cae767d690e5b323bc897b7.tar.bz2 | |
refactor cache list menu
* move refresh to top instead of having "delete all" there
* disable some menu items for empty lists
| -rw-r--r-- | main/res/menu/cache_list_options.xml | 16 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/CacheListActivity.java | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/main/res/menu/cache_list_options.xml b/main/res/menu/cache_list_options.xml index 6618f3e..af9135f 100644 --- a/main/res/menu/cache_list_options.xml +++ b/main/res/menu/cache_list_options.xml @@ -27,14 +27,6 @@ android:title="@string/caches_manage"> <menu> <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"> - </item> - <item android:id="@+id/menu_refresh_stored" android:title="@string/cache_offline_refresh"> </item> @@ -43,6 +35,14 @@ android:title="@string/cache_menu_move_list"> </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"> + </item> + <item android:id="@+id/menu_delete_events" android:title="@string/caches_delete_events"> </item> diff --git a/main/src/cgeo/geocaching/CacheListActivity.java b/main/src/cgeo/geocaching/CacheListActivity.java index ef6de09..33535ad 100644 --- a/main/src/cgeo/geocaching/CacheListActivity.java +++ b/main/src/cgeo/geocaching/CacheListActivity.java @@ -531,7 +531,7 @@ public class CacheListActivity extends AbstractListActivity implements FilteredA setVisible(menu, R.id.menu_switch_select_mode, !isEmpty); - setVisible(menu, R.id.submenu_manage, isOffline || isHistory); + setVisible(menu, R.id.submenu_manage, (isHistory && !isEmpty) || isOffline); setVisible(menu, R.id.submenu_manage_lists, isOffline); setVisible(menu, R.id.menu_sort, !isEmpty && !isHistory); @@ -545,7 +545,7 @@ public class CacheListActivity extends AbstractListActivity implements FilteredA setVisible(menu, R.id.menu_clear_offline_logs, !isEmpty && containsOfflineLogs() && (isHistory || isOffline)); setVisible(menu, R.id.menu_import_web, isOffline && Settings.getWebDeviceCode() != null); setVisible(menu, R.id.menu_import_gpx, isOffline); - setVisible(menu, R.id.menu_refresh_stored_top, !isOffline); + 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); |