diff options
author | Robert Hak <adiamas@rockbox.org> | 2002-10-16 07:25:33 +0000 |
---|---|---|
committer | Robert Hak <adiamas@rockbox.org> | 2002-10-16 07:25:33 +0000 |
commit | c88751ffa58ec8a8cff2aa50225ec9baab705ab8 (patch) | |
tree | 3c59b57a730fad6ecd438ec4c88ef62d0fe6f383 | |
parent | a3e1648856b229138ec00d788c1c4b05cfef5fa2 (diff) | |
download | rockbox-c88751ffa58ec8a8cff2aa50225ec9baab705ab8.tar.gz rockbox-c88751ffa58ec8a8cff2aa50225ec9baab705ab8.zip |
resume ask once option added
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2672 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/lang/english.lang | 11 | ||||
-rw-r--r-- | apps/settings.h | 3 | ||||
-rw-r--r-- | apps/settings_menu.c | 3 | ||||
-rw-r--r-- | apps/tree.c | 6 |
4 files changed, 20 insertions, 3 deletions
diff --git a/apps/lang/english.lang b/apps/lang/english.lang index c22c4bac94..baadc2e2ca 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang | |||
@@ -237,7 +237,9 @@ eng: "Backlight" | |||
237 | new: | 237 | new: |
238 | 238 | ||
239 | id: LANG_BACKLIGHT_ON | 239 | id: LANG_BACKLIGHT_ON |
240 | desc: in settings_menu, | 240 | desc: in settings_menu |
241 | eng: "" | ||
242 | new: | ||
241 | 243 | ||
242 | id: LANG_SCROLL | 244 | id: LANG_SCROLL |
243 | desc: in settings_menu | 245 | desc: in settings_menu |
@@ -1020,3 +1022,10 @@ id: LANG_OSCILLOGRAPH | |||
1020 | desc: the name of the oscillograph demo in the demo menu | 1022 | desc: the name of the oscillograph demo in the demo menu |
1021 | eng: "Oscillograph" | 1023 | eng: "Oscillograph" |
1022 | new: | 1024 | new: |
1025 | |||
1026 | id: LANG_RESUME_SETTING_ASK_ONCE | ||
1027 | desc: in settings_menu | ||
1028 | eng: "Ask Once" | ||
1029 | new: | ||
1030 | |||
1031 | |||
diff --git a/apps/settings.h b/apps/settings.h index 39a7b7c74e..8644b56d85 100644 --- a/apps/settings.h +++ b/apps/settings.h | |||
@@ -31,7 +31,8 @@ | |||
31 | 31 | ||
32 | #define RESUME_OFF 0 | 32 | #define RESUME_OFF 0 |
33 | #define RESUME_ASK 1 | 33 | #define RESUME_ASK 1 |
34 | #define RESUME_ON 2 | 34 | #define RESUME_ASK_ONCE 2 |
35 | #define RESUME_ON 3 | ||
35 | 36 | ||
36 | #define FF_REWIND_1000 0 | 37 | #define FF_REWIND_1000 0 |
37 | #define FF_REWIND_2000 1 | 38 | #define FF_REWIND_2000 1 |
diff --git a/apps/settings_menu.c b/apps/settings_menu.c index 6fcd687f18..0aa8f3efe0 100644 --- a/apps/settings_menu.c +++ b/apps/settings_menu.c | |||
@@ -161,10 +161,11 @@ static bool resume(void) | |||
161 | { | 161 | { |
162 | char* names[] = { str(LANG_SET_BOOL_NO), | 162 | char* names[] = { str(LANG_SET_BOOL_NO), |
163 | str(LANG_RESUME_SETTING_ASK), | 163 | str(LANG_RESUME_SETTING_ASK), |
164 | str(LANG_RESUME_SETTING_ASK_ONCE), | ||
164 | str(LANG_SET_BOOL_YES) }; | 165 | str(LANG_SET_BOOL_YES) }; |
165 | 166 | ||
166 | return set_option( str(LANG_RESUME), &global_settings.resume, | 167 | return set_option( str(LANG_RESUME), &global_settings.resume, |
167 | names, 3, NULL ); | 168 | names, 4, NULL ); |
168 | } | 169 | } |
169 | 170 | ||
170 | static bool backlight_on_when_charging(void) | 171 | static bool backlight_on_when_charging(void) |
diff --git a/apps/tree.c b/apps/tree.c index 1b19b04bba..2b97ac692f 100644 --- a/apps/tree.c +++ b/apps/tree.c | |||
@@ -454,6 +454,11 @@ bool ask_resume(void) | |||
454 | if ( global_settings.resume == RESUME_ON ) | 454 | if ( global_settings.resume == RESUME_ON ) |
455 | return true; | 455 | return true; |
456 | 456 | ||
457 | if ( global_settings.resume == RESUME_ASK_ONCE) { | ||
458 | global_settings.resume_index = -1; | ||
459 | settings_save(); | ||
460 | } | ||
461 | |||
457 | lcd_clear_display(); | 462 | lcd_clear_display(); |
458 | lcd_puts(0,0,str(LANG_RESUME_ASK)); | 463 | lcd_puts(0,0,str(LANG_RESUME_ASK)); |
459 | #ifdef HAVE_LCD_CHARCELLS | 464 | #ifdef HAVE_LCD_CHARCELLS |
@@ -463,6 +468,7 @@ bool ask_resume(void) | |||
463 | lcd_puts(0,2,str(LANG_RESUME_CANCEL_RECORDER)); | 468 | lcd_puts(0,2,str(LANG_RESUME_CANCEL_RECORDER)); |
464 | #endif | 469 | #endif |
465 | lcd_update(); | 470 | lcd_update(); |
471 | |||
466 | if (button_get(true) == BUTTON_PLAY) | 472 | if (button_get(true) == BUTTON_PLAY) |
467 | return true; | 473 | return true; |
468 | return false; | 474 | return false; |