diff options
Diffstat (limited to 'uisimulator/win32')
-rw-r--r-- | uisimulator/win32/Makefile | 11 | ||||
-rw-r--r-- | uisimulator/win32/UI-fmrecorder.bmp | bin | 0 -> 236864 bytes | |||
-rw-r--r-- | uisimulator/win32/UI-h100.bmp | bin | 0 -> 265464 bytes | |||
-rw-r--r-- | uisimulator/win32/UI-ondiofm.bmp | bin | 0 -> 104264 bytes | |||
-rw-r--r-- | uisimulator/win32/UI-ondiosp.bmp | bin | 0 -> 104264 bytes | |||
-rw-r--r-- | uisimulator/win32/UI-player.bmp | bin | 0 -> 238616 bytes | |||
-rw-r--r-- | uisimulator/win32/UI-recorder.bmp | bin | 0 -> 219296 bytes | |||
-rw-r--r-- | uisimulator/win32/UI-v2.bmp | bin | 0 -> 236864 bytes | |||
-rw-r--r-- | uisimulator/win32/UI256.bmp | bin | 87480 -> 0 bytes | |||
-rw-r--r-- | uisimulator/win32/uisw32.c | 4 | ||||
-rw-r--r-- | uisimulator/win32/uisw32.h | 67 |
11 files changed, 68 insertions, 14 deletions
diff --git a/uisimulator/win32/Makefile b/uisimulator/win32/Makefile index d04bf050ef..8509948457 100644 --- a/uisimulator/win32/Makefile +++ b/uisimulator/win32/Makefile | |||
@@ -55,8 +55,6 @@ no_configure: | |||
55 | @echo "http://rockbox.haxx.se/docs/how_to_compile.html" | 55 | @echo "http://rockbox.haxx.se/docs/how_to_compile.html" |
56 | endif | 56 | endif |
57 | 57 | ||
58 | LANGUAGE = english | ||
59 | |||
60 | DEFINES = -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR \ | 58 | DEFINES = -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR \ |
61 | $(TARGET) -DAPPSVERSION=\"$(VERSION)\" $(EXTRA_DEFINES) | 59 | $(TARGET) -DAPPSVERSION=\"$(VERSION)\" $(EXTRA_DEFINES) |
62 | 60 | ||
@@ -146,14 +144,19 @@ clean: | |||
146 | $(OBJDIR)/lang.[cho] $(OBJDIR)/build.lang $(OBJDIR)/*.o \ | 144 | $(OBJDIR)/lang.[cho] $(OBJDIR)/build.lang $(OBJDIR)/*.o \ |
147 | $(OBJDIR)/*.rock $(OBJDIR)/*.def $(OBJDIR)/sysfont.c \ | 145 | $(OBJDIR)/*.rock $(OBJDIR)/*.def $(OBJDIR)/sysfont.c \ |
148 | $(OBJDIR)/credits.raw $(OBJDIR)/libplugin.a | 146 | $(OBJDIR)/credits.raw $(OBJDIR)/libplugin.a |
147 | $(RM) -f $(OBJDIR)/UI256.bmp | ||
149 | $(RM) -r $(DEPS) | 148 | $(RM) -r $(DEPS) |
150 | 149 | ||
151 | ################## Specific dependencies ################## | 150 | ################## Specific dependencies ################## |
152 | $(OBJDIR)/credits.raw: $(DOCSDIR)/CREDITS | 151 | $(OBJDIR)/credits.raw: $(DOCSDIR)/CREDITS |
153 | perl $(APPDIR)/credits.pl < $< > $@ | 152 | perl $(APPDIR)/credits.pl < $< > $@ |
154 | 153 | ||
155 | $(OBJDIR)/uisw32-res.o: uisw32.rc | 154 | $(OBJDIR)/UI256.bmp: UI-$(ARCHOS).bmp |
156 | $(WINDRES) -i $< -o $@ | 155 | @echo UI |
156 | @cp $< $@ | ||
157 | |||
158 | $(OBJDIR)/uisw32-res.o: uisw32.rc $(OBJDIR)/UI256.bmp | ||
159 | $(WINDRES) -I$(OBJDIR) -i $< -o $@ | ||
157 | 160 | ||
158 | $(OBJDIR)/credits.o: $(APPDIR)/credits.c $(APPDIR)/credits.h $(OBJDIR)/credits.raw | 161 | $(OBJDIR)/credits.o: $(APPDIR)/credits.c $(APPDIR)/credits.h $(OBJDIR)/credits.raw |
159 | 162 | ||
diff --git a/uisimulator/win32/UI-fmrecorder.bmp b/uisimulator/win32/UI-fmrecorder.bmp new file mode 100644 index 0000000000..53f705b9ef --- /dev/null +++ b/uisimulator/win32/UI-fmrecorder.bmp | |||
Binary files differ | |||
diff --git a/uisimulator/win32/UI-h100.bmp b/uisimulator/win32/UI-h100.bmp new file mode 100644 index 0000000000..5c0898ab22 --- /dev/null +++ b/uisimulator/win32/UI-h100.bmp | |||
Binary files differ | |||
diff --git a/uisimulator/win32/UI-ondiofm.bmp b/uisimulator/win32/UI-ondiofm.bmp new file mode 100644 index 0000000000..e258720d28 --- /dev/null +++ b/uisimulator/win32/UI-ondiofm.bmp | |||
Binary files differ | |||
diff --git a/uisimulator/win32/UI-ondiosp.bmp b/uisimulator/win32/UI-ondiosp.bmp new file mode 100644 index 0000000000..c62c2334a3 --- /dev/null +++ b/uisimulator/win32/UI-ondiosp.bmp | |||
Binary files differ | |||
diff --git a/uisimulator/win32/UI-player.bmp b/uisimulator/win32/UI-player.bmp new file mode 100644 index 0000000000..db4003b120 --- /dev/null +++ b/uisimulator/win32/UI-player.bmp | |||
Binary files differ | |||
diff --git a/uisimulator/win32/UI-recorder.bmp b/uisimulator/win32/UI-recorder.bmp new file mode 100644 index 0000000000..98937fea2d --- /dev/null +++ b/uisimulator/win32/UI-recorder.bmp | |||
Binary files differ | |||
diff --git a/uisimulator/win32/UI-v2.bmp b/uisimulator/win32/UI-v2.bmp new file mode 100644 index 0000000000..53f705b9ef --- /dev/null +++ b/uisimulator/win32/UI-v2.bmp | |||
Binary files differ | |||
diff --git a/uisimulator/win32/UI256.bmp b/uisimulator/win32/UI256.bmp deleted file mode 100644 index cb3689a566..0000000000 --- a/uisimulator/win32/UI256.bmp +++ /dev/null | |||
Binary files differ | |||
diff --git a/uisimulator/win32/uisw32.c b/uisimulator/win32/uisw32.c index d2274bdc16..c0e1076b3d 100644 --- a/uisimulator/win32/uisw32.c +++ b/uisimulator/win32/uisw32.c | |||
@@ -251,12 +251,12 @@ BOOL GUIStartup () | |||
251 | // create window | 251 | // create window |
252 | hGUIWnd = CreateWindowEx ( | 252 | hGUIWnd = CreateWindowEx ( |
253 | WS_EX_OVERLAPPEDWINDOW, | 253 | WS_EX_OVERLAPPEDWINDOW, |
254 | "RockBoxUISimulator", "ARCHOS JukeBox", | 254 | "RockBoxUISimulator", UI_TITLE, |
255 | WS_VISIBLE | WS_SYSMENU | WS_OVERLAPPEDWINDOW, | 255 | WS_VISIBLE | WS_SYSMENU | WS_OVERLAPPEDWINDOW, |
256 | CW_USEDEFAULT, CW_USEDEFAULT, | 256 | CW_USEDEFAULT, CW_USEDEFAULT, |
257 | UI_WIDTH + GetSystemMetrics (SM_CXSIZEFRAME) * 2 +4, | 257 | UI_WIDTH + GetSystemMetrics (SM_CXSIZEFRAME) * 2 +4, |
258 | UI_HEIGHT + GetSystemMetrics (SM_CYSIZEFRAME) * 2 + | 258 | UI_HEIGHT + GetSystemMetrics (SM_CYSIZEFRAME) * 2 + |
259 | GetSystemMetrics (SM_CYSMCAPTION) +4, | 259 | GetSystemMetrics (SM_CYCAPTION) +4, |
260 | NULL, NULL, GetModuleHandle (NULL), NULL); | 260 | NULL, NULL, GetModuleHandle (NULL), NULL); |
261 | 261 | ||
262 | if (hGUIWnd == NULL) | 262 | if (hGUIWnd == NULL) |
diff --git a/uisimulator/win32/uisw32.h b/uisimulator/win32/uisw32.h index 2efa699dad..b04ab6a027 100644 --- a/uisimulator/win32/uisw32.h +++ b/uisimulator/win32/uisw32.h | |||
@@ -27,16 +27,67 @@ typedef unsigned short wchar_t; | |||
27 | #include <windows.h> | 27 | #include <windows.h> |
28 | #include "lcd-win32.h" | 28 | #include "lcd-win32.h" |
29 | 29 | ||
30 | #define UI_WIDTH 240 // width of GUI window | 30 | #if defined(ARCHOS_RECORDER) |
31 | #define UI_HEIGHT 360 // height of GUI window | 31 | #define UI_TITLE "Jukebox Recorder" |
32 | #define UI_LCD_BGCOLOR 46, 67, 49 // bkgnd color of LCD (no backlight) | 32 | #define UI_WIDTH 270 // width of GUI window |
33 | //#define UI_LCD_BGCOLORLIGHT 56, 77, 59 // bkgnd color of LCD (backlight) | 33 | #define UI_HEIGHT 406 // height of GUI window |
34 | #define UI_LCD_BGCOLORLIGHT 109, 212, 68 // bkgnd color of LCD (backlight) | 34 | #define UI_LCD_BGCOLOR 90, 145, 90 // bkgnd color of LCD (no backlight) |
35 | #define UI_LCD_BGCOLORLIGHT 126, 229, 126 // bkgnd color of LCD (backlight) | ||
35 | #define UI_LCD_BLACK 0, 0, 0 // black | 36 | #define UI_LCD_BLACK 0, 0, 0 // black |
36 | #define UI_LCD_POSX 59 // x position of lcd | 37 | #define UI_LCD_POSX 80 // x position of lcd |
37 | #define UI_LCD_POSY 95 // y position of lcd | 38 | #define UI_LCD_POSY 104 // y position of lcd (96 for real aspect) |
38 | #define UI_LCD_WIDTH 112 | 39 | #define UI_LCD_WIDTH 112 |
39 | #define UI_LCD_HEIGHT 64 | 40 | #define UI_LCD_HEIGHT 64 // (80 for real aspect) |
41 | |||
42 | #elif defined(ARCHOS_PLAYER) | ||
43 | #define UI_TITLE "Jukebox Player" | ||
44 | #define UI_WIDTH 284 // width of GUI window | ||
45 | #define UI_HEIGHT 420 // height of GUI window | ||
46 | #define UI_LCD_BGCOLOR 90, 145, 90 // bkgnd color of LCD (no backlight) | ||
47 | #define UI_LCD_BGCOLORLIGHT 126, 229, 126 // bkgnd color of LCD (backlight) | ||
48 | #define UI_LCD_BLACK 0, 0, 0 // black | ||
49 | #define UI_LCD_POSX 75 // x position of lcd | ||
50 | #define UI_LCD_POSY 111 // y position of lcd | ||
51 | #define UI_LCD_WIDTH 132 | ||
52 | #define UI_LCD_HEIGHT 75 | ||
53 | |||
54 | #elif defined(ARCHOS_FMRECORDER) || defined(ARCHOS_RECORDERV2) | ||
55 | #define UI_TITLE "Jukebox FM Recorder" | ||
56 | #define UI_WIDTH 285 // width of GUI window | ||
57 | #define UI_HEIGHT 414 // height of GUI window | ||
58 | #define UI_LCD_BGCOLOR 90, 145, 90 // bkgnd color of LCD (no backlight) | ||
59 | #define UI_LCD_BGCOLORLIGHT 126, 229, 126 // bkgnd color of LCD (backlight) | ||
60 | #define UI_LCD_BLACK 0, 0, 0 // black | ||
61 | #define UI_LCD_POSX 87 // x position of lcd | ||
62 | #define UI_LCD_POSY 77 // y position of lcd (69 for real aspect) | ||
63 | #define UI_LCD_WIDTH 112 | ||
64 | #define UI_LCD_HEIGHT 64 // (80 for real aspect) | ||
65 | |||
66 | #elif defined(ARCHOS_ONDIOSP) || defined(ARCHOS_ONDIOFM) | ||
67 | #define UI_TITLE "Ondio" | ||
68 | #define UI_WIDTH 155 // width of GUI window | ||
69 | #define UI_HEIGHT 334 // height of GUI window | ||
70 | #define UI_LCD_BGCOLOR 90, 145, 90 // bkgnd color of LCD (no backlight) | ||
71 | #define UI_LCD_BGCOLORLIGHT 90, 145, 90 // bkgnd color of LCD (backlight) | ||
72 | #define UI_LCD_BLACK 0, 0, 0 // black | ||
73 | #define UI_LCD_POSX 21 // x position of lcd | ||
74 | #define UI_LCD_POSY 82 // y position of lcd (74 for real aspect) | ||
75 | #define UI_LCD_WIDTH 112 | ||
76 | #define UI_LCD_HEIGHT 64 // (80 for real aspect) | ||
77 | |||
78 | #elif defined(IRIVER_H100) | ||
79 | #define UI_TITLE "iRiver H100" | ||
80 | #define UI_WIDTH 352 // width of GUI window | ||
81 | #define UI_HEIGHT 377 // height of GUI window | ||
82 | #define UI_LCD_BGCOLOR 90, 145, 90 // bkgnd color of LCD (no backlight) | ||
83 | #define UI_LCD_BGCOLORLIGHT 230, 216, 173 // bkgnd color of LCD (backlight) | ||
84 | #define UI_LCD_BLACK 0, 0, 0 // black | ||
85 | #define UI_LCD_POSX 96 // x position of lcd | ||
86 | #define UI_LCD_POSY 28 // y position of lcd | ||
87 | #define UI_LCD_WIDTH 160 | ||
88 | #define UI_LCD_HEIGHT 128 | ||
89 | |||
90 | #endif | ||
40 | 91 | ||
41 | #define TM_YIELD WM_USER + 101 // thread message for yield | 92 | #define TM_YIELD WM_USER + 101 // thread message for yield |
42 | #define TIMER_EVENT 0x34928340 | 93 | #define TIMER_EVENT 0x34928340 |