diff options
author | Michael Hohmuth <sideral@rockbox.org> | 2011-02-08 20:31:22 +0000 |
---|---|---|
committer | Michael Hohmuth <sideral@rockbox.org> | 2011-02-08 20:31:22 +0000 |
commit | f0ce1886814d597b5bbe58fe36556356d42b7db6 (patch) | |
tree | d97172e9bcbe4246455bfd3ea55d417126dde92b /apps | |
parent | 5f037ac015e6d76d030a163753db5ff58cdff49b (diff) | |
download | rockbox-f0ce1886814d597b5bbe58fe36556356d42b7db6.tar.gz rockbox-f0ce1886814d597b5bbe58fe36556356d42b7db6.zip |
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
Diffstat (limited to 'apps')
-rw-r--r-- | apps/lang/czech.lang | 16 | ||||
-rw-r--r-- | apps/lang/deutsch.lang | 16 | ||||
-rw-r--r-- | apps/lang/english.lang | 28 | ||||
-rw-r--r-- | apps/lang/francais.lang | 16 | ||||
-rw-r--r-- | apps/lang/hrvatski.lang | 16 | ||||
-rw-r--r-- | apps/lang/italiano.lang | 16 | ||||
-rw-r--r-- | apps/lang/portugues.lang | 16 | ||||
-rw-r--r-- | apps/lang/russian.lang | 16 | ||||
-rw-r--r-- | apps/lang/slovak.lang | 16 | ||||
-rw-r--r-- | apps/lang/tagalog.lang | 16 | ||||
-rw-r--r-- | apps/menus/settings_menu.c | 22 | ||||
-rw-r--r-- | apps/settings_list.c | 4 |
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 @@ | |||
12593 | </phrase> | 12593 | </phrase> |
12594 | <phrase> | 12594 | <phrase> |
12595 | id: LANG_AUTORESUME_ENABLE | 12595 | id: LANG_AUTORESUME_ENABLE |
12596 | desc: resume settings menu | 12596 | desc: deprecated |
12597 | user: core | 12597 | user: core |
12598 | <source> | 12598 | <source> |
12599 | *: "Enable automatic resume" | 12599 | *: "" |
12600 | </source> | 12600 | </source> |
12601 | <dest> | 12601 | <dest> |
12602 | *: "Auto.pokračování u všech souborů" | 12602 | *: "" |
12603 | </dest> | 12603 | </dest> |
12604 | <voice> | 12604 | <voice> |
12605 | *: "Automatycké pokračování u všech souborů" | 12605 | *: "" |
12606 | </voice> | 12606 | </voice> |
12607 | </phrase> | 12607 | </phrase> |
12608 | <phrase> | 12608 | <phrase> |
12609 | id: LANG_AUTORESUME_ENABLE_YES | 12609 | id: LANG_AUTORESUME_ENABLE_YES |
12610 | desc: resume settings menu | 12610 | desc: deprecated |
12611 | user: core | 12611 | user: core |
12612 | <source> | 12612 | <source> |
12613 | *: "Yes (requires initialized database)" | 12613 | *: "" |
12614 | </source> | 12614 | </source> |
12615 | <dest> | 12615 | <dest> |
12616 | *: "Ano (vyžaduje inicializovanou databázi)" | 12616 | *: "" |
12617 | </dest> | 12617 | </dest> |
12618 | <voice> | 12618 | <voice> |
12619 | *: "Ano, vyžaduje inicializovanou databázi" | 12619 | *: "" |
12620 | </voice> | 12620 | </voice> |
12621 | </phrase> | 12621 | </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 @@ | |||
12610 | </phrase> | 12610 | </phrase> |
12611 | <phrase> | 12611 | <phrase> |
12612 | id: LANG_AUTORESUME_ENABLE_YES | 12612 | id: LANG_AUTORESUME_ENABLE_YES |
12613 | desc: resume settings menu | 12613 | desc: deprecated |
12614 | user: core | 12614 | user: core |
12615 | <source> | 12615 | <source> |
12616 | *: "Yes (requires initialized database)" | 12616 | *: "" |
12617 | </source> | 12617 | </source> |
12618 | <dest> | 12618 | <dest> |
12619 | *: "Ja (erfordert initialisierte Datenbank)" | 12619 | *: "" |
12620 | </dest> | 12620 | </dest> |
12621 | <voice> | 12621 | <voice> |
12622 | *: "Ja (erfordert initialisierte Datenbank)" | 12622 | *: "" |
12623 | </voice> | 12623 | </voice> |
12624 | </phrase> | 12624 | </phrase> |
12625 | <phrase> | 12625 | <phrase> |
12626 | id: LANG_AUTORESUME_ENABLE | 12626 | id: LANG_AUTORESUME_ENABLE |
12627 | desc: resume settings menu | 12627 | desc: deprecated |
12628 | user: core | 12628 | user: core |
12629 | <source> | 12629 | <source> |
12630 | *: "Enable automatic resume" | 12630 | *: "" |
12631 | </source> | 12631 | </source> |
12632 | <dest> | 12632 | <dest> |
12633 | *: "Automatisches Fortsetzen aktivieren" | 12633 | *: "" |
12634 | </dest> | 12634 | </dest> |
12635 | <voice> | 12635 | <voice> |
12636 | *: "Automatisches Fortsetzen aktivieren" | 12636 | *: "" |
12637 | </voice> | 12637 | </voice> |
12638 | </phrase> | 12638 | </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 @@ | |||
12676 | </phrase> | 12676 | </phrase> |
12677 | <phrase> | 12677 | <phrase> |
12678 | id: LANG_AUTORESUME_ENABLE | 12678 | id: LANG_AUTORESUME_ENABLE |
12679 | desc: resume settings menu | 12679 | desc: deprecated |
12680 | user: core | 12680 | user: core |
12681 | <source> | 12681 | <source> |
12682 | *: "Enable automatic resume" | 12682 | *: "" |
12683 | </source> | 12683 | </source> |
12684 | <dest> | 12684 | <dest> |
12685 | *: "Enable automatic resume" | 12685 | *: "" |
12686 | </dest> | 12686 | </dest> |
12687 | <voice> | 12687 | <voice> |
12688 | *: "Enable automatic resume" | 12688 | *: "" |
12689 | </voice> | 12689 | </voice> |
12690 | </phrase> | 12690 | </phrase> |
12691 | <phrase> | 12691 | <phrase> |
12692 | id: LANG_AUTORESUME_ENABLE_YES | 12692 | id: LANG_AUTORESUME_ENABLE_YES |
12693 | desc: deprecated | ||
12694 | user: core | ||
12695 | <source> | ||
12696 | *: "" | ||
12697 | </source> | ||
12698 | <dest> | ||
12699 | *: "" | ||
12700 | </dest> | ||
12701 | <voice> | ||
12702 | *: "" | ||
12703 | </voice> | ||
12704 | </phrase> | ||
12705 | <phrase> | ||
12706 | id: LANG_AUTORESUME | ||
12693 | desc: resume settings menu | 12707 | desc: resume settings menu |
12694 | user: core | 12708 | user: core |
12695 | <source> | 12709 | <source> |
12696 | *: "Yes (requires initialized database)" | 12710 | *: "Automatic resume" |
12697 | </source> | 12711 | </source> |
12698 | <dest> | 12712 | <dest> |
12699 | *: "Yes (requires initialized database)" | 12713 | *: "Automatic resume" |
12700 | </dest> | 12714 | </dest> |
12701 | <voice> | 12715 | <voice> |
12702 | *: "Yes (requires initialized database)" | 12716 | *: "Automatic resume" |
12703 | </voice> | 12717 | </voice> |
12704 | </phrase> | 12718 | </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 @@ | |||
12617 | </phrase> | 12617 | </phrase> |
12618 | <phrase> | 12618 | <phrase> |
12619 | id: LANG_AUTORESUME_ENABLE | 12619 | id: LANG_AUTORESUME_ENABLE |
12620 | desc: resume settings menu | 12620 | desc: deprecated |
12621 | user: core | 12621 | user: core |
12622 | <source> | 12622 | <source> |
12623 | *: "Enable automatic resume" | 12623 | *: "" |
12624 | </source> | 12624 | </source> |
12625 | <dest> | 12625 | <dest> |
12626 | *: "Activer la reprise automatique" | 12626 | *: "" |
12627 | </dest> | 12627 | </dest> |
12628 | <voice> | 12628 | <voice> |
12629 | *: "Activer la reprise automatique" | 12629 | *: "" |
12630 | </voice> | 12630 | </voice> |
12631 | </phrase> | 12631 | </phrase> |
12632 | <phrase> | 12632 | <phrase> |
12633 | id: LANG_AUTORESUME_ENABLE_YES | 12633 | id: LANG_AUTORESUME_ENABLE_YES |
12634 | desc: resume settings menu | 12634 | desc: deprecated |
12635 | user: core | 12635 | user: core |
12636 | <source> | 12636 | <source> |
12637 | *: "Yes (requires initialized database)" | 12637 | *: "" |
12638 | </source> | 12638 | </source> |
12639 | <dest> | 12639 | <dest> |
12640 | *: "Oui (nécessite l'activation de la base de données)" | 12640 | *: "" |
12641 | </dest> | 12641 | </dest> |
12642 | <voice> | 12642 | <voice> |
12643 | *: "Oui (nécessite l'activation de la base de données)" | 12643 | *: "" |
12644 | </voice> | 12644 | </voice> |
12645 | </phrase> | 12645 | </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 @@ | |||
12591 | </phrase> | 12591 | </phrase> |
12592 | <phrase> | 12592 | <phrase> |
12593 | id: LANG_AUTORESUME_ENABLE_YES | 12593 | id: LANG_AUTORESUME_ENABLE_YES |
12594 | desc: resume settings menu | 12594 | desc: deprecated |
12595 | user: core | 12595 | user: core |
12596 | <source> | 12596 | <source> |
12597 | *: "Yes (requires initialized database)" | 12597 | *: "" |
12598 | </source> | 12598 | </source> |
12599 | <dest> | 12599 | <dest> |
12600 | *: "Da (zahtijeva pokrenutu bazu podataka)" | 12600 | *: "" |
12601 | </dest> | 12601 | </dest> |
12602 | <voice> | 12602 | <voice> |
12603 | *: "Da (zahtijeva pokrenutu bazu podataka)" | 12603 | *: "" |
12604 | </voice> | 12604 | </voice> |
12605 | </phrase> | 12605 | </phrase> |
12606 | <phrase> | 12606 | <phrase> |
12607 | id: LANG_AUTORESUME_ENABLE | 12607 | id: LANG_AUTORESUME_ENABLE |
12608 | desc: resume settings menu | 12608 | desc: deprecated |
12609 | user: core | 12609 | user: core |
12610 | <source> | 12610 | <source> |
12611 | *: "Enable automatic resume" | 12611 | *: "" |
12612 | </source> | 12612 | </source> |
12613 | <dest> | 12613 | <dest> |
12614 | *: "Omogući automatsko nastavljanje" | 12614 | *: "" |
12615 | </dest> | 12615 | </dest> |
12616 | <voice> | 12616 | <voice> |
12617 | *: "Omogući automatsko nastavljanje" | 12617 | *: "" |
12618 | </voice> | 12618 | </voice> |
12619 | </phrase> | 12619 | </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 @@ | |||
12593 | </phrase> | 12593 | </phrase> |
12594 | <phrase> | 12594 | <phrase> |
12595 | id: LANG_AUTORESUME_ENABLE | 12595 | id: LANG_AUTORESUME_ENABLE |
12596 | desc: resume settings menu | 12596 | desc: deprecated |
12597 | user: core | 12597 | user: core |
12598 | <source> | 12598 | <source> |
12599 | *: "Enable automatic resume" | 12599 | *: "" |
12600 | </source> | 12600 | </source> |
12601 | <dest> | 12601 | <dest> |
12602 | *: "Abilita Riprendi Automatico" | 12602 | *: "" |
12603 | </dest> | 12603 | </dest> |
12604 | <voice> | 12604 | <voice> |
12605 | *: "Abilita Riprendi Automatico" | 12605 | *: "" |
12606 | </voice> | 12606 | </voice> |
12607 | </phrase> | 12607 | </phrase> |
12608 | <phrase> | 12608 | <phrase> |
12609 | id: LANG_AUTORESUME_ENABLE_YES | 12609 | id: LANG_AUTORESUME_ENABLE_YES |
12610 | desc: resume settings menu | 12610 | desc: deprecated |
12611 | user: core | 12611 | user: core |
12612 | <source> | 12612 | <source> |
12613 | *: "Yes (requires initialized database)" | 12613 | *: "" |
12614 | </source> | 12614 | </source> |
12615 | <dest> | 12615 | <dest> |
12616 | *: "Sì (richiede database inizializzato)" | 12616 | *: "" |
12617 | </dest> | 12617 | </dest> |
12618 | <voice> | 12618 | <voice> |
12619 | *: "Sì (richiede database inizializzato)" | 12619 | *: "" |
12620 | </voice> | 12620 | </voice> |
12621 | </phrase> | 12621 | </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 @@ | |||
12572 | </phrase> | 12572 | </phrase> |
12573 | <phrase> | 12573 | <phrase> |
12574 | id: LANG_AUTORESUME_ENABLE_YES | 12574 | id: LANG_AUTORESUME_ENABLE_YES |
12575 | desc: resume settings menu | 12575 | desc: deprecated |
12576 | user: core | 12576 | user: core |
12577 | <source> | 12577 | <source> |
12578 | *: "Yes (requires initialized database)" | 12578 | *: "" |
12579 | </source> | 12579 | </source> |
12580 | <dest> | 12580 | <dest> |
12581 | *: "Sim (requer base de dados inicializada)" | 12581 | *: "" |
12582 | </dest> | 12582 | </dest> |
12583 | <voice> | 12583 | <voice> |
12584 | *: "Sim (requer base de dados inicializada)" | 12584 | *: "" |
12585 | </voice> | 12585 | </voice> |
12586 | </phrase> | 12586 | </phrase> |
12587 | <phrase> | 12587 | <phrase> |
@@ -12603,15 +12603,15 @@ | |||
12603 | </phrase> | 12603 | </phrase> |
12604 | <phrase> | 12604 | <phrase> |
12605 | id: LANG_AUTORESUME_ENABLE | 12605 | id: LANG_AUTORESUME_ENABLE |
12606 | desc: resume settings menu | 12606 | desc: deprecated |
12607 | user: core | 12607 | user: core |
12608 | <source> | 12608 | <source> |
12609 | *: "Enable automatic resume" | 12609 | *: "" |
12610 | </source> | 12610 | </source> |
12611 | <dest> | 12611 | <dest> |
12612 | *: "Habilitar retoma da reprodução automática" | 12612 | *: "" |
12613 | </dest> | 12613 | </dest> |
12614 | <voice> | 12614 | <voice> |
12615 | *: "Habilitar retoma da reprodução automática" | 12615 | *: "" |
12616 | </voice> | 12616 | </voice> |
12617 | </phrase> | 12617 | </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 @@ | |||
12597 | </phrase> | 12597 | </phrase> |
12598 | <phrase> | 12598 | <phrase> |
12599 | id: LANG_AUTORESUME_ENABLE_YES | 12599 | id: LANG_AUTORESUME_ENABLE_YES |
12600 | desc: resume settings menu | 12600 | desc: deprecated |
12601 | user: core | 12601 | user: core |
12602 | <source> | 12602 | <source> |
12603 | *: "Yes (requires initialized database)" | 12603 | *: "" |
12604 | </source> | 12604 | </source> |
12605 | <dest> | 12605 | <dest> |
12606 | *: "Да (необходима инициализированная база данных)" | 12606 | *: "" |
12607 | </dest> | 12607 | </dest> |
12608 | <voice> | 12608 | <voice> |
12609 | *: "Да (необходима инициализированная база данных)" | 12609 | *: "" |
12610 | </voice> | 12610 | </voice> |
12611 | </phrase> | 12611 | </phrase> |
12612 | <phrase> | 12612 | <phrase> |
12613 | id: LANG_AUTORESUME_ENABLE | 12613 | id: LANG_AUTORESUME_ENABLE |
12614 | desc: resume settings menu | 12614 | desc: deprecated |
12615 | user: core | 12615 | user: core |
12616 | <source> | 12616 | <source> |
12617 | *: "Enable automatic resume" | 12617 | *: "" |
12618 | </source> | 12618 | </source> |
12619 | <dest> | 12619 | <dest> |
12620 | *: "Автоматически продолжать воспроизведение" | 12620 | *: "" |
12621 | </dest> | 12621 | </dest> |
12622 | <voice> | 12622 | <voice> |
12623 | *: "Автоматически продолжать воспроизведение" | 12623 | *: "" |
12624 | </voice> | 12624 | </voice> |
12625 | </phrase> | 12625 | </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 @@ | |||
12572 | </phrase> | 12572 | </phrase> |
12573 | <phrase> | 12573 | <phrase> |
12574 | id: LANG_AUTORESUME_ENABLE_YES | 12574 | id: LANG_AUTORESUME_ENABLE_YES |
12575 | desc: resume settings menu | 12575 | desc: deprecated |
12576 | user: core | 12576 | user: core |
12577 | <source> | 12577 | <source> |
12578 | *: "Yes (requires initialized database)" | 12578 | *: "" |
12579 | </source> | 12579 | </source> |
12580 | <dest> | 12580 | <dest> |
12581 | *: "Áno (požaduje inicializovanú databázu)" | 12581 | *: "" |
12582 | </dest> | 12582 | </dest> |
12583 | <voice> | 12583 | <voice> |
12584 | *: "Áno (požaduje inicializovanú databázu)" | 12584 | *: "" |
12585 | </voice> | 12585 | </voice> |
12586 | </phrase> | 12586 | </phrase> |
12587 | <phrase> | 12587 | <phrase> |
@@ -12603,15 +12603,15 @@ | |||
12603 | </phrase> | 12603 | </phrase> |
12604 | <phrase> | 12604 | <phrase> |
12605 | id: LANG_AUTORESUME_ENABLE | 12605 | id: LANG_AUTORESUME_ENABLE |
12606 | desc: resume settings menu | 12606 | desc: deprecated |
12607 | user: core | 12607 | user: core |
12608 | <source> | 12608 | <source> |
12609 | *: "Enable automatic resume" | 12609 | *: "" |
12610 | </source> | 12610 | </source> |
12611 | <dest> | 12611 | <dest> |
12612 | *: "Aktivovať Automatické Obnovenie Prehrávania" | 12612 | *: "" |
12613 | </dest> | 12613 | </dest> |
12614 | <voice> | 12614 | <voice> |
12615 | *: "Aktivovať Automatické Obnovenie Prehrávania" | 12615 | *: "" |
12616 | </voice> | 12616 | </voice> |
12617 | </phrase> | 12617 | </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 @@ | |||
12591 | </phrase> | 12591 | </phrase> |
12592 | <phrase> | 12592 | <phrase> |
12593 | id: LANG_AUTORESUME_ENABLE_YES | 12593 | id: LANG_AUTORESUME_ENABLE_YES |
12594 | desc: resume settings menu | 12594 | desc: deprecated |
12595 | user: core | 12595 | user: core |
12596 | <source> | 12596 | <source> |
12597 | *: "Yes (requires initialized database)" | 12597 | *: "" |
12598 | </source> | 12598 | </source> |
12599 | <dest> | 12599 | <dest> |
12600 | *: "Oo (kailangan initialize database)" | 12600 | *: "" |
12601 | </dest> | 12601 | </dest> |
12602 | <voice> | 12602 | <voice> |
12603 | *: "Oo (kailangan initialize database)" | 12603 | *: "" |
12604 | </voice> | 12604 | </voice> |
12605 | </phrase> | 12605 | </phrase> |
12606 | <phrase> | 12606 | <phrase> |
12607 | id: LANG_AUTORESUME_ENABLE | 12607 | id: LANG_AUTORESUME_ENABLE |
12608 | desc: resume settings menu | 12608 | desc: deprecated |
12609 | user: core | 12609 | user: core |
12610 | <source> | 12610 | <source> |
12611 | *: "Enable automatic resume" | 12611 | *: "" |
12612 | </source> | 12612 | </source> |
12613 | <dest> | 12613 | <dest> |
12614 | *: "Paganahin ang awtomatikong resume" | 12614 | *: "" |
12615 | </dest> | 12615 | </dest> |
12616 | <voice> | 12616 | <voice> |
12617 | *: "Paganahin ang awtomatikong resume" | 12617 | *: "" |
12618 | </voice> | 12618 | </voice> |
12619 | </phrase> | 12619 | </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 @@ | |||
34 | #include "tagtree.h" | 34 | #include "tagtree.h" |
35 | #include "usb.h" | 35 | #include "usb.h" |
36 | #include "splash.h" | 36 | #include "splash.h" |
37 | #include "yesno.h" | ||
37 | #include "talk.h" | 38 | #include "talk.h" |
38 | #include "powermgmt.h" | 39 | #include "powermgmt.h" |
39 | #if CONFIG_CODEC == SWCODEC | 40 | #if CONFIG_CODEC == SWCODEC |
@@ -426,7 +427,26 @@ MAKE_MENU(hotkey_menu, ID2P(LANG_HOTKEY), 0, Icon_NOICON, | |||
426 | 427 | ||
427 | #ifdef HAVE_TAGCACHE | 428 | #ifdef HAVE_TAGCACHE |
428 | #if CONFIG_CODEC == SWCODEC | 429 | #if CONFIG_CODEC == SWCODEC |
429 | MENUITEM_SETTING(autoresume_enable, &global_settings.autoresume_enable, NULL); | 430 | static int autoresume_callback(int action, const struct menu_item_ex *this_item) |
431 | { | ||
432 | (void)this_item; | ||
433 | |||
434 | if (action == ACTION_EXIT_MENUITEM /* on exit */ | ||
435 | && global_settings.autoresume_enable | ||
436 | && !tagcache_is_usable()) | ||
437 | { | ||
438 | static const char *lines[] = {ID2P(LANG_TAGCACHE_BUSY), | ||
439 | ID2P(LANG_TAGCACHE_FORCE_UPDATE)}; | ||
440 | static const struct text_message message = {lines, 2}; | ||
441 | |||
442 | if (gui_syncyesno_run(&message, NULL, NULL) == YESNO_YES) | ||
443 | tagcache_rebuild_with_splash(); | ||
444 | } | ||
445 | return action; | ||
446 | } | ||
447 | |||
448 | MENUITEM_SETTING(autoresume_enable, &global_settings.autoresume_enable, | ||
449 | autoresume_callback); | ||
430 | #endif | 450 | #endif |
431 | #endif | 451 | #endif |
432 | 452 | ||
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[] = { | |||
1258 | 1258 | ||
1259 | #ifdef HAVE_TAGCACHE | 1259 | #ifdef HAVE_TAGCACHE |
1260 | #if CONFIG_CODEC == SWCODEC | 1260 | #if CONFIG_CODEC == SWCODEC |
1261 | BOOL_SETTING(0, autoresume_enable, LANG_AUTORESUME_ENABLE, false, | 1261 | BOOL_SETTING(0, autoresume_enable, LANG_AUTORESUME, false, |
1262 | "autoresume enable", off_on, | 1262 | "autoresume enable", off_on, |
1263 | LANG_AUTORESUME_ENABLE_YES, LANG_SET_BOOL_NO, NULL), | 1263 | LANG_SET_BOOL_YES, LANG_SET_BOOL_NO, NULL), |
1264 | #endif | 1264 | #endif |
1265 | 1265 | ||
1266 | OFFON_SETTING(0, runtimedb, LANG_RUNTIMEDB_ACTIVE, false, | 1266 | OFFON_SETTING(0, runtimedb, LANG_RUNTIMEDB_ACTIVE, false, |