From b7638221cd4f247fe00d4ee0f2c7c7ef625b24e2 Mon Sep 17 00:00:00 2001 From: Björn Stenberg Date: Tue, 8 Oct 2002 10:10:16 +0000 Subject: Added new icons for .cfg and .txt files git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2522 a1c6a512-1295-4272-9138-f99709370657 --- apps/player/icons.c | 4 ++- apps/player/icons.h | 2 +- apps/recorder/icons.c | 89 ++++++++++++++++++--------------------------------- apps/recorder/icons.h | 2 +- apps/tree.c | 6 ++-- 5 files changed, 39 insertions(+), 64 deletions(-) diff --git a/apps/player/icons.c b/apps/player/icons.c index d5a71bad0f..15f92bc0b0 100644 --- a/apps/player/icons.c +++ b/apps/player/icons.c @@ -29,7 +29,9 @@ char tree_icons_5x7[LastTreeIcon][8] = { 0x17, 0x00, 0x17, 0x00, 0x17, 0x00, 0x17, 0x00 }, /* Playlist */ { 0x01, 0x01, 0x02, 0x02, 0x14, 0x0c, 0x04, 0x00 }, /* WPS */ { 0x1f, 0x11, 0x1b, 0x15, 0x1b, 0x11, 0x1f, 0x00 }, /* MOD/AJZ */ - { 0x00, 0x1f, 0x15, 0x1f, 0x15, 0x1f, 0x00, 0x00 } /* Language */ + { 0x00, 0x1f, 0x15, 0x1f, 0x15, 0x1f, 0x00, 0x00 }, /* Language */ + { 0x1f, 0x00, 0x1f, 0x00, 0x1f, 0x00, 0x1f, 0x00 }, /* Text file */ + { 0x0b, 0x10, 0x0b, 0x00, 0x1f, 0x00, 0x1f, 0x00 }, /* Config file */ }; #endif diff --git a/apps/player/icons.h b/apps/player/icons.h index f896283eb1..02293d36fb 100644 --- a/apps/player/icons.h +++ b/apps/player/icons.h @@ -25,7 +25,7 @@ #ifdef HAVE_LCD_CHARCELLS enum { - Unknown, File, Folder, Playlist, Wps, Mod_Ajz, Language, + Unknown, File, Folder, Playlist, Wps, Mod_Ajz, Language, Text, Config, LastTreeIcon }; diff --git a/apps/recorder/icons.c b/apps/recorder/icons.c index 6414a17418..238d522444 100644 --- a/apps/recorder/icons.c +++ b/apps/recorder/icons.c @@ -45,68 +45,41 @@ unsigned char bitmap_icons_5x8[][5] = unsigned char bitmap_icons_6x8[LastIcon][6] = { - /* Box_Filled */ - { 0x00, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f }, - /* Box_Empty */ - { 0x00, 0x7f, 0x41, 0x41, 0x41, 0x7f }, - /* Slider_Horizontal */ - { 0x00, 0x3e, 0x7f, 0x63, 0x7f, 0x3e }, - /* File */ - { 0x60, 0x7f, 0x03, 0x63, 0x7f, 0x00 }, - /* Folder */ - { 0x7e, 0x41, 0x41, 0x42, 0x7e, 0x00 }, - /* Directory */ - { 0x3e, 0x26, 0x26, 0x24, 0x3c, 0x00 }, - /* Playlist */ - { 0x55, 0x00, 0x55, 0x55, 0x55, 0x00 }, - /* Repeat */ - { 0x39, 0x43, 0x47, 0x71, 0x61, 0x4e }, - /* Selected */ - { 0x00, 0x1c, 0x3e, 0x3e, 0x3e, 0x1c }, - /* Cursor / Marker */ - { 0x3e, 0x1c, 0x08, 0x00, 0x00, 0x00 }, - /* WPS file */ - { 0x58, 0x5f, 0x42, 0x50, 0x55, 0x00 }, - /* Mod or ajz file */ - { 0x63, 0x7f, 0x3a, 0x7f, 0x63, 0x00 }, - /* Font file */ - { 0x60, 0x70, 0x38, 0x2c, 0x7e, 0x7e }, - /* Language file */ - { 0x3e, 0x2a, 0x3e, 0x2a, 0x2a, 0x3e }, + { 0x00, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f }, /* Box_Filled */ + { 0x00, 0x7f, 0x41, 0x41, 0x41, 0x7f }, /* Box_Empty */ + { 0x00, 0x3e, 0x7f, 0x63, 0x7f, 0x3e }, /* Slider_Horizontal */ + { 0x60, 0x7f, 0x03, 0x63, 0x7f, 0x00 }, /* File */ + { 0x7e, 0x41, 0x41, 0x42, 0x7e, 0x00 }, /* Folder */ + { 0x3e, 0x26, 0x26, 0x24, 0x3c, 0x00 }, /* Directory */ + { 0x55, 0x00, 0x55, 0x55, 0x55, 0x55 }, /* Playlist */ + { 0x39, 0x43, 0x47, 0x71, 0x61, 0x4e }, /* Repeat */ + { 0x00, 0x1c, 0x3e, 0x3e, 0x3e, 0x1c }, /* Selected */ + { 0x3e, 0x1c, 0x08, 0x00, 0x00, 0x00 }, /* Cursor / Marker */ + { 0x58, 0x5f, 0x42, 0x50, 0x55, 0x55 }, /* WPS file */ + { 0x63, 0x7f, 0x3a, 0x7f, 0x63, 0x00 }, /* Mod or ajz file */ + { 0x60, 0x70, 0x38, 0x2c, 0x7e, 0x7e }, /* Font file */ + { 0x3e, 0x2a, 0x3e, 0x2a, 0x2a, 0x3e }, /* Language file */ + { 0x55, 0x55, 0x55, 0x55, 0x55, 0x55 }, /* Text file */ + { 0x4e, 0x51, 0x51, 0x40, 0x55, 0x55 }, /* Config file */ }; unsigned char bitmap_icons_7x8[][7] = { - /* Power plug */ - {0x08,0x1c,0x3e,0x3e,0x3e,0x14,0x14}, - /* Speaker */ - {0x00,0x1c,0x1c,0x3e,0x7f,0x00,0x00}, - /* Speaker mute */ - {0x01,0x1e,0x1c,0x3e,0x7f,0x20,0x40}, - /* Play */ - {0x00,0x7f,0x7f,0x3e,0x1c,0x08,0x00}, - /* Stop */ - {0x7f,0x7f,0x7f,0x7f,0x7f,0x7f,0x7f}, - /* Pause */ - {0x00,0x7f,0x7f,0x00,0x7f,0x7f,0x00}, - /* Fast forward */ - {0x7f,0x3e,0x1c,0x7f,0x3e,0x1c,0x08}, - /* Fast backward */ - {0x08,0x1c,0x3e,0x7f,0x1c,0x3e,0x7f}, - /* Record */ - {0x1c,0x3e,0x7f,0x7f,0x7f,0x3e,0x1c}, - /* Record pause */ - {0x1c,0x3e,0x7f,0x00,0x7f,0x3e,0x1c}, - /* Normal playmode */ - {0x08,0x08,0x08,0x08,0x3e,0x1c,0x08}, - /* Repeat playmode */ - {0x38,0x44,0x44,0x4e,0x5f,0x44,0x38}, - /* Shuffle playmode (dice) */ - {0x3e,0x41,0x51,0x41,0x45,0x41,0x3e}, - /* Down-arrow */ - {0x04,0x0c,0x1c,0x3c,0x1c,0x0c,0x04}, - /* Up-arrow */ - {0x20,0x30,0x38,0x3c,0x38,0x30,0x20}, + {0x08,0x1c,0x3e,0x3e,0x3e,0x14,0x14}, /* Power plug */ + {0x00,0x1c,0x1c,0x3e,0x7f,0x00,0x00}, /* Speaker */ + {0x01,0x1e,0x1c,0x3e,0x7f,0x20,0x40}, /* Speaker mute */ + {0x00,0x7f,0x7f,0x3e,0x1c,0x08,0x00}, /* Play */ + {0x7f,0x7f,0x7f,0x7f,0x7f,0x7f,0x7f}, /* Stop */ + {0x00,0x7f,0x7f,0x00,0x7f,0x7f,0x00}, /* Pause */ + {0x7f,0x3e,0x1c,0x7f,0x3e,0x1c,0x08}, /* Fast forward */ + {0x08,0x1c,0x3e,0x7f,0x1c,0x3e,0x7f}, /* Fast backward */ + {0x1c,0x3e,0x7f,0x7f,0x7f,0x3e,0x1c}, /* Record */ + {0x1c,0x3e,0x7f,0x00,0x7f,0x3e,0x1c}, /* Record pause */ + {0x08,0x08,0x08,0x08,0x3e,0x1c,0x08}, /* Normal playmode */ + {0x38,0x44,0x44,0x4e,0x5f,0x44,0x38}, /* Repeat playmode */ + {0x3e,0x41,0x51,0x41,0x45,0x41,0x3e}, /* Shuffle playmode (dice) */ + {0x04,0x0c,0x1c,0x3c,0x1c,0x0c,0x04}, /* Down-arrow */ + {0x20,0x30,0x38,0x3c,0x38,0x30,0x20}, /* Up-arrow */ }; unsigned char rockbox112x37[]={ diff --git a/apps/recorder/icons.h b/apps/recorder/icons.h index 13bc9274ff..68688e4de7 100644 --- a/apps/recorder/icons.h +++ b/apps/recorder/icons.h @@ -28,7 +28,7 @@ enum icons_6x8 { Box_Filled, Box_Empty, Slider_Horizontal, File, Folder, Directory, Playlist, Repeat, Selected, Cursor, Wps, Mod_Ajz, - Font, Language, + Font, Language, Text, Config, LastIcon }; diff --git a/apps/tree.c b/apps/tree.c index 4eeec4098d..e5c515f06b 100644 --- a/apps/tree.c +++ b/apps/tree.c @@ -256,7 +256,7 @@ static int showdir(char *path, int start) dptr->attr |= TREE_ATTR_MPA; else if (!strcasecmp(&entry->d_name[len-4], ".m3u")) dptr->attr |= TREE_ATTR_M3U; - else if (!strcasecmp(&entry->d_name[len-3], ".cfg")) + else if (!strcasecmp(&entry->d_name[len-4], ".cfg")) dptr->attr |= TREE_ATTR_CFG; else if (!strcasecmp(&entry->d_name[len-4], ".wps")) dptr->attr |= TREE_ATTR_WPS; @@ -384,11 +384,11 @@ static int showdir(char *path, int start) break; case TREE_ATTR_CFG: - icon_type = Wps; + icon_type = Config; break; case TREE_ATTR_TXT: - icon_type = Wps; + icon_type = Text; break; case TREE_ATTR_LNG: -- cgit