diff options
author | Björn Stenberg <bjorn@haxx.se> | 2002-09-24 08:37:58 +0000 |
---|---|---|
committer | Björn Stenberg <bjorn@haxx.se> | 2002-09-24 08:37:58 +0000 |
commit | 3163aa150b386b0c3902a5633d9d9cb800fbe4b4 (patch) | |
tree | 2ab9fcc6da17d8f7eb2f4884b13673e91a3eee87 /apps/wps.c | |
parent | 868111c5c12038bcd58c6cee6b4aa9268dbd89d3 (diff) | |
download | rockbox-3163aa150b386b0c3902a5633d9d9cb800fbe4b4.tar.gz rockbox-3163aa150b386b0c3902a5633d9d9cb800fbe4b4.zip |
Quickscreens now stay up if you release the F-key before pressing a combination key.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2382 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/wps.c')
-rw-r--r-- | apps/wps.c | 30 |
1 files changed, 12 insertions, 18 deletions
diff --git a/apps/wps.c b/apps/wps.c index c8fafc5913..be3f21193b 100644 --- a/apps/wps.c +++ b/apps/wps.c | |||
@@ -121,13 +121,9 @@ void display_keylock_text(bool locked) | |||
121 | lcd_puts(0, 0, str(LANG_KEYLOCK_OFF_PLAYER)); | 121 | lcd_puts(0, 0, str(LANG_KEYLOCK_OFF_PLAYER)); |
122 | #else | 122 | #else |
123 | if(locked) | 123 | if(locked) |
124 | { | ||
125 | lcd_puts(2, 3, str(LANG_KEYLOCK_ON_RECORDER)); | 124 | lcd_puts(2, 3, str(LANG_KEYLOCK_ON_RECORDER)); |
126 | } | ||
127 | else | 125 | else |
128 | { | ||
129 | lcd_puts(2, 3, str(LANG_KEYLOCK_OFF_RECORDER)); | 126 | lcd_puts(2, 3, str(LANG_KEYLOCK_OFF_RECORDER)); |
130 | } | ||
131 | lcd_update(); | 127 | lcd_update(); |
132 | #endif | 128 | #endif |
133 | 129 | ||
@@ -146,13 +142,9 @@ void display_mute_text(bool muted) | |||
146 | lcd_puts(0, 0, str(LANG_MUTE_OFF_PLAYER)); | 142 | lcd_puts(0, 0, str(LANG_MUTE_OFF_PLAYER)); |
147 | #else | 143 | #else |
148 | if (muted) | 144 | if (muted) |
149 | { | ||
150 | lcd_puts(2, 3, str(LANG_MUTE_ON_RECORDER)); | 145 | lcd_puts(2, 3, str(LANG_MUTE_ON_RECORDER)); |
151 | } | ||
152 | else | 146 | else |
153 | { | ||
154 | lcd_puts(2, 3, str(LANG_MUTE_OFF_RECORDER)); | 147 | lcd_puts(2, 3, str(LANG_MUTE_OFF_RECORDER)); |
155 | } | ||
156 | lcd_update(); | 148 | lcd_update(); |
157 | #endif | 149 | #endif |
158 | 150 | ||
@@ -750,6 +742,7 @@ int on_screen(void) | |||
750 | bool f2_screen(void) | 742 | bool f2_screen(void) |
751 | { | 743 | { |
752 | bool exit = false; | 744 | bool exit = false; |
745 | bool used = false; | ||
753 | int w, h; | 746 | int w, h; |
754 | char buf[32]; | 747 | char buf[32]; |
755 | 748 | ||
@@ -789,19 +782,19 @@ bool f2_screen(void) | |||
789 | randomise_playlist(current_tick); | 782 | randomise_playlist(current_tick); |
790 | else | 783 | else |
791 | sort_playlist(true); | 784 | sort_playlist(true); |
785 | used = true; | ||
792 | break; | 786 | break; |
793 | 787 | ||
794 | case BUTTON_DOWN: | 788 | case BUTTON_DOWN: |
795 | case BUTTON_F2 | BUTTON_DOWN: | 789 | case BUTTON_F2 | BUTTON_DOWN: |
796 | global_settings.mp3filter = !global_settings.mp3filter; | 790 | global_settings.mp3filter = !global_settings.mp3filter; |
791 | used = true; | ||
797 | break; | 792 | break; |
798 | 793 | ||
799 | #ifdef SIMULATOR | ||
800 | case BUTTON_F2: | ||
801 | #else | ||
802 | case BUTTON_F2 | BUTTON_REL: | 794 | case BUTTON_F2 | BUTTON_REL: |
803 | #endif | 795 | if ( used ) |
804 | exit = true; | 796 | exit = true; |
797 | used = true; | ||
805 | break; | 798 | break; |
806 | 799 | ||
807 | #ifndef SIMULATOR | 800 | #ifndef SIMULATOR |
@@ -820,6 +813,7 @@ bool f2_screen(void) | |||
820 | bool f3_screen(void) | 813 | bool f3_screen(void) |
821 | { | 814 | { |
822 | bool exit = false; | 815 | bool exit = false; |
816 | bool used = false; | ||
823 | 817 | ||
824 | lcd_stop_scroll(); | 818 | lcd_stop_scroll(); |
825 | 819 | ||
@@ -850,19 +844,19 @@ bool f3_screen(void) | |||
850 | case BUTTON_LEFT: | 844 | case BUTTON_LEFT: |
851 | case BUTTON_F3 | BUTTON_LEFT: | 845 | case BUTTON_F3 | BUTTON_LEFT: |
852 | global_settings.scrollbar = !global_settings.scrollbar; | 846 | global_settings.scrollbar = !global_settings.scrollbar; |
847 | used = true; | ||
853 | break; | 848 | break; |
854 | 849 | ||
855 | case BUTTON_RIGHT: | 850 | case BUTTON_RIGHT: |
856 | case BUTTON_F3 | BUTTON_RIGHT: | 851 | case BUTTON_F3 | BUTTON_RIGHT: |
857 | global_settings.statusbar = !global_settings.statusbar; | 852 | global_settings.statusbar = !global_settings.statusbar; |
853 | used = true; | ||
858 | break; | 854 | break; |
859 | 855 | ||
860 | #ifdef SIMULATOR | ||
861 | case BUTTON_F3: | ||
862 | #else | ||
863 | case BUTTON_F3 | BUTTON_REL: | 856 | case BUTTON_F3 | BUTTON_REL: |
864 | #endif | 857 | if ( used ) |
865 | exit = true; | 858 | exit = true; |
859 | used = true; | ||
866 | break; | 860 | break; |
867 | 861 | ||
868 | #ifndef SIMULATOR | 862 | #ifndef SIMULATOR |