diff options
author | Björn Stenberg <bjorn@haxx.se> | 2002-09-03 15:58:47 +0000 |
---|---|---|
committer | Björn Stenberg <bjorn@haxx.se> | 2002-09-03 15:58:47 +0000 |
commit | abe11fd910f979f95454e3b44aba5a57570c6543 (patch) | |
tree | 295747d156f9ff4f579a126fb4bd4617e248752a /apps/recorder | |
parent | 27c739277773c960ca9b385eacf77c40523dab5c (diff) | |
download | rockbox-abe11fd910f979f95454e3b44aba5a57570c6543.tar.gz rockbox-abe11fd910f979f95454e3b44aba5a57570c6543.zip |
Added quick-set screens to F2 (play modes) and F3 (screen settings) in dir browser and wps. Fixed minor propfont issues in lcd.c. Exported icons outside of icons.c
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2154 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/recorder')
-rw-r--r-- | apps/recorder/icons.c | 16 | ||||
-rw-r--r-- | apps/recorder/icons.h | 46 |
2 files changed, 32 insertions, 30 deletions
diff --git a/apps/recorder/icons.c b/apps/recorder/icons.c index 2019a1728a..440902a83a 100644 --- a/apps/recorder/icons.c +++ b/apps/recorder/icons.c | |||
@@ -36,7 +36,7 @@ unsigned char slider_bar[] = | |||
36 | 0x7c, 0x28, 0x28, 0x28, 0x28, 0x38 | 36 | 0x7c, 0x28, 0x28, 0x28, 0x28, 0x38 |
37 | }; | 37 | }; |
38 | 38 | ||
39 | static unsigned char bitmap_icon_5x8[][5] = | 39 | unsigned char bitmap_icons_5x8[][5] = |
40 | { | 40 | { |
41 | /* Lock */ | 41 | /* Lock */ |
42 | {0x78,0x7f,0x49,0x7f,0x78} | 42 | {0x78,0x7f,0x49,0x7f,0x78} |
@@ -70,7 +70,7 @@ unsigned char bitmap_icons_6x8[LastIcon][6] = | |||
70 | { 0x63, 0x7f, 0x3a, 0x7f, 0x63, 0x00 }, | 70 | { 0x63, 0x7f, 0x3a, 0x7f, 0x63, 0x00 }, |
71 | }; | 71 | }; |
72 | 72 | ||
73 | static unsigned char bitmap_icon_7x8[][7] = | 73 | unsigned char bitmap_icons_7x8[][7] = |
74 | { | 74 | { |
75 | /* Power plug */ | 75 | /* Power plug */ |
76 | {0x08,0x1c,0x3e,0x3e,0x3e,0x14,0x14}, | 76 | {0x08,0x1c,0x3e,0x3e,0x3e,0x14,0x14}, |
@@ -190,7 +190,7 @@ void statusbar_icon_battery(int percent, bool charging) | |||
190 | 190 | ||
191 | /* draw power plug if charging */ | 191 | /* draw power plug if charging */ |
192 | if (charging) | 192 | if (charging) |
193 | lcd_bitmap(bitmap_icon_7x8[Icon_Plug], ICON_PLUG_X_POS, | 193 | lcd_bitmap(bitmap_icons_7x8[Icon_Plug], ICON_PLUG_X_POS, |
194 | STATUSBAR_Y_POS, ICON_PLUG_WIDTH, STATUSBAR_HEIGHT, false); | 194 | STATUSBAR_Y_POS, ICON_PLUG_WIDTH, STATUSBAR_HEIGHT, false); |
195 | }; | 195 | }; |
196 | 196 | ||
@@ -217,7 +217,7 @@ void statusbar_icon_volume(int percent) | |||
217 | volume = 100; | 217 | volume = 100; |
218 | 218 | ||
219 | if (volume==0) { | 219 | if (volume==0) { |
220 | lcd_bitmap(bitmap_icon_7x8[Icon_Mute], | 220 | lcd_bitmap(bitmap_icons_7x8[Icon_Mute], |
221 | ICON_VOLUME_X_POS + ICON_VOLUME_WIDTH / 2 - 4, | 221 | ICON_VOLUME_X_POS + ICON_VOLUME_WIDTH / 2 - 4, |
222 | STATUSBAR_Y_POS, 7, STATUSBAR_HEIGHT, false); | 222 | STATUSBAR_Y_POS, 7, STATUSBAR_HEIGHT, false); |
223 | } | 223 | } |
@@ -259,7 +259,7 @@ void statusbar_icon_volume(int percent) | |||
259 | */ | 259 | */ |
260 | void statusbar_icon_play_state(int state) | 260 | void statusbar_icon_play_state(int state) |
261 | { | 261 | { |
262 | lcd_bitmap(bitmap_icon_7x8[state], ICON_PLAY_STATE_X_POS, STATUSBAR_Y_POS, | 262 | lcd_bitmap(bitmap_icons_7x8[state], ICON_PLAY_STATE_X_POS, STATUSBAR_Y_POS, |
263 | ICON_PLAY_STATE_WIDTH, STATUSBAR_HEIGHT, false); | 263 | ICON_PLAY_STATE_WIDTH, STATUSBAR_HEIGHT, false); |
264 | } | 264 | } |
265 | 265 | ||
@@ -268,7 +268,7 @@ void statusbar_icon_play_state(int state) | |||
268 | */ | 268 | */ |
269 | void statusbar_icon_play_mode(int mode) | 269 | void statusbar_icon_play_mode(int mode) |
270 | { | 270 | { |
271 | lcd_bitmap(bitmap_icon_7x8[mode], ICON_PLAY_MODE_X_POS, STATUSBAR_Y_POS, | 271 | lcd_bitmap(bitmap_icons_7x8[mode], ICON_PLAY_MODE_X_POS, STATUSBAR_Y_POS, |
272 | ICON_PLAY_MODE_WIDTH, STATUSBAR_HEIGHT, false); | 272 | ICON_PLAY_MODE_WIDTH, STATUSBAR_HEIGHT, false); |
273 | } | 273 | } |
274 | 274 | ||
@@ -277,7 +277,7 @@ void statusbar_icon_play_mode(int mode) | |||
277 | */ | 277 | */ |
278 | void statusbar_icon_shuffle(void) | 278 | void statusbar_icon_shuffle(void) |
279 | { | 279 | { |
280 | lcd_bitmap(bitmap_icon_7x8[Icon_Shuffle], ICON_SHUFFLE_X_POS, | 280 | lcd_bitmap(bitmap_icons_7x8[Icon_Shuffle], ICON_SHUFFLE_X_POS, |
281 | STATUSBAR_Y_POS, ICON_SHUFFLE_WIDTH, STATUSBAR_HEIGHT, false); | 281 | STATUSBAR_Y_POS, ICON_SHUFFLE_WIDTH, STATUSBAR_HEIGHT, false); |
282 | } | 282 | } |
283 | 283 | ||
@@ -286,7 +286,7 @@ void statusbar_icon_shuffle(void) | |||
286 | */ | 286 | */ |
287 | void statusbar_icon_lock(void) | 287 | void statusbar_icon_lock(void) |
288 | { | 288 | { |
289 | lcd_bitmap(bitmap_icon_5x8[Icon_Lock], LOCK_X_POS, | 289 | lcd_bitmap(bitmap_icons_5x8[Icon_Lock], LOCK_X_POS, |
290 | STATUSBAR_Y_POS, 5, 8, false); | 290 | STATUSBAR_Y_POS, 5, 8, false); |
291 | } | 291 | } |
292 | 292 | ||
diff --git a/apps/recorder/icons.h b/apps/recorder/icons.h index 5017ed5b49..46b7c3d2d9 100644 --- a/apps/recorder/icons.h +++ b/apps/recorder/icons.h | |||
@@ -31,7 +31,31 @@ enum icons_6x8 { | |||
31 | LastIcon | 31 | LastIcon |
32 | }; | 32 | }; |
33 | 33 | ||
34 | /* Symbolic names for icons */ | ||
35 | enum icons_5x8 { | ||
36 | Icon_Lock | ||
37 | }; | ||
38 | |||
39 | enum icons_7x8 { | ||
40 | Icon_Plug, | ||
41 | Icon_Speaker, | ||
42 | Icon_Mute, | ||
43 | Icon_Play, | ||
44 | Icon_Stop, | ||
45 | Icon_Pause, | ||
46 | Icon_FastForward, | ||
47 | Icon_FastBackward, | ||
48 | Icon_Record, | ||
49 | Icon_RecPause, | ||
50 | Icon_Normal, | ||
51 | Icon_Repeat, | ||
52 | Icon_Shuffle, | ||
53 | Icon_Last | ||
54 | }; | ||
55 | |||
56 | extern unsigned char bitmap_icons_5x8[1][5]; | ||
34 | extern unsigned char bitmap_icons_6x8[LastIcon][6]; | 57 | extern unsigned char bitmap_icons_6x8[LastIcon][6]; |
58 | extern unsigned char bitmap_icons_7x8[Icon_Last][7]; | ||
35 | 59 | ||
36 | extern unsigned char rockbox112x37[]; | 60 | extern unsigned char rockbox112x37[]; |
37 | 61 | ||
@@ -57,28 +81,6 @@ extern unsigned char slider_bar[]; | |||
57 | #define LOCK_WIDTH 5 | 81 | #define LOCK_WIDTH 5 |
58 | #define TIME_X_END STATUSBAR_WIDTH-1 | 82 | #define TIME_X_END STATUSBAR_WIDTH-1 |
59 | 83 | ||
60 | /* Symbolic names for icons */ | ||
61 | enum | ||
62 | { | ||
63 | Icon_Lock = 0 | ||
64 | }; | ||
65 | enum | ||
66 | { | ||
67 | Icon_Plug = 0, | ||
68 | Icon_Speaker, | ||
69 | Icon_Mute, | ||
70 | Icon_Play, | ||
71 | Icon_Stop, | ||
72 | Icon_Pause, | ||
73 | Icon_FastForward, | ||
74 | Icon_FastBackward, | ||
75 | Icon_Record, | ||
76 | Icon_RecPause, | ||
77 | Icon_Normal, | ||
78 | Icon_Repeat, | ||
79 | Icon_Shuffle | ||
80 | }; | ||
81 | |||
82 | extern void statusbar_wipe(void); | 84 | extern void statusbar_wipe(void); |
83 | extern void statusbar_icon_battery(int percent, bool charging); | 85 | extern void statusbar_icon_battery(int percent, bool charging); |
84 | extern void statusbar_icon_volume(int percent); | 86 | extern void statusbar_icon_volume(int percent); |