Make enable-autoresume option more consistent with other settings.

Rename "Enable automatic resume" to "Automatic resume", and make it a
simple Yes/No option.  Offer the user to initialize the database in
case it is not yet ready when enabling autoresume.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29249 a1c6a512-1295-4272-9138-f99709370657

12 files changed, 116 insertions, 82 deletions

diff --git a/apps/lang/czech.lang b/apps/lang/czech.lang
index 7aae9e4b74..3b6ea25ebe 100644
--- a/apps/lang/czech.lang
+++ b/apps/lang/czech.lang
@@ -12593,29 +12593,29 @@
 </phrase>
 <phrase>
   id: LANG_AUTORESUME_ENABLE
-  desc: resume settings menu
+  desc: deprecated
   user: core
   <source>
-    *: "Enable automatic resume"
+    *: ""
   </source>
   <dest>
-    *: "Auto.pokračování u všech souborů"
+    *: ""
   </dest>
   <voice>
-    *: "Automatycké pokračování u všech souborů"
+    *: ""
   </voice>
 </phrase>
 <phrase>
   id: LANG_AUTORESUME_ENABLE_YES
-  desc: resume settings menu
+  desc: deprecated
   user: core
   <source>
-    *: "Yes (requires initialized database)"
+    *: ""
   </source>
   <dest>
-    *: "Ano (vyžaduje inicializovanou databázi)"
+    *: ""
   </dest>
   <voice>
-    *: "Ano, vyžaduje inicializovanou databázi"
+    *: ""
   </voice>
 </phrase>
diff --git a/apps/lang/deutsch.lang b/apps/lang/deutsch.lang
index 98e282a4c9..932d31f058 100644
--- a/apps/lang/deutsch.lang
+++ b/apps/lang/deutsch.lang
@@ -12610,29 +12610,29 @@
 </phrase>
 <phrase>
   id: LANG_AUTORESUME_ENABLE_YES
-  desc: resume settings menu
+  desc: deprecated
   user: core
   <source>
-    *: "Yes (requires initialized database)"
+    *: ""
   </source>
   <dest>
-    *: "Ja (erfordert initialisierte Datenbank)"
+    *: ""
   </dest>
   <voice>
-    *: "Ja (erfordert initialisierte Datenbank)"
+    *: ""
   </voice>
 </phrase>
 <phrase>
   id: LANG_AUTORESUME_ENABLE
-  desc: resume settings menu
+  desc: deprecated
   user: core
   <source>
-    *: "Enable automatic resume"
+    *: ""
   </source>
   <dest>
-    *: "Automatisches Fortsetzen aktivieren"
+    *: ""
   </dest>
   <voice>
-    *: "Automatisches Fortsetzen aktivieren"
+    *: ""
   </voice>
 </phrase>
diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index 048f8410c9..dd8ed84caf 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -12676,29 +12676,43 @@
 </phrase>
 <phrase>
   id: LANG_AUTORESUME_ENABLE
-  desc: resume settings menu
+  desc: deprecated
   user: core
   <source>
-    *: "Enable automatic resume"
+    *: ""
   </source>
   <dest>
-    *: "Enable automatic resume"
+    *: ""
   </dest>
   <voice>
-    *: "Enable automatic resume"
+    *: ""
   </voice>
 </phrase>
 <phrase>
   id: LANG_AUTORESUME_ENABLE_YES
+  desc: deprecated
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_AUTORESUME
   desc: resume settings menu
   user: core
   <source>
-    *: "Yes (requires initialized database)"
+    *: "Automatic resume"
   </source>
   <dest>
-    *: "Yes (requires initialized database)"
+    *: "Automatic resume"
   </dest>
   <voice>
-    *: "Yes (requires initialized database)"
+    *: "Automatic resume"
   </voice>
 </phrase>
diff --git a/apps/lang/francais.lang b/apps/lang/francais.lang
index 0dfc5cb034..d4b3aa263d 100644
--- a/apps/lang/francais.lang
+++ b/apps/lang/francais.lang
@@ -12617,29 +12617,29 @@
 </phrase>
 <phrase>
   id: LANG_AUTORESUME_ENABLE
-  desc: resume settings menu
+  desc: deprecated
   user: core
   <source>
-    *: "Enable automatic resume"
+    *: ""
   </source>
   <dest>
-    *: "Activer la reprise automatique"
+    *: ""
   </dest>
   <voice>
-    *: "Activer la reprise automatique"
+    *: ""
   </voice>
 </phrase>
 <phrase>
   id: LANG_AUTORESUME_ENABLE_YES
-  desc: resume settings menu
+  desc: deprecated
   user: core
   <source>
-    *: "Yes (requires initialized database)"
+    *: ""
   </source>
   <dest>
-    *: "Oui (nécessite l'activation de la base de données)"
+    *: ""
   </dest>
   <voice>
-    *: "Oui (nécessite l'activation de la base de données)"
+    *: ""
   </voice>
 </phrase>
diff --git a/apps/lang/hrvatski.lang b/apps/lang/hrvatski.lang
index 5c586b2298..38e8877318 100644
--- a/apps/lang/hrvatski.lang
+++ b/apps/lang/hrvatski.lang
@@ -12591,29 +12591,29 @@
 </phrase>
 <phrase>
   id: LANG_AUTORESUME_ENABLE_YES
-  desc: resume settings menu
+  desc: deprecated
   user: core
   <source>
-    *: "Yes (requires initialized database)"
+    *: ""
   </source>
   <dest>
-    *: "Da (zahtijeva pokrenutu bazu podataka)"
+    *: ""
   </dest>
   <voice>
-    *: "Da (zahtijeva pokrenutu bazu podataka)"
+    *: ""
   </voice>
 </phrase>
 <phrase>
   id: LANG_AUTORESUME_ENABLE
-  desc: resume settings menu
+  desc: deprecated
   user: core
   <source>
-    *: "Enable automatic resume"
+    *: ""
   </source>
   <dest>
-    *: "Omogući automatsko nastavljanje"
+    *: ""
   </dest>
   <voice>
-    *: "Omogući automatsko nastavljanje"
+    *: ""
   </voice>
 </phrase>
diff --git a/apps/lang/italiano.lang b/apps/lang/italiano.lang
index 3286b132e5..9df1d2607b 100644
--- a/apps/lang/italiano.lang
+++ b/apps/lang/italiano.lang
@@ -12593,29 +12593,29 @@
 </phrase>
 <phrase>
   id: LANG_AUTORESUME_ENABLE
-  desc: resume settings menu
+  desc: deprecated
   user: core
   <source>
-    *: "Enable automatic resume"
+    *: ""
   </source>
   <dest>
-    *: "Abilita Riprendi Automatico"
+    *: ""
   </dest>
   <voice>
-    *: "Abilita Riprendi Automatico"
+    *: ""
   </voice>
 </phrase>
 <phrase>
   id: LANG_AUTORESUME_ENABLE_YES
-  desc: resume settings menu
+  desc: deprecated
   user: core
   <source>
-    *: "Yes (requires initialized database)"
+    *: ""
   </source>
   <dest>
-    *: "Sì (richiede database inizializzato)"
+    *: ""
   </dest>
   <voice>
-    *: "Sì (richiede database inizializzato)"
+    *: ""
   </voice>
 </phrase>
diff --git a/apps/lang/portugues.lang b/apps/lang/portugues.lang
index d26e237850..fffb265ef4 100644
--- a/apps/lang/portugues.lang
+++ b/apps/lang/portugues.lang
@@ -12572,16 +12572,16 @@
 </phrase>
 <phrase>
   id: LANG_AUTORESUME_ENABLE_YES
-  desc: resume settings menu
+  desc: deprecated
   user: core
   <source>
-    *: "Yes (requires initialized database)"
+    *: ""
   </source>
   <dest>
-    *: "Sim (requer base de dados inicializada)"
+    *: ""
   </dest>
   <voice>
-    *: "Sim (requer base de dados inicializada)"
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -12603,15 +12603,15 @@
 </phrase>
 <phrase>
   id: LANG_AUTORESUME_ENABLE
-  desc: resume settings menu
+  desc: deprecated
   user: core
   <source>
-    *: "Enable automatic resume"
+    *: ""
   </source>
   <dest>
-    *: "Habilitar retoma da reprodução automática"
+    *: ""
   </dest>
   <voice>
-    *: "Habilitar retoma da reprodução automática"
+    *: ""
   </voice>
 </phrase>
diff --git a/apps/lang/russian.lang b/apps/lang/russian.lang
index fd61d0a8a7..7e01735f33 100644
--- a/apps/lang/russian.lang
+++ b/apps/lang/russian.lang
@@ -12597,29 +12597,29 @@
 </phrase>
 <phrase>
   id: LANG_AUTORESUME_ENABLE_YES
-  desc: resume settings menu
+  desc: deprecated
   user: core
   <source>
-    *: "Yes (requires initialized database)"
+    *: ""
   </source>
   <dest>
-    *: "Да (необходима инициализированная база данных)"
+    *: ""
   </dest>
   <voice>
-    *: "Да (необходима инициализированная база данных)"
+    *: ""
   </voice>
 </phrase>
 <phrase>
   id: LANG_AUTORESUME_ENABLE
-  desc: resume settings menu
+  desc: deprecated
   user: core
   <source>
-    *: "Enable automatic resume"
+    *: ""
   </source>
   <dest>
-    *: "Автоматически продолжать воспроизведение"
+    *: ""
   </dest>
   <voice>
-    *: "Автоматически продолжать воспроизведение"
+    *: ""
   </voice>
 </phrase>
diff --git a/apps/lang/slovak.lang b/apps/lang/slovak.lang
index 71ecd1877d..285c56ac35 100644
--- a/apps/lang/slovak.lang
+++ b/apps/lang/slovak.lang
@@ -12572,16 +12572,16 @@
 </phrase>
 <phrase>
   id: LANG_AUTORESUME_ENABLE_YES
-  desc: resume settings menu
+  desc: deprecated
   user: core
   <source>
-    *: "Yes (requires initialized database)"
+    *: ""
   </source>
   <dest>
-    *: "Áno (požaduje inicializovanú databázu)"
+    *: ""
   </dest>
   <voice>
-    *: "Áno (požaduje inicializovanú databázu)"
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -12603,15 +12603,15 @@
 </phrase>
 <phrase>
   id: LANG_AUTORESUME_ENABLE
-  desc: resume settings menu
+  desc: deprecated
   user: core
   <source>
-    *: "Enable automatic resume"
+    *: ""
   </source>
   <dest>
-    *: "Aktivovať Automatické Obnovenie Prehrávania"
+    *: ""
   </dest>
   <voice>
-    *: "Aktivovať Automatické Obnovenie Prehrávania"
+    *: ""
   </voice>
 </phrase>
diff --git a/apps/lang/tagalog.lang b/apps/lang/tagalog.lang
index f9bba61ada..de8c8ef27b 100644
--- a/apps/lang/tagalog.lang
+++ b/apps/lang/tagalog.lang
@@ -12591,29 +12591,29 @@
 </phrase>
 <phrase>
   id: LANG_AUTORESUME_ENABLE_YES
-  desc: resume settings menu
+  desc: deprecated
   user: core
   <source>
-    *: "Yes (requires initialized database)"
+    *: ""
   </source>
   <dest>
-    *: "Oo (kailangan initialize database)"
+    *: ""
   </dest>
   <voice>
-    *: "Oo (kailangan initialize database)"
+    *: ""
   </voice>
 </phrase>
 <phrase>
   id: LANG_AUTORESUME_ENABLE
-  desc: resume settings menu
+  desc: deprecated
   user: core
   <source>
-    *: "Enable automatic resume"
+    *: ""
   </source>
   <dest>
-    *: "Paganahin ang awtomatikong resume"
+    *: ""
   </dest>
   <voice>
-    *: "Paganahin ang awtomatikong resume"
+    *: ""
   </voice>
 </phrase>
diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c
index cc3871a4d6..ce03e1a646 100644
--- a/apps/menus/settings_menu.c
+++ b/apps/menus/settings_menu.c
@@ -34,6 +34,7 @@
 #include "tagtree.h"
 #include "usb.h"
 #include "splash.h"
+#include "yesno.h"
 #include "talk.h"
 #include "powermgmt.h"
 #if CONFIG_CODEC == SWCODEC
@@ -426,7 +427,26 @@ MAKE_MENU(hotkey_menu, ID2P(LANG_HOTKEY), 0, Icon_NOICON,
 
 #ifdef HAVE_TAGCACHE
 #if CONFIG_CODEC == SWCODEC 
-MENUITEM_SETTING(autoresume_enable, &global_settings.autoresume_enable, NULL);
+static int autoresume_callback(int action, const struct menu_item_ex *this_item)
+{
+    (void)this_item;
+
+    if (action == ACTION_EXIT_MENUITEM  /* on exit */
+        && global_settings.autoresume_enable
+        && !tagcache_is_usable())
+    {
+        static const char *lines[] = {ID2P(LANG_TAGCACHE_BUSY),
+                                      ID2P(LANG_TAGCACHE_FORCE_UPDATE)};
+        static const struct text_message message = {lines, 2};
+        
+        if (gui_syncyesno_run(&message, NULL, NULL) == YESNO_YES)
+            tagcache_rebuild_with_splash();
+    }
+    return action;
+}
+
+MENUITEM_SETTING(autoresume_enable, &global_settings.autoresume_enable,
+                 autoresume_callback);
 #endif
 #endif
 
diff --git a/apps/settings_list.c b/apps/settings_list.c
index 94910c0818..0521d4fb90 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -1258,9 +1258,9 @@ const struct settings_list settings[] = {
 
 #ifdef HAVE_TAGCACHE
 #if CONFIG_CODEC == SWCODEC 
-    BOOL_SETTING(0, autoresume_enable, LANG_AUTORESUME_ENABLE, false,
+    BOOL_SETTING(0, autoresume_enable, LANG_AUTORESUME, false,
                  "autoresume enable", off_on,
-                 LANG_AUTORESUME_ENABLE_YES, LANG_SET_BOOL_NO, NULL),
+                 LANG_SET_BOOL_YES, LANG_SET_BOOL_NO, NULL),
 #endif                  
 
     OFFON_SETTING(0, runtimedb, LANG_RUNTIMEDB_ACTIVE, false,