devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Make enable-autoresume option more consistent with other settings.

Browse source 
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
This commit is contained in:
Michael Hohmuth 2011-02-08 20:31:22 +00:00
parent 5f037ac015
commit f0ce188681
12 changed files with 116 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

16
apps/lang/czech.lang
View file

@ -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>

16
apps/lang/deutsch.lang
View file

@ -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>

28
apps/lang/english.lang
View file

@ -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>

16
apps/lang/francais.lang
View file

@ -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>

16
apps/lang/hrvatski.lang
View file

@ -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>

16
apps/lang/italiano.lang
View file

@ -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>

16
apps/lang/portugues.lang
View file

@ -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>

16
apps/lang/russian.lang
View file

@ -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>

16
apps/lang/slovak.lang
View file

@ -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>

16
apps/lang/tagalog.lang
View file

@ -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>

22
apps/menus/settings_menu.c
View file

@ -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

4
apps/settings_list.c
View file

@ -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,