summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarianne Arnold <pixelma@rockbox.org>2006-11-20 10:56:22 +0000
committerMarianne Arnold <pixelma@rockbox.org>2006-11-20 10:56:22 +0000
commit99975e9fb580252e04e5b240e0909be0f210ee7e (patch)
tree3d14ac9b585c983ac002671445a12b44b8bb8a5b
parent0b2ac4b427a3013c0e4f20560e78c0216ed4d803 (diff)
downloadrockbox-99975e9fb580252e04e5b240e0909be0f210ee7e.tar.gz
rockbox-99975e9fb580252e04e5b240e0909be0f210ee7e.zip
new usb logos for all screens, utilising lcd_bitmap_transparent() on colour displays. It saves some bytes on Archos as a nice side effect
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11560 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/bitmaps/native/SOURCES17
-rwxr-xr-xapps/bitmaps/native/usblogo.100x20x1.bmpbin0 -> 382 bytes
-rw-r--r--apps/bitmaps/native/usblogo.100x32x1.bmpbin574 -> 0 bytes
-rwxr-xr-xapps/bitmaps/native/usblogo.104x27x1.bmpbin0 -> 494 bytes
-rwxr-xr-xapps/bitmaps/native/usblogo.128x33x2.bmpbin0 -> 4294 bytes
-rwxr-xr-xapps/bitmaps/native/usblogo.128x37x16.bmpbin0 -> 14262 bytes
-rwxr-xr-xapps/bitmaps/native/usblogo.176x48x16.bmpbin0 -> 25398 bytes
-rw-r--r--apps/bitmaps/remote_native/SOURCES4
-rw-r--r--apps/bitmaps/remote_native/remote_usblogo.100x32x1.bmpbin574 -> 0 bytes
-rwxr-xr-xapps/bitmaps/remote_native/remote_usblogo.104x27x1.bmpbin0 -> 494 bytes
-rwxr-xr-xapps/bitmaps/remote_native/remote_usblogo.104x27x2.bmpbin0 -> 2878 bytes
-rw-r--r--apps/screens.c11
12 files changed, 27 insertions, 5 deletions
diff --git a/apps/bitmaps/native/SOURCES b/apps/bitmaps/native/SOURCES
index ffb3f728d0..027f33e238 100644
--- a/apps/bitmaps/native/SOURCES
+++ b/apps/bitmaps/native/SOURCES
@@ -21,6 +21,21 @@ rockboxlogo.240x74x16.bmp
rockboxlogo.320x98x16.bmp
#endif
-usblogo.100x32x1.bmp
+/* USB logo */
+#ifdef HAVE_LCD_COLOR
+#if LCD_WIDTH > 176
+usblogo.176x48x16.bmp
+#elif LCD_WIDTH >= 128
+usblogo.128x37x16.bmp
+#endif
+#elif LCD_DEPTH > 1 /* greyscale */
+usblogo.128x33x2.bmp
+#else /* monochrome */
+#if LCD_WIDTH == 112
+usblogo.100x20x1.bmp
+#else
+usblogo.104x27x1.bmp
+#endif
+#endif
#endif /* HAVE_LCD_BITMAP */
diff --git a/apps/bitmaps/native/usblogo.100x20x1.bmp b/apps/bitmaps/native/usblogo.100x20x1.bmp
new file mode 100755
index 0000000000..804cdde275
--- /dev/null
+++ b/apps/bitmaps/native/usblogo.100x20x1.bmp
Binary files differ
diff --git a/apps/bitmaps/native/usblogo.100x32x1.bmp b/apps/bitmaps/native/usblogo.100x32x1.bmp
deleted file mode 100644
index 49ca1cf79d..0000000000
--- a/apps/bitmaps/native/usblogo.100x32x1.bmp
+++ /dev/null
Binary files differ
diff --git a/apps/bitmaps/native/usblogo.104x27x1.bmp b/apps/bitmaps/native/usblogo.104x27x1.bmp
new file mode 100755
index 0000000000..ef9633a40c
--- /dev/null
+++ b/apps/bitmaps/native/usblogo.104x27x1.bmp
Binary files differ
diff --git a/apps/bitmaps/native/usblogo.128x33x2.bmp b/apps/bitmaps/native/usblogo.128x33x2.bmp
new file mode 100755
index 0000000000..ae56af4ec7
--- /dev/null
+++ b/apps/bitmaps/native/usblogo.128x33x2.bmp
Binary files differ
diff --git a/apps/bitmaps/native/usblogo.128x37x16.bmp b/apps/bitmaps/native/usblogo.128x37x16.bmp
new file mode 100755
index 0000000000..b7b21f695a
--- /dev/null
+++ b/apps/bitmaps/native/usblogo.128x37x16.bmp
Binary files differ
diff --git a/apps/bitmaps/native/usblogo.176x48x16.bmp b/apps/bitmaps/native/usblogo.176x48x16.bmp
new file mode 100755
index 0000000000..9c7a6600cb
--- /dev/null
+++ b/apps/bitmaps/native/usblogo.176x48x16.bmp
Binary files differ
diff --git a/apps/bitmaps/remote_native/SOURCES b/apps/bitmaps/remote_native/SOURCES
index 7ed8d0a112..c93dc89a1c 100644
--- a/apps/bitmaps/remote_native/SOURCES
+++ b/apps/bitmaps/remote_native/SOURCES
@@ -2,10 +2,10 @@
#if (LCD_REMOTE_DEPTH == 1)
remote_rockboxlogo.128x42x1.bmp
+remote_usblogo.104x27x1.bmp
#elif (LCD_REMOTE_DEPTH == 2)
remote_rockboxlogo.128x42x2.bmp
+remote_usblogo.104x27x2.bmp
#endif
-remote_usblogo.100x32x1.bmp
-
#endif /* HAVE_REMOTE_LCD */
diff --git a/apps/bitmaps/remote_native/remote_usblogo.100x32x1.bmp b/apps/bitmaps/remote_native/remote_usblogo.100x32x1.bmp
deleted file mode 100644
index 49ca1cf79d..0000000000
--- a/apps/bitmaps/remote_native/remote_usblogo.100x32x1.bmp
+++ /dev/null
Binary files differ
diff --git a/apps/bitmaps/remote_native/remote_usblogo.104x27x1.bmp b/apps/bitmaps/remote_native/remote_usblogo.104x27x1.bmp
new file mode 100755
index 0000000000..ef9633a40c
--- /dev/null
+++ b/apps/bitmaps/remote_native/remote_usblogo.104x27x1.bmp
Binary files differ
diff --git a/apps/bitmaps/remote_native/remote_usblogo.104x27x2.bmp b/apps/bitmaps/remote_native/remote_usblogo.104x27x2.bmp
new file mode 100755
index 0000000000..0e663c20f3
--- /dev/null
+++ b/apps/bitmaps/remote_native/remote_usblogo.104x27x2.bmp
Binary files differ
diff --git a/apps/screens.c b/apps/screens.c
index 835cf09a13..032fd0b60d 100644
--- a/apps/screens.c
+++ b/apps/screens.c
@@ -96,7 +96,7 @@ void usb_screen(void)
#ifdef HAVE_REMOTE_LCD
lcd_remote_clear_display();
lcd_remote_bitmap(remote_usblogo,
- (LCD_REMOTE_WIDTH-BMPWIDTH_remote_usblogo)/2,
+ (LCD_REMOTE_WIDTH-BMPWIDTH_remote_usblogo),
(LCD_REMOTE_HEIGHT-BMPHEIGHT_remote_usblogo)/2,
BMPWIDTH_remote_usblogo, BMPHEIGHT_remote_usblogo);
lcd_remote_update();
@@ -104,9 +104,16 @@ void usb_screen(void)
lcd_clear_display();
#ifdef HAVE_LCD_BITMAP
- lcd_bitmap(usblogo, (LCD_WIDTH-BMPWIDTH_usblogo)/2,
+#ifdef HAVE_LCD_COLOR
+ lcd_bitmap_transparent(usblogo, (LCD_WIDTH-BMPWIDTH_usblogo),
+ (LCD_HEIGHT-BMPHEIGHT_usblogo)/2,
+ BMPWIDTH_usblogo, BMPHEIGHT_usblogo);
+#else
+ lcd_bitmap(usblogo, (LCD_WIDTH-BMPWIDTH_usblogo),
(LCD_HEIGHT-BMPHEIGHT_usblogo)/2,
BMPWIDTH_usblogo, BMPHEIGHT_usblogo);
+#endif /* HAVE_LCD_COLOR */
+
lcd_update();
#else
lcd_double_height(false);