summaryrefslogtreecommitdiffstats
path: root/uisimulator
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2006-02-20 00:31:10 +0000
committerJens Arnold <amiconn@rockbox.org>2006-02-20 00:31:10 +0000
commit3e496e3ecf60db743cfe82e57b82b72764e20f39 (patch)
tree833798e58b5bfd3428cfaaa6d8d1c95ba8681a8a /uisimulator
parentda8db11e2872904c842454443475dcca98366a7e (diff)
downloadrockbox-3e496e3ecf60db743cfe82e57b82b72764e20f39.tar.gz
rockbox-3e496e3ecf60db743cfe82e57b82b72764e20f39.tar.bz2
rockbox-3e496e3ecf60db743cfe82e57b82b72764e20f39.zip
Reworked player simulator icons to fit the changed charcell scale factor and look more like the actual icons. Adapted player sim display sizes.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8745 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'uisimulator')
-rw-r--r--uisimulator/common/lcd-playersim.c8
-rw-r--r--uisimulator/common/sim_icons.c379
-rw-r--r--uisimulator/sdl/uisdl.h4
-rw-r--r--uisimulator/win32/uisw32.h4
4 files changed, 126 insertions, 269 deletions
diff --git a/uisimulator/common/lcd-playersim.c b/uisimulator/common/lcd-playersim.c
index 156f83e639..0e10acf437 100644
--- a/uisimulator/common/lcd-playersim.c
+++ b/uisimulator/common/lcd-playersim.c
@@ -34,9 +34,9 @@
#define CHAR_WIDTH 6
#define CHAR_HEIGHT 8
-#define ICON_HEIGHT 24
+#define ICON_HEIGHT 12
#define CHAR_PIXEL 2
-#define BORDER_MARGIN 2
+#define BORDER_MARGIN 1
static int double_height=1;
extern bool lcd_display_redraw;
@@ -47,13 +47,13 @@ extern unsigned char hardware_buffer_lcd[11][2];
void lcd_print_icon(int x, int icon_line, bool enable, char **icon)
{
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 p=0, cp=0;
struct coordinate points[LCD_WIDTH * LCD_HEIGHT];
struct coordinate clearpoints[LCD_WIDTH * LCD_HEIGHT];
-
+
while (icon[row]) {
col=0;
while (icon[row][col]) {
diff --git a/uisimulator/common/sim_icons.c b/uisimulator/common/sim_icons.c
index cb0aad0809..bd81e11fbf 100644
--- a/uisimulator/common/sim_icons.c
+++ b/uisimulator/common/sim_icons.c
@@ -31,73 +31,46 @@ extern void lcd_print_icon(int x, int icon_line, bool enable, char **icon);
static char* icon_battery_bit[]=
{
- "------",
- "------",
- "------",
- "******",
- "******",
- "******",
- "******",
- "******",
- "******",
- "******",
- "******",
- "******",
- "******",
- "******",
- "******",
- "******",
- "------",
- "------",
- "------",
+ "-----",
+ " ",
+ "*****",
+ "*****",
+ "*****",
+ "*****",
+ "*****",
+ "*****",
+ " ",
+ "-----",
NULL
};
static char* icon_battery[]=
{
- " ********************************** ",
- "*..................................* ",
- "*..................................* ",
- "*..................................* ",
- "*..................................* ",
- "*..................................*****",
- "*..................................*****",
- "*..................................*****",
- "*..................................*****",
- "*..................................*****",
- "*..................................*****",
- "*..................................*****",
- "*..................................*****",
- "*..................................*****",
- "*..................................* ",
- "*..................................* ",
- "*..................................* ",
- "*..................................* ",
- " ********************************** ",
+ "********************* ",
+ "* * ",
+ "* * ",
+ "* ***",
+ "* * *",
+ "* * *",
+ "* ***",
+ "* * ",
+ "* * ",
+ "********************* ",
NULL
};
static char* icon_volume[]=
{
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- "* * * ",
- "* * * ",
- " * * * ",
- " * * * ",
- " * * * ",
- " * * * ",
- " * * * ",
- " * * ** * ",
- " * * * * * ",
- " * * * * * ",
- " * * * * * ",
- " * * * * * ",
- " * ** * ",
+ " ",
+ " ",
+ " ",
+ " ",
+ "* * * ",
+ "* * * ",
+ " * * *** * ",
+ " * * * * * ",
+ " * * * * ",
+ " * *** * ",
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[]=
{
" ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- "**",
- "**",
- "**",
"**",
"**",
"**",
@@ -199,15 +136,6 @@ static char* icon_volume_4[]=
static char* icon_volume_5[]=
{
- " ",
- " ",
- " ",
- " ",
- "**",
- "**",
- "**",
- "**",
- "**",
"**",
"**",
"**",
@@ -223,174 +151,112 @@ static char* icon_volume_5[]=
static char* icon_pause[]=
{
- "**** ****",
- "**** ****",
- "**** ****",
- "**** ****",
- "**** ****",
- "**** ****",
- "**** ****",
- "**** ****",
- "**** ****",
- "**** ****",
- "**** ****",
- "**** ****",
- "**** ****",
- "**** ****",
- "**** ****",
- "**** ****",
- "**** ****",
- "**** ****",
- "**** ****",
+ " **** **** ",
+ " **** **** ",
+ " **** **** ",
+ " **** **** ",
+ " **** **** ",
+ " **** **** ",
+ " **** **** ",
+ " **** **** ",
+ " **** **** ",
+ " **** **** ",
NULL
};
static char* icon_play[]=
{
- "** ",
- "**** ",
- "****** ",
- "******** ",
- "********** ",
- "************ ",
- "************** ",
- "**************** ",
- "****************** ",
- "******************** ",
- "****************** ",
- "**************** ",
- "************** ",
- "************ ",
- "********** ",
- "******** ",
- "****** ",
- "**** ",
- "** ",
+ "** ",
+ "***** ",
+ "******* ",
+ "********* ",
+ "*********** ",
+ "********* ",
+ "******* ",
+ "***** ",
+ "** ",
+ " ",
NULL
};
static char* icon_record[]=
{
- " ",
- " ",
- " ",
- " ",
- " *** ",
- " ********* ",
- " ************* ",
- " *************** ",
- "*****************",
- "*****************",
- "*****************",
- " *************** ",
- " ************* ",
- " ********* ",
- " *** ",
- " ",
- " ",
- " ",
- " ",
+ " *** ",
+ " ***** ",
+ " ******* ",
+ " ********* ",
+ " ********* ",
+ " ********* ",
+ " ******* ",
+ " ***** ",
+ " *** ",
+ " ",
NULL
};
static char* icon_usb[]=
{
- " ",
- " ",
- " ************************** ",
- " ** **** ",
- " ** ",
- " ** ",
- " ** ",
- " ** ",
- " ** ",
- " **** ** **** ",
- "***************************************************",
- " **** ** **** ",
- " ** ",
- " ** ",
- " ** ",
- " ** ",
- " *** *** ",
- " ***************** ",
- " ",
+ " ********* ",
+ " ** ** ",
+ " * ",
+ " ** * ** ",
+ "***********************",
+ " ** * ** ",
+ " * ",
+ " ** ** ",
+ " ******** ",
+ " ** ",
NULL
};
static char* icon_audio[]=
{
- " ************************************** ",
- " ****************************************** ",
- " ** ** ",
- " ** ** ",
- " ** **** ** ** ****** ** **** ** ",
- "** ****** ** ** ******* ** ****** **",
- "** ** ** ** ** ** ** ** ** ** **",
- "** ** ** ** ** ** ** ** ** ** **",
- "** ** ** ** ** ** ** ** ** ** **",
- "** ** ** ** ** ** ** ** ** ** **",
- "** ******** ** ** ** ** ** ** ** **",
- "** ******** ** ** ** ** ** ** ** **",
- "** ** ** ** ** ** ** ** ** ** **",
- "** ** ** ****** ******* ** ****** **",
- " ** ** ** **** ****** ** **** ** ",
- " ** ** ",
- " ** ** ",
- " ****************************************** ",
- " ************************************** ",
+ " *************************** ",
+ " ** ** ",
+ "* ** * * **** * *** *",
+ "* * * * * * * * * * *",
+ "* * * * * * * * * * *",
+ "* ****** * * * * * * * *",
+ "* * * * * * * * * * *",
+ "* * * *** **** * *** *",
+ " ** ** ",
+ " *************************** ",
NULL
};
static char* icon_param[]=
{
- " ********************************************** ",
- " ************************************************** ",
- " ** ** ",
- " ** ** ",
- " ** ******* **** ******* ***** ** ** ** ",
- "** ******** ****** ******** ******* ** ** **",
- "** ** ** ** ** ** ** ** ** *** *** **",
- "** ** ** ** ** ** ** ** ** *** *** **",
- "** ** ** ** ** ** ** ** ** **** **** **",
- "** ** ** ** ** ** ** ** ** ** **** ** **",
- "** ******** ******** ******** ******** ** **** ** **",
- "** ******* ******** ******* ******** ** ** ** **",
- "** ** ** ** ** *** ** ** ** ** **",
- "** ** ** ** ** *** ** ** ** ** **",
- " ** ** ** ** ** *** ** ** ** ** ** ",
- " ** ** ",
- " ** ** ",
- " ************************************************** ",
- " ********************************************** ",
+ " ********************************* ",
+ " ** ** ",
+ "* **** ** **** ** ** ** *",
+ "* * * * * * * * * ** ** *",
+ "* * * * * * * * * * * * * *",
+ "* **** ****** **** ****** * * * * *",
+ "* * * * * * * * * * * *",
+ "* * * * * * * * * * * *",
+ " ** ** ",
+ " ********************************* ",
NULL
};
static char* icon_repeat[]=
{
- " ************************* ",
- " *************************** ",
- " *** ",
- " ** ",
- " ** ",
- " ** ",
- " ** ",
- "** ",
- "** ",
- "** ",
- "** ",
- "** ",
- " ** ** ",
- " ** **** ",
- " ** ****** ",
- " ** ******** ",
- " *** ********** ",
- " ***************************** ",
- " *****************************",
+ " ",
+ " *************",
+ " * ",
+ " * ",
+ "* ",
+ "* ",
+ "* ** ",
+ " * **** ",
+ " * ****** ",
+ " *************",
NULL
};
static char* icon_repeat2[]=
{
+ " ",
" *",
" **",
"***",
@@ -400,16 +266,6 @@ static char* icon_repeat2[]=
" *",
" *",
" *",
- " *",
- " *",
- " *",
- " *",
- " *",
- " *",
- " *",
- " *",
- " *",
- " *",
NULL
};
@@ -421,30 +277,31 @@ struct icon_info
int row;
};
-#define ICON_VOLUME_POS 224
-#define ICON_VOLUME_SIZE 20
+#define ICON_VOLUME_POS 102
+#define ICON_VOLUME_SIZE 14
#define ICON_VOLUME_X_SIZE 2
static struct icon_info icons [] =
{
+
{icon_battery, 0, 0},
- {icon_battery_bit, 5, 0},
- {icon_battery_bit, 15, 0},
- {icon_battery_bit, 25, 0},
+ {icon_battery_bit, 2, 0},
+ {icon_battery_bit, 8, 0},
+ {icon_battery_bit, 14, 0},
{icon_usb, 0, 1},
- {icon_play, 55, 0},
- {icon_record, 75, 0},
- {icon_pause, 100, 0},
- {icon_audio, 90, 1},
- {icon_repeat, 170, 0},
- {icon_repeat2, 170+35+4, 0},
+ {icon_play, 36, 0},
+ {icon_record, 48, 0},
+ {icon_pause, 60, 0},
+ {icon_audio, 37, 1},
+ {icon_repeat, 74, 0},
+ {icon_repeat2, 94, 0},
{icon_volume, ICON_VOLUME_POS, 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_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_5, ICON_VOLUME_POS+ICON_VOLUME_SIZE+(4*ICON_VOLUME_X_SIZE)+4, 0},
- {icon_param, 170, 1}
+ {icon_param, 90, 1}
};
void
diff --git a/uisimulator/sdl/uisdl.h b/uisimulator/sdl/uisdl.h
index f4a28f9e0f..0501028fb2 100644
--- a/uisimulator/sdl/uisdl.h
+++ b/uisimulator/sdl/uisdl.h
@@ -45,9 +45,9 @@
#define UI_LCD_BGCOLORLIGHT 126, 229, 126 // bkgnd color of LCD (backlight)
#define UI_LCD_BLACK 0, 0, 0 // black
#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_HEIGHT 75
+#define UI_LCD_HEIGHT 64
#elif defined(ARCHOS_FMRECORDER) || defined(ARCHOS_RECORDERV2)
#define UI_TITLE "Jukebox FM Recorder"
diff --git a/uisimulator/win32/uisw32.h b/uisimulator/win32/uisw32.h
index ce8a046bcd..22a9015196 100644
--- a/uisimulator/win32/uisw32.h
+++ b/uisimulator/win32/uisw32.h
@@ -47,9 +47,9 @@ typedef unsigned short wchar_t;
#define UI_LCD_BGCOLORLIGHT 126, 229, 126 // bkgnd color of LCD (backlight)
#define UI_LCD_BLACK 0, 0, 0 // black
#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_HEIGHT 75
+#define UI_LCD_HEIGHT 64
#elif defined(ARCHOS_FMRECORDER) || defined(ARCHOS_RECORDERV2)
#define UI_TITLE "Jukebox FM Recorder"