summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2005-07-08 19:26:17 +0000
committerJens Arnold <amiconn@rockbox.org>2005-07-08 19:26:17 +0000
commita5ef8f0c6f348e55389e66b8637484f482f8f6f1 (patch)
tree5911a7a0b21942d49313bc933761e9803e175238
parentb5fc2530a796d4414f0dbe8f7b8c4e768cc1aeca (diff)
downloadrockbox-a5ef8f0c6f348e55389e66b8637484f482f8f6f1.tar.gz
rockbox-a5ef8f0c6f348e55389e66b8637484f482f8f6f1.zip
Simulator fixes: H120 Win32 simulator build working. H120 X11 simulator uses correct LCD background colour.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7075 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--uisimulator/win32/UI-h120.bmpbin0 -> 194120 bytes
-rw-r--r--uisimulator/win32/uisw32.h4
-rw-r--r--uisimulator/x11/uibasic.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/uisimulator/win32/UI-h120.bmp b/uisimulator/win32/UI-h120.bmp
new file mode 100644
index 0000000000..caeb81bc4b
--- /dev/null
+++ b/uisimulator/win32/UI-h120.bmp
Binary files differ
diff --git a/uisimulator/win32/uisw32.h b/uisimulator/win32/uisw32.h
index cf44a8a76d..7d46067c60 100644
--- a/uisimulator/win32/uisw32.h
+++ b/uisimulator/win32/uisw32.h
@@ -75,8 +75,8 @@ typedef unsigned short wchar_t;
75#define UI_LCD_WIDTH 112 75#define UI_LCD_WIDTH 112
76#define UI_LCD_HEIGHT 64 // (80 for real aspect) 76#define UI_LCD_HEIGHT 64 // (80 for real aspect)
77 77
78#elif defined(IRIVER_H100) 78#elif defined(IRIVER_H100_SERIES)
79#define UI_TITLE "iriver H100" 79#define UI_TITLE "iriver H1x0"
80#define UI_WIDTH 379 // width of GUI window 80#define UI_WIDTH 379 // width of GUI window
81#define UI_HEIGHT 508 // height of GUI window 81#define UI_HEIGHT 508 // height of GUI window
82#define UI_LCD_BGCOLOR 90, 145, 90 // bkgnd color of LCD (no backlight) 82#define UI_LCD_BGCOLOR 90, 145, 90 // bkgnd color of LCD (no backlight)
diff --git a/uisimulator/x11/uibasic.c b/uisimulator/x11/uibasic.c
index 08fdf594ed..3e7f46c70d 100644
--- a/uisimulator/x11/uibasic.c
+++ b/uisimulator/x11/uibasic.c
@@ -59,7 +59,7 @@ XrmOptionDescRec options [] = {
59char *progclass = "rockboxui"; 59char *progclass = "rockboxui";
60 60
61char *defaults [] = { 61char *defaults [] = {
62#ifdef IRIVER_H100 62#ifdef IRIVER_H100_SERIES
63 ".background: lightblue", 63 ".background: lightblue",
64#elif defined ARCHOS_GMINI120 64#elif defined ARCHOS_GMINI120
65 ".background: royalblue", 65 ".background: royalblue",