summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apps/player/icons.c4
-rw-r--r--apps/player/icons.h2
-rw-r--r--apps/recorder/icons.c89
-rw-r--r--apps/recorder/icons.h2
-rw-r--r--apps/tree.c6
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] =
29 { 0x17, 0x00, 0x17, 0x00, 0x17, 0x00, 0x17, 0x00 }, /* Playlist */ 29 { 0x17, 0x00, 0x17, 0x00, 0x17, 0x00, 0x17, 0x00 }, /* Playlist */
30 { 0x01, 0x01, 0x02, 0x02, 0x14, 0x0c, 0x04, 0x00 }, /* WPS */ 30 { 0x01, 0x01, 0x02, 0x02, 0x14, 0x0c, 0x04, 0x00 }, /* WPS */
31 { 0x1f, 0x11, 0x1b, 0x15, 0x1b, 0x11, 0x1f, 0x00 }, /* MOD/AJZ */ 31 { 0x1f, 0x11, 0x1b, 0x15, 0x1b, 0x11, 0x1f, 0x00 }, /* MOD/AJZ */
32 { 0x00, 0x1f, 0x15, 0x1f, 0x15, 0x1f, 0x00, 0x00 } /* Language */ 32 { 0x00, 0x1f, 0x15, 0x1f, 0x15, 0x1f, 0x00, 0x00 }, /* Language */
33 { 0x1f, 0x00, 0x1f, 0x00, 0x1f, 0x00, 0x1f, 0x00 }, /* Text file */
34 { 0x0b, 0x10, 0x0b, 0x00, 0x1f, 0x00, 0x1f, 0x00 }, /* Config file */
33}; 35};
34 36
35#endif 37#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 @@
25#ifdef HAVE_LCD_CHARCELLS 25#ifdef HAVE_LCD_CHARCELLS
26 26
27enum { 27enum {
28 Unknown, File, Folder, Playlist, Wps, Mod_Ajz, Language, 28 Unknown, File, Folder, Playlist, Wps, Mod_Ajz, Language, Text, Config,
29 LastTreeIcon 29 LastTreeIcon
30}; 30};
31 31
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] =
45 45
46unsigned char bitmap_icons_6x8[LastIcon][6] = 46unsigned char bitmap_icons_6x8[LastIcon][6] =
47{ 47{
48 /* Box_Filled */ 48 { 0x00, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f }, /* Box_Filled */
49 { 0x00, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f }, 49 { 0x00, 0x7f, 0x41, 0x41, 0x41, 0x7f }, /* Box_Empty */
50 /* Box_Empty */ 50 { 0x00, 0x3e, 0x7f, 0x63, 0x7f, 0x3e }, /* Slider_Horizontal */
51 { 0x00, 0x7f, 0x41, 0x41, 0x41, 0x7f }, 51 { 0x60, 0x7f, 0x03, 0x63, 0x7f, 0x00 }, /* File */
52 /* Slider_Horizontal */ 52 { 0x7e, 0x41, 0x41, 0x42, 0x7e, 0x00 }, /* Folder */
53 { 0x00, 0x3e, 0x7f, 0x63, 0x7f, 0x3e }, 53 { 0x3e, 0x26, 0x26, 0x24, 0x3c, 0x00 }, /* Directory */
54 /* File */ 54 { 0x55, 0x00, 0x55, 0x55, 0x55, 0x55 }, /* Playlist */
55 { 0x60, 0x7f, 0x03, 0x63, 0x7f, 0x00 }, 55 { 0x39, 0x43, 0x47, 0x71, 0x61, 0x4e }, /* Repeat */
56 /* Folder */ 56 { 0x00, 0x1c, 0x3e, 0x3e, 0x3e, 0x1c }, /* Selected */
57 { 0x7e, 0x41, 0x41, 0x42, 0x7e, 0x00 }, 57 { 0x3e, 0x1c, 0x08, 0x00, 0x00, 0x00 }, /* Cursor / Marker */
58 /* Directory */ 58 { 0x58, 0x5f, 0x42, 0x50, 0x55, 0x55 }, /* WPS file */
59 { 0x3e, 0x26, 0x26, 0x24, 0x3c, 0x00 }, 59 { 0x63, 0x7f, 0x3a, 0x7f, 0x63, 0x00 }, /* Mod or ajz file */
60 /* Playlist */ 60 { 0x60, 0x70, 0x38, 0x2c, 0x7e, 0x7e }, /* Font file */
61 { 0x55, 0x00, 0x55, 0x55, 0x55, 0x00 }, 61 { 0x3e, 0x2a, 0x3e, 0x2a, 0x2a, 0x3e }, /* Language file */
62 /* Repeat */ 62 { 0x55, 0x55, 0x55, 0x55, 0x55, 0x55 }, /* Text file */
63 { 0x39, 0x43, 0x47, 0x71, 0x61, 0x4e }, 63 { 0x4e, 0x51, 0x51, 0x40, 0x55, 0x55 }, /* Config file */
64 /* Selected */
65 { 0x00, 0x1c, 0x3e, 0x3e, 0x3e, 0x1c },
66 /* Cursor / Marker */
67 { 0x3e, 0x1c, 0x08, 0x00, 0x00, 0x00 },
68 /* WPS file */
69 { 0x58, 0x5f, 0x42, 0x50, 0x55, 0x00 },
70 /* Mod or ajz file */
71 { 0x63, 0x7f, 0x3a, 0x7f, 0x63, 0x00 },
72 /* Font file */
73 { 0x60, 0x70, 0x38, 0x2c, 0x7e, 0x7e },
74 /* Language file */
75 { 0x3e, 0x2a, 0x3e, 0x2a, 0x2a, 0x3e },
76}; 64};
77 65
78unsigned char bitmap_icons_7x8[][7] = 66unsigned char bitmap_icons_7x8[][7] =
79{ 67{
80 /* Power plug */ 68 {0x08,0x1c,0x3e,0x3e,0x3e,0x14,0x14}, /* Power plug */
81 {0x08,0x1c,0x3e,0x3e,0x3e,0x14,0x14}, 69 {0x00,0x1c,0x1c,0x3e,0x7f,0x00,0x00}, /* Speaker */
82 /* Speaker */ 70 {0x01,0x1e,0x1c,0x3e,0x7f,0x20,0x40}, /* Speaker mute */
83 {0x00,0x1c,0x1c,0x3e,0x7f,0x00,0x00}, 71 {0x00,0x7f,0x7f,0x3e,0x1c,0x08,0x00}, /* Play */
84 /* Speaker mute */ 72 {0x7f,0x7f,0x7f,0x7f,0x7f,0x7f,0x7f}, /* Stop */
85 {0x01,0x1e,0x1c,0x3e,0x7f,0x20,0x40}, 73 {0x00,0x7f,0x7f,0x00,0x7f,0x7f,0x00}, /* Pause */
86 /* Play */ 74 {0x7f,0x3e,0x1c,0x7f,0x3e,0x1c,0x08}, /* Fast forward */
87 {0x00,0x7f,0x7f,0x3e,0x1c,0x08,0x00}, 75 {0x08,0x1c,0x3e,0x7f,0x1c,0x3e,0x7f}, /* Fast backward */
88 /* Stop */ 76 {0x1c,0x3e,0x7f,0x7f,0x7f,0x3e,0x1c}, /* Record */
89 {0x7f,0x7f,0x7f,0x7f,0x7f,0x7f,0x7f}, 77 {0x1c,0x3e,0x7f,0x00,0x7f,0x3e,0x1c}, /* Record pause */
90 /* Pause */ 78 {0x08,0x08,0x08,0x08,0x3e,0x1c,0x08}, /* Normal playmode */
91 {0x00,0x7f,0x7f,0x00,0x7f,0x7f,0x00}, 79 {0x38,0x44,0x44,0x4e,0x5f,0x44,0x38}, /* Repeat playmode */
92 /* Fast forward */ 80 {0x3e,0x41,0x51,0x41,0x45,0x41,0x3e}, /* Shuffle playmode (dice) */
93 {0x7f,0x3e,0x1c,0x7f,0x3e,0x1c,0x08}, 81 {0x04,0x0c,0x1c,0x3c,0x1c,0x0c,0x04}, /* Down-arrow */
94 /* Fast backward */ 82 {0x20,0x30,0x38,0x3c,0x38,0x30,0x20}, /* Up-arrow */
95 {0x08,0x1c,0x3e,0x7f,0x1c,0x3e,0x7f},
96 /* Record */
97 {0x1c,0x3e,0x7f,0x7f,0x7f,0x3e,0x1c},
98 /* Record pause */
99 {0x1c,0x3e,0x7f,0x00,0x7f,0x3e,0x1c},
100 /* Normal playmode */
101 {0x08,0x08,0x08,0x08,0x3e,0x1c,0x08},
102 /* Repeat playmode */
103 {0x38,0x44,0x44,0x4e,0x5f,0x44,0x38},
104 /* Shuffle playmode (dice) */
105 {0x3e,0x41,0x51,0x41,0x45,0x41,0x3e},
106 /* Down-arrow */
107 {0x04,0x0c,0x1c,0x3c,0x1c,0x0c,0x04},
108 /* Up-arrow */
109 {0x20,0x30,0x38,0x3c,0x38,0x30,0x20},
110}; 83};
111 84
112unsigned char rockbox112x37[]={ 85unsigned 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 {
28 Box_Filled, Box_Empty, Slider_Horizontal, File, 28 Box_Filled, Box_Empty, Slider_Horizontal, File,
29 Folder, Directory, Playlist, Repeat, 29 Folder, Directory, Playlist, Repeat,
30 Selected, Cursor, Wps, Mod_Ajz, 30 Selected, Cursor, Wps, Mod_Ajz,
31 Font, Language, 31 Font, Language, Text, Config,
32 LastIcon 32 LastIcon
33}; 33};
34 34
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)
256 dptr->attr |= TREE_ATTR_MPA; 256 dptr->attr |= TREE_ATTR_MPA;
257 else if (!strcasecmp(&entry->d_name[len-4], ".m3u")) 257 else if (!strcasecmp(&entry->d_name[len-4], ".m3u"))
258 dptr->attr |= TREE_ATTR_M3U; 258 dptr->attr |= TREE_ATTR_M3U;
259 else if (!strcasecmp(&entry->d_name[len-3], ".cfg")) 259 else if (!strcasecmp(&entry->d_name[len-4], ".cfg"))
260 dptr->attr |= TREE_ATTR_CFG; 260 dptr->attr |= TREE_ATTR_CFG;
261 else if (!strcasecmp(&entry->d_name[len-4], ".wps")) 261 else if (!strcasecmp(&entry->d_name[len-4], ".wps"))
262 dptr->attr |= TREE_ATTR_WPS; 262 dptr->attr |= TREE_ATTR_WPS;
@@ -384,11 +384,11 @@ static int showdir(char *path, int start)
384 break; 384 break;
385 385
386 case TREE_ATTR_CFG: 386 case TREE_ATTR_CFG:
387 icon_type = Wps; 387 icon_type = Config;
388 break; 388 break;
389 389
390 case TREE_ATTR_TXT: 390 case TREE_ATTR_TXT:
391 icon_type = Wps; 391 icon_type = Text;
392 break; 392 break;
393 393
394 case TREE_ATTR_LNG: 394 case TREE_ATTR_LNG:
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-29 07:33:57 +0000