From dd47fa066acf1a4a7859105b39e49b31b5eaa2c8 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Mon, 14 Jul 2014 09:20:13 -0600
Subject: [PATCH] NxWM: Add larger media player icon

---
 nxwm/Makefile                       |   7 +-
 nxwm/images/mediaplayer24x24.png    | Bin 0 -> 2963 bytes
 nxwm/images/mediaplayer44x50.png    | Bin 0 -> 1098 bytes
 nxwm/include/nxwmglyphs.hxx         |   2 +-
 nxwm/src/glyph_calibration24x21.cxx |  80 ++++++++--------
 nxwm/src/glyph_mediaplayer24x24.cxx | 140 ++++++++++++++--------------
 6 files changed, 119 insertions(+), 110 deletions(-)
 create mode 100755 nxwm/images/mediaplayer24x24.png
 create mode 100755 nxwm/images/mediaplayer44x50.png

diff --git a/nxwm/Makefile b/nxwm/Makefile
index ff4b256b1..624be08c2 100644
--- a/nxwm/Makefile
+++ b/nxwm/Makefile
@@ -86,7 +86,12 @@ CXXSRCS += glyph_minimize21x21.cxx glyph_play24x24.cxx glyph_stop21x21.cxx
 endif
 
 ifeq ($(CONFIG_NXWM_MEDIAPLAYER),y)
-CXXSRCS += glyph_mediaplayer24x24.cxx cmediaplayer.cxx glyph_mplayer_controls32x32.cxx
+CXXSRCS += cmediaplayer.cxx
+ifeq ($(CONFIG_NXWM_LARGE_ICONS),y)
+CXXSRCS += glyph_mediaplayer44x50.cxx glyph_mplayer_controls32x32.cxx
+else
+CXXSRCS += glyph_mediaplayer24x24.cxx glyph_mplayer_controls32x32.cxx
+endif
 endif
 
 SRCS = $(ASRCS) $(CSRCS) $(CXXSRCS)
diff --git a/nxwm/images/mediaplayer24x24.png b/nxwm/images/mediaplayer24x24.png
new file mode 100755
index 0000000000000000000000000000000000000000..bf59b82a4fc20ad26ffed1d924926f09742e3c74
GIT binary patch
literal 2963
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
JPDHLkV1gjUru6^-

literal 0
HcmV?d00001

diff --git a/nxwm/images/mediaplayer44x50.png b/nxwm/images/mediaplayer44x50.png
new file mode 100755
index 0000000000000000000000000000000000000000..c70a2ed7b31a88d5a4ae13fd87f0d2562c9dfff2
GIT binary patch
literal 1098
zcmWksUuYLp6#mvP-JHy=Kj6}`KMz^mGU-$gYZS`He!o&1V;2iatms(zq9_p&>-Gm}
zjHoDrQ?i#R>y9QW&WA-11=TtfNmuk?va$jr$S4Xj__}*I_wbzq_nh;6-}vyBp{~wV
zodCL8&4H1cZ?17$N29(y`@cF>Q`_E=p^cdS=E`%xMSl%%8Xc@fKmY{{aDWIv5Claq
z1V<nu5Cu^Y4bc&a1SCOHBtvo}A_G~F71@v-nJ7RJ6h$!<M`8UN6i`6}9ju_v7J&*(
z;I$_K5=4SZFbOV!5+P9}szj6M5-ACiM3PD}NiK<!Az37=WRvWYDFsqQib^plE`>q}
zMW{j(y0Gq1&lZI$OyPAc4bUJORD)@74b%vYqER)PM%PG9&?K5vlWB5I)C|p{Sv8wx
z*Gw(YB3e|7X>l!7LMcjBn$ne(g37oU)L;g$j97pLv7i>rf?J?PSQLwD(JZ<}T7o69
zq?XK*TcTxH7RzecEW2e|ffcc$R?Lc9p%F$gs?m&Ytn62@#i0&!coo9~JctMNU>@89
zJ;I}SRFCG-J<=0Ai6`}Bp4<~X!?So+&*s@Z(+j+a7xiLZ+zXv>ic_8DbSD>$P}QiE
z)V*r6S|NZz7?i;noPmsB6h>t<MrR}wn1o50jLDhE3}#_gW@C0{vVcWcl*L$_WpP+F
zT2;GJUhl4Wyzk3{)%9(U+&46UmzP}CtYF#h=7W2I<(Dl+8{R(9TZ`@cTAK&k&$O@T
zZeP2#qjz&HecKw?Fxvd$=d$6_&#viMGJNvDuUC&>n0?~O)vx^U?xtN^A8Vbt;f?=3
zXwHn@aqDyGSX{O4{KCECe{|iwt8x8nXR&Vgo@0%b*ERgD?=PPmdoyew`}EcGy^~iw
zb>p^2Ps~3r^Y?td^nn%cd~|fr%<IceoF2QY=ePH#rnRSc{lcC7eYo)O>3u(S|GD$)
z&VSDJ%`6P`?O#88{E{7?T>Jad)nhMyxBc<k=b!H1)_?Tlk(Xws=PsT&JUe&)&NXMB
zxv6{k@wK;foNNpooR~YZ^23RdUw%9^)i^S>=HF9)KlJQ-hbQZ4Xbo-|nBKVKh5rF!
C<M=@U

literal 0
HcmV?d00001

diff --git a/nxwm/include/nxwmglyphs.hxx b/nxwm/include/nxwmglyphs.hxx
index b0e3a9c7d..729bd5e18 100644
--- a/nxwm/include/nxwmglyphs.hxx
+++ b/nxwm/include/nxwmglyphs.hxx
@@ -1,7 +1,7 @@
 /****************************************************************************
  * NxWidgets/nxwm/include/nxwmconfig.hxx
  *
- *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2012, 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/nxwm/src/glyph_calibration24x21.cxx b/nxwm/src/glyph_calibration24x21.cxx
index fb1c5e6bc..c94093119 100644
--- a/nxwm/src/glyph_calibration24x21.cxx
+++ b/nxwm/src/glyph_calibration24x21.cxx
@@ -144,39 +144,39 @@ static const nxgl_mxpixel_t g_calibrationSelectedLut[BITMAP_NLUTCODES] =
 
 static const struct NXWidgets::SRlePaletteBitmapEntry g_calibrationRleEntries[] =
 {
-  { 11,   0}, {  1,   1}, {  1,   2}, {  6,   0}, {  1,   3}, {  1,   2}, {  3,   0},              /* Row 0 */
-  { 11,   0}, {  1,   1}, {  1,   2}, {  4,   0}, {  2,   1}, {  1,   3}, {  2,   1}, {  2,   0},  /* Row 1 */
-  { 11,   0}, {  1,   1}, {  1,   2}, {  2,   0}, {  2,   1}, {  2,   2}, {  1,   3}, {  1,   2},  /* Row 2 */
-  {  3,   0},
-  { 11,   0}, {  1,   1}, {  1,   3}, {  2,   1}, {  2,   2}, {  2,   0}, {  1,   3}, {  4,   0},  /* Row 3 */
-  {  9,   0}, {  2,   1}, {  2,   3}, {  2,   2}, {  4,   0}, {  1,   3}, {  4,   0},              /* Row 4 */
-  {  3,   0}, {  1,   1}, {  1,   2}, {  2,   0}, {  2,   1}, {  2,   2}, {  1,   1}, {  1,   2},  /* Row 5 */
-  {  5,   0}, {  1,   1}, {  2,   3}, {  3,   0},
-  {  2,   0}, {  2,   1}, {  1,   3}, {  2,   1}, {  2,   2}, {  2,   0}, {  1,   1}, {  1,   2},  /* Row 6 */
-  {  4,   0}, {  1,   1}, {  1,   3}, {  1,   0}, {  2,   3}, {  2,   0},
-  {  3,   0}, {  1,   2}, {  1,   3}, {  2,   2}, {  4,   0}, {  1,   1}, {  1,   2}, {  4,   0},  /* Row 7 */
-  {  1,   1}, {  3,   0}, {  1,   3}, {  2,   0},
-  {  4,   0}, {  1,   3}, {  6,   0}, {  1,   1}, {  1,   2}, {  3,   0}, {  1,   1}, {  1,   3},  /* Row 8 */
-  {  3,   0}, {  2,   3}, {  1,   0},
-  {  3,   0}, {  1,   1}, {  2,   3}, {  5,   0}, {  1,   1}, {  1,   2}, {  3,   0}, {  1,   1},  /* Row 9 */
-  {  5,   0}, {  1,   3}, {  1,   0},
-  {  2,   0}, {  1,   1}, {  1,   3}, {  1,   0}, {  2,   3}, {  4,   0}, {  1,   1}, {  1,   2},  /* Row 10 */
-  {  3,   0}, {  1,   1}, {  1,   0}, {  2,   4}, {  1,   5}, {  1,   0}, {  1,   3}, {  1,   0},
-  {  2,   0}, {  1,   1}, {  3,   0}, {  1,   3}, {  4,   0}, {  1,   1}, {  1,   2}, {  3,   0},  /* Row 11 */
-  {  1,   1}, {  1,   0}, {  2,   4}, {  1,   5}, {  1,   0}, {  1,   3}, {  1,   0},
-  {  1,   0}, {  1,   1}, {  1,   3}, {  2,   4}, {  1,   5}, {  2,   3}, {  3,   0}, {  1,   1},  /* Row 12 */
-  {  1,   2}, {  2,   0}, {  9,   3},
-  {  1,   0}, {  1,   1}, {  1,   0}, {  2,   4}, {  1,   5}, {  1,   0}, {  1,   3}, {  3,   0},  /* Row 13 */
-  {  1,   1}, {  1,   2}, { 11,   0},
-  {  1,   0}, {  1,   1}, {  1,   0}, {  2,   4}, {  1,   5}, {  1,   0}, {  1,   3}, {  3,   0},  /* Row 14 */
-  {  1,   1}, {  1,   2}, { 11,   0},
-  {  1,   0}, {  1,   1}, {  1,   0}, {  2,   4}, {  1,   5}, {  1,   0}, {  1,   3}, {  3,   0},  /* Row 15 */
-  {  1,   1}, {  1,   2}, { 11,   0},
-  {  9,   3}, {  2,   0}, {  1,   1}, {  1,   2}, { 11,   0},                                      /* Row 16 */
-  { 11,   0}, {  1,   1}, {  1,   2}, { 11,   0},                                                  /* Row 17 */
-  { 10,   0}, {  1,   1}, {  2,   3}, {  1,   2}, { 10,   0},                                      /* Row 18 */
-  {  5,   0}, {  4,   1}, {  6,   3}, {  4,   2}, {  5,   0},                                      /* Row 19 */
-  {  4,   0}, {  4,   1}, {  8,   3}, {  4,   2}, {  4,   0},                                      /* Row 20 */
+  {11, 0}, { 1, 1}, { 1, 2}, { 6, 0}, { 1, 3}, { 1, 2}, { 3, 0},           /* Row 0 */
+  {11, 0}, { 1, 1}, { 1, 2}, { 4, 0}, { 2, 1}, { 1, 3}, { 2, 1}, { 2, 0},  /* Row 1 */
+  {11, 0}, { 1, 1}, { 1, 2}, { 2, 0}, { 2, 1}, { 2, 2}, { 1, 3}, { 1, 2},  /* Row 2 */
+  { 3, 0},
+  {11, 0}, { 1, 1}, { 1, 3}, { 2, 1}, { 2, 2}, { 2, 0}, { 1, 3}, { 4, 0},  /* Row 3 */
+  { 9, 0}, { 2, 1}, { 2, 3}, { 2, 2}, { 4, 0}, { 1, 3}, { 4, 0},            /* Row 4 */
+  { 3, 0}, { 1, 1}, { 1, 2}, { 2, 0}, { 2, 1}, { 2, 2}, { 1, 1}, { 1, 2},  /* Row 5 */
+  { 5, 0}, { 1, 1}, { 2, 3}, { 3, 0},
+  { 2, 0}, { 2, 1}, { 1, 3}, { 2, 1}, { 2, 2}, { 2, 0}, { 1, 1}, { 1, 2},  /* Row 6 */
+  { 4, 0}, { 1, 1}, { 1, 3}, { 1, 0}, { 2, 3}, { 2, 0},
+  { 3, 0}, { 1, 2}, { 1, 3}, { 2, 2}, { 4, 0}, { 1, 1}, { 1, 2}, { 4, 0},  /* Row 7 */
+  { 1, 1}, { 3, 0}, { 1, 3}, { 2, 0},
+  { 4, 0}, { 1, 3}, { 6, 0}, { 1, 1}, { 1, 2}, { 3, 0}, { 1, 1}, { 1, 3},  /* Row 8 */
+  { 3, 0}, { 2, 3}, { 1, 0},
+  { 3, 0}, { 1, 1}, { 2, 3}, { 5, 0}, { 1, 1}, { 1, 2}, { 3, 0}, { 1, 1},  /* Row 9 */
+  { 5, 0}, { 1, 3}, { 1, 0},
+  { 2, 0}, { 1, 1}, { 1, 3}, { 1, 0}, { 2, 3}, { 4, 0}, { 1, 1}, { 1, 2},  /* Row 10 */
+  { 3, 0}, { 1, 1}, { 1, 0}, { 2, 4}, { 1, 5}, { 1, 0}, { 1, 3}, { 1, 0},
+  { 2, 0}, { 1, 1}, { 3, 0}, { 1, 3}, { 4, 0}, { 1, 1}, { 1, 2}, { 3, 0},  /* Row 11 */
+  { 1, 1}, { 1, 0}, { 2, 4}, { 1, 5}, { 1, 0}, { 1, 3}, { 1, 0},
+  { 1, 0}, { 1, 1}, { 1, 3}, { 2, 4}, { 1, 5}, { 2, 3}, { 3, 0}, { 1, 1},  /* Row 12 */
+  { 1, 2}, { 2, 0}, { 9, 3},
+  { 1, 0}, { 1, 1}, { 1, 0}, { 2, 4}, { 1, 5}, { 1, 0}, { 1, 3}, { 3, 0},  /* Row 13 */
+  { 1, 1}, { 1, 2}, {11, 0},
+  { 1, 0}, { 1, 1}, { 1, 0}, { 2, 4}, { 1, 5}, { 1, 0}, { 1, 3}, { 3, 0},  /* Row 14 */
+  { 1, 1}, { 1, 2}, {11, 0},
+  { 1, 0}, { 1, 1}, { 1, 0}, { 2, 4}, { 1, 5}, { 1, 0}, { 1, 3}, { 3, 0},  /* Row 15 */
+  { 1, 1}, { 1, 2}, {11, 0},
+  { 9, 3}, { 2, 0}, { 1, 1}, { 1, 2}, {11, 0},                             /* Row 16 */
+  {11, 0}, { 1, 1}, { 1, 2}, {11, 0},                                      /* Row 17 */
+  {10, 0}, { 1, 1}, { 2, 3}, { 1, 2}, {10, 0},                             /* Row 18 */
+  { 5, 0}, { 4, 1}, { 6, 3}, { 4, 2}, { 5, 0},                             /* Row 19 */
+  { 4, 0}, { 4, 1}, { 8, 3}, { 4, 2}, { 4, 0},                             /* Row 20 */
 };
 
 /********************************************************************************************
@@ -185,13 +185,13 @@ static const struct NXWidgets::SRlePaletteBitmapEntry g_calibrationRleEntries[]
 
 const struct NXWidgets::SRlePaletteBitmap NxWM::g_calibrationBitmap =
 {
-  CONFIG_NXWIDGETS_BPP,       // bpp    - Bits per pixel
-  CONFIG_NXWIDGETS_FMT,       // fmt    - Color format
-  BITMAP_NLUTCODES,           // nlut   - Number of colors in the lLook-Up Table (LUT)
-  BITMAP_NCOLUMNS,            // width  - Width in pixels
-  BITMAP_NROWS,               // height - Height in rows
-  {                           // lut    - Pointer to the beginning of the Look-Up Table (LUT)
-    g_calibrationNormalLut,   //          Index 0: Unselected LUT
+  CONFIG_NXWIDGETS_BPP,     // bpp    - Bits per pixel
+  CONFIG_NXWIDGETS_FMT,     // fmt    - Color format
+  BITMAP_NLUTCODES,         // nlut   - Number of colors in the lLook-Up Table (LUT)
+  BITMAP_NCOLUMNS,          // width  - Width in pixels
+  BITMAP_NROWS,             // height - Height in rows
+  {                          // lut    - Pointer to the beginning of the Look-Up Table (LUT)
+    g_calibrationNormalLut, //          Index 0: Unselected LUT
     g_calibrationSelectedLut, //          Index 1: Selected LUT
   },
   g_calibrationRleEntries     // data   - Pointer to the beginning of the RLE data
diff --git a/nxwm/src/glyph_mediaplayer24x24.cxx b/nxwm/src/glyph_mediaplayer24x24.cxx
index 5e8899c38..6651cb3e1 100644
--- a/nxwm/src/glyph_mediaplayer24x24.cxx
+++ b/nxwm/src/glyph_mediaplayer24x24.cxx
@@ -37,9 +37,6 @@
  * Included Files
  ********************************************************************************************/
 
-/* Automatically NuttX bitmap file. */
-/* Generated from play_music.png by bitmap_converter.py. */
-
 #include <nuttx/config.h>
 
 #include <sys/types.h>
@@ -55,15 +52,18 @@
 #include "nxwmconfig.hxx"
 #include "nxwmglyphs.hxx"
 
-
 /********************************************************************************************
  * Pre-Processor Definitions
  ********************************************************************************************/
 
-#define BITMAP_WIDTH 24
-#define BITMAP_HEIGHT 24
+#define BITMAP_WIDTH       24
+#define BITMAP_HEIGHT      24
 #define BITMAP_PALETTESIZE 9
 
+/********************************************************************************************
+ * Private Bitmap Data
+ ********************************************************************************************/
+
 using namespace NxWM;
 
 /* RGB24 (8-8-8) Colors */
@@ -84,70 +84,74 @@ static const NXWidgets::nxwidget_pixel_t hilight_palette[BITMAP_PALETTESIZE] =
 
 static const NXWidgets::SRlePaletteBitmapEntry bitmap[] =
 {
-  {  8,   8}, {  8,   7}, {  8,   8},                                      /* Row 0 */
-  {  6,   8}, {  1,   7}, {  1,   3}, {  1,   5}, {  2,   2}, {  2,   1},
-  {  2,   2}, {  1,   5}, {  1,   3}, {  1,   7}, {  6,   8},              /* Row 1 */
-  {  4,   8}, {  2,   7}, {  1,   4}, {  1,   2}, {  1,   6}, {  6,   1},
-  {  1,   6}, {  1,   2}, {  1,   4}, {  2,   7}, {  4,   8},              /* Row 2 */
-  {  3,   8}, {  1,   7}, {  1,   3}, {  1,   2}, {  1,   6}, {  2,   1},
-  {  4,   6}, {  2,   1}, {  2,   6}, {  2,   2}, {  1,   3}, {  1,   7},
-  {  3,   8},                                                              /* Row 3 */
-  {  2,   8}, {  1,   7}, {  1,   3}, {  1,   1}, {  2,   6}, {  3,   1},
-  {  2,   2}, {  1,   4}, {  1,   3}, {  5,   5}, {  1,   1}, {  1,   3},
-  {  1,   7}, {  2,   8},                                                  /* Row 4 */
-  {  2,   8}, {  1,   7}, {  1,   2}, {  1,   6}, {  4,   1}, {  1,   4},
-  {  3,   5}, {  2,   6}, {  3,   0}, {  1,   3}, {  2,   2}, {  1,   7},
-  {  2,   8},                                                              /* Row 5 */
-  {  1,   8}, {  1,   7}, {  1,   4}, {  1,   6}, {  4,   1}, {  1,   2},
-  {  1,   5}, {  1,   6}, {  7,   0}, {  1,   3}, {  1,   2}, {  1,   6},
-  {  1,   4}, {  1,   7}, {  1,   8},                                      /* Row 6 */
-  {  1,   8}, {  1,   3}, {  1,   6}, {  4,   1}, {  1,   2}, {  1,   5},
-  {  4,   0}, {  2,   6}, {  1,   3}, {  1,   5}, {  1,   0}, {  1,   3},
-  {  1,   2}, {  1,   1}, {  1,   6}, {  1,   3}, {  1,   8},              /* Row 7 */
-  {  1,   3}, {  1,   4}, {  1,   6}, {  4,   1}, {  1,   2}, {  1,   5},
-  {  2,   0}, {  1,   6}, {  3,   3}, {  1,   4}, {  1,   5}, {  1,   0},
-  {  1,   3}, {  1,   2}, {  1,   1}, {  1,   6}, {  1,   4}, {  1,   3},  /* Row 8 */
-  {  1,   3}, {  6,   1}, {  1,   2}, {  1,   5}, {  1,   0}, {  1,   4},
-  {  1,   3}, {  1,   4}, {  3,   2}, {  1,   5}, {  1,   0}, {  1,   3},
-  {  1,   2}, {  3,   1}, {  1,   3},                                      /* Row 9 */
-  {  1,   3}, {  6,   1}, {  1,   2}, {  1,   5}, {  1,   0}, {  1,   3},
-  {  1,   4}, {  4,   2}, {  1,   7}, {  1,   0}, {  1,   3}, {  1,   2},
-  {  3,   1}, {  1,   3},                                                  /* Row 10 */
-  {  1,   3}, {  6,   1}, {  1,   2}, {  1,   5}, {  1,   0}, {  1,   3},
-  {  1,   4}, {  4,   2}, {  1,   7}, {  1,   0}, {  1,   7}, {  1,   2},
-  {  3,   1}, {  1,   3},                                                  /* Row 11 */
-  {  1,   3}, {  6,   1}, {  1,   2}, {  1,   5}, {  1,   0}, {  1,   3},
-  {  1,   4}, {  4,   2}, {  1,   7}, {  1,   0}, {  1,   7}, {  1,   2},
-  {  3,   1}, {  1,   5},                                                  /* Row 12 */
-  {  1,   3}, {  1,   6}, {  4,   1}, {  2,   2}, {  1,   5}, {  1,   0},
-  {  1,   3}, {  1,   4}, {  2,   2}, {  1,   5}, {  1,   7}, {  1,   6},
-  {  1,   0}, {  1,   7}, {  1,   2}, {  2,   1}, {  1,   6}, {  1,   3},  /* Row 13 */
-  {  1,   3}, {  5,   1}, {  1,   2}, {  2,   3}, {  1,   0}, {  1,   3},
-  {  1,   4}, {  1,   2}, {  1,   7}, {  1,   6}, {  3,   0}, {  1,   7},
-  {  1,   2}, {  2,   1}, {  1,   2}, {  1,   3},                          /* Row 14 */
-  {  1,   5}, {  1,   4}, {  3,   1}, {  1,   2}, {  1,   3}, {  1,   2},
-  {  1,   6}, {  1,   0}, {  1,   3}, {  1,   2}, {  1,   5}, {  1,   6},
-  {  4,   0}, {  1,   7}, {  1,   2}, {  2,   1}, {  1,   4}, {  1,   5},  /* Row 15 */
-  {  1,   8}, {  1,   4}, {  2,   1}, {  1,   2}, {  1,   3}, {  4,   0},
-  {  1,   3}, {  1,   2}, {  1,   3}, {  1,   6}, {  3,   0}, {  1,   6},
-  {  1,   7}, {  1,   2}, {  2,   1}, {  1,   4}, {  1,   8},              /* Row 16 */
-  {  1,   8}, {  1,   5}, {  1,   2}, {  1,   1}, {  1,   5}, {  1,   6},
-  {  4,   0}, {  1,   3}, {  2,   2}, {  1,   3}, {  1,   6}, {  1,   0},
-  {  1,   6}, {  1,   7}, {  1,   4}, {  2,   1}, {  1,   2}, {  1,   5},
-  {  1,   8},                                                              /* Row 17 */
-  {  2,   8}, {  1,   5}, {  1,   1}, {  1,   5}, {  1,   1}, {  4,   0},
-  {  1,   3}, {  1,   2}, {  1,   1}, {  1,   4}, {  1,   3}, {  1,   7},
-  {  1,   3}, {  1,   2}, {  3,   1}, {  1,   5}, {  2,   8},              /* Row 18 */
-  {  2,   8}, {  1,   5}, {  1,   4}, {  1,   1}, {  1,   3}, {  1,   6},
-  {  1,   0}, {  1,   6}, {  1,   3}, {  1,   2}, {  9,   1}, {  1,   4},
-  {  1,   5}, {  2,   8},                                                  /* Row 19 */
-  {  3,   8}, {  1,   5}, {  1,   4}, {  1,   1}, {  1,   3}, {  1,   5},
-  {  1,   3}, { 10,   1}, {  1,   4}, {  1,   5}, {  3,   8},              /* Row 20 */
-  {  4,   8}, {  2,   4}, { 12,   1}, {  2,   4}, {  4,   8},              /* Row 21 */
-  {  6,   8}, {  2,   4}, {  8,   1}, {  2,   4}, {  6,   8},              /* Row 22 */
-  {  8,   8}, {  8,   4}, {  8,   8},                                      /* Row 23 */
+  { 8, 8}, { 8, 7}, { 8, 8},                              /* Row 0 */
+  { 6, 8}, { 1, 7}, { 1, 3}, { 1, 5}, { 2, 2}, { 2, 1},
+  { 2, 2}, { 1, 5}, { 1, 3}, { 1, 7}, { 6, 8},            /* Row 1 */
+  { 4, 8}, { 2, 7}, { 1, 4}, { 1, 2}, { 1, 6}, { 6, 1},
+  { 1, 6}, { 1, 2}, { 1, 4}, { 2, 7}, { 4, 8},            /* Row 2 */
+  { 3, 8}, { 1, 7}, { 1, 3}, { 1, 2}, { 1, 6}, { 2, 1},
+  { 4, 6}, { 2, 1}, { 2, 6}, { 2, 2}, { 1, 3}, { 1, 7},
+  { 3, 8},                                                /* Row 3 */
+  { 2, 8}, { 1, 7}, { 1, 3}, { 1, 1}, { 2, 6}, { 3, 1},
+  { 2, 2}, { 1, 4}, { 1, 3}, { 5, 5}, { 1, 1}, { 1, 3},
+  { 1, 7}, { 2, 8},                                       /* Row 4 */
+  { 2, 8}, { 1, 7}, { 1, 2}, { 1, 6}, { 4, 1}, { 1, 4},
+  { 3, 5}, { 2, 6}, { 3, 0}, { 1, 3}, { 2, 2}, { 1, 7},
+  { 2, 8},                                                /* Row 5 */
+  { 1, 8}, { 1, 7}, { 1, 4}, { 1, 6}, { 4, 1}, { 1, 2},
+  { 1, 5}, { 1, 6}, { 7, 0}, { 1, 3}, { 1, 2}, { 1, 6},
+  { 1, 4}, { 1, 7}, { 1, 8},                              /* Row 6 */
+  { 1, 8}, { 1, 3}, { 1, 6}, { 4, 1}, { 1, 2}, { 1, 5},
+  { 4, 0}, { 2, 6}, { 1, 3}, { 1, 5}, { 1, 0}, { 1, 3},
+  { 1, 2}, { 1, 1}, { 1, 6}, { 1, 3}, { 1, 8},            /* Row 7 */
+  { 1, 3}, { 1, 4}, { 1, 6}, { 4, 1}, { 1, 2}, { 1, 5},
+  { 2, 0}, { 1, 6}, { 3, 3}, { 1, 4}, { 1, 5}, { 1, 0},
+  { 1, 3}, { 1, 2}, { 1, 1}, { 1, 6}, { 1, 4}, { 1, 3},   /* Row 8 */
+  { 1, 3}, { 6, 1}, { 1, 2}, { 1, 5}, { 1, 0}, { 1, 4},
+  { 1, 3}, { 1, 4}, { 3, 2}, { 1, 5}, { 1, 0}, { 1, 3},
+  { 1, 2}, { 3, 1}, { 1, 3},                              /* Row 9 */
+  { 1, 3}, { 6, 1}, { 1, 2}, { 1, 5}, { 1, 0}, { 1, 3},
+  { 1, 4}, { 4, 2}, { 1, 7}, { 1, 0}, { 1, 3}, { 1, 2},
+  { 3, 1}, { 1, 3},                                       /* Row 10 */
+  { 1, 3}, { 6, 1}, { 1, 2}, { 1, 5}, { 1, 0}, { 1, 3},
+  { 1, 4}, { 4, 2}, { 1, 7}, { 1, 0}, { 1, 7}, { 1, 2},
+  { 3, 1}, { 1, 3},                                       /* Row 11 */
+  { 1, 3}, { 6, 1}, { 1, 2}, { 1, 5}, { 1, 0}, { 1, 3},
+  { 1, 4}, { 4, 2}, { 1, 7}, { 1, 0}, { 1, 7}, { 1, 2},
+  { 3, 1}, { 1, 5},                                       /* Row 12 */
+  { 1, 3}, { 1, 6}, { 4, 1}, { 2, 2}, { 1, 5}, { 1, 0},
+  { 1, 3}, { 1, 4}, { 2, 2}, { 1, 5}, { 1, 7}, { 1, 6},
+  { 1, 0}, { 1, 7}, { 1, 2}, { 2, 1}, { 1, 6}, { 1, 3},   /* Row 13 */
+  { 1, 3}, { 5, 1}, { 1, 2}, { 2, 3}, { 1, 0}, { 1, 3},
+  { 1, 4}, { 1, 2}, { 1, 7}, { 1, 6}, { 3, 0}, { 1, 7},
+  { 1, 2}, { 2, 1}, { 1, 2}, { 1, 3},                     /* Row 14 */
+  { 1, 5}, { 1, 4}, { 3, 1}, { 1, 2}, { 1, 3}, { 1, 2},
+  { 1, 6}, { 1, 0}, { 1, 3}, { 1, 2}, { 1, 5}, { 1, 6},
+  { 4, 0}, { 1, 7}, { 1, 2}, { 2, 1}, { 1, 4}, { 1, 5},   /* Row 15 */
+  { 1, 8}, { 1, 4}, { 2, 1}, { 1, 2}, { 1, 3}, { 4, 0},
+  { 1, 3}, { 1, 2}, { 1, 3}, { 1, 6}, { 3, 0}, { 1, 6},
+  { 1, 7}, { 1, 2}, { 2, 1}, { 1, 4}, { 1, 8},            /* Row 16 */
+  { 1, 8}, { 1, 5}, { 1, 2}, { 1, 1}, { 1, 5}, { 1, 6},
+  { 4, 0}, { 1, 3}, { 2, 2}, { 1, 3}, { 1, 6}, { 1, 0},
+  { 1, 6}, { 1, 7}, { 1, 4}, { 2, 1}, { 1, 2}, { 1, 5},
+  { 1, 8},                                                /* Row 17 */
+  { 2, 8}, { 1, 5}, { 1, 1}, { 1, 5}, { 1, 1}, { 4, 0},
+  { 1, 3}, { 1, 2}, { 1, 1}, { 1, 4}, { 1, 3}, { 1, 7},
+  { 1, 3}, { 1, 2}, { 3, 1}, { 1, 5}, { 2, 8},            /* Row 18 */
+  { 2, 8}, { 1, 5}, { 1, 4}, { 1, 1}, { 1, 3}, { 1, 6},
+  { 1, 0}, { 1, 6}, { 1, 3}, { 1, 2}, { 9, 1}, { 1, 4},
+  { 1, 5}, { 2, 8},                                       /* Row 19 */
+  { 3, 8}, { 1, 5}, { 1, 4}, { 1, 1}, { 1, 3}, { 1, 5},
+  { 1, 3}, {10, 1}, { 1, 4}, { 1, 5}, { 3, 8},            /* Row 20 */
+  { 4, 8}, { 2, 4}, {12, 1}, { 2, 4}, { 4, 8},            /* Row 21 */
+  { 6, 8}, { 2, 4}, { 8, 1}, { 2, 4}, { 6, 8},            /* Row 22 */
+  { 8, 8}, { 8, 4}, { 8, 8},                              /* Row 23 */
 };
 
+/********************************************************************************************
+ * Public Bitmap Structure Definitions
+ ********************************************************************************************/
+
 const struct NXWidgets::SRlePaletteBitmap NxWM::g_mediaplayerBitmap =
 {
   CONFIG_NXWIDGETS_BPP,