From 0bef47273f0a9ec58e23a83b00bddf2017d7ba4f Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Tue, 15 Jul 2014 08:05:47 -0600
Subject: [PATCH] Update media player icons again

---
 nxwm/Makefile                                 |   2 +-
 nxwm/images/mediaforward43x41.png             | Bin 317 -> 363 bytes
 nxwm/images/mediagrip30x30.png                | Bin 252 -> 0 bytes
 nxwm/images/mediagrip60x30.png                | Bin 0 -> 283 bytes
 nxwm/images/mediapause21x41.png               | Bin 157 -> 0 bytes
 nxwm/images/mediapause43x41.png               | Bin 0 -> 222 bytes
 nxwm/images/mediaplay21x41.png                | Bin 289 -> 0 bytes
 nxwm/images/mediaplay43x41.png                | Bin 0 -> 332 bytes
 nxwm/images/mediarewind43x41.png              | Bin 316 -> 359 bytes
 ...grip30x30.cxx => glyph_mediagrip60x30.cxx} |  66 +--
 nxwm/src/glyph_mplayer_controls43x41.cxx      | 389 ++++++++++--------
 11 files changed, 254 insertions(+), 203 deletions(-)
 delete mode 100755 nxwm/images/mediagrip30x30.png
 create mode 100755 nxwm/images/mediagrip60x30.png
 delete mode 100755 nxwm/images/mediapause21x41.png
 create mode 100755 nxwm/images/mediapause43x41.png
 delete mode 100755 nxwm/images/mediaplay21x41.png
 create mode 100755 nxwm/images/mediaplay43x41.png
 rename nxwm/src/{glyph_mediagrip30x30.cxx => glyph_mediagrip60x30.cxx} (74%)

diff --git a/nxwm/Makefile b/nxwm/Makefile
index ad9b39e24..75c923299 100644
--- a/nxwm/Makefile
+++ b/nxwm/Makefile
@@ -89,7 +89,7 @@ ifeq ($(CONFIG_NXWM_MEDIAPLAYER),y)
 CXXSRCS += cmediaplayer.cxx
 ifeq ($(CONFIG_NXWM_LARGE_ICONS),y)
 CXXSRCS += glyph_mediaplayer44x50.cxx glyph_mplayer_controls43x41.cxx
-CXXSRCS += glyph_mediagrip30x30.cxx
+CXXSRCS += glyph_mediagrip60x30.cxx
 else
 CXXSRCS += glyph_mediaplayer24x24.cxx glyph_mplayer_controls32x32.cxx
 endif
diff --git a/nxwm/images/mediaforward43x41.png b/nxwm/images/mediaforward43x41.png
index 3165856dd91f183a89410107416b811c474c1cf4..ab5440a271f048acff81dddd5c9a701190f4f556 100755
GIT binary patch
delta 294
zcmV+>0one&0_y^hPJa&!Iug;TP3!;w0R2fsK~z}7#gwZN!cY)J@7#&UM$iG3qyi+J
zASeP)6{uJgWkg`<0Kp6lOd$Jq_r4bulXFf!Hy92RVn>ib0N7lE5fK98h#-L}_Yom5
z>tVVHOnjq00&_nr2Z8C|b}501ffW%bTDhG--LJ+-plIcG0)Is-w-YE@xt&1K%IyS-
zR&FOyv~oLvqLteT6s_D&plIcGLI+^j_Fl$x-mim%4#4F&`mVm;cF&Ut!T%Os`XGUA
z_0EDsy{8~oUtEx`FDp>!3kpPfYk^L0Dv;`z3)K3Bf(rV71$Fd43##eo3u@|T3M%Wr
s3+n4X3YzHO1s|>S0I=#$L3fbw0E6*{_KB+KlK=n!07*qoM6N<$f_Ei?!2kdN

delta 247
zcmaFOw3lguUp=1)yUe$Oy+0Tj7|wgTIEF+VK03ousM&z$NXNhb&%fNzWIlWBo0W}&
zkifSCrqA~jg->#jo2U{{BrnMn%5Utm;6v{*jw^Dj85%!r-s^qfV`HwMLG4p3#`{+~
zSk_c87bxg|H>n{%%Y|v*N<q#a%iL5R%$AynBv615aaxtoGf_t(xgbowo;&ncg5yHF
zpn%o)^)#-(7q$2z&8oIH>cM4i*08_34y=tAF?sP{^vjEQ?pt5Zv(Ek1-jw!t?}GUM
n!38e=buE_Kf4=>!td_y~P>XHcg?oHJzcF~a`njxgN@xNAzuItv

diff --git a/nxwm/images/mediagrip30x30.png b/nxwm/images/mediagrip30x30.png
deleted file mode 100755
index 40add47b765b9d18c1d20502e343d97d3144c93e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 252
zcmeAS@N?(olHy`uVBq!ia0vp^av;pX1SGcvS$+jljKx9jP7LeL$-D$|I14-?iy0WW
zg+Z8+Vb&Z8pdfpRr>`sfJ$613RsO3ryV!t2eV#6kAs)w*QxXzB<Wy~{eag-Dit&6w
z=i5@Fo)B~KJS*kqZ<1`c7}VHiH74e4N#AkgzxJ_$Cz5)OJ$j24ef%$)T#{>*?!LHC
zK(bd=%J#78wyR!~Q@X-G2cNmb)O~Tr%SH|Jq$M*iW~k(B0SX5B9$b}bvbbMn@kJqq
siJlo-+?FrC=n{55#q><ZwK*&di{_f=>MgW#0lJLA)78&qol`;+0Qf3cRR910

diff --git a/nxwm/images/mediagrip60x30.png b/nxwm/images/mediagrip60x30.png
new file mode 100755
index 0000000000000000000000000000000000000000..a2bcef665e6ac79141a68cdd5befa0bffcf18329
GIT binary patch
literal 283
zcmeAS@N?(olHy`uVBq!ia0vp^Hb5-L!2~4#|9T|>q!^2X+?^QKos)S9<Zu>vL>4nJ
za0`PlBg3pYAQkK-p1!W^_t^P)v;}hN_%8s3)_S@)hD01rPDx1kkW;m(_9=JULI#_|
zs@txgG~iPdKYaJ>i3PQ7i7Ob@+7vn5WNn>f-b(6y{NH6LQ`zP%usFNH_|bpuV=wqF
zSz6Ds0m?s;=~Y#(YV*!nJyq?b$ogl?k8ELGk!mF7p8PChQH{ULy5-YOF3zmFa&d{}
zt<^s@S1uD+*&3zRANCk5xVX<vTc$%N&aL|K;y$^uKDABEHWdx&J6Mzt3&=FEFf537
VzIZ{H<1*0U44$rjF6*2UngE^EW{Us-

literal 0
HcmV?d00001

diff --git a/nxwm/images/mediapause21x41.png b/nxwm/images/mediapause21x41.png
deleted file mode 100755
index 35e815930cb77fc0583647106a8ab33e0be2b12d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 157
zcmeAS@N?(olHy`uVBq!ia0vp^qCl+4!2~2j&wdpLQjEnx?oJHr&dIz4aySb-B8wRq
z_zr_G<MI3zDL_H?5>H=O_IvDnB7CB8dHX;n=zF?2hIkx*ds>l?fq~<&!?FMWZFHDK
yx|WoBmu->_p7iTZp5*oq6*hAH#~**(U&A<QDx3dwS(gPstqh*7elF{r5}E+o1}>@q

diff --git a/nxwm/images/mediapause43x41.png b/nxwm/images/mediapause43x41.png
new file mode 100755
index 0000000000000000000000000000000000000000..0aa79923ebc92d02501a1c18eb0e587dbdad073a
GIT binary patch
literal 222
zcmeAS@N?(olHy`uVBq!ia0vp^+CZ$y!2~3gzq`)?QjEnx?oJHr&dIz4aySb-B8wRq
z_zr_G<MI3zDL_H?5>H=O_IvF7JZ2WlmY+5Q3Ke*|IEF+VPEJu^sxY&46uud!?!3*&
z<bX%d*W2Oy8a5qP?eo3OomgKZ=-+1KbKr=<g@h}ti}fT*53b;Li#2%F6e!-a3#X8j
qUV@67;Qk{{CW32{OI);^nHj8?%LP1iZUwrHfx*+&&t;ucLK6T*l17pM

literal 0
HcmV?d00001

diff --git a/nxwm/images/mediaplay21x41.png b/nxwm/images/mediaplay21x41.png
deleted file mode 100755
index aa96551ecf946090ac7bd3e9ac81f4d6f70a6a21..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 289
zcmeAS@N?(olHy`uVBq!ia0vp^qCl+4!2~2j&wdpLQjEnx?oJHr&dIz4aySb-B8wRq
z_zr_G<MI3zDL_H?5>H=O_IvDnBK(qmhY!~Sg*JP-IEHu}Uwh4yk6Dq&B{2B=e&a|5
zL8fDR;)$1;tM*@Ae5>mHH-m&Uea@cNIR|1c3q_c>uxxvq#q@k#5YxLjyT;orGaU?$
zs|ffn=Un36A)Mf6<k7I_+;)~9(QnlPs&1WQS;hZnTEmBPYdJI4|MhYB_o>I__u=pU
za%)ZZB>ers++CM+bp4Ju<}shu^(w?S|7+8fe{kox#YfFPo96ZNj_iBB@v(Qs_s~C&
jS^s>Ms{8d>>M^tRQzuuJ$hlvE&S&s+^>bP0l+XkKm7a5x

diff --git a/nxwm/images/mediaplay43x41.png b/nxwm/images/mediaplay43x41.png
new file mode 100755
index 0000000000000000000000000000000000000000..440544b17bc05b35b11b92994e83f75a5906a7a8
GIT binary patch
literal 332
zcmeAS@N?(olHy`uVBq!ia0vp^+CZ$y!2~3gzq`)?QjEnx?oJHr&dIz4aySb-B8wRq
z_zr_G<MI3zDL_H?5>H=O_IvF7JciZ<?|Hm|Liapf977@wAHA_r@Q?$K%SCBkSBnMA
zT7|4F?^+s^GFm&PbQsA@xWve7ps@Deqwcl8^K14UNq%yzCayi*_2JFK$=QwUf=@Z6
z1WyTcaTNABx7cwhE;991ShU+wTJS*i8^xxdbEG;B<W243_>h*(5u%`&;V7FZAR;K|
z$eJj;M9|NXFHuZIVE3P}&xJvvufJ|#XZe2G_x1jHr>8CdV4E-g=S(&0%sqh<&g^FS
zxyLo&)aRxwIWdmPpaoA28|S36%(YR-c(%K#Zl9{dr(F%Fx|s~tbKIzjY<T|v@8(C3
ZtC&}8b*YgJ{{r$UgQu&X%Q~loCIF1Wez*Vt

literal 0
HcmV?d00001

diff --git a/nxwm/images/mediarewind43x41.png b/nxwm/images/mediarewind43x41.png
index 772186e6e41c351715d3b28c42b3680446ec473d..dd3d5e1061a0b172e2d9c7621d5f14269498b402 100755
GIT binary patch
delta 290
zcmdnP^qgseUp+rB0}G>=&u0b(hM%4;jv*0;k51bt*yJGMVt<=qWut5WXXu4a#<>zv
zjJ^SEj4Nd&UOafQ;Lq;A)#aA&ZCT3<l>O}Wj>&di=<hByUj05TCEn(4SkQl!1?%jV
zD}>FD5m@K19q>Y!%cUy6(eJ(1gjfCCSAI1&G5xA%P5ole-BthcJGa-XaxSjd`?*iO
zw&z;);y&xvFYBASs*JNw<nMi1q{i7hbL;Z#Z(qNcDsbM=IFrcnKv0EIaeuR-!mIOV
z)D%ASJrfl89g!*^@Gob%(1MDClQ;zSKCNRa34W~NU~cM%pRrh4P2y+aHbJ@B^&e+A
TavD?tgMq=*)z4*}Q$iB}njd(g

delta 246
zcmV<S015x+0=xo{PJa#*2ovE~yruvE0M1E7K~z}7#g;)1gFp-ez5f57(@Uj_iWcuC
zPI$n~0E-2XxFQ0%D<U|n2f$hVVL_q(q@Y&6T~MyyD{$yH3QT&nz^9iAtor8yxBj7^
zLI1CyNB^^+O@Cj|slO>`)_)iD>n{Z(`cJ`>{#`Jr2f$f90B^3fk_AZu^N1vYCHIjb
zu<BtR6Il30&j_qNRtE%@pY2@&9Us^hfu^rqC(t)FB7xSuQwa1;jYyzxYD5BkQzH`S
wn;MZo-_(c%`ld!C&^I+AfxfA66UzRuU*EWdJ&+Z30RR9107*qoM6N<$f=LW+ivR!s

diff --git a/nxwm/src/glyph_mediagrip30x30.cxx b/nxwm/src/glyph_mediagrip60x30.cxx
similarity index 74%
rename from nxwm/src/glyph_mediagrip30x30.cxx
rename to nxwm/src/glyph_mediagrip60x30.cxx
index ecbf5e4f9..3ede869ff 100644
--- a/nxwm/src/glyph_mediagrip30x30.cxx
+++ b/nxwm/src/glyph_mediagrip60x30.cxx
@@ -1,5 +1,5 @@
 /********************************************************************************************
- * NxWidgets/nxwm/src/mediagrip30x30.cxx
+ * NxWidgets/nxwm/src/mediagrip60x30.cxx
  *
  *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -57,7 +57,7 @@
  ********************************************************************************************/
 
 #define BITMAP_NROWS         30
-#define BITMAP_NCOLUMNS      30
+#define BITMAP_NCOLUMNS      60
 #define BITMAP_NLUTCODES     4
 
 #define MEDIA_GRIP_DARK_ICON 1
@@ -215,36 +215,38 @@ static const nxgl_mxpixel_t g_gripBrightLut[BITMAP_NLUTCODES] =
 
 static const struct NXWidgets::SRlePaletteBitmapEntry g_gripRleEntries[] =
 {
-  { 1, 0}, { 1, 1}, {26, 2}, { 1, 1}, { 1, 0},  /* Row 0 */
-  { 1, 1}, {28, 2}, { 1, 1},                    /* Row 1 */
-  {30, 2},                                      /* Row 2 */
-  {30, 2},                                      /* Row 3 */
-  {30, 2},                                      /* Row 4 */
-  {30, 2},                                      /* Row 5 */
-  {12, 2}, { 1, 1}, { 4, 3}, { 1, 1}, {12, 2},  /* Row 6 */
-  {12, 2}, { 6, 3}, {12, 2},                    /* Row 7 */
-  {12, 2}, { 6, 3}, {12, 2},                    /* Row 8 */
-  {12, 2}, { 6, 3}, {12, 2},                    /* Row 9 */
-  {12, 2}, { 6, 3}, {12, 2},                    /* Row 10 */
-  {12, 2}, { 6, 3}, {12, 2},                    /* Row 11 */
-  { 6, 2}, { 1, 1}, {16, 3}, { 1, 1}, { 6, 2},  /* Row 12 */
-  { 6, 2}, {18, 3}, { 6, 2},                    /* Row 13 */
-  { 6, 2}, {18, 3}, { 6, 2},                    /* Row 14 */
-  { 6, 2}, {18, 3}, { 6, 2},                    /* Row 15 */
-  { 6, 2}, {18, 3}, { 6, 2},                    /* Row 16 */
-  { 6, 2}, { 1, 1}, {16, 3}, { 1, 1}, { 6, 2},  /* Row 17 */
-  {12, 2}, { 6, 3}, {12, 2},                    /* Row 18 */
-  {12, 2}, { 6, 3}, {12, 2},                    /* Row 19 */
-  {12, 2}, { 6, 3}, {12, 2},                    /* Row 20 */
-  {12, 2}, { 6, 3}, {12, 2},                    /* Row 21 */
-  {12, 2}, { 6, 3}, {12, 2},                    /* Row 22 */
-  {12, 2}, { 1, 1}, { 4, 3}, { 1, 1}, {12, 2},  /* Row 23 */
-  {30, 2},                                      /* Row 24 */
-  {30, 2},                                      /* Row 25 */
-  {30, 2},                                      /* Row 26 */
-  {30, 2},                                      /* Row 27 */
-  { 1, 1}, {28, 2}, { 1, 1},                    /* Row 28 */
-  { 1, 0}, { 1, 1}, {26, 2}, { 1, 1}, { 1, 0}   /* Row 29 */
+  { 1, 0}, { 1, 1}, {56, 2}, { 1, 1}, { 1, 0},                             /* Row 0 */
+  { 1, 1}, {58, 2}, { 1, 1},                                               /* Row 1 */
+  {60, 2},                                                                 /* Row 2 */
+  {60, 2},                                                                 /* Row 3 */
+  {60, 2},                                                                 /* Row 4 */
+  {60, 2},                                                                 /* Row 5 */
+  {42, 2}, { 1, 1}, { 4, 3}, { 1, 1}, {12, 2},                             /* Row 6 */
+  {42, 2}, { 6, 3}, {12, 2},                                               /* Row 7 */
+  {42, 2}, { 6, 3}, {12, 2},                                               /* Row 8 */
+  {42, 2}, { 6, 3}, {12, 2},                                               /* Row 9 */
+  {42, 2}, { 6, 3}, {12, 2},                                               /* Row 10 */
+  {42, 2}, { 6, 3}, {12, 2},                                               /* Row 11 */
+  { 6, 2}, { 1, 1}, {16, 3}, { 1, 1}, {12, 2}, { 1, 1}, {16, 3}, { 1, 1},  /* Row 12 */
+  { 6, 2},
+  { 6, 2}, {18, 3}, {12, 2}, {18, 3}, { 6, 2},                             /* Row 13 */
+  { 6, 2}, {18, 3}, {12, 2}, {18, 3}, { 6, 2},                             /* Row 14 */
+  { 6, 2}, {18, 3}, {12, 2}, {18, 3}, { 6, 2},                             /* Row 15 */
+  { 6, 2}, {18, 3}, {12, 2}, {18, 3}, { 6, 2},                             /* Row 16 */
+  { 6, 2}, { 1, 1}, {16, 3}, { 1, 1}, {12, 2}, { 1, 1}, {16, 3}, { 1, 1},  /* Row 17 */
+  { 6, 2},
+  {42, 2}, { 6, 3}, {12, 2},                                               /* Row 18 */
+  {42, 2}, { 6, 3}, {12, 2},                                               /* Row 19 */
+  {42, 2}, { 6, 3}, {12, 2},                                               /* Row 20 */
+  {42, 2}, { 6, 3}, {12, 2},                                               /* Row 21 */
+  {42, 2}, { 6, 3}, {12, 2},                                               /* Row 22 */
+  {42, 2}, { 1, 1}, { 4, 3}, { 1, 1}, {12, 2},                             /* Row 23 */
+  {60, 2},                                                                 /* Row 24 */
+  {60, 2},                                                                 /* Row 25 */
+  {60, 2},                                                                 /* Row 26 */
+  {60, 2},                                                                 /* Row 27 */
+  { 1, 1}, {58, 2}, { 1, 1},                                               /* Row 28 */
+  { 1, 0}, { 1, 1}, {56, 2}, { 1, 1}, { 1, 0}                              /* Row 29 */
 };
 
 /********************************************************************************************
diff --git a/nxwm/src/glyph_mplayer_controls43x41.cxx b/nxwm/src/glyph_mplayer_controls43x41.cxx
index 505d612d4..067c47936 100644
--- a/nxwm/src/glyph_mplayer_controls43x41.cxx
+++ b/nxwm/src/glyph_mplayer_controls43x41.cxx
@@ -63,13 +63,13 @@
 #define FORWARD_BITMAP_NCOLUMNS 43
 
 #define PLAY_BITMAP_NROWS       41
-#define PLAY_BITMAP_NCOLUMNS    21
+#define PLAY_BITMAP_NCOLUMNS    43
 
 #define REWIND_BITMAPNROWS      41
 #define REWIND_BITMAPNCOLUMNS   43
 
 #define PAUSE_BITMAP_NROWS      41
-#define PAUSE_BITMAP_NCOLUMNS   21
+#define PAUSE_BITMAP_NCOLUMNS   43
 
 #define BITMAP_NLUTCODES        8
 
@@ -83,202 +83,251 @@ using namespace NxWM;
 
 static const NXWidgets::nxwidget_pixel_t g_normalLut[BITMAP_NLUTCODES] =
 {
-  CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR,                                   /* Code 0 */
-  MKRGB(189,189,189)                                                     /* Code 1 */
+  CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR,                   /* Code 0 */
+  MKRGB(54,99,171),                                      /* Code 1 */
+  MKRGB(0,33,153),                                       /* Code 2 */
+  MKRGB(12,16,120)                                       /* Code 3 */
 };
 
 static const NXWidgets::nxwidget_pixel_t g_brightLut[BITMAP_NLUTCODES] =
 {
-  CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR,                                   /* Code 0 */
-  MKRGB(252,252,252)                                                     /* Code 1 */
+  CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR,                   /* Code 0 */
+#if 1 // Red
+  MKRGB(228,132,72),                                     /* Code 1 */
+  MKRGB(204,44,0),                                       /* Code 2 */
+  MKRGB(160,24,16)                                       /* Code 3 */
+#else // Blue
+  MKRGB(72,132,228),                                     /* Code 1 */
+  MKRGB(0,44,204),                                       /* Code 2 */
+  MKRGB(16,24,160)                                       /* Code 3 */
+#endif
 };
 
 /* Bitmap definition for the "Forward" button */
 
 static const struct NXWidgets::SRlePaletteBitmapEntry g_forwardRleEntries[] =
 {
-  { 1, 1}, {21, 0}, { 1, 1}, {20, 0},  /* Row 0 */
-  { 2, 1}, {20, 0}, { 2, 1}, {19, 0},  /* Row 1 */
-  { 3, 1}, {19, 0}, { 3, 1}, {18, 0},  /* Row 2 */
-  { 4, 1}, {18, 0}, { 4, 1}, {17, 0},  /* Row 3 */
-  { 5, 1}, {17, 0}, { 5, 1}, {16, 0},  /* Row 4 */
-  { 6, 1}, {16, 0}, { 6, 1}, {15, 0},  /* Row 5 */
-  { 7, 1}, {15, 0}, { 7, 1}, {14, 0},  /* Row 6 */
-  { 8, 1}, {14, 0}, { 8, 1}, {13, 0},  /* Row 7 */
-  { 9, 1}, {13, 0}, { 9, 1}, {12, 0},  /* Row 8 */
-  {10, 1}, {12, 0}, {10, 1}, {11, 0},  /* Row 9 */
-  {11, 1}, {11, 0}, {11, 1}, {10, 0},  /* Row 10 */
-  {12, 1}, {10, 0}, {12, 1}, { 9, 0},  /* Row 11 */
-  {13, 1}, { 9, 0}, {13, 1}, { 8, 0},  /* Row 12 */
-  {14, 1}, { 8, 0}, {14, 1}, { 7, 0},  /* Row 13 */
-  {15, 1}, { 7, 0}, {15, 1}, { 6, 0},  /* Row 14 */
-  {16, 1}, { 6, 0}, {16, 1}, { 5, 0},  /* Row 15 */
-  {17, 1}, { 5, 0}, {17, 1}, { 4, 0},  /* Row 16 */
-  {18, 1}, { 4, 0}, {18, 1}, { 3, 0},  /* Row 17 */
-  {19, 1}, { 3, 0}, {19, 1}, { 2, 0},  /* Row 18 */
-  {20, 1}, { 2, 0}, {20, 1}, { 1, 0},  /* Row 19 */
-  {21, 1}, { 1, 0}, {21, 1},           /* Row 20 */
-  {20, 1}, { 2, 0}, {20, 1}, { 1, 0},  /* Row 21 */
-  {19, 1}, { 3, 0}, {19, 1}, { 2, 0},  /* Row 22 */
-  {18, 1}, { 4, 0}, {18, 1}, { 3, 0},  /* Row 23 */
-  {17, 1}, { 5, 0}, {17, 1}, { 4, 0},  /* Row 24 */
-  {16, 1}, { 6, 0}, {16, 1}, { 5, 0},  /* Row 25 */
-  {15, 1}, { 7, 0}, {15, 1}, { 6, 0},  /* Row 26 */
-  {14, 1}, { 8, 0}, {14, 1}, { 7, 0},  /* Row 27 */
-  {13, 1}, { 9, 0}, {13, 1}, { 8, 0},  /* Row 28 */
-  {12, 1}, {10, 0}, {12, 1}, { 9, 0},  /* Row 29 */
-  {11, 1}, {11, 0}, {11, 1}, {10, 0},  /* Row 30 */
-  {10, 1}, {12, 0}, {10, 1}, {11, 0},  /* Row 31 */
-  { 9, 1}, {13, 0}, { 9, 1}, {12, 0},  /* Row 32 */
-  { 8, 1}, {14, 0}, { 8, 1}, {13, 0},  /* Row 33 */
-  { 7, 1}, {15, 0}, { 7, 1}, {14, 0},  /* Row 34 */
-  { 6, 1}, {16, 0}, { 6, 1}, {15, 0},  /* Row 35 */
-  { 5, 1}, {17, 0}, { 5, 1}, {16, 0},  /* Row 36 */
-  { 4, 1}, {18, 0}, { 4, 1}, {17, 0},  /* Row 37 */
-  { 3, 1}, {19, 0}, { 3, 1}, {18, 0},  /* Row 38 */
-  { 2, 1}, {20, 0}, { 2, 1}, {19, 0},  /* Row 39 */
-  { 1, 1}, {21, 0}, { 1, 1}, {20, 0}   /* Row 40 */
+  { 1, 1}, {21, 0}, { 1, 1}, {20, 0},                    /* Row 0 */
+  { 1, 1}, { 1, 2}, {20, 0}, { 1, 1}, { 1, 2}, {19, 0},  /* Row 1 */
+  { 1, 1}, { 2, 2}, {19, 0}, { 1, 1}, { 2, 2}, {18, 0},  /* Row 2 */
+  { 1, 1}, { 3, 2}, {18, 0}, { 1, 1}, { 3, 2}, {17, 0},  /* Row 3 */
+  { 1, 1}, { 4, 2}, {17, 0}, { 1, 1}, { 4, 2}, {16, 0},  /* Row 4 */
+  { 1, 1}, { 5, 2}, {16, 0}, { 1, 1}, { 5, 2}, {15, 0},  /* Row 5 */
+  { 1, 1}, { 6, 2}, {15, 0}, { 1, 1}, { 6, 2}, {14, 0},  /* Row 6 */
+  { 1, 1}, { 7, 2}, {14, 0}, { 1, 1}, { 7, 2}, {13, 0},  /* Row 7 */
+  { 1, 1}, { 8, 2}, {13, 0}, { 1, 1}, { 8, 2}, {12, 0},  /* Row 8 */
+  { 1, 1}, { 9, 2}, {12, 0}, { 1, 1}, { 9, 2}, {11, 0},  /* Row 9 */
+  { 1, 1}, {10, 2}, {11, 0}, { 1, 1}, {10, 2}, {10, 0},  /* Row 10 */
+  { 1, 1}, {11, 2}, {10, 0}, { 1, 1}, {11, 2}, { 9, 0},  /* Row 11 */
+  { 1, 1}, {12, 2}, { 9, 0}, { 1, 1}, {12, 2}, { 8, 0},  /* Row 12 */
+  { 1, 1}, {13, 2}, { 8, 0}, { 1, 1}, {13, 2}, { 7, 0},  /* Row 13 */
+  { 1, 1}, {14, 2}, { 7, 0}, { 1, 1}, {14, 2}, { 6, 0},  /* Row 14 */
+  { 1, 1}, {15, 2}, { 6, 0}, { 1, 1}, {15, 2}, { 5, 0},  /* Row 15 */
+  { 1, 1}, {16, 2}, { 5, 0}, { 1, 1}, {16, 2}, { 4, 0},  /* Row 16 */
+  { 1, 1}, {17, 2}, { 4, 0}, { 1, 1}, {17, 2}, { 3, 0},  /* Row 17 */
+  { 1, 1}, {18, 2}, { 3, 0}, { 1, 1}, {18, 2}, { 2, 0},  /* Row 18 */
+  { 1, 1}, {19, 2}, { 2, 0}, { 1, 1}, {19, 2}, { 1, 0},  /* Row 19 */
+  {21, 1}, { 1, 0}, {21, 1},                             /* Row 20 */
+  { 1, 1}, {19, 3}, { 2, 0}, { 1, 1}, {19, 3}, { 1, 0},  /* Row 21 */
+  { 1, 1}, {18, 3}, { 3, 0}, { 1, 1}, {18, 3}, { 2, 0},  /* Row 22 */
+  { 1, 1}, {17, 3}, { 4, 0}, { 1, 1}, {17, 3}, { 3, 0},  /* Row 23 */
+  { 1, 1}, {16, 3}, { 5, 0}, { 1, 1}, {16, 3}, { 4, 0},  /* Row 24 */
+  { 1, 1}, {15, 3}, { 6, 0}, { 1, 1}, {15, 3}, { 5, 0},  /* Row 25 */
+  { 1, 1}, {14, 3}, { 7, 0}, { 1, 1}, {14, 3}, { 6, 0},  /* Row 26 */
+  { 1, 1}, {13, 3}, { 8, 0}, { 1, 1}, {13, 3}, { 7, 0},  /* Row 27 */
+  { 1, 1}, {12, 3}, { 9, 0}, { 1, 1}, {12, 3}, { 8, 0},  /* Row 28 */
+  { 1, 1}, {11, 3}, {10, 0}, { 1, 1}, {11, 3}, { 9, 0},  /* Row 29 */
+  { 1, 1}, {10, 3}, {11, 0}, { 1, 1}, {10, 3}, {10, 0},  /* Row 30 */
+  { 1, 1}, { 9, 3}, {12, 0}, { 1, 1}, { 9, 3}, {11, 0},  /* Row 31 */
+  { 1, 1}, { 8, 3}, {13, 0}, { 1, 1}, { 8, 3}, {12, 0},  /* Row 32 */
+  { 1, 1}, { 7, 3}, {14, 0}, { 1, 1}, { 7, 3}, {13, 0},  /* Row 33 */
+  { 1, 1}, { 6, 3}, {15, 0}, { 1, 1}, { 6, 3}, {14, 0},  /* Row 34 */
+  { 1, 1}, { 5, 3}, {16, 0}, { 1, 1}, { 5, 3}, {15, 0},  /* Row 35 */
+  { 1, 1}, { 4, 3}, {17, 0}, { 1, 1}, { 4, 3}, {16, 0},  /* Row 36 */
+  { 1, 1}, { 3, 3}, {18, 0}, { 1, 1}, { 3, 3}, {17, 0},  /* Row 37 */
+  { 1, 1}, { 2, 3}, {19, 0}, { 1, 1}, { 2, 3}, {18, 0},  /* Row 38 */
+  { 1, 1}, { 1, 3}, {20, 0}, { 1, 1}, { 1, 3}, {19, 0},  /* Row 39 */
+  { 1, 3}, {21, 0}, { 1, 3}, {20, 0}                     /* Row 40 */
 };
 
 /* Bitmap definition for the "Play" button */
 
 static const struct NXWidgets::SRlePaletteBitmapEntry g_playRleEntries[] =
 {
-  { 1, 1}, {20, 0},  /* Row 0 */
-  { 2, 1}, {19, 0},  /* Row 1 */
-  { 3, 1}, {18, 0},  /* Row 2 */
-  { 4, 1}, {17, 0},  /* Row 3 */
-  { 5, 1}, {16, 0},  /* Row 4 */
-  { 6, 1}, {15, 0},  /* Row 5 */
-  { 7, 1}, {14, 0},  /* Row 6 */
-  { 8, 1}, {13, 0},  /* Row 7 */
-  { 9, 1}, {12, 0},  /* Row 8 */
-  {10, 1}, {11, 0},  /* Row 9 */
-  {11, 1}, {10, 0},  /* Row 10 */
-  {12, 1}, { 9, 0},  /* Row 11 */
-  {13, 1}, { 8, 0},  /* Row 12 */
-  {14, 1}, { 7, 0},  /* Row 13 */
-  {15, 1}, { 6, 0},  /* Row 14 */
-  {16, 1}, { 5, 0},  /* Row 15 */
-  {17, 1}, { 4, 0},  /* Row 16 */
-  {18, 1}, { 3, 0},  /* Row 17 */
-  {19, 1}, { 2, 0},  /* Row 18 */
-  {20, 1}, { 1, 0},  /* Row 19 */
-  {21, 1},           /* Row 20 */
-  {20, 1}, { 1, 0},  /* Row 21 */
-  {19, 1}, { 2, 0},  /* Row 22 */
-  {18, 1}, { 3, 0},  /* Row 23 */
-  {17, 1}, { 4, 0},  /* Row 24 */
-  {16, 1}, { 5, 0},  /* Row 25 */
-  {15, 1}, { 6, 0},  /* Row 26 */
-  {14, 1}, { 7, 0},  /* Row 27 */
-  {13, 1}, { 8, 0},  /* Row 28 */
-  {12, 1}, { 9, 0},  /* Row 29 */
-  {11, 1}, {10, 0},  /* Row 30 */
-  {10, 1}, {11, 0},  /* Row 31 */
-  { 9, 1}, {12, 0},  /* Row 32 */
-  { 8, 1}, {13, 0},  /* Row 33 */
-  { 7, 1}, {14, 0},  /* Row 34 */
-  { 6, 1}, {15, 0},  /* Row 35 */
-  { 5, 1}, {16, 0},  /* Row 36 */
-  { 4, 1}, {17, 0},  /* Row 37 */
-  { 3, 1}, {18, 0},  /* Row 38 */
-  { 2, 1}, {19, 0},  /* Row 39 */
-  { 1, 1}, {20, 0}  /* Row 40 */
+  {13, 0}, { 1, 1}, {29, 0},                             /* Row 0 */
+  {13, 0}, { 1, 1}, { 1, 2}, {28, 0},                    /* Row 1 */
+  {13, 0}, { 1, 1}, { 2, 2}, {27, 0},                    /* Row 2 */
+  {13, 0}, { 1, 1}, { 3, 2}, {26, 0},                    /* Row 3 */
+  {13, 0}, { 1, 1}, { 4, 2}, {25, 0},                    /* Row 4 */
+  {13, 0}, { 1, 1}, { 5, 2}, {24, 0},                    /* Row 5 */
+  {13, 0}, { 1, 1}, { 6, 2}, {23, 0},                    /* Row 6 */
+  {13, 0}, { 1, 1}, { 7, 2}, {22, 0},                    /* Row 7 */
+  {13, 0}, { 1, 1}, { 8, 2}, {21, 0},                    /* Row 8 */
+  {13, 0}, { 1, 1}, { 9, 2}, {20, 0},                    /* Row 9 */
+  {13, 0}, { 1, 1}, {10, 2}, {19, 0},                    /* Row 10 */
+  {13, 0}, { 1, 1}, {11, 2}, {18, 0},                    /* Row 11 */
+  {13, 0}, { 1, 1}, {12, 2}, {17, 0},                    /* Row 12 */
+  {13, 0}, { 1, 1}, {13, 2}, {16, 0},                    /* Row 13 */
+  {13, 0}, { 1, 1}, {14, 2}, {15, 0},                    /* Row 14 */
+  {13, 0}, { 1, 1}, {15, 2}, {14, 0},                    /* Row 15 */
+  {13, 0}, { 1, 1}, {16, 2}, {13, 0},                    /* Row 16 */
+  {13, 0}, { 1, 1}, {17, 2}, {12, 0},                    /* Row 17 */
+  {13, 0}, { 1, 1}, {18, 2}, {11, 0},                    /* Row 18 */
+  {13, 0}, { 1, 1}, {19, 2}, {10, 0},                    /* Row 19 */
+  {13, 0}, {21, 1}, { 9, 0},                             /* Row 20 */
+  {13, 0}, { 1, 1}, {19, 3}, {10, 0},                    /* Row 21 */
+  {13, 0}, { 1, 1}, {18, 3}, {11, 0},                    /* Row 22 */
+  {13, 0}, { 1, 1}, {17, 3}, {12, 0},                    /* Row 23 */
+  {13, 0}, { 1, 1}, {16, 3}, {13, 0},                    /* Row 24 */
+  {13, 0}, { 1, 1}, {15, 3}, {14, 0},                    /* Row 25 */
+  {13, 0}, { 1, 1}, {14, 3}, {15, 0},                    /* Row 26 */
+  {13, 0}, { 1, 1}, {13, 3}, {16, 0},                    /* Row 27 */
+  {13, 0}, { 1, 1}, {12, 3}, {17, 0},                    /* Row 28 */
+  {13, 0}, { 1, 1}, {11, 3}, {18, 0},                    /* Row 29 */
+  {13, 0}, { 1, 1}, {10, 3}, {19, 0},                    /* Row 30 */
+  {13, 0}, { 1, 1}, { 9, 3}, {20, 0},                    /* Row 31 */
+  {13, 0}, { 1, 1}, { 8, 3}, {21, 0},                    /* Row 32 */
+  {13, 0}, { 1, 1}, { 7, 3}, {22, 0},                    /* Row 33 */
+  {13, 0}, { 1, 1}, { 6, 3}, {23, 0},                    /* Row 34 */
+  {13, 0}, { 1, 1}, { 5, 3}, {24, 0},                    /* Row 35 */
+  {13, 0}, { 1, 1}, { 4, 3}, {25, 0},                    /* Row 36 */
+  {13, 0}, { 1, 1}, { 3, 3}, {26, 0},                    /* Row 37 */
+  {13, 0}, { 1, 1}, { 2, 3}, {27, 0},                    /* Row 38 */
+  {13, 0}, { 1, 1}, { 1, 3}, {28, 0},                    /* Row 39 */
+  {13, 0}, { 1, 2}, {29, 0}                              /* Row 40 */
 };
 
 /* Bitmap definition for "Rewind" control */
 
 static const struct NXWidgets::SRlePaletteBitmapEntry g_rewindRleEntries[] =
 {
-  {20, 0}, { 1, 1}, {21, 0}, { 1, 1},  /* Row 0 */
-  {19, 0}, { 2, 1}, {20, 0}, { 2, 1},  /* Row 1 */
-  {18, 0}, { 3, 1}, {19, 0}, { 3, 1},  /* Row 2 */
-  {17, 0}, { 4, 1}, {18, 0}, { 4, 1},  /* Row 3 */
-  {16, 0}, { 5, 1}, {17, 0}, { 5, 1},  /* Row 4 */
-  {15, 0}, { 6, 1}, {16, 0}, { 6, 1},  /* Row 5 */
-  {14, 0}, { 7, 1}, {15, 0}, { 7, 1},  /* Row 6 */
-  {13, 0}, { 8, 1}, {14, 0}, { 8, 1},  /* Row 7 */
-  {12, 0}, { 9, 1}, {13, 0}, { 9, 1},  /* Row 8 */
-  {11, 0}, {10, 1}, {12, 0}, {10, 1},  /* Row 9 */
-  {10, 0}, {11, 1}, {11, 0}, {11, 1},  /* Row 10 */
-  { 9, 0}, {12, 1}, {10, 0}, {12, 1},  /* Row 11 */
-  { 8, 0}, {13, 1}, { 9, 0}, {13, 1},  /* Row 12 */
-  { 7, 0}, {14, 1}, { 8, 0}, {14, 1},  /* Row 13 */
-  { 6, 0}, {15, 1}, { 7, 0}, {15, 1},  /* Row 14 */
-  { 5, 0}, {16, 1}, { 6, 0}, {16, 1},  /* Row 15 */
-  { 4, 0}, {17, 1}, { 5, 0}, {17, 1},  /* Row 16 */
-  { 3, 0}, {18, 1}, { 4, 0}, {18, 1},  /* Row 17 */
-  { 2, 0}, {19, 1}, { 3, 0}, {19, 1},  /* Row 18 */
-  { 1, 0}, {20, 1}, { 2, 0}, {20, 1},  /* Row 19 */
-  {21, 1}, { 1, 0}, {21, 1},           /* Row 20 */
-  { 1, 0}, {20, 1}, { 2, 0}, {20, 1},  /* Row 21 */
-  { 2, 0}, {19, 1}, { 3, 0}, {19, 1},  /* Row 22 */
-  { 3, 0}, {18, 1}, { 4, 0}, {18, 1},  /* Row 23 */
-  { 4, 0}, {17, 1}, { 5, 0}, {17, 1},  /* Row 24 */
-  { 5, 0}, {16, 1}, { 6, 0}, {16, 1},  /* Row 25 */
-  { 6, 0}, {15, 1}, { 7, 0}, {15, 1},  /* Row 26 */
-  { 7, 0}, {14, 1}, { 8, 0}, {14, 1},  /* Row 27 */
-  { 8, 0}, {13, 1}, { 9, 0}, {13, 1},  /* Row 28 */
-  { 9, 0}, {12, 1}, {10, 0}, {12, 1},  /* Row 29 */
-  {10, 0}, {11, 1}, {11, 0}, {11, 1},  /* Row 30 */
-  {11, 0}, {10, 1}, {12, 0}, {10, 1},  /* Row 31 */
-  {12, 0}, { 9, 1}, {13, 0}, { 9, 1},  /* Row 32 */
-  {13, 0}, { 8, 1}, {14, 0}, { 8, 1},  /* Row 33 */
-  {14, 0}, { 7, 1}, {15, 0}, { 7, 1},  /* Row 34 */
-  {15, 0}, { 6, 1}, {16, 0}, { 6, 1},  /* Row 35 */
-  {16, 0}, { 5, 1}, {17, 0}, { 5, 1},  /* Row 36 */
-  {17, 0}, { 4, 1}, {18, 0}, { 4, 1},  /* Row 37 */
-  {18, 0}, { 3, 1}, {19, 0}, { 3, 1},  /* Row 38 */
-  {19, 0}, { 2, 1}, {20, 0}, { 2, 1},  /* Row 39 */
-  {20, 0}, { 1, 1}, {21, 0}, { 1, 1}   /* Row 40 */
+  {20, 0}, { 1, 1}, {21, 0}, { 1, 1},                    /* Row 0 */
+  {19, 0}, { 1, 1}, { 1, 2}, {20, 0}, { 1, 1}, { 1, 2},  /* Row 1 */
+  {18, 0}, { 1, 1}, { 2, 2}, {19, 0}, { 1, 1}, { 2, 2},  /* Row 2 */
+  {17, 0}, { 1, 1}, { 3, 2}, {18, 0}, { 1, 1}, { 3, 2},  /* Row 3 */
+  {16, 0}, { 1, 1}, { 4, 2}, {17, 0}, { 1, 1}, { 4, 2},  /* Row 4 */
+  {15, 0}, { 1, 1}, { 5, 2}, {16, 0}, { 1, 1}, { 5, 2},  /* Row 5 */
+  {14, 0}, { 1, 1}, { 6, 2}, {15, 0}, { 1, 1}, { 6, 2},  /* Row 6 */
+  {13, 0}, { 1, 1}, { 7, 2}, {14, 0}, { 1, 1}, { 7, 2},  /* Row 7 */
+  {12, 0}, { 1, 1}, { 8, 2}, {13, 0}, { 1, 1}, { 8, 2},  /* Row 8 */
+  {11, 0}, { 1, 1}, { 9, 2}, {12, 0}, { 1, 1}, { 9, 2},  /* Row 9 */
+  {10, 0}, { 1, 1}, {10, 2}, {11, 0}, { 1, 1}, {10, 2},  /* Row 10 */
+  { 9, 0}, { 1, 1}, {11, 2}, {10, 0}, { 1, 1}, {11, 2},  /* Row 11 */
+  { 8, 0}, { 1, 1}, {12, 2}, { 9, 0}, { 1, 1}, {12, 2},  /* Row 12 */
+  { 7, 0}, { 1, 1}, {13, 2}, { 8, 0}, { 1, 1}, {13, 2},  /* Row 13 */
+  { 6, 0}, { 1, 1}, {14, 2}, { 7, 0}, { 1, 1}, {14, 2},  /* Row 14 */
+  { 5, 0}, { 1, 1}, {15, 2}, { 6, 0}, { 1, 1}, {15, 2},  /* Row 15 */
+  { 4, 0}, { 1, 1}, {16, 2}, { 5, 0}, { 1, 1}, {16, 2},  /* Row 16 */
+  { 3, 0}, { 1, 1}, {17, 2}, { 4, 0}, { 1, 1}, {17, 2},  /* Row 17 */
+  { 2, 0}, { 1, 1}, {18, 2}, { 3, 0}, { 1, 1}, {18, 2},  /* Row 18 */
+  { 1, 0}, { 1, 1}, {19, 2}, { 2, 0}, { 1, 1}, {19, 2},  /* Row 19 */
+  {21, 1}, { 1, 0}, {21, 1},                             /* Row 20 */
+  { 1, 0}, {20, 3}, { 2, 0}, {20, 3},                    /* Row 21 */
+  { 2, 0}, {19, 3}, { 3, 0}, {19, 3},                    /* Row 22 */
+  { 3, 0}, {18, 3}, { 4, 0}, {18, 3},                    /* Row 23 */
+  { 4, 0}, {17, 3}, { 5, 0}, {17, 3},                    /* Row 24 */
+  { 5, 0}, {16, 3}, { 6, 0}, {16, 3},                    /* Row 25 */
+  { 6, 0}, {15, 3}, { 7, 0}, {15, 3},                    /* Row 26 */
+  { 7, 0}, {14, 3}, { 8, 0}, {14, 3},                    /* Row 27 */
+  { 8, 0}, {13, 3}, { 9, 0}, {13, 3},                    /* Row 28 */
+  { 9, 0}, {12, 3}, {10, 0}, {12, 3},                    /* Row 29 */
+  {10, 0}, {11, 3}, {11, 0}, {11, 3},                    /* Row 30 */
+  {11, 0}, {10, 3}, {12, 0}, {10, 3},                    /* Row 31 */
+  {12, 0}, { 9, 3}, {13, 0}, { 9, 3},                    /* Row 32 */
+  {13, 0}, { 8, 3}, {14, 0}, { 8, 3},                    /* Row 33 */
+  {14, 0}, { 7, 3}, {15, 0}, { 7, 3},                    /* Row 34 */
+  {15, 0}, { 6, 3}, {16, 0}, { 6, 3},                    /* Row 35 */
+  {16, 0}, { 5, 3}, {17, 0}, { 5, 3},                    /* Row 36 */
+  {17, 0}, { 4, 3}, {18, 0}, { 4, 3},                    /* Row 37 */
+  {18, 0}, { 3, 3}, {19, 0}, { 3, 3},                    /* Row 38 */
+  {19, 0}, { 2, 3}, {20, 0}, { 2, 3},                    /* Row 39 */
+  {20, 0}, { 1, 3}, {21, 0}, { 1, 3}                     /* Row 40 */
 };
 
 /* Bitmap definition for the "Pause" button */
 
 static const struct NXWidgets::SRlePaletteBitmapEntry g_pauseRleEntries[] =
 {
-  { 2, 1}, { 5, 0}, {14, 1},  /* Row 0 */
-  { 2, 1}, { 5, 0}, {14, 1},  /* Row 1 */
-  { 2, 1}, { 5, 0}, {14, 1},  /* Row 2 */
-  { 2, 1}, { 5, 0}, {14, 1},  /* Row 3 */
-  { 2, 1}, { 5, 0}, {14, 1},  /* Row 4 */
-  { 2, 1}, { 5, 0}, {14, 1},  /* Row 5 */
-  { 2, 1}, { 5, 0}, {14, 1},  /* Row 6 */
-  { 2, 1}, { 5, 0}, {14, 1},  /* Row 7 */
-  { 2, 1}, { 5, 0}, {14, 1},  /* Row 8 */
-  { 2, 1}, { 5, 0}, {14, 1},  /* Row 9 */
-  { 2, 1}, { 5, 0}, {14, 1},  /* Row 10 */
-  { 2, 1}, { 5, 0}, {14, 1},  /* Row 11 */
-  { 2, 1}, { 5, 0}, {14, 1},  /* Row 12 */
-  { 2, 1}, { 5, 0}, {14, 1},  /* Row 13 */
-  { 2, 1}, { 5, 0}, {14, 1},  /* Row 14 */
-  { 2, 1}, { 5, 0}, {14, 1},  /* Row 15 */
-  { 2, 1}, { 5, 0}, {14, 1},  /* Row 16 */
-  { 2, 1}, { 5, 0}, {14, 1},  /* Row 17 */
-  { 2, 1}, { 5, 0}, {14, 1},  /* Row 18 */
-  { 2, 1}, { 5, 0}, {14, 1},  /* Row 19 */
-  { 2, 1}, { 5, 0}, {14, 1},  /* Row 20 */
-  { 2, 1}, { 5, 0}, {14, 1},  /* Row 21 */
-  { 2, 1}, { 5, 0}, {14, 1},  /* Row 22 */
-  { 2, 1}, { 5, 0}, {14, 1},  /* Row 23 */
-  { 2, 1}, { 5, 0}, {14, 1},  /* Row 24 */
-  { 2, 1}, { 5, 0}, {14, 1},  /* Row 25 */
-  { 2, 1}, { 5, 0}, {14, 1},  /* Row 26 */
-  { 2, 1}, { 5, 0}, {14, 1},  /* Row 27 */
-  { 2, 1}, { 5, 0}, {14, 1},  /* Row 28 */
-  { 2, 1}, { 5, 0}, {14, 1},  /* Row 29 */
-  { 2, 1}, { 5, 0}, {14, 1},  /* Row 30 */
-  { 2, 1}, { 5, 0}, {14, 1},  /* Row 31 */
-  { 2, 1}, { 5, 0}, {14, 1},  /* Row 32 */
-  { 2, 1}, { 5, 0}, {14, 1},  /* Row 33 */
-  { 2, 1}, { 5, 0}, {14, 1},  /* Row 34 */
-  { 2, 1}, { 5, 0}, {14, 1},  /* Row 35 */
-  { 2, 1}, { 5, 0}, {14, 1},  /* Row 36 */
-  { 2, 1}, { 5, 0}, {14, 1},  /* Row 37 */
-  { 2, 1}, { 5, 0}, {14, 1},  /* Row 38 */
-  { 2, 1}, { 5, 0}, {14, 1},  /* Row 39 */
-  { 2, 1}, { 5, 0}, {14, 1}   /* Row 40 */
+  {12, 0}, { 6, 1}, { 7, 0}, { 6, 1}, {12, 0},                             /* Row 0 */
+  {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2},  /* Row 1 */
+  { 1, 1}, { 3, 3}, {11, 0},
+  {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2},  /* Row 2 */
+  { 1, 1}, { 3, 3}, {11, 0},
+  {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2},  /* Row 3 */
+  { 1, 1}, { 3, 3}, {11, 0},
+  {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2},  /* Row 4 */
+  { 1, 1}, { 3, 3}, {11, 0},
+  {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2},  /* Row 5 */
+  { 1, 1}, { 3, 3}, {11, 0},
+  {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2},  /* Row 6 */
+  { 1, 1}, { 3, 3}, {11, 0},
+  {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2},  /* Row 7 */
+  { 1, 1}, { 3, 3}, {11, 0},
+  {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2},  /* Row 8 */
+  { 1, 1}, { 3, 3}, {11, 0},
+  {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2},  /* Row 9 */
+  { 1, 1}, { 3, 3}, {11, 0},
+  {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2},  /* Row 10 */
+  { 1, 1}, { 3, 3}, {11, 0},
+  {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2},  /* Row 11 */
+  { 1, 1}, { 3, 3}, {11, 0},
+  {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2},  /* Row 12 */
+  { 1, 1}, { 3, 3}, {11, 0},
+  {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2},  /* Row 13 */
+  { 1, 1}, { 3, 3}, {11, 0},
+  {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2},  /* Row 14 */
+  { 1, 1}, { 3, 3}, {11, 0},
+  {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2},  /* Row 15 */
+  { 1, 1}, { 3, 3}, {11, 0},
+  {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2},  /* Row 16 */
+  { 1, 1}, { 3, 3}, {11, 0},
+  {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2},  /* Row 17 */
+  { 1, 1}, { 3, 3}, {11, 0},
+  {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2},  /* Row 18 */
+  { 1, 1}, { 3, 3}, {11, 0},
+  {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2},  /* Row 19 */
+  { 1, 1}, { 3, 3}, {11, 0},
+  {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2},  /* Row 20 */
+  { 1, 1}, { 3, 3}, {11, 0},
+  {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2},  /* Row 21 */
+  { 1, 1}, { 3, 3}, {11, 0},
+  {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2},  /* Row 22 */
+  { 1, 1}, { 3, 3}, {11, 0},
+  {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2},  /* Row 23 */
+  { 1, 1}, { 3, 3}, {11, 0},
+  {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2},  /* Row 24 */
+  { 1, 1}, { 3, 3}, {11, 0},
+  {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2},  /* Row 25 */
+  { 1, 1}, { 3, 3}, {11, 0},
+  {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2},  /* Row 26 */
+  { 1, 1}, { 3, 3}, {11, 0},
+  {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2},  /* Row 27 */
+  { 1, 1}, { 3, 3}, {11, 0},
+  {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2},  /* Row 28 */
+  { 1, 1}, { 3, 3}, {11, 0},
+  {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2},  /* Row 29 */
+  { 1, 1}, { 3, 3}, {11, 0},
+  {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2},  /* Row 30 */
+  { 1, 1}, { 3, 3}, {11, 0},
+  {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2},  /* Row 31 */
+  { 1, 1}, { 3, 3}, {11, 0},
+  {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2},  /* Row 32 */
+  { 1, 1}, { 3, 3}, {11, 0},
+  {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2},  /* Row 33 */
+  { 1, 1}, { 3, 3}, {11, 0},
+  {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2},  /* Row 34 */
+  { 1, 1}, { 3, 3}, {11, 0},
+  {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2},  /* Row 35 */
+  { 1, 1}, { 3, 3}, {11, 0},
+  {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2},  /* Row 36 */
+  { 1, 1}, { 3, 3}, {11, 0},
+  {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2},  /* Row 37 */
+  { 1, 1}, { 3, 3}, {11, 0},
+  {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2},  /* Row 38 */
+  { 1, 1}, { 3, 3}, {11, 0},
+  {11, 0}, { 1, 1}, { 3, 2}, { 1, 1}, { 3, 3}, { 5, 0}, { 1, 1}, { 3, 2},  /* Row 39 */
+  { 1, 1}, { 3, 3}, {11, 0},
+  {12, 0}, { 6, 3}, { 7, 0}, { 6, 3}, {12, 0}                              /* Row 40 */
 };
 
 /********************************************************************************************