Added bookmark icon for the Player/Studio

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4880 a1c6a512-1295-4272-9138-f99709370657

11 files changed, 57 insertions, 59 deletions

diff --git a/apps/player/icons.h b/apps/player/icons.h
index 041f09eca6..f5842eca40 100644
--- a/apps/player/icons.h
+++ b/apps/player/icons.h
@@ -29,8 +29,8 @@
 
 enum {
     Unknown = 0x90,
-    Plugin = 0x17,
-    Folder, Mod_Ajz, Language, File, Wps, Playlist, Text, Config,
+    Bookmark = 0x16,
+    Plugin, Folder, Mod_Ajz, Language, File, Wps, Playlist, Text, Config,
 };
 
 #endif
diff --git a/apps/tree.c b/apps/tree.c
index 820974979b..988e6b3d93 100644
--- a/apps/tree.c
+++ b/apps/tree.c
@@ -80,10 +80,8 @@ struct filetype filetypes[] = {
     { ".rock",TREE_ATTR_ROCK,Plugin, VOICE_EXT_ROCK },
 #ifdef HAVE_LCD_BITMAP
     { ".fnt", TREE_ATTR_FONT,Font, VOICE_EXT_FONT },
-    { ".bmark",TREE_ATTR_BMARK, Bookmark, VOICE_EXT_BMARK },
-#else
-    { ".bmark", TREE_ATTR_BMARK, -1, VOICE_EXT_BMARK },
 #endif
+    { ".bmark",TREE_ATTR_BMARK, Bookmark, VOICE_EXT_BMARK },
 #ifndef SIMULATOR
 #ifdef HAVE_LCD_BITMAP
     { ".ajz", TREE_ATTR_MOD, Mod_Ajz, VOICE_EXT_AJZ },
diff --git a/firmware/drivers/lcd-player-charset.c b/firmware/drivers/lcd-player-charset.c
index ca1b6a3db9..ff35e4efa1 100644
--- a/firmware/drivers/lcd-player-charset.c
+++ b/firmware/drivers/lcd-player-charset.c
@@ -25,28 +25,28 @@
 unsigned short new_lcd_rocklatin1_to_xlcd[] =
 {
    NOCHAR_NEW,    /* 0x00 reserved never to be used */
-   RESERVED_CHAR, /* 0x01-0x16 reserved */
-   RESERVED_CHAR, /* 0x01-0x16 reserved */
-   RESERVED_CHAR, /* 0x01-0x16 reserved */
-   RESERVED_CHAR, /* 0x01-0x16 reserved */
-   RESERVED_CHAR, /* 0x01-0x16 reserved */
-   RESERVED_CHAR, /* 0x01-0x16 reserved */
-   RESERVED_CHAR, /* 0x01-0x16 reserved */
-   RESERVED_CHAR, /* 0x01-0x16 reserved */
-   RESERVED_CHAR, /* 0x01-0x16 reserved */
-   RESERVED_CHAR, /* 0x01-0x16 reserved */
-   RESERVED_CHAR, /* 0x01-0x16 reserved */
-   RESERVED_CHAR, /* 0x01-0x16 reserved */
-   RESERVED_CHAR, /* 0x01-0x16 reserved */
-   RESERVED_CHAR, /* 0x01-0x16 reserved */
-   RESERVED_CHAR, /* 0x01-0x16 reserved */
-   RESERVED_CHAR, /* 0x01-0x16 reserved */
-   RESERVED_CHAR, /* 0x01-0x16 reserved */
-   RESERVED_CHAR, /* 0x01-0x16 reserved */
-   RESERVED_CHAR, /* 0x01-0x16 reserved */
-   RESERVED_CHAR, /* 0x01-0x16 reserved */
-   RESERVED_CHAR, /* 0x01-0x16 reserved */
-   RESERVED_CHAR, /* 0x01-0x16 reserved */
+   RESERVED_CHAR, /* reserved */
+   RESERVED_CHAR, /* reserved */
+   RESERVED_CHAR, /* reserved */
+   RESERVED_CHAR, /* reserved */
+   RESERVED_CHAR, /* reserved */
+   RESERVED_CHAR, /* reserved */
+   RESERVED_CHAR, /* reserved */
+   RESERVED_CHAR, /* reserved */
+   RESERVED_CHAR, /* reserved */
+   RESERVED_CHAR, /* reserved */
+   RESERVED_CHAR, /* reserved */
+   RESERVED_CHAR, /* reserved */
+   RESERVED_CHAR, /* reserved */
+   RESERVED_CHAR, /* reserved */
+   RESERVED_CHAR, /* reserved */
+   RESERVED_CHAR, /* reserved */
+   RESERVED_CHAR, /* reserved */
+   RESERVED_CHAR, /* reserved */
+   RESERVED_CHAR, /* reserved */
+   RESERVED_CHAR, /* reserved */
+   RESERVED_CHAR, /* reserved */
+   0x216, /* 0x16 .. "bookmark" icon */
    0x217, /* 0x17 .. "plugin" icon */
    0x218, /* 0x18 .. "folder" icon */
    0x219, /* 0x19 .. "MOD/AJZ" icon (winlatin o (dote in the middle) */
@@ -287,28 +287,28 @@ unsigned short old_lcd_rocklatin1_to_xlcd[] =
 {
    /* OLD LCD */
    NOCHAR_OLD, /* 0x00 reserved never to be used */
-   RESERVED_CHAR, /* 0x01-0x16 reserved */
-   RESERVED_CHAR, /* 0x01-0x16 reserved */
-   RESERVED_CHAR, /* 0x01-0x16 reserved */
-   RESERVED_CHAR, /* 0x01-0x16 reserved */
-   RESERVED_CHAR, /* 0x01-0x16 reserved */
-   RESERVED_CHAR, /* 0x01-0x16 reserved */
-   RESERVED_CHAR, /* 0x01-0x16 reserved */
-   RESERVED_CHAR, /* 0x01-0x16 reserved */
-   RESERVED_CHAR, /* 0x01-0x16 reserved */
-   RESERVED_CHAR, /* 0x01-0x16 reserved */
-   RESERVED_CHAR, /* 0x01-0x16 reserved */
-   RESERVED_CHAR, /* 0x01-0x16 reserved */
-   RESERVED_CHAR, /* 0x01-0x16 reserved */
-   RESERVED_CHAR, /* 0x01-0x16 reserved */
-   RESERVED_CHAR, /* 0x01-0x16 reserved */
-   RESERVED_CHAR, /* 0x01-0x16 reserved */
-   RESERVED_CHAR, /* 0x01-0x16 reserved */
-   RESERVED_CHAR, /* 0x01-0x16 reserved */
-   RESERVED_CHAR, /* 0x01-0x16 reserved */
-   RESERVED_CHAR, /* 0x01-0x16 reserved */
-   RESERVED_CHAR, /* 0x01-0x16 reserved */
-   RESERVED_CHAR, /* 0x01-0x16 reserved */
+   RESERVED_CHAR, /* reserved */
+   RESERVED_CHAR, /* reserved */
+   RESERVED_CHAR, /* reserved */
+   RESERVED_CHAR, /* reserved */
+   RESERVED_CHAR, /* reserved */
+   RESERVED_CHAR, /* reserved */
+   RESERVED_CHAR, /* reserved */
+   RESERVED_CHAR, /* reserved */
+   RESERVED_CHAR, /* reserved */
+   RESERVED_CHAR, /* reserved */
+   RESERVED_CHAR, /* reserved */
+   RESERVED_CHAR, /* reserved */
+   RESERVED_CHAR, /* reserved */
+   RESERVED_CHAR, /* reserved */
+   RESERVED_CHAR, /* reserved */
+   RESERVED_CHAR, /* reserved */
+   RESERVED_CHAR, /* reserved */
+   RESERVED_CHAR, /* reserved */
+   RESERVED_CHAR, /* reserved */
+   RESERVED_CHAR, /* reserved */
+   RESERVED_CHAR, /* reserved */
+   0x216, /* 0x16 .. "bookmark" icon */
    0x217, /* 0x17 .. "plugin" icon */
    0x218, /* 0x18 .. "folder" icon */
    0x219, /* 0x19 .. "MOD/AJZ" icon (winlatin o (dote in the middle) */
@@ -563,13 +563,13 @@ unsigned char lcd_player_extended_lcd_to_rocklatin1[NO_EXTENDED_LCD_CHARS] =
 /* 0d */ NOCHAR_NEW,  /* 0-16 user defined */
 /* 0e */ NOCHAR_NEW,  /* 0-16 user defined */
 /* 0f */ NOCHAR_NEW,  /* 0-16 user defined */
-/* 10 */ NOCHAR_NEW,  /* 16-31 reserved */
-/* 11 */ NOCHAR_NEW,  /* 16-31 reserved */
-/* 12 */ NOCHAR_NEW,  /* 16-31 reserved */
-/* 13 */ NOCHAR_NEW,  /* 16-31 reserved */
-/* 14 */ NOCHAR_NEW,  /* 16-31 reserved */
-/* 15 */ NOCHAR_NEW,  /* 16-31 reserved */
-/* 16 */ NOCHAR_NEW,  /* 16-31 reserved */
+/* 10 */ NOCHAR_NEW,  /* reserved */
+/* 11 */ NOCHAR_NEW,  /* reserved */
+/* 12 */ NOCHAR_NEW,  /* reserved */
+/* 13 */ NOCHAR_NEW,  /* reserved */
+/* 14 */ NOCHAR_NEW,  /* reserved */
+/* 15 */ NOCHAR_NEW,  /* reserved */
+/* 16 */ 0x91,  /* bookmark icon */
 /* 17 */ 0x29,  /* plugin icon */
 /* 18 */ 0x93, /* folder icon */
 /* 19 */ 'x', /* MOD/AJZ icon */
@@ -667,7 +667,7 @@ unsigned char extended_font_player[NO_EXTENDED_LCD_CHARS][8] = {
   { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 13 */
   { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 14 */
   { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 15 */
-  { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, /* 16 */
+  { 0x00, 0x03, 0x07, 0x0e, 0x1c, 0x08, 0x00, 0x00}, /* 16 Bookmark icon */
   { 0x04, 0x1e, 0x07, 0x1f, 0x05, 0x01, 0x06, 0x00}, /* 17 Plugin file icon */
   { 0x0c, 0x13, 0x11, 0x11, 0x11, 0x11, 0x1f, 0x00}, /* 18 Folder icon */
   { 0x1f, 0x11, 0x1b, 0x15, 0x1b, 0x11, 0x1f, 0x00}, /* 19 MOD/AJZ icon */
diff --git a/firmware/export/lcd-player-charset.h b/firmware/export/lcd-player-charset.h
index 2789f8da70..c94fab8f3b 100644
--- a/firmware/export/lcd-player-charset.h
+++ b/firmware/export/lcd-player-charset.h
@@ -20,7 +20,7 @@
 
 #define NO_EXTENDED_LCD_CHARS 0x5e
 #define RESERVED_CHAR 0xff
-#define LAST_RESERVED_CHAR 0x17
+#define LAST_RESERVED_CHAR 0x16
 #define NOCHAR_OLD 0x24
 #define NOCHAR_NEW 0x20
 
diff --git a/www/docs/lcd_new.gif b/www/docs/lcd_new.gif
index 5d6e3587a1..39a6287b8c 100644
--- a/www/docs/lcd_new.gif
+++ b/www/docs/lcd_new.gif
diff --git a/www/docs/lcd_new_hw.gif b/www/docs/lcd_new_hw.gif
index 11690897b1..87930d3d65 100644
--- a/www/docs/lcd_new_hw.gif
+++ b/www/docs/lcd_new_hw.gif
diff --git a/www/docs/lcd_new_subst.gif b/www/docs/lcd_new_subst.gif
index 5a1e126a64..17bdd834a1 100644
--- a/www/docs/lcd_new_subst.gif
+++ b/www/docs/lcd_new_subst.gif
diff --git a/www/docs/lcd_old.gif b/www/docs/lcd_old.gif
index 2683f54f26..877b3f57bf 100644
--- a/www/docs/lcd_old.gif
+++ b/www/docs/lcd_old.gif
diff --git a/www/docs/lcd_old_hw.gif b/www/docs/lcd_old_hw.gif
index 651450187f..19f35f6711 100644
--- a/www/docs/lcd_old_hw.gif
+++ b/www/docs/lcd_old_hw.gif
diff --git a/www/docs/lcd_old_subst.gif b/www/docs/lcd_old_subst.gif
index dfffde9850..a9f40f12f9 100644
--- a/www/docs/lcd_old_subst.gif
+++ b/www/docs/lcd_old_subst.gif
diff --git a/www/docs/rocklatin.t b/www/docs/rocklatin.t
index 7aee26fd3e..819a845051 100644
--- a/www/docs/rocklatin.t
+++ b/www/docs/rocklatin.t
@@ -68,7 +68,7 @@ or 8 of such characters. This code example shows how to define a pattern:
   lcd_unlock_pattern(handle);
 }
 </pre>
-The handle is very likely to be between 0x01 to 0x16, which in software will
+The handle is very likely to be between 0x01 to 0x15, which in software will
 be handled as a prioritized character (even higher than the icons).
 
 <h2>Some notes</h2>