From 65fc20ddde21d409f52ce29d67ccd9f4020f4681 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Tue, 9 Feb 2016 23:07:30 +0100 Subject: [PATCH] [Horus] Martin's design for buttons --- radio/src/bitmaps/horus/CMakeLists.txt | 2 +- .../bitmaps/horus/button/alpha_button_off.png | Bin 0 -> 454 bytes .../bitmaps/horus/button/alpha_button_on.png | Bin 0 -> 618 bytes radio/src/bitmaps/horus/button/bmp_left.png | Bin 583 -> 0 bytes radio/src/bitmaps/horus/button/bmp_mid.png | Bin 185 -> 0 bytes radio/src/bitmaps/horus/button/bmp_right.png | Bin 296 -> 0 bytes .../button/button_hover_dot_backround.png | Bin 303 -> 0 bytes .../horus/button/button_hover_dot_center.png | Bin 298 -> 0 bytes .../src/bitmaps/horus/button/button_left.png | Bin 583 -> 0 bytes radio/src/bitmaps/horus/button/button_mid.png | Bin 185 -> 0 bytes .../src/bitmaps/horus/button/button_right.png | Bin 296 -> 0 bytes .../bitmaps/horus/mask_carroussel_left.png | Bin 0 -> 405 bytes .../bitmaps/horus/mask_carroussel_right.png | Bin 0 -> 423 bytes radio/src/gui/horus/bitmaps.cpp | 9 +++++++++ radio/src/gui/horus/bitmaps.h | 4 ++++ radio/src/gui/horus/lcd.h | 6 ++---- radio/src/gui/horus/menu_model_setup.cpp | 8 ++++---- radio/src/gui/horus/screens_setup.cpp | 2 +- radio/src/gui/horus/widgets.cpp | 19 +++++++++++++++--- radio/src/gui/horus/widgets.h | 3 +++ 20 files changed, 40 insertions(+), 13 deletions(-) create mode 100644 radio/src/bitmaps/horus/button/alpha_button_off.png create mode 100644 radio/src/bitmaps/horus/button/alpha_button_on.png delete mode 100644 radio/src/bitmaps/horus/button/bmp_left.png delete mode 100644 radio/src/bitmaps/horus/button/bmp_mid.png delete mode 100644 radio/src/bitmaps/horus/button/bmp_right.png delete mode 100644 radio/src/bitmaps/horus/button/button_hover_dot_backround.png delete mode 100644 radio/src/bitmaps/horus/button/button_hover_dot_center.png delete mode 100644 radio/src/bitmaps/horus/button/button_left.png delete mode 100644 radio/src/bitmaps/horus/button/button_mid.png delete mode 100644 radio/src/bitmaps/horus/button/button_right.png create mode 100644 radio/src/bitmaps/horus/mask_carroussel_left.png create mode 100644 radio/src/bitmaps/horus/mask_carroussel_right.png diff --git a/radio/src/bitmaps/horus/CMakeLists.txt b/radio/src/bitmaps/horus/CMakeLists.txt index 0a6c29a9e..5f7f1f5b0 100644 --- a/radio/src/bitmaps/horus/CMakeLists.txt +++ b/radio/src/bitmaps/horus/CMakeLists.txt @@ -8,7 +8,7 @@ add_custom_target(ttf_horus_fonts DEPENDS ttf_horus_tinsize ttf_horus_smlsize tt add_bitmaps_target(horus_bitmaps "${RADIO_SRC_DIRECTORY}/bitmaps/horus/bmp_*.png" 480 5/6/5) add_bitmaps_target(horus_calibration_bitmaps "${RADIO_SRC_DIRECTORY}/bitmaps/horus/calibration/bmp_*.png" 480 5/6/5) -add_bitmaps_target(horus_button_bitmaps "${RADIO_SRC_DIRECTORY}/bitmaps/horus/button/bmp_*.png" 480 5/6/5) +add_bitmaps_target(horus_button_bitmaps "${RADIO_SRC_DIRECTORY}/bitmaps/horus/button/alpha_*.png" 480 5/6/5/8) add_bitmaps_target(horus_alpha_bitmaps "${RADIO_SRC_DIRECTORY}/bitmaps/horus/alpha_*.png" 480 5/6/5/8) add_bitmaps_target(horus_alpha_calibration_bitmaps "${RADIO_SRC_DIRECTORY}/bitmaps/horus/calibration/alpha_*.png" 480 5/6/5/8) add_bitmaps_target(horus_masks ${RADIO_SRC_DIRECTORY}/bitmaps/horus/mask_*.png 480 8bits) diff --git a/radio/src/bitmaps/horus/button/alpha_button_off.png b/radio/src/bitmaps/horus/button/alpha_button_off.png new file mode 100644 index 0000000000000000000000000000000000000000..056368e302ddf3f84723dcd118e7993e73bf7786 GIT binary patch literal 454 zcmeAS@N?(olHy`uVBq!ia0vp@Ak4uAB#T}@sR2@KN#5=*KpF^sI`6IrQk(@Ik;On& z*Fl)kNn>^eP>{XE)7O>#0TZXFj*(gLw_2c(Y-UJAiF1B#Zfaf$kjuc}T$GwvlA5AW zo>`Ki;O^-gkfN8$&cMK^<>}%WqH(_W{NAiX0TRbP9+yd;RP5Jxgx@J&LBZ+ZR`2aR zUBT~^g7pur41bXD{@@)4S+1Rpda_!sUJG_eWEr(g`dp^rq#5>U_I-OB{SV!lv-q12 zDmnD%HT&8HRNL?}R zT`6X>C%)dLZ{M10-k@R`^Z8~(S<@Wt~$(69C|aw50$5 literal 0 HcmV?d00001 diff --git a/radio/src/bitmaps/horus/button/alpha_button_on.png b/radio/src/bitmaps/horus/button/alpha_button_on.png new file mode 100644 index 0000000000000000000000000000000000000000..cbb0f0a35dcd6943fe566d3cb64e677d7ff49863 GIT binary patch literal 618 zcmV-w0+s!VP)WFU8GbZ8()Nlj2>E@cM*00GWPL_t(2&wb9#ixL4G z#_`7)b>2r%(_SvMkswAOd8$K2V6@gnkDa;-VJvj)u;6JA3tc*t!B+bR=rKCQhI9>s z-DsDP&{SA=of)msoq0OMMuho=-|hE-2l%T{DD)y8j~}Y4>WiXC!!W#9EY<^1#+)ui zB9Vi1I?ZOY$;179dbY)Wug6BC!Duu}UDsOx%wr(yy6#r1ReH9~+3pwGPu6*`@_^1p zjs9@RAEOZqg#r!3*!eAFc`KjK`~G-Ldwq@FrPJ)5J^AOpU%bGdZ{N_hEGCml0(cmZ zB#He_2XgBphWGEyn~s1a;l#TS*xKGfu~@VP(==%WML5r%;(yU~F?qFtTsDizWMT-J zOa=j2!R%8Di#qze4NVjf3-(w!2kdN literal 0 HcmV?d00001 diff --git a/radio/src/bitmaps/horus/button/bmp_left.png b/radio/src/bitmaps/horus/button/bmp_left.png deleted file mode 100644 index 62e4969e637336423e829661ed3e0eed9ab028b4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 583 zcmV-N0=WH&P){(5g-{ROk}CeB6^ zH5jl}sP3*gILoNu>h8Xz52UNUyn5ZVU}naZm>I?x7-Mj^^^)xC4=NfOLvGdPZee!q_( z2mk1uF3TZ!w^Z5;Ql&QDbI5xNmBG$uIoZ;Ra%`+2g~IW$K&xK zOeuxUW&@?D=(And{R-9G6boU&vVf0|UwC`_0nhV_gVI{#aFEz;w=m|ekC}PBUSqLX z{BblP1nTuVs(yqLkeTuR{u6N=Ka1?C#Py3EMG>MXDvj~aK;RN|nx;t8wDJ{trcdGi VPo0w>By0cx002ovPDHLkV1gNu0U-bY diff --git a/radio/src/bitmaps/horus/button/bmp_mid.png b/radio/src/bitmaps/horus/button/bmp_mid.png deleted file mode 100644 index 36bd4a76030437007e9cab9e81b4dd45ae127bea..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 185 zcmeAS@N?(olHy`uVBq!ia0vp^j6f{H!3HFK_`(+gDVAa<&kznEsNqQI0P;BtJR*yM z>aT+^qm#z$3ZS55iEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$Qb0v!o-U3d z95a18H}WzVa2#Ir=iq;HCeF7_SM;XoDjV~!=3@DfoaW%keS3eYxklyXYsAfL0qBeEE% z{yGRVI%&+V018T$xJHx&=ckpFCl;kLl$V$5W#(lUCnpx9>g5-u&wghk1yr=u)5S4F zW8&KWgIp~JJTCFK9kewnKC4uG`v2cA>T(%>cQ^O$Tg}XtEql(Ws2z*2JQ?+SGNOX*y~$e+XV!!zD}PbyexB9dCWA{_kaIOJ9DggeafPb;e^fk m?;gzu%sM~^GkCiCxvX~}U&Kt*djT^vI+ zCQhBSySK$bgr)jg;t$)z&I$+h=azLqjRd}hU}E}hdep3f9Gym9>pW7pj)ntSHkYy-NR!PC{xWt~$(69A-Kbd&%9 diff --git a/radio/src/bitmaps/horus/button/button_hover_dot_center.png b/radio/src/bitmaps/horus/button/button_hover_dot_center.png deleted file mode 100644 index 8e067a538f375363efad5ddb29795ee9ab63a890..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 298 zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&kmSQK*5Dp-y;YjHK@;M7UB8!3Q zuY)k7lg8`{prB-lYeY$Kep*R+Vo@qXd3m{BW?pu2a$-TMUVc&f>~}U&Kt; diff --git a/radio/src/bitmaps/horus/button/button_left.png b/radio/src/bitmaps/horus/button/button_left.png deleted file mode 100644 index 62e4969e637336423e829661ed3e0eed9ab028b4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 583 zcmV-N0=WH&P){(5g-{ROk}CeB6^ zH5jl}sP3*gILoNu>h8Xz52UNUyn5ZVU}naZm>I?x7-Mj^^^)xC4=NfOLvGdPZee!q_( z2mk1uF3TZ!w^Z5;Ql&QDbI5xNmBG$uIoZ;Ra%`+2g~IW$K&xK zOeuxUW&@?D=(And{R-9G6boU&vVf0|UwC`_0nhV_gVI{#aFEz;w=m|ekC}PBUSqLX z{BblP1nTuVs(yqLkeTuR{u6N=Ka1?C#Py3EMG>MXDvj~aK;RN|nx;t8wDJ{trcdGi VPo0w>By0cx002ovPDHLkV1gNu0U-bY diff --git a/radio/src/bitmaps/horus/button/button_mid.png b/radio/src/bitmaps/horus/button/button_mid.png deleted file mode 100644 index 36bd4a76030437007e9cab9e81b4dd45ae127bea..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 185 zcmeAS@N?(olHy`uVBq!ia0vp^j6f{H!3HFK_`(+gDVAa<&kznEsNqQI0P;BtJR*yM z>aT+^qm#z$3ZS55iEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$Qb0v!o-U3d z95a18H}WzVa2#Ir=iq;HCeF7_SM;XoDjV~!=3@DfoaW%keS3eYxklyXYsAfL0qBeEE% z{yGRVI%&+V018T$xJHx&=ckpFCl;kLl$V$5W#(lUCnpx9>g5-u&wghk1yr=u)5S4F zW8&KWgIp~JJTCFK9kewnKC4uG`v2cA>T(%>cQ^O$Tg}XtEql(Ws2z*2JQ?+SGNOX*y~$e+XV!!zD}PbyexB9dCWA{_kaIOJ9DggeafPb;e^fk m?;gzu%sM~^GkCiCxvX_9Bf!2~3iY;`CCQk(@Ik;Opy>mbbNq%pe!q^iWz z*OmPN6DNYGO%hib8p2Nrr;Er*A-tUMkRZ zMs80R#}JM4xtI3xxf+PDf4FzeU9fv*_=ZYexAzJkb=+nj{3>9!`3QHyhK(NL-5wU@ z3U*a<*Y5vQd~4n}W`-A$sgZU6u70**IlpR^*JYEq+WX<5Ul-=y7IF#+J^H;bP-N|E zE{5+S12A+MGY0#P4@GMdFy=luOF9RXCI1++t*ymby{rwTPD{Q-jXw zcj^;UC3A15-8NfaIj^{Qf=cI?+WVzuNoWZb{RXU-~8>QaiDcGSezZ=*(+qreAQ zh6clBnYT2X6l98b9M{jC#g=?Vn_UrNUEz*b+VURgqdGY=CZh=D*_9gNrcHeFD tMOh9$?){$B^K#d}Pv;LA)Lh)PuKt_9Bf!2~3iY;`CCQk(@Ik;Opy>mbbNq%pe!q^iWz z*OmPN6DKbp+oFVR3P2&*%#er@=ltB<)VvZPmw~~#C^fMpHASI3vm`^o-P1Q9MK2X- zI-{(oi(`n!`P@s^d`%7lY!Bwg%5i5H924@2va;I2pt9{=V}azkhV~7Mw|-z?OUiX; zlx4ZbbU3;6l>Yy;@-(sY&nN#EVHI!{Y`OLRdueR<&3*6r+nohiX6q;(DV($J^|eR= zCx$1L`vSc*8Sa1ouhFnb0) { CHECK_INCDEC_MODELVAR_ZERO(event, g_model.header.modelId[moduleIdx], IS_MODULE_DSM2(moduleIdx) ? 20 : 63); } - drawButton(MODEL_SETUP_2ND_COLUMN+xOffsetBind, y, STR_MODULE_BIND, l_posHorz==1 ? attr : 0); - drawButton(MODEL_SETUP_2ND_COLUMN+MODEL_SETUP_RANGE_OFS+xOffsetBind, y, STR_MODULE_RANGE, l_posHorz==2 ? attr : 0); + drawButton(MODEL_SETUP_2ND_COLUMN+xOffsetBind, y, STR_MODULE_BIND, (moduleFlag[moduleIdx] == MODULE_BIND ? BUTTON_ON : BUTTON_OFF) | (l_posHorz==1 ? attr : 0)); + drawButton(MODEL_SETUP_2ND_COLUMN+MODEL_SETUP_RANGE_OFS+xOffsetBind, y, STR_MODULE_RANGE, (moduleFlag[moduleIdx] == MODULE_RANGECHECK ? BUTTON_ON : BUTTON_OFF) | (l_posHorz==2 ? attr : 0)); uint8_t newFlag = 0; if (attr && l_posHorz>0 && s_editMode>0) { if (l_posHorz == 1) diff --git a/radio/src/gui/horus/screens_setup.cpp b/radio/src/gui/horus/screens_setup.cpp index 8be8a7938..b42d7dd2b 100644 --- a/radio/src/gui/horus/screens_setup.cpp +++ b/radio/src/gui/horus/screens_setup.cpp @@ -181,7 +181,7 @@ bool menuSetupScreensView(evt_t event) linesCount++; } - SUBMENU_WITH_OPTIONS("Main views setup", LBM_MAINVIEWS_ICON, linesCount, OPTION_MENU_TITLE_BAR, { countRegisteredLayouts-1, ORPHAN_ROW, 0, 0, 0, 0 }); + SUBMENU_WITH_OPTIONS("Main views setup", LBM_MAINVIEWS_ICON, linesCount, OPTION_MENU_TITLE_BAR, { uint8_t(countRegisteredLayouts-1), ORPHAN_ROW, 0, 0, 0, 0 }); for (int i=0; i