diff options
author | Thomas Martitz <kugel@rockbox.org> | 2013-12-28 14:50:22 +0100 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2014-01-05 19:35:23 +0100 |
commit | dd7b14173647c6e3326d705e5c4d802a35711030 (patch) | |
tree | 63c0d8ccf453094b76ba03d0e99e35c7e1ad4e99 | |
parent | a17a7038c265d3bd6b5399f77c4caa4edfc67df7 (diff) | |
download | rockbox-dd7b14173647c6e3326d705e5c4d802a35711030.tar.gz rockbox-dd7b14173647c6e3326d705e5c4d802a35711030.zip |
apps/bitmaps: Replace pseudo-native default icons with mono ones.
The old icons looked exactly like the mono version, and all >1 bpp drivers
support rendering mono bitmaps. Therefore a mono bitmap can be used which
requires less ram.
This affects only the builtin icons, not the ones used by cabbiev2.
Change-Id: I3b02b5b04fe8b4bcc69e83310871254d336b648a
-rw-r--r-- | apps/bitmaps/mono/SOURCES | 4 | ||||
-rw-r--r-- | apps/bitmaps/mono/default_icons.bmp (renamed from apps/bitmaps/native/default_icons.6x8x1.bmp) | bin | 5174 -> 5174 bytes | |||
-rw-r--r-- | apps/bitmaps/native/SOURCES | 9 | ||||
-rw-r--r-- | apps/bitmaps/native/default_icons.6x8x16.bmp | bin | 5174 -> 0 bytes | |||
-rw-r--r-- | apps/bitmaps/remote_mono/SOURCES | 4 | ||||
-rw-r--r-- | apps/bitmaps/remote_mono/remote_default_icons.bmp (renamed from apps/bitmaps/native/default_icons.6x8x2.bmp) | bin | 5174 -> 5174 bytes | |||
-rw-r--r-- | apps/bitmaps/remote_native/SOURCES | 2 | ||||
-rw-r--r-- | apps/bitmaps/remote_native/remote_default_icons.6x8x1.bmp | bin | 5174 -> 0 bytes | |||
-rw-r--r-- | apps/bitmaps/remote_native/remote_default_icons.6x8x2.bmp | bin | 5174 -> 0 bytes |
9 files changed, 8 insertions, 11 deletions
diff --git a/apps/bitmaps/mono/SOURCES b/apps/bitmaps/mono/SOURCES index 2dccf2ad4f..c0f72c023a 100644 --- a/apps/bitmaps/mono/SOURCES +++ b/apps/bitmaps/mono/SOURCES | |||
@@ -1,3 +1,7 @@ | |||
1 | #ifdef HAVE_LCD_BITMAP | ||
2 | default_icons.bmp | ||
3 | #endif | ||
4 | |||
1 | #if (CONFIG_PLATFORM & PLATFORM_HOSTED) && defined(__APPLE__) | 5 | #if (CONFIG_PLATFORM & PLATFORM_HOSTED) && defined(__APPLE__) |
2 | osx_dummy.bmp | 6 | osx_dummy.bmp |
3 | #endif | 7 | #endif |
diff --git a/apps/bitmaps/native/default_icons.6x8x1.bmp b/apps/bitmaps/mono/default_icons.bmp index 857b1e1d7b..857b1e1d7b 100644 --- a/apps/bitmaps/native/default_icons.6x8x1.bmp +++ b/apps/bitmaps/mono/default_icons.bmp | |||
Binary files differ | |||
diff --git a/apps/bitmaps/native/SOURCES b/apps/bitmaps/native/SOURCES index d910dd5c06..9479f3e933 100644 --- a/apps/bitmaps/native/SOURCES +++ b/apps/bitmaps/native/SOURCES | |||
@@ -64,15 +64,6 @@ usblogo.104x27x1.bmp | |||
64 | #endif | 64 | #endif |
65 | #endif | 65 | #endif |
66 | 66 | ||
67 | /* List Icons */ | ||
68 | #if LCD_DEPTH == 16 | ||
69 | default_icons.6x8x16.bmp | ||
70 | #elif LCD_DEPTH > 1 /* greyscale */ | ||
71 | default_icons.6x8x2.bmp | ||
72 | #else | ||
73 | default_icons.6x8x1.bmp | ||
74 | #endif | ||
75 | |||
76 | #endif /* BOOTLOADER */ | 67 | #endif /* BOOTLOADER */ |
77 | 68 | ||
78 | #endif /* HAVE_LCD_BITMAP */ | 69 | #endif /* HAVE_LCD_BITMAP */ |
diff --git a/apps/bitmaps/native/default_icons.6x8x16.bmp b/apps/bitmaps/native/default_icons.6x8x16.bmp deleted file mode 100644 index dad29b2e50..0000000000 --- a/apps/bitmaps/native/default_icons.6x8x16.bmp +++ /dev/null | |||
Binary files differ | |||
diff --git a/apps/bitmaps/remote_mono/SOURCES b/apps/bitmaps/remote_mono/SOURCES index 75f641fd95..41d85fccff 100644 --- a/apps/bitmaps/remote_mono/SOURCES +++ b/apps/bitmaps/remote_mono/SOURCES | |||
@@ -1,3 +1,7 @@ | |||
1 | #ifdef HAVE_LCD_BITMAP | ||
2 | remote_default_icons.bmp | ||
3 | #endif | ||
4 | |||
1 | #if (CONFIG_PLATFORM & PLATFORM_HOSTED) && defined(__APPLE__) | 5 | #if (CONFIG_PLATFORM & PLATFORM_HOSTED) && defined(__APPLE__) |
2 | osx_remote_dummy.bmp | 6 | osx_remote_dummy.bmp |
3 | #endif | 7 | #endif |
diff --git a/apps/bitmaps/native/default_icons.6x8x2.bmp b/apps/bitmaps/remote_mono/remote_default_icons.bmp index 857b1e1d7b..857b1e1d7b 100644 --- a/apps/bitmaps/native/default_icons.6x8x2.bmp +++ b/apps/bitmaps/remote_mono/remote_default_icons.bmp | |||
Binary files differ | |||
diff --git a/apps/bitmaps/remote_native/SOURCES b/apps/bitmaps/remote_native/SOURCES index 02d1b542b2..6350c4eba1 100644 --- a/apps/bitmaps/remote_native/SOURCES +++ b/apps/bitmaps/remote_native/SOURCES | |||
@@ -5,11 +5,9 @@ | |||
5 | #if (LCD_REMOTE_DEPTH == 1) | 5 | #if (LCD_REMOTE_DEPTH == 1) |
6 | remote_rockboxlogo.128x42x1.bmp | 6 | remote_rockboxlogo.128x42x1.bmp |
7 | remote_usblogo.104x27x1.bmp | 7 | remote_usblogo.104x27x1.bmp |
8 | remote_default_icons.6x8x1.bmp | ||
9 | #elif (LCD_REMOTE_DEPTH == 2) | 8 | #elif (LCD_REMOTE_DEPTH == 2) |
10 | remote_rockboxlogo.128x42x2.bmp | 9 | remote_rockboxlogo.128x42x2.bmp |
11 | remote_usblogo.104x27x2.bmp | 10 | remote_usblogo.104x27x2.bmp |
12 | remote_default_icons.6x8x2.bmp | ||
13 | #endif | 11 | #endif |
14 | 12 | ||
15 | #endif /* BOOTLOADER */ | 13 | #endif /* BOOTLOADER */ |
diff --git a/apps/bitmaps/remote_native/remote_default_icons.6x8x1.bmp b/apps/bitmaps/remote_native/remote_default_icons.6x8x1.bmp deleted file mode 100644 index 857b1e1d7b..0000000000 --- a/apps/bitmaps/remote_native/remote_default_icons.6x8x1.bmp +++ /dev/null | |||
Binary files differ | |||
diff --git a/apps/bitmaps/remote_native/remote_default_icons.6x8x2.bmp b/apps/bitmaps/remote_native/remote_default_icons.6x8x2.bmp deleted file mode 100644 index 857b1e1d7b..0000000000 --- a/apps/bitmaps/remote_native/remote_default_icons.6x8x2.bmp +++ /dev/null | |||
Binary files differ | |||