diff options
author | Jens Arnold <amiconn@rockbox.org> | 2005-11-22 08:44:53 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2005-11-22 08:44:53 +0000 |
commit | 91f6c3d604b3ffba45d78852ef53f7d285b0e14e (patch) | |
tree | 69e98fe5ec97d9cc209f4925c5a1629af09908a8 /apps/screens.c | |
parent | 6919d1e3b38eba13f02d541104e150b60eee697c (diff) | |
download | rockbox-91f6c3d604b3ffba45d78852ef53f7d285b0e14e.tar.gz rockbox-91f6c3d604b3ffba45d78852ef53f7d285b0e14e.zip |
The const police strikes back. Also only include the F3 quickscreen for units with an F3 button.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8041 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/screens.c')
-rw-r--r-- | apps/screens.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/apps/screens.c b/apps/screens.c index e893f5442b..e9489b595a 100644 --- a/apps/screens.c +++ b/apps/screens.c | |||
@@ -552,14 +552,14 @@ bool quick_screen_quick(void) | |||
552 | [0]={ STR(LANG_OFF) }, | 552 | [0]={ STR(LANG_OFF) }, |
553 | [1]={ STR(LANG_ON) } | 553 | [1]={ STR(LANG_ON) } |
554 | }; | 554 | }; |
555 | struct opt_items bottom_items[] = { | 555 | static const struct opt_items bottom_items[] = { |
556 | [SHOW_ALL]={ STR(LANG_FILTER_ALL) }, | 556 | [SHOW_ALL]={ STR(LANG_FILTER_ALL) }, |
557 | [SHOW_SUPPORTED]={ STR(LANG_FILTER_SUPPORTED) }, | 557 | [SHOW_SUPPORTED]={ STR(LANG_FILTER_SUPPORTED) }, |
558 | [SHOW_MUSIC]={ STR(LANG_FILTER_MUSIC) }, | 558 | [SHOW_MUSIC]={ STR(LANG_FILTER_MUSIC) }, |
559 | [SHOW_PLAYLIST]={ STR(LANG_FILTER_PLAYLIST) }, | 559 | [SHOW_PLAYLIST]={ STR(LANG_FILTER_PLAYLIST) }, |
560 | [SHOW_ID3DB]={ STR(LANG_FILTER_ID3DB) } | 560 | [SHOW_ID3DB]={ STR(LANG_FILTER_ID3DB) } |
561 | }; | 561 | }; |
562 | struct opt_items right_items[] = { | 562 | static const struct opt_items right_items[] = { |
563 | [REPEAT_OFF]={ STR(LANG_OFF) }, | 563 | [REPEAT_OFF]={ STR(LANG_OFF) }, |
564 | [REPEAT_ALL]={ STR(LANG_REPEAT_ALL) }, | 564 | [REPEAT_ALL]={ STR(LANG_REPEAT_ALL) }, |
565 | [REPEAT_ONE]={ STR(LANG_REPEAT_ONE) }, | 565 | [REPEAT_ONE]={ STR(LANG_REPEAT_ONE) }, |
@@ -611,6 +611,7 @@ bool quick_screen_quick(void) | |||
611 | return(res); | 611 | return(res); |
612 | } | 612 | } |
613 | 613 | ||
614 | #ifdef BUTTON_F3 | ||
614 | void quick_screen_f3_apply(struct gui_quickscreen *qs) | 615 | void quick_screen_f3_apply(struct gui_quickscreen *qs) |
615 | { | 616 | { |
616 | global_settings.scrollbar=int_to_bool(option_select_get_selected(qs->left_option)); | 617 | global_settings.scrollbar=int_to_bool(option_select_get_selected(qs->left_option)); |
@@ -629,11 +630,11 @@ bool quick_screen_f3(void) | |||
629 | struct option_select left_option; | 630 | struct option_select left_option; |
630 | struct option_select bottom_option; | 631 | struct option_select bottom_option; |
631 | struct option_select right_option; | 632 | struct option_select right_option; |
632 | struct opt_items onoff_items[] = { | 633 | static const struct opt_items onoff_items[] = { |
633 | [0]={ STR(LANG_OFF) }, | 634 | [0]={ STR(LANG_OFF) }, |
634 | [1]={ STR(LANG_ON) } | 635 | [1]={ STR(LANG_ON) } |
635 | }; | 636 | }; |
636 | struct opt_items yesno_items[] = { | 637 | static const struct opt_items yesno_items[] = { |
637 | [0]={ STR(LANG_SET_BOOL_NO) }, | 638 | [0]={ STR(LANG_SET_BOOL_NO) }, |
638 | [1]={ STR(LANG_SET_BOOL_YES) } | 639 | [1]={ STR(LANG_SET_BOOL_YES) } |
639 | }; | 640 | }; |
@@ -662,7 +663,8 @@ bool quick_screen_f3(void) | |||
662 | settings_save(); | 663 | settings_save(); |
663 | return(res); | 664 | return(res); |
664 | } | 665 | } |
665 | #endif | 666 | #endif /* BUTTON_F3 */ |
667 | #endif /* CONFIG_KEYPAD in (RECORDER_PAD |IRIVER_H100_PAD | IRIVER_H300_PAD) */ | ||
666 | 668 | ||
667 | #if defined(HAVE_CHARGING) || defined(SIMULATOR) | 669 | #if defined(HAVE_CHARGING) || defined(SIMULATOR) |
668 | void charging_splash(void) | 670 | void charging_splash(void) |