devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Reworked player simulator icons to fit the changed charcell scale factor and look more like the actual icons. Adapted player sim display sizes.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8745 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jens Arnold 2006-02-20 00:31:10 +00:00
parent da8db11e28
commit 3e496e3ecf
5 changed files with 128 additions and 271 deletions
Download patch file Download diff file Expand all files Collapse all files

4
firmware/export/config-player.h
View file

@ -2,8 +2,8 @@
#define HAVE_LCD_CHARCELLS 1 #define HAVE_LCD_CHARCELLS 1
/* LCD dimensions (for the simulator) */ /* LCD dimensions (for the simulator) */
#define LCD_WIDTH (4*11*6) /* Display width in pixels */ #define LCD_WIDTH 132 /* Display width in pixels */
#define LCD_HEIGHT (4*16+2*24) /* 4*char + 2*icons */ #define LCD_HEIGHT 64 /* Display height in pixels */
#define LCD_DEPTH 1 #define LCD_DEPTH 1
/* define this if you have the Player's keyboard */ /* define this if you have the Player's keyboard */

6
uisimulator/common/lcd-playersim.c
View file

@ -34,9 +34,9 @@
#define CHAR_WIDTH 6 #define CHAR_WIDTH 6
#define CHAR_HEIGHT 8 #define CHAR_HEIGHT 8
#define ICON_HEIGHT 24 #define ICON_HEIGHT 12
#define CHAR_PIXEL 2 #define CHAR_PIXEL 2
#define BORDER_MARGIN 2 #define BORDER_MARGIN 1
static int double_height=1; static int double_height=1;
extern bool lcd_display_redraw; extern bool lcd_display_redraw;
@ -47,7 +47,7 @@ extern unsigned char hardware_buffer_lcd[11][2];
void lcd_print_icon(int x, int icon_line, bool enable, char **icon) void lcd_print_icon(int x, int icon_line, bool enable, char **icon)
{ {
int xpos = x; int xpos = x;
int ypos = icon_line*(ICON_HEIGHT+CHAR_HEIGHT*2*4); int ypos = icon_line*(ICON_HEIGHT+(CHAR_HEIGHT*2+2)*CHAR_PIXEL);
int row=0, col; int row=0, col;
int p=0, cp=0; int p=0, cp=0;

341
uisimulator/common/sim_icons.c
View file

@ -31,49 +31,31 @@ extern void lcd_print_icon(int x, int icon_line, bool enable, char **icon);
static char* icon_battery_bit[]= static char* icon_battery_bit[]=
{ {
"------", "-----",
"------", " ",
"------", "*****",
"******", "*****",
"******", "*****",
"******", "*****",
"******", "*****",
"******", "*****",
"******", " ",
"******", "-----",
"******",
"******",
"******",
"******",
"******",
"******",
"------",
"------",
"------",
NULL NULL
}; };
static char* icon_battery[]= static char* icon_battery[]=
{ {
" ********************************** ", "********************* ",
"*..................................* ", "* * ",
"*..................................* ", "* * ",
"*..................................* ", "* ***",
"*..................................* ", "* * *",
"*..................................*****", "* * *",
"*..................................*****", "* ***",
"*..................................*****", "* * ",
"*..................................*****", "* * ",
"*..................................*****", "********************* ",
"*..................................*****",
"*..................................*****",
"*..................................*****",
"*..................................*****",
"*..................................* ",
"*..................................* ",
"*..................................* ",
"*..................................* ",
" ********************************** ",
NULL NULL
}; };
@ -83,21 +65,12 @@ static char* icon_volume[]=
" ", " ",
" ", " ",
" ", " ",
" ",
" ",
"* * * ", "* * * ",
"* * * ", "* * * ",
" * * * ", " * * *** * ",
" * * * ",
" * * * ",
" * * * ",
" * * * ",
" * * ** * ",
" * * * * * ", " * * * * * ",
" * * * * * ", " * * * * ",
" * * * * * ", " * *** * ",
" * * * * * ",
" * ** * ",
NULL NULL
}; };
@ -107,18 +80,9 @@ static char* icon_volume_1[]=
" ", " ",
" ", " ",
" ", " ",
" ", "**",
" ", "**",
" ", "**",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
"**", "**",
"**", "**",
"**", "**",
@ -130,16 +94,7 @@ static char* icon_volume_2[]=
" ", " ",
" ", " ",
" ", " ",
" ", "**",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
"**", "**",
"**", "**",
"**", "**",
@ -153,15 +108,6 @@ static char* icon_volume_3[]=
{ {
" ", " ",
" ", " ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
"**",
"**", "**",
"**", "**",
"**", "**",
@ -176,15 +122,6 @@ static char* icon_volume_3[]=
static char* icon_volume_4[]= static char* icon_volume_4[]=
{ {
" ", " ",
" ",
" ",
" ",
" ",
" ",
" ",
"**",
"**",
"**",
"**", "**",
"**", "**",
"**", "**",
@ -199,15 +136,6 @@ static char* icon_volume_4[]=
static char* icon_volume_5[]= static char* icon_volume_5[]=
{ {
" ",
" ",
" ",
" ",
"**",
"**",
"**",
"**",
"**",
"**", "**",
"**", "**",
"**", "**",
@ -223,174 +151,112 @@ static char* icon_volume_5[]=
static char* icon_pause[]= static char* icon_pause[]=
{ {
"**** ****", " **** **** ",
"**** ****", " **** **** ",
"**** ****", " **** **** ",
"**** ****", " **** **** ",
"**** ****", " **** **** ",
"**** ****", " **** **** ",
"**** ****", " **** **** ",
"**** ****", " **** **** ",
"**** ****", " **** **** ",
"**** ****", " **** **** ",
"**** ****",
"**** ****",
"**** ****",
"**** ****",
"**** ****",
"**** ****",
"**** ****",
"**** ****",
"**** ****",
NULL NULL
}; };
static char* icon_play[]= static char* icon_play[]=
{ {
"** ", "** ",
"**** ", "***** ",
"****** ", "******* ",
"******** ", "********* ",
"********** ", "*********** ",
"************ ", "********* ",
"************** ", "******* ",
"**************** ", "***** ",
"****************** ",
"******************** ",
"****************** ",
"**************** ",
"************** ",
"************ ",
"********** ",
"******** ",
"****** ",
"**** ",
"** ", "** ",
" ",
NULL NULL
}; };
static char* icon_record[]= static char* icon_record[]=
{ {
" ",
" ",
" ",
" ",
" *** ", " *** ",
" ***** ",
" ******* ",
" ********* ", " ********* ",
" ************* ",
" *************** ",
"*****************",
"*****************",
"*****************",
" *************** ",
" ************* ",
" ********* ", " ********* ",
" ********* ",
" ******* ",
" ***** ",
" *** ", " *** ",
" ", " ",
" ",
" ",
" ",
NULL NULL
}; };
static char* icon_usb[]= static char* icon_usb[]=
{ {
" ", " ********* ",
" ", " ** ** ",
" ************************** ", " * ",
" ** **** ", " ** * ** ",
"***********************",
" ** * ** ",
" * ",
" ** ** ",
" ******** ",
" ** ", " ** ",
" ** ",
" ** ",
" ** ",
" ** ",
" **** ** **** ",
"***************************************************",
" **** ** **** ",
" ** ",
" ** ",
" ** ",
" ** ",
" *** *** ",
" ***************** ",
" ",
NULL NULL
}; };
static char* icon_audio[]= static char* icon_audio[]=
{ {
" ************************************** ", " *************************** ",
" ****************************************** ",
" ** ** ", " ** ** ",
"* ** * * **** * *** *",
"* * * * * * * * * * *",
"* * * * * * * * * * *",
"* ****** * * * * * * * *",
"* * * * * * * * * * *",
"* * * *** **** * *** *",
" ** ** ", " ** ** ",
" ** **** ** ** ****** ** **** ** ", " *************************** ",
"** ****** ** ** ******* ** ****** **",
"** ** ** ** ** ** ** ** ** ** **",
"** ** ** ** ** ** ** ** ** ** **",
"** ** ** ** ** ** ** ** ** ** **",
"** ** ** ** ** ** ** ** ** ** **",
"** ******** ** ** ** ** ** ** ** **",
"** ******** ** ** ** ** ** ** ** **",
"** ** ** ** ** ** ** ** ** ** **",
"** ** ** ****** ******* ** ****** **",
" ** ** ** **** ****** ** **** ** ",
" ** ** ",
" ** ** ",
" ****************************************** ",
" ************************************** ",
NULL NULL
}; };
static char* icon_param[]= static char* icon_param[]=
{ {
" ********************************************** ", " ********************************* ",
" ************************************************** ",
" ** ** ", " ** ** ",
"* **** ** **** ** ** ** *",
"* * * * * * * * * ** ** *",
"* * * * * * * * * * * * * *",
"* **** ****** **** ****** * * * * *",
"* * * * * * * * * * * *",
"* * * * * * * * * * * *",
" ** ** ", " ** ** ",
" ** ******* **** ******* ***** ** ** ** ", " ********************************* ",
"** ******** ****** ******** ******* ** ** **",
"** ** ** ** ** ** ** ** ** *** *** **",
"** ** ** ** ** ** ** ** ** *** *** **",
"** ** ** ** ** ** ** ** ** **** **** **",
"** ** ** ** ** ** ** ** ** ** **** ** **",
"** ******** ******** ******** ******** ** **** ** **",
"** ******* ******** ******* ******** ** ** ** **",
"** ** ** ** ** *** ** ** ** ** **",
"** ** ** ** ** *** ** ** ** ** **",
" ** ** ** ** ** *** ** ** ** ** ** ",
" ** ** ",
" ** ** ",
" ************************************************** ",
" ********************************************** ",
NULL NULL
}; };
static char* icon_repeat[]= static char* icon_repeat[]=
{ {
" ************************* ", " ",
" *************************** ", " *************",
" *** ", " * ",
" ** ", " * ",
" ** ", "* ",
" ** ", "* ",
" ** ", "* ** ",
"** ", " * **** ",
"** ", " * ****** ",
"** ", " *************",
"** ",
"** ",
" ** ** ",
" ** **** ",
" ** ****** ",
" ** ******** ",
" *** ********** ",
" ***************************** ",
" *****************************",
NULL NULL
}; };
static char* icon_repeat2[]= static char* icon_repeat2[]=
{ {
" ",
" *", " *",
" **", " **",
"***", "***",
@ -400,16 +266,6 @@ static char* icon_repeat2[]=
" *", " *",
" *", " *",
" *", " *",
" *",
" *",
" *",
" *",
" *",
" *",
" *",
" *",
" *",
" *",
NULL NULL
}; };
@ -421,30 +277,31 @@ struct icon_info
int row; int row;
}; };
#define ICON_VOLUME_POS 224 #define ICON_VOLUME_POS 102
#define ICON_VOLUME_SIZE 20 #define ICON_VOLUME_SIZE 14
#define ICON_VOLUME_X_SIZE 2 #define ICON_VOLUME_X_SIZE 2
static struct icon_info icons [] = static struct icon_info icons [] =
{ {
{icon_battery, 0, 0}, {icon_battery, 0, 0},
{icon_battery_bit, 5, 0}, {icon_battery_bit, 2, 0},
{icon_battery_bit, 15, 0}, {icon_battery_bit, 8, 0},
{icon_battery_bit, 25, 0}, {icon_battery_bit, 14, 0},
{icon_usb, 0, 1}, {icon_usb, 0, 1},
{icon_play, 55, 0}, {icon_play, 36, 0},
{icon_record, 75, 0}, {icon_record, 48, 0},
{icon_pause, 100, 0}, {icon_pause, 60, 0},
{icon_audio, 90, 1}, {icon_audio, 37, 1},
{icon_repeat, 170, 0}, {icon_repeat, 74, 0},
{icon_repeat2, 170+35+4, 0}, {icon_repeat2, 94, 0},
{icon_volume, ICON_VOLUME_POS, 0}, {icon_volume, ICON_VOLUME_POS, 0},
{icon_volume_1, ICON_VOLUME_POS+ICON_VOLUME_SIZE, 0}, {icon_volume_1, ICON_VOLUME_POS+ICON_VOLUME_SIZE, 0},
{icon_volume_2, ICON_VOLUME_POS+ICON_VOLUME_SIZE+(1*ICON_VOLUME_X_SIZE)+1, 0}, {icon_volume_2, ICON_VOLUME_POS+ICON_VOLUME_SIZE+(1*ICON_VOLUME_X_SIZE)+1, 0},
{icon_volume_3, ICON_VOLUME_POS+ICON_VOLUME_SIZE+(2*ICON_VOLUME_X_SIZE)+2, 0}, {icon_volume_3, ICON_VOLUME_POS+ICON_VOLUME_SIZE+(2*ICON_VOLUME_X_SIZE)+2, 0},
{icon_volume_4, ICON_VOLUME_POS+ICON_VOLUME_SIZE+(3*ICON_VOLUME_X_SIZE)+3, 0}, {icon_volume_4, ICON_VOLUME_POS+ICON_VOLUME_SIZE+(3*ICON_VOLUME_X_SIZE)+3, 0},
{icon_volume_5, ICON_VOLUME_POS+ICON_VOLUME_SIZE+(4*ICON_VOLUME_X_SIZE)+4, 0}, {icon_volume_5, ICON_VOLUME_POS+ICON_VOLUME_SIZE+(4*ICON_VOLUME_X_SIZE)+4, 0},
{icon_param, 170, 1} {icon_param, 90, 1}
}; };
void void

4
uisimulator/sdl/uisdl.h
View file

@ -45,9 +45,9 @@
#define UI_LCD_BGCOLORLIGHT 126, 229, 126 // bkgnd color of LCD (backlight) #define UI_LCD_BGCOLORLIGHT 126, 229, 126 // bkgnd color of LCD (backlight)
#define UI_LCD_BLACK 0, 0, 0 // black #define UI_LCD_BLACK 0, 0, 0 // black
#define UI_LCD_POSX 75 // x position of lcd #define UI_LCD_POSX 75 // x position of lcd
#define UI_LCD_POSY 111 // y position of lcd #define UI_LCD_POSY 116 // y position of lcd
#define UI_LCD_WIDTH 132 #define UI_LCD_WIDTH 132
#define UI_LCD_HEIGHT 75 #define UI_LCD_HEIGHT 64
#elif defined(ARCHOS_FMRECORDER) || defined(ARCHOS_RECORDERV2) #elif defined(ARCHOS_FMRECORDER) || defined(ARCHOS_RECORDERV2)
#define UI_TITLE "Jukebox FM Recorder" #define UI_TITLE "Jukebox FM Recorder"

4
uisimulator/win32/uisw32.h
View file

@ -47,9 +47,9 @@ typedef unsigned short wchar_t;
#define UI_LCD_BGCOLORLIGHT 126, 229, 126 // bkgnd color of LCD (backlight) #define UI_LCD_BGCOLORLIGHT 126, 229, 126 // bkgnd color of LCD (backlight)
#define UI_LCD_BLACK 0, 0, 0 // black #define UI_LCD_BLACK 0, 0, 0 // black
#define UI_LCD_POSX 75 // x position of lcd #define UI_LCD_POSX 75 // x position of lcd
#define UI_LCD_POSY 111 // y position of lcd #define UI_LCD_POSY 116 // y position of lcd
#define UI_LCD_WIDTH 132 #define UI_LCD_WIDTH 132
#define UI_LCD_HEIGHT 75 #define UI_LCD_HEIGHT 64
#elif defined(ARCHOS_FMRECORDER) || defined(ARCHOS_RECORDERV2) #elif defined(ARCHOS_FMRECORDER) || defined(ARCHOS_RECORDERV2)
#define UI_TITLE "Jukebox FM Recorder" #define UI_TITLE "Jukebox FM Recorder"