From 0af868a8522c7435417732ae59f3e8ea881e1820 Mon Sep 17 00:00:00 2001
From: 3djc <lesitewebdejc@hotmail.com>
Date: Sun, 12 Feb 2017 10:26:18 +0100
Subject: [PATCH] Reduce HORUS modelset left top icon width by 5 pixels to
 avoid selected model box to 'hit' it.

SD Version INCREMENTED
---
 CMakeLists.txt                                |   2 +-
 .../Darkblue/modelsel/mask_iconback.png       | Bin 1005 -> 1080 bytes
 .../THEMES/Default/modelsel/mask_iconback.png | Bin 1005 -> 1080 bytes
 radio/src/gui/480x272/themes/darkblue.cpp     |   2 +-
 radio/src/gui/480x272/themes/default.cpp      |   2 +-
 5 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a48376627..119c598f7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,7 @@ set(VERSION_REVISION "0")
 set(VERSION_SUFFIX $ENV{OPENTX_VERSION_SUFFIX})
 set(VERSION_FAMILY ${VERSION_MAJOR}.${VERSION_MINOR})
 set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION}${VERSION_SUFFIX})
-set(SDCARD_REVISION "0005")
+set(SDCARD_REVISION "0006")
 set(SDCARD_VERSION  ${VERSION_MAJOR}.${VERSION_MINOR}V${SDCARD_REVISION})
 
 cmake_minimum_required(VERSION 2.8)
diff --git a/radio/sdcard/horus/THEMES/Darkblue/modelsel/mask_iconback.png b/radio/sdcard/horus/THEMES/Darkblue/modelsel/mask_iconback.png
index 3e853d3d5f1382ef6ce4a9599b83feba2b2be5ea..6f19c3ee090eea18819881eadc799f23dd633dd9 100644
GIT binary patch
delta 1048
zcmV+z1n2wh2e=3!iBL{Q4GJ0x0000DNk~Le0001Z000132nGNE06xew<dGpTf8hcQ
z2sa7F632G{00YHIL_t(|+U?s-ODb<1#__9?6b9+}agmuqP(c!jNrvUdg|&!iQL7d~
zFQ7N@e<3Z})vh)cuC&yUBr<}bg@aL0B0bQ;9;j)~=5QeD^taQd`Eh;VUZhNm`8s!Z
zw=)1>aQwVsv)PR0<z?f$szE=}f8*mLlF1})Zf?Hydl>i!J3Bi=G#X`KsfxuSwzsz#
zSTa>rk;~;6SgL$Jk60|mz*3dVWu((-+~40bu;ghvkw`GGRGOwC9*;AyWCsTa$mjD6
zELAR-Ln@VGV5x3zZ?U(xhv(;K29_$D%_5u4GO*-ndVhbPfh9|))3~^}e_&wAfxohK
z$-pLad3lLUCIem98Ca^_-CdlVoG`FdJ3Bi#K0an($tu0ugMm#d7K>H1b;-acrD+-t
z4-a7&1_MjAwY7!w^K%B4DjJQVP$)34RJyJskw~CiE;F!H8yg#+Ze234$sHXXK~+@-
zmTYr#6W7<*e|?|N0-1a$e~MzLs>)}Rq$-!oh{xl2dV1m%E!EoE8t(4y7+9)QDuvV2
zQwEl7eSQ7ICm^^`5i**an~h?z$VHY^S65d^CX;XO_F!OPR##Wwtfs4eU*05$rfKNu
z>ERVD`Cq1&mlrOwqz<RkX*@hUaFHcdp-@03lYwCvoT8;#Sy_Q$e;8b3NoBEEP%4#B
z1K>ZN4tZW*U*T{#cm+!~G&ID&!IJ5^&cKo_EiG}1ma4Y47Nt^&SFlvGv$L?<?F=l{
z;^HEzs;U5RYfs#8yWQNXlx$&P0Tzn|0KYC2sZc1OySp0zzb+If5{aO-we`=>3@mVZ
zwpy)kUgN?<$Y^V8e=|y@5^uVbYJPqmilV%Gou7UoBb&|g*(9j~fdIO?y57Ccz(UN;
z&7rQYj)5hz+wBO2Lhn}33@pUV%nVvuT0VS_frSKaYHDI&i3SG;(c9bm*Y_FN<ff;m
z(b?I_z!FtgS7Us9{KL%+1{Pp)auQCb^Yae@Pm_5?B9RX_e>WId0GG=JkH_=>(>PC+
zIfcVvxZQ3BmMRzwqOq}&fu+Xn@9(c{rOnf2J`)oY=<DlaV2L_9I^gws|J?J;z`~4<
zj#jjKW?+*V8yov{Ym$LY%;WK3czF0r$1t#o_<TP2d_D%2sG*?&BO@cIsi|RLsnc^H
z5cu+O3~Ul!Zm+kZtw{zpA(zXAU@-Vk$1<=93=9k)6bdo0M2e!o@At!IvoWwlZnqoZ
zaQL5(XJ8Xd&tKV^WMC6%Z*TwB)yu#?oWtS3)YKFMOJucL;rIJdUtj;N-}4K$63FT1
S_y&Oh0000<MNUMnLSTZHpz&=0

delta 973
zcmdnN@s?e&Gr-TCmrII^fq{Y7)59eQNY?^!1P2?Cyz%hIf{BU-^$)m(Ijv<*^nKXH
zz`$JP>EaktaqI0|Yj5R5iPrOHR4%$4_2y8NQq_nv&|uqm;nbmHP6A9~i&~o=oWJp3
zv56y0EGacHQF)S=z@F9#7KM6AiHWKihjO+$MO^RoG`(LfCt+adXW0I{LdGzQ!A2n7
zz}mVS2$r2+Y*<oXSXo)$>7#b}ie*WhTm8n}yS*<jy?FB`=k-#-PM3^bB60EYg%uSi
zs-_=1caHCMtkU)C*FBbBHksSpw@lmDM5;CSc1CXQ(w9LMm6ZoCUKD%{l=!;NX4bNY
z|NhA-D=VACa?N{gYVsmu*ZI!lk2mOWA556A%=_WbpOVLqA74|>XLW6NN4;aXhKPZQ
ziOXeG-d%h5+RoDJbx~?8+8J|w!Qz))AHIBPnLJtenl-!Z>)1-3!wxG$4jnka;5*%E
zYt-883l~d{zIgxs_~FCMJck#&3<BD)eED*S!Jk-|7^j?0{qpVGr4r2$Ezvjc-(N1t
z<l*C66rka7y>ymdYtYJ;&6|zup=LWR6v(;lrX#i(=$rcb|3x6PC1qug-n}bp;tLc!
z@%*!ey?y##Z~2ln<%}(d6K`zmoi|SoXwLTS<}xxeS8Set4ER4|#*7dD4qRZB-5GQ4
zv(5SBz1%V-GDS@p+1bsncNsAJdGvI`!Q;o-gI0?8PCxeLi%ES-{baYTQK>I3-MDuz
zZLjyD#fzEOy}nf9xn|9p1$+0(?y*$<@QlY<yvWDbxAtCJ>R#@|;^NPrlld$eU6ceZ
z`kL3R(_{E^brr{^n{Uz|@WgUNM@O6XN51bewzKP-J$v@7=NY>eFuGr6y>RIg)A2%q
zUboC$BGaZ%|IamNA-8nFn)0Ldl5%oxcJtT&JS{d$FX2F~sD*F%lmr8g)0+hPkMI9u
z;~PF<>C&b3Z09bt@>*Qmy+~!U=Zs}1&H1OK{VZ?1TyoTahk041(oCPa-&V8M2>?^p
ze_oi;FJ8ZH&YZ=;!URkQ($dnUtbUh89j}*)bh|DITKOyPy!W$uF|m5FSA0+nt{y5v
z6*V<$e*d=g4R84R^{YHkN9{TP|Hrj}{GUI6%CkdValZ3t(uQ2=g#jJQyc2VC*DgGe
zxvQW3&fB-T$BrG7`c*aSo%6G2&!k`m&%bo{E-%pceC<HrhlPjF=9;tY_k`7}wSD~j
pl+8-{X1!BROG}%@C&N(3T)T-S>GI8sn}9i#!PC{xWt~$(69AV|$YcNj

diff --git a/radio/sdcard/horus/THEMES/Default/modelsel/mask_iconback.png b/radio/sdcard/horus/THEMES/Default/modelsel/mask_iconback.png
index 3e853d3d5f1382ef6ce4a9599b83feba2b2be5ea..6f19c3ee090eea18819881eadc799f23dd633dd9 100644
GIT binary patch
delta 1048
zcmV+z1n2wh2e=3!iBL{Q4GJ0x0000DNk~Le0001Z000132nGNE06xew<dGpTf8hcQ
z2sa7F632G{00YHIL_t(|+U?s-ODb<1#__9?6b9+}agmuqP(c!jNrvUdg|&!iQL7d~
zFQ7N@e<3Z})vh)cuC&yUBr<}bg@aL0B0bQ;9;j)~=5QeD^taQd`Eh;VUZhNm`8s!Z
zw=)1>aQwVsv)PR0<z?f$szE=}f8*mLlF1})Zf?Hydl>i!J3Bi=G#X`KsfxuSwzsz#
zSTa>rk;~;6SgL$Jk60|mz*3dVWu((-+~40bu;ghvkw`GGRGOwC9*;AyWCsTa$mjD6
zELAR-Ln@VGV5x3zZ?U(xhv(;K29_$D%_5u4GO*-ndVhbPfh9|))3~^}e_&wAfxohK
z$-pLad3lLUCIem98Ca^_-CdlVoG`FdJ3Bi#K0an($tu0ugMm#d7K>H1b;-acrD+-t
z4-a7&1_MjAwY7!w^K%B4DjJQVP$)34RJyJskw~CiE;F!H8yg#+Ze234$sHXXK~+@-
zmTYr#6W7<*e|?|N0-1a$e~MzLs>)}Rq$-!oh{xl2dV1m%E!EoE8t(4y7+9)QDuvV2
zQwEl7eSQ7ICm^^`5i**an~h?z$VHY^S65d^CX;XO_F!OPR##Wwtfs4eU*05$rfKNu
z>ERVD`Cq1&mlrOwqz<RkX*@hUaFHcdp-@03lYwCvoT8;#Sy_Q$e;8b3NoBEEP%4#B
z1K>ZN4tZW*U*T{#cm+!~G&ID&!IJ5^&cKo_EiG}1ma4Y47Nt^&SFlvGv$L?<?F=l{
z;^HEzs;U5RYfs#8yWQNXlx$&P0Tzn|0KYC2sZc1OySp0zzb+If5{aO-we`=>3@mVZ
zwpy)kUgN?<$Y^V8e=|y@5^uVbYJPqmilV%Gou7UoBb&|g*(9j~fdIO?y57Ccz(UN;
z&7rQYj)5hz+wBO2Lhn}33@pUV%nVvuT0VS_frSKaYHDI&i3SG;(c9bm*Y_FN<ff;m
z(b?I_z!FtgS7Us9{KL%+1{Pp)auQCb^Yae@Pm_5?B9RX_e>WId0GG=JkH_=>(>PC+
zIfcVvxZQ3BmMRzwqOq}&fu+Xn@9(c{rOnf2J`)oY=<DlaV2L_9I^gws|J?J;z`~4<
zj#jjKW?+*V8yov{Ym$LY%;WK3czF0r$1t#o_<TP2d_D%2sG*?&BO@cIsi|RLsnc^H
z5cu+O3~Ul!Zm+kZtw{zpA(zXAU@-Vk$1<=93=9k)6bdo0M2e!o@At!IvoWwlZnqoZ
zaQL5(XJ8Xd&tKV^WMC6%Z*TwB)yu#?oWtS3)YKFMOJucL;rIJdUtj;N-}4K$63FT1
S_y&Oh0000<MNUMnLSTZHpz&=0

delta 973
zcmdnN@s?e&Gr-TCmrII^fq{Y7)59eQNY?^!1P2?Cyz%hIf{BU-^$)m(Ijv<*^nKXH
zz`$JP>EaktaqI0|Yj5R5iPrOHR4%$4_2y8NQq_nv&|uqm;nbmHP6A9~i&~o=oWJp3
zv56y0EGacHQF)S=z@F9#7KM6AiHWKihjO+$MO^RoG`(LfCt+adXW0I{LdGzQ!A2n7
zz}mVS2$r2+Y*<oXSXo)$>7#b}ie*WhTm8n}yS*<jy?FB`=k-#-PM3^bB60EYg%uSi
zs-_=1caHCMtkU)C*FBbBHksSpw@lmDM5;CSc1CXQ(w9LMm6ZoCUKD%{l=!;NX4bNY
z|NhA-D=VACa?N{gYVsmu*ZI!lk2mOWA556A%=_WbpOVLqA74|>XLW6NN4;aXhKPZQ
ziOXeG-d%h5+RoDJbx~?8+8J|w!Qz))AHIBPnLJtenl-!Z>)1-3!wxG$4jnka;5*%E
zYt-883l~d{zIgxs_~FCMJck#&3<BD)eED*S!Jk-|7^j?0{qpVGr4r2$Ezvjc-(N1t
z<l*C66rka7y>ymdYtYJ;&6|zup=LWR6v(;lrX#i(=$rcb|3x6PC1qug-n}bp;tLc!
z@%*!ey?y##Z~2ln<%}(d6K`zmoi|SoXwLTS<}xxeS8Set4ER4|#*7dD4qRZB-5GQ4
zv(5SBz1%V-GDS@p+1bsncNsAJdGvI`!Q;o-gI0?8PCxeLi%ES-{baYTQK>I3-MDuz
zZLjyD#fzEOy}nf9xn|9p1$+0(?y*$<@QlY<yvWDbxAtCJ>R#@|;^NPrlld$eU6ceZ
z`kL3R(_{E^brr{^n{Uz|@WgUNM@O6XN51bewzKP-J$v@7=NY>eFuGr6y>RIg)A2%q
zUboC$BGaZ%|IamNA-8nFn)0Ldl5%oxcJtT&JS{d$FX2F~sD*F%lmr8g)0+hPkMI9u
z;~PF<>C&b3Z09bt@>*Qmy+~!U=Zs}1&H1OK{VZ?1TyoTahk041(oCPa-&V8M2>?^p
ze_oi;FJ8ZH&YZ=;!URkQ($dnUtbUh89j}*)bh|DITKOyPy!W$uF|m5FSA0+nt{y5v
z6*V<$e*d=g4R84R^{YHkN9{TP|Hrj}{GUI6%CkdValZ3t(uQ2=g#jJQyc2VC*DgGe
zxvQW3&fB-T$BrG7`c*aSo%6G2&!k`m&%bo{E-%pceC<HrhlPjF=9;tY_k`7}wSD~j
pl+8-{X1!BROG}%@C&N(3T)T-S>GI8sn}9i#!PC{xWt~$(69AV|$YcNj

diff --git a/radio/src/gui/480x272/themes/darkblue.cpp b/radio/src/gui/480x272/themes/darkblue.cpp
index f7c66a27f..c15c70b4f 100644
--- a/radio/src/gui/480x272/themes/darkblue.cpp
+++ b/radio/src/gui/480x272/themes/darkblue.cpp
@@ -149,7 +149,7 @@ class DarkblueTheme: public Theme
       modelselIconBitmap = BitmapBuffer::loadMaskOnBackground("modelsel/mask_iconback.png", TITLE_BGCOLOR, TEXT_BGCOLOR);
       if (modelselIconBitmap) {
         BitmapBuffer * bitmap = BitmapBuffer::load(getThemePath("modelsel/icon_default.png"));
-        modelselIconBitmap->drawBitmap(25, 8, bitmap);
+        modelselIconBitmap->drawBitmap(20, 8, bitmap);
         delete bitmap;
       }
 
diff --git a/radio/src/gui/480x272/themes/default.cpp b/radio/src/gui/480x272/themes/default.cpp
index 65a3a4978..30c96c3fd 100644
--- a/radio/src/gui/480x272/themes/default.cpp
+++ b/radio/src/gui/480x272/themes/default.cpp
@@ -180,7 +180,7 @@ class DefaultTheme: public Theme
       modelselIconBitmap = BitmapBuffer::loadMaskOnBackground("modelsel/mask_iconback.png", TITLE_BGCOLOR, TEXT_BGCOLOR);
       if (modelselIconBitmap) {
         BitmapBuffer * bitmap = BitmapBuffer::load(getThemePath("modelsel/icon_default.png"));
-        modelselIconBitmap->drawBitmap(25, 8, bitmap);
+        modelselIconBitmap->drawBitmap(20, 8, bitmap);
         delete bitmap;
       }