aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBananeweizen <bananeweizen@gmx.de>2014-07-22 18:00:12 +0200
committerBananeweizen <bananeweizen@gmx.de>2014-07-22 18:00:12 +0200
commitfd22d0ecd69c0ff9f44b481a8bc43e1cb32fe5c1 (patch)
treede5dffc02024cffb43dd16ea3754415a230d114c
parentda6467b17a37a6eb2c8a4e98525a80679b695bb3 (diff)
downloadcgeo-fd22d0ecd69c0ff9f44b481a8bc43e1cb32fe5c1.zip
cgeo-fd22d0ecd69c0ff9f44b481a8bc43e1cb32fe5c1.tar.gz
cgeo-fd22d0ecd69c0ff9f44b481a8bc43e1cb32fe5c1.tar.bz2
fix #3999: bad import menu in history
-rw-r--r--main/res/menu/cache_list_options.xml2
-rw-r--r--main/src/cgeo/geocaching/CacheListActivity.java2
2 files changed, 4 insertions, 0 deletions
diff --git a/main/res/menu/cache_list_options.xml b/main/res/menu/cache_list_options.xml
index 3c0d0a6..1198d5b 100644
--- a/main/res/menu/cache_list_options.xml
+++ b/main/res/menu/cache_list_options.xml
@@ -96,6 +96,7 @@
android:title="@string/list_menu_rename">
</item>
<item
+ android:id="@+id/menu_import"
android:title="@string/list_menu_import"
app:showAsAction="never|withText">
<menu>
@@ -114,6 +115,7 @@
</menu>
</item>
<item
+ android:id="@+id/menu_export"
android:title="@string/export"
app:showAsAction="never|withText">
<menu>
diff --git a/main/src/cgeo/geocaching/CacheListActivity.java b/main/src/cgeo/geocaching/CacheListActivity.java
index 7f628d3..2f2ce68 100644
--- a/main/src/cgeo/geocaching/CacheListActivity.java
+++ b/main/src/cgeo/geocaching/CacheListActivity.java
@@ -606,8 +606,10 @@ public class CacheListActivity extends AbstractListActivity implements FilteredA
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_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) {