From df8c215d4318c8b4d427beaeaa480367f50f7c77 Mon Sep 17 00:00:00 2001 From: Adubbz Date: Fri, 23 Feb 2018 14:45:44 +1100 Subject: [PATCH] Changed hbmenu logo --- Makefile.pc | 12 +++++++++++- common/menu.c | 12 ++++++------ common/theme.c | 8 ++++++-- common/theme.h | 1 + data/hbmenu_logo_dark.bin | Bin 0 -> 33600 bytes data/hbmenu_logo_light.bin | Bin 0 -> 33600 bytes 6 files changed, 24 insertions(+), 9 deletions(-) create mode 100644 data/hbmenu_logo_dark.bin create mode 100644 data/hbmenu_logo_light.bin diff --git a/Makefile.pc b/Makefile.pc index c2bbc8f..3367097 100644 --- a/Makefile.pc +++ b/Makefile.pc @@ -12,7 +12,7 @@ test : pc_main/main.cpp pc_main/pc_launch.c \ common/menu-entry.c common/menu-list.c common/text.c \ common/nanojpeg.c common/ui.c common/math.c common/theme.c \ build_pc/tahoma24.o build_pc/tahoma12.o build_pc/switchicon_questionmark.bin.o build_pc/folder_icon.bin.o \ - build_pc/button_a_light.bin.o build_pc/button_a_dark.bin.o + build_pc/button_a_light.bin.o build_pc/button_a_dark.bin.o build_pc/hbmenu_logo_light.bin.o build_pc/hbmenu_logo_dark.bin.o gcc -Wall -O2 -g0 $^ -lsfml-graphics -lsfml-window -lsfml-system -lstdc++ -I. -Ibuild_pc -o $@ build_pc/tahoma12.o : data/tahoma12.nxfnt @@ -45,5 +45,15 @@ build_pc/button_a_dark.bin.o : data/button_a_dark.bin @echo $(notdir $<) @$(bin2o) +build_pc/hbmenu_logo_light.bin.o : data/hbmenu_logo_light.bin + mkdir -p $(dir $@) + @echo $(notdir $<) + @$(bin2o) + +build_pc/hbmenu_logo_dark.bin.o : data/hbmenu_logo_dark.bin + mkdir -p $(dir $@) + @echo $(notdir $<) + @$(bin2o) + clean: rm -rf build_pc/ test diff --git a/common/menu.c b/common/menu.c index 47d1007..dd6a3c0 100644 --- a/common/menu.c +++ b/common/menu.c @@ -285,18 +285,18 @@ void menuLoop() { drawWave(timer, themeCurrent.frontWaveColor, 280.0, 4.0, -2.5); timer += 0.05; - DrawText(tahoma24, 40, 30, themeCurrent.textColor, "hbmenu"); - DrawText(tahoma12, 40 + 120, 30 + 16, themeCurrent.textColor, "v2.0.0"); - DrawText(tahoma12, 40, 720 - 32 - 16, themeCurrent.textColor, menu->dirname); + drawImage(40, 20, 140, 60, themeCurrent.hbmenuLogoImage, IMAGE_MODE_RGB32); + DrawText(tahoma12, 180, 47, themeCurrent.textColor, "v2.0.0"); + DrawText(tahoma12, 40, 720 - 48, themeCurrent.textColor, menu->dirname); //drawTime(); - drawImage(1280 - 190 + 64, 720 - 32 - 16, 32, 32, themeCurrent.buttonAImage, IMAGE_MODE_RGB32); - DrawText(tahoma12, 1280 - 190 + 32 + 68, 720 - 32 - 16 + 4, themeCurrent.textColor, "Launch"); + drawImage(1280 - 126, 720 - 48, 32, 32, themeCurrent.buttonAImage, IMAGE_MODE_RGB32); + DrawText(tahoma12, 1280 - 90, 720 - 44, themeCurrent.textColor, "Launch"); if (menu->nEntries==0) { - DrawText(tahoma12, 64, 96 + 32, themeCurrent.textColor, textGetString(StrId_NoAppsFound_Msg)); + DrawText(tahoma12, 64, 128, themeCurrent.textColor, textGetString(StrId_NoAppsFound_Msg)); } else { diff --git a/common/theme.c b/common/theme.c index 2db60c2..dbc6840 100644 --- a/common/theme.c +++ b/common/theme.c @@ -1,6 +1,8 @@ #include "theme.h" #include "button_a_light_bin.h" #include "button_a_dark_bin.h" +#include "hbmenu_logo_light_bin.h" +#include "hbmenu_logo_dark_bin.h" void themeStartup(ThemePreset preset) { switch (preset) { @@ -13,7 +15,8 @@ void themeStartup(ThemePreset preset) { backgroundColor: MakeColor(233, 236, 241, 255), highlightColor: MakeColor(129, 137, 236, 255), enableWaveBlending: 0, - buttonAImage: button_a_light_bin + buttonAImage: button_a_light_bin, + hbmenuLogoImage: hbmenu_logo_light_bin }; break; @@ -26,7 +29,8 @@ void themeStartup(ThemePreset preset) { backgroundColor: MakeColor(45, 55, 66, 255), highlightColor: MakeColor(129, 137, 236, 255), enableWaveBlending: 0, - buttonAImage: button_a_dark_bin + buttonAImage: button_a_dark_bin, + hbmenuLogoImage: hbmenu_logo_dark_bin }; break; } diff --git a/common/theme.h b/common/theme.h index 15a42dd..331d0c5 100644 --- a/common/theme.h +++ b/common/theme.h @@ -12,6 +12,7 @@ typedef struct color_t highlightColor; bool enableWaveBlending; const uint8_t *buttonAImage; + const uint8_t *hbmenuLogoImage; } theme_t; typedef enum diff --git a/data/hbmenu_logo_dark.bin b/data/hbmenu_logo_dark.bin new file mode 100644 index 0000000000000000000000000000000000000000..68900425403d764fcdba22723982a89b34bc68b9 GIT binary patch literal 33600 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 F{{Z}W_sakP literal 0 HcmV?d00001 diff --git a/data/hbmenu_logo_light.bin b/data/hbmenu_logo_light.bin new file mode 100644 index 0000000000000000000000000000000000000000..d55a3157a16efe429d3dae6f07cfc85b1921e1e0 GIT binary patch literal 33600 zcmeI3dx%w46vpjIMQN|;L18q`I3qIy##A=ZLs7&O)2t~K%XfiP5M^XaGYHWi{Skpg znU!LeC_(hVqD(R}3q`EVA~ncJDKyJhI_C6S!&#R-YxcSKI@9GIV+}0!-fMsR+iQP& z-E+=9cW$p<{^ts~0Nb3tE=zqNpx_&YkA3+#XaHlvDr|-?yIytU$U_`S&YK-C5yX~-IzRIvb#4~jLh>T zi@TEDm^@#yyEj>k%=0CSyOQ0Q^5siaRaFHxnzQg7oS6m<9z6K0VpalY>UkQz-q;vy zx^UOj)LdN*XJcdIIpAktv(%X9CK=nmfB)<8O{YB$zM3??`uh4yS<6_k)4-0btE;;( z4O@&Ko(j+p#7uVBa2CnYiM$KHUu*7AgHuwC*6-%`fTqdXv7#x^tO zr1tjqQ$n7w&e$ntjBxD5KC*tWTd;d{d_zOS1@OO$@2J7b`rg4B6kDilZEZajp2>_^ zj~&NyYf1Peo{{-@zzqq$Bse z&DbL`zxwEJ!{%BpZG(&DOQ+mZE>o^$EfvZWmdtm*!RGcUkAEe6b@cy~2P5k}ip>n? zi`54V7;qK1jrq8OzV`+W9C&_=hnR*3xNse@JrDbrah*NGa>}(g#z(9pELPg`el3QN zVXZGVu2>)OylDBP&G=ZpgzHYN!?}&?*Tt3>e|Pdl<|(uXxmei8Np@as%YBX*ek)cR z!GZrScF)U`FS%IK=7DpC#-!!Rk}t9*);>$)))IfW^Ci)FjlDPZAYTgZL9jQ6$ki)! z9a@qq=Yjblz!l9&+^g+cdXg`RK2tO{DNm++A^v@}wY3+8@#8C)FX&k4o;N<^ER-+w z+h>#1JuQG;5Y8)g@bhJ#dSDYn&SLVVK#V)WXW1;|3-QW+KEc{5xTc;TNmR?e47L#pLcL$smt@S&4bF;!X zR;-k0IX;FDF=_SKxP1RF)!lqyo~>yy$oCAaq0Pp^T)FFW8S~|N8y9VP7c0+5#o9iw zqjdfMb-oBM`uxot@(dnYr*oOk4|cA>b&S#ed}VB0iSi{i-_h^hlsE=y>}AZC$8BuH z(kAbEHMSEiOO!9$BXPbQiw&Hd6T`g9WWEsNF0`r(*MRR@Y)>Tqy6rq%5jX_q)(I(-IW^W!@xXO}SMa^;J}Ks*yu;w-e5z2P}P z*Hemo5pFd4qMLDctV83=SH}1=kS`N#%;n4%iG}&2@1bM*g+9i0d5=)4d?7b$nOmO0 z3*~XN-)bIf$GFRwFUQdL!C0K-&X?pJ$A>Y!3ivkJ^^_`KWFB-HK|BWw#FY7bVI3P; zgWT_XK&m^p84&&r|2l@T5 zygQQri`z{7HTv$3<%x30Ssd*5;k>jz4Zl-StdznBRx}USK0n0Ry66e#D8?+N{2CMO zR&npRMebYFe>8kuzAv$y-gX6C0aw5ka0OfeSHKl;1zZ7Fz!h)>Tme_W6>tSy0aw5k fa0OfeSHKl;1zZ7Fz!h)>Tme_W6>tSkHU<6#x0ZhN literal 0 HcmV?d00001