From d906417b97a3db54c3691019f892a83558e7078b Mon Sep 17 00:00:00 2001 From: rsudev Date: Sun, 26 May 2013 11:03:40 +0200 Subject: Menu tuning Added refresh to cache context menu in lists Switched 'Store offline' to 'Refresh' in history Added 'Clear offline logs' to history --- main/res/values-cs/strings.xml | 1 + main/res/values-da/strings.xml | 1 + main/res/values-de/strings.xml | 1 + main/res/values-es/strings.xml | 1 + main/res/values-fr/strings.xml | 1 + main/res/values-hu/strings.xml | 1 + main/res/values-it/strings.xml | 1 + main/res/values-ja/strings.xml | 1 + main/res/values-nb/strings.xml | 1 + main/res/values-nl/strings.xml | 1 + main/res/values-pl/strings.xml | 1 + main/res/values-pt/strings.xml | 1 + main/res/values-sk/strings.xml | 1 + main/res/values-sv/strings.xml | 1 + main/res/values/strings.xml | 1 + main/src/cgeo/geocaching/cgeocaches.java | 13 ++++++++++--- 16 files changed, 25 insertions(+), 3 deletions(-) diff --git a/main/res/values-cs/strings.xml b/main/res/values-cs/strings.xml index b891ea3..db5ad9d 100644 --- a/main/res/values-cs/strings.xml +++ b/main/res/values-cs/strings.xml @@ -585,6 +585,7 @@ Keš v okolí Přidat do kalendáře Detaily + Obnovit Sdílet keš Přesunout do jiného seznamu GCC diff --git a/main/res/values-da/strings.xml b/main/res/values-da/strings.xml index 9332b9f..f621f9c 100644 --- a/main/res/values-da/strings.xml +++ b/main/res/values-da/strings.xml @@ -208,6 +208,7 @@ Cacher i nærheden Tilføj til kalender Detaljer + Genindlæs Status Log gemt Fundet diff --git a/main/res/values-de/strings.xml b/main/res/values-de/strings.xml index 1a5b84f..5b47c3b 100644 --- a/main/res/values-de/strings.xml +++ b/main/res/values-de/strings.xml @@ -580,6 +580,7 @@ Caches im Umkreis Zum Kalender hinzufügen Details + Aktualisieren Weiterleiten Auf andere Liste verschieben GCC diff --git a/main/res/values-es/strings.xml b/main/res/values-es/strings.xml index bc7b467..4373be0 100644 --- a/main/res/values-es/strings.xml +++ b/main/res/values-es/strings.xml @@ -467,6 +467,7 @@ Alrededores Añadir a calendario Detalles + Actualizar Compartir escondite Mover a otra lista GCC diff --git a/main/res/values-fr/strings.xml b/main/res/values-fr/strings.xml index 23af86a..12d59a7 100644 --- a/main/res/values-fr/strings.xml +++ b/main/res/values-fr/strings.xml @@ -594,6 +594,7 @@ Alentours Ajouter à l\'agenda Détails + Recharger Partager la cache Déplacer dans une autre liste GCC diff --git a/main/res/values-hu/strings.xml b/main/res/values-hu/strings.xml index d57c6c0..930b18f 100644 --- a/main/res/values-hu/strings.xml +++ b/main/res/values-hu/strings.xml @@ -544,6 +544,7 @@ Közeli ládák Hozzáadás a naptárhoz Részletek + Frissítés Láda megosztása Mozgatás másik listára GCC diff --git a/main/res/values-it/strings.xml b/main/res/values-it/strings.xml index 8cd5ee7..00551f5 100644 --- a/main/res/values-it/strings.xml +++ b/main/res/values-it/strings.xml @@ -588,6 +588,7 @@ Cache qui intorno Aggiungi al calendario Dettagli + Aggiorna Condividi cache Muovi in un\'altra lista GCC diff --git a/main/res/values-ja/strings.xml b/main/res/values-ja/strings.xml index e21d2bf..4bb15a2 100644 --- a/main/res/values-ja/strings.xml +++ b/main/res/values-ja/strings.xml @@ -562,6 +562,7 @@ 近くのキャッシュ カレンダーに登録 詳細 + 更新 キャッシュを共有 他のリストに移動 GCC diff --git a/main/res/values-nb/strings.xml b/main/res/values-nb/strings.xml index 1cf6bf5..12823e5 100644 --- a/main/res/values-nb/strings.xml +++ b/main/res/values-nb/strings.xml @@ -280,6 +280,7 @@ Cacher i nærheten Eksporter til kalender Detaljer + Oppdater Status Logg lagret Funnet diff --git a/main/res/values-nl/strings.xml b/main/res/values-nl/strings.xml index 8bcbd38..4eb1bc6 100644 --- a/main/res/values-nl/strings.xml +++ b/main/res/values-nl/strings.xml @@ -568,6 +568,7 @@ Caches rondom Toevoegen aan kalender Details + Verversen Deel cache Verplaats naar andere lijst GCC diff --git a/main/res/values-pl/strings.xml b/main/res/values-pl/strings.xml index 9f67bc2..50a383f 100644 --- a/main/res/values-pl/strings.xml +++ b/main/res/values-pl/strings.xml @@ -584,6 +584,7 @@ Skrzynki w okręgu Dodaj do kalendarza Szczegóły + Odśwież Podziel się skrzynką Przenieś do innej listy GCC diff --git a/main/res/values-pt/strings.xml b/main/res/values-pt/strings.xml index ae6366f..bbc094c 100644 --- a/main/res/values-pt/strings.xml +++ b/main/res/values-pt/strings.xml @@ -548,6 +548,7 @@ Caches próximas Adicionar ao calendário Detalhes + Actualizar Partilhar cache Mover para outra lista GCC diff --git a/main/res/values-sk/strings.xml b/main/res/values-sk/strings.xml index 00d62e9..87286cb 100644 --- a/main/res/values-sk/strings.xml +++ b/main/res/values-sk/strings.xml @@ -546,6 +546,7 @@ Skrýše v okolí Pridať do kalendára Detaily + Obnoviť Zdielať skrýšu Presunúť do iného zoznamu GCC diff --git a/main/res/values-sv/strings.xml b/main/res/values-sv/strings.xml index 801dc68..51bee26 100644 --- a/main/res/values-sv/strings.xml +++ b/main/res/values-sv/strings.xml @@ -594,6 +594,7 @@ Cacher i närheten Lägg till i kalender Detaljer + Uppdatera Skicka länk Flytta till annan lista GCC diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml index 1a5d2d1..6309201 100644 --- a/main/res/values/strings.xml +++ b/main/res/values/strings.xml @@ -594,6 +594,7 @@ Caches around Add to calendar Details + Refresh Share cache Move to other list GCC diff --git a/main/src/cgeo/geocaching/cgeocaches.java b/main/src/cgeo/geocaching/cgeocaches.java index 7c758e9..3b26376 100644 --- a/main/src/cgeo/geocaching/cgeocaches.java +++ b/main/src/cgeo/geocaching/cgeocaches.java @@ -97,6 +97,7 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity private static final int MENU_REMOVE_FROM_HISTORY = 23; private static final int MENU_DROP_CACHE = 24; private static final int MENU_MOVE_TO_LIST = 25; + private static final int MENU_REFRESH = 26; private static final int MENU_SWITCH_SELECT_MODE = 52; private static final int SUBMENU_SHOW_MAP = 54; private static final int SUBMENU_MANAGE_LISTS = 55; @@ -111,6 +112,7 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity private static final int MENU_FILTER = 74; private static final int MENU_DELETE_EVENTS = 75; private static final int MENU_CLEAR_OFFLINE_LOGS = 76; + private static final int MENU_EXPORT_FIELDNOTES = 77; private static final int MSG_DONE = -1; private static final int MSG_RESTART_GEO_AND_DIR = -2; @@ -568,8 +570,11 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity SubMenu subMenu = menu.addSubMenu(0, SUBMENU_MANAGE_HISTORY, 0, res.getString(R.string.caches_manage)).setIcon(R.drawable.ic_menu_save); subMenu.add(0, MENU_REMOVE_FROM_HISTORY, 0, res.getString(R.string.cache_clear_history)); // remove from history subMenu.add(0, MENU_EXPORT, 0, res.getString(R.string.export)); // export caches + subMenu.add(0, MENU_CLEAR_OFFLINE_LOGS, 0, res.getString(R.string.caches_clear_offlinelogs)); + menu.add(0, MENU_REFRESH_STORED, 0, res.getString(R.string.cache_offline_refresh)).setIcon(R.drawable.ic_menu_set_as); + } else { + menu.add(0, MENU_REFRESH_STORED, 0, res.getString(R.string.caches_store_offline)).setIcon(R.drawable.ic_menu_set_as); // download details for all caches } - menu.add(0, MENU_REFRESH_STORED, 0, res.getString(R.string.caches_store_offline)).setIcon(R.drawable.ic_menu_set_as); // download details for all caches } navigationMenu = CacheListAppFactory.addMenuItems(menu, this, res); @@ -630,12 +635,12 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity final boolean hasSelection = adapter != null && adapter.getCheckedCount() > 0; final boolean isNonDefaultList = isConcrete && listId != StoredList.STANDARD_LIST_ID; - if (type == CacheListType.OFFLINE) { // only offline list + if (type == CacheListType.OFFLINE || type == CacheListType.HISTORY) { // only offline list setMenuItemLabel(menu, MENU_DROP_CACHES, R.string.caches_drop_selected, R.string.caches_drop_all); menu.findItem(MENU_DROP_CACHES_AND_LIST).setVisible(!hasSelection && isNonDefaultList && !adapter.isFiltered()); setMenuItemLabel(menu, MENU_REFRESH_STORED, R.string.caches_refresh_selected, R.string.caches_refresh_all); setMenuItemLabel(menu, MENU_MOVE_TO_LIST, R.string.caches_move_selected, R.string.caches_move_all); - } else { // search and history list (all other than offline) + } else { // search and global list (all other than offline and history) setMenuItemLabel(menu, MENU_REFRESH_STORED, R.string.caches_store_selected, R.string.caches_store_offline); } @@ -859,6 +864,7 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity menu.add(0, MENU_DROP_CACHE, 0, res.getString(R.string.cache_offline_drop)); menu.add(0, MENU_MOVE_TO_LIST, 0, res.getString(R.string.cache_menu_move_list)); menu.add(0, MENU_EXPORT, 0, res.getString(R.string.export)); + menu.add(0, MENU_REFRESH, 0, res.getString(R.string.cache_menu_refresh)); } else { menu.add(0, MENU_STORE_CACHE, 0, res.getString(R.string.cache_offline_store)); @@ -938,6 +944,7 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity }, true, listId); break; case MENU_STORE_CACHE: + case MENU_REFRESH: refreshStored(Collections.singletonList(cache)); break; case MENU_EXPORT: -- cgit v1.1