From 9fe664ee72e9cdf187d036fd08b4e8eddf12bd5b Mon Sep 17 00:00:00 2001 From: Chris Date: Thu, 1 Sep 2022 14:39:38 +1000 Subject: [PATCH] Adding DEVICE_TYPE_ACCESSORY to enum + Adding Accessory icons for light and dark theme + Adding entry into OpenRGBDialog2 to display icon + Creating `Accessory` category in "Supported Devices" --- RGBController/RGBController.h | 1 + qt/OpenRGBDialog2.cpp | 3 +++ qt/accessory.png | Bin 0 -> 1349 bytes qt/accessory_dark.png | Bin 0 -> 1488 bytes qt/resources.qrc | 4 ++++ qt/unknown.png | Bin 0 -> 1426 bytes qt/unknown_dark.png | Bin 0 -> 1547 bytes scripts/build-supported-devices-md.sh | 5 +++++ 8 files changed, 13 insertions(+) create mode 100644 qt/accessory.png create mode 100644 qt/accessory_dark.png create mode 100644 qt/unknown.png create mode 100644 qt/unknown_dark.png diff --git a/RGBController/RGBController.h b/RGBController/RGBController.h index 14e21b87b..fcddfa449 100644 --- a/RGBController/RGBController.h +++ b/RGBController/RGBController.h @@ -178,6 +178,7 @@ enum DEVICE_TYPE_STORAGE, DEVICE_TYPE_CASE, DEVICE_TYPE_MICROPHONE, + DEVICE_TYPE_ACCESSORY, DEVICE_TYPE_UNKNOWN, }; diff --git a/qt/OpenRGBDialog2.cpp b/qt/OpenRGBDialog2.cpp index 4b33c2db2..835ea9a5a 100644 --- a/qt/OpenRGBDialog2.cpp +++ b/qt/OpenRGBDialog2.cpp @@ -33,6 +33,9 @@ static QString GetIconString(device_type type, bool dark) QString filename; switch(type) { + case DEVICE_TYPE_ACCESSORY: + filename = "accessory"; + break; case DEVICE_TYPE_MOTHERBOARD: filename = "motherboard"; break; diff --git a/qt/accessory.png b/qt/accessory.png new file mode 100644 index 0000000000000000000000000000000000000000..3ce7cef6dc0b5dd493b390978c22481e248021e3 GIT binary patch literal 1349 zcmV-L1-kl)P) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U=KJlI$i7h2L34mVhLL#Bwk{RoOw7p96M#x@RWI zy>;(Xs!bWNkcE6cpl8DP>(3efz(pl+sb9go+gGycDCCo!$-nE|@$hui7+OlhcABmu^k^>qRyE1_wFQ0b{ z7@q}t5&6*zpVhy6pTy^S+2xa#`O*lTZwE-f7k^9qG_l+n@#}!eBh*)s=j=Y`IKQr@ z3`O&`qGEWcv)+N@0m)^*mQf71qHntt6puAFAn&oo1Eo!mq?mZH zp=E9?+vZ|ixGh$aR-wrTdR-i_8jk>cN%+o%_Pk}!*T^w*C%7^p7;XIjP{O|r{!9sT zwj~iozqLYMyjCvKSmag>F94x=anmjEqg?po)B3?u1wq|1J3g?+;|y^qeXK3noCSW0 z_S`}gtX}~j5$0ATLjnRZlPG11#%x5;(E+F;bC$#h2#_jwB*{qx=aI4Vnj7yJZC_T- zyv#V800R3+3~aE!04pWM`my9#LsdnSs%ACyphatzoU-PeEw4kanpiTmY-Vo7s*5LA z&u;EsycRBkGf+z|R=ku_D~F1SDq>amS6B`{BBx)y`cy zj)|VTb?>FuL1Eye7-{Ip!-kJC>cm=`GSk$Vr%j(_)|=Wz^-K8)YIITKO=|hsO%2vy z_6R}iIMKxn#5fU%+aiDk&5K!dN{JV_#Vi)arcg$by4ZwHix?25L9CN*b|2(^h+9zq zA#VI%Y*nJouUITkwKWg*gnF52R>uUO>9(0l#KlZ@RqT324+02c3^AEm z#+)Q2;agw#)Jt_2TyR<7nPD@XnkNnui-k5;+L#qhjd+?kqG~$j3mK19&Rd+da+Njj$zK@C=_|`z zr!|ZO7O?~gA{10nLK!xqwCki;NYQ!R$3NuyC2}d`DuIz>0TpPFT|f9A{GP3qpPKZN zLUEw;#c@7HfUaGjQFEN{W5;Qn0KsSAN^kiqbztU`^jb@c90C2?z{Pb-Q}%$%9boXu zkWJZ@g0zHu9(X^aZ^{A#w?OZjH@D_FP9K0Y%_?~V92^3p1D00(qQ zO+^Rh2>}B*8z$MDWdHyGM@d9MR5;6HWIzS~8HfXnxFm=%07VTG1BHMIk1hZ4@Tup5 z!5aod14c5^0M4}VpPaB72C+b@EB+IktNs%k@{A1uy!EP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+SQj)lH)22MgO&mSppIW#Bwm0s@cI?{#>x*PSWn~ zq?4a#Dh3N7Z5wEp+E(;r;o)F^1Om}7LfLJnC98s@eu&pW#?@B4$hG;Zv4bO=ly zwcj37+5HRb`Z3@#2QRmFvb{%a4|IvV2lQiRL8DzK3A=1|4tt=yZjG2NU8lOpR@dEe zrm}zPIzv0&CmYXnZ3qb}HHDWKSv}12Zd(R^e8d;jdEOa*>^<7*Bh4!BnLv=6*E)f_gRGKJ zi&XK`W2rcm#7 zNW{(#t&o?Dm5Ve6xp9XVfN#Lf6 za_IJ0EIQBQ(cvF8efL_=grj$4GirKAHW!V~ho6u;34VCdsoO6y`{l zuj|Jpr>~dvbK&Sc%khCt`@h|5XZU|t(@Q7ORrd6|z5Y(I@4V?P0=;~&y;-9fj(&Z- zzFDK|6Y_=Vs6jV_{88)J{>!esn(Rtj* zKjiu)aw+60fstbY6=;xMKlmT~o~@Oin)H%FaiH_XaXvS%3k+*cX#{T{_Sbb?+166a;ers$k6}*00v@9M??Ss00000`9r&Z z00009a7bBm000id000id0mpBsWB>pF2XskIMF-{y0RuSzwWnmr0000_NklQtgquCF?HbO#Dhf1v#Z qg&@v;a0SUl)k7hvQpi-Ti|_{XeMj32y?tH)0000OpenRGBGreyscale.png microphone.png microphone_dark.png + accessory.png + accessory_dark.png + unknown.png + unknown_dark.png diff --git a/qt/unknown.png b/qt/unknown.png new file mode 100644 index 0000000000000000000000000000000000000000..2cb6d18a9ae9ee58c02849281978fa9c781ca7b7 GIT binary patch literal 1426 zcmV;D1#S9?P) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U=KJlI$i7h2L34mVhLL#Bwk{RoOw7p96M#x@RWI zy>;(Xs!bWNkcE6cpl8DP>(3efz(pl+sb9go+gGycDCCo!$-nE|@$hui7+OlhcA4xj<;T*U!fgmrRcMBMw z1$q(r(F>o|zk8p==X%-Yla~3?2%T>SNWT|m zZYi#lQyp3$RjBtRG8`HB?nJscKeJ4_dTl$ti2j+44H%s);32%Vy?Qth#t|_3Y;E z#cSarI0LohV#P}-wQ{JKs3KN{e}(1XLymOlkq2Oo=72N!2u9b5%L@B!lJ z4LCuqO|LzSV+-%+{ZuU`XzEH(i|qi@Or1Ghl$nm4!RIZhvdG|eh`0~{OzqXo)d_jz}B``rHRY0mElcb9Uh z)VGd000McNliru z<_Q4=0Shpt7d`+00GCNbK~y-)#n7<|L17ri@gJKaXOSzgpUJFTj0~>9xdO?JxCpC_ zky%n^N*&8PD4iVNz`x$!dh7o@eIM^+m|=qx?$~3ZCQFnRQ`8BVV}&7F=wlH9H?$>k zh>-mC*sLix(TRX_N_!FVIz^s_d_?bCd5i}x7^JlCqkWVjXCd!C{caWA*w@s6M(onR g$fJFm`h?%`1e$&#EX-C_G5`Po07*qoM6N<$f+a|p>i_@% literal 0 HcmV?d00001 diff --git a/qt/unknown_dark.png b/qt/unknown_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..01604653b63d3e0b13eab811b0af2a3c93756e3c GIT binary patch literal 1547 zcmV+m2K4!fP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+Rc}3lH({0hW~SlJpvL4iQ`}}Rda(q{=Q&4AKgjM zB=J?KF;%g;g7+c-Cb@l zOaXn^F176b1$MbkIM$%$-tKI_!?p)HBJTmiSQ)wdcAF&ZyxA%4f%3WyQZ~I!b>XeA zyW>n{|J8Md_OvfHuHCI6DpYC$ufV(pnCIEH48r(vDCqM%6Z|N|ZS2tD*fW73caL`w z(BBGlC-O0JU)8^izKG9dw}&rUrd=Zp9^N2%EdG@EX5nzji0^OYc7*yaa_`N0U$>_# zF+tI^SCn^$I%5tT7f2rFw1lSk3C22GMl)Z01@h*rU(hOLVo>RhA~h=1X`OwgiWDQS ztmv65hiS8*oVkXL6B>0^&}+d!vhwPHEC#;hLUY|b*Q;b$xe;8M5R4}NC(ZqI^Ofd$ zuR|j8cF_uX@u*y+G02TGya0sy&P}GkN89oHoBBbif}l*94G&oSvV~ZLuC)~==Kw!J zzr8}_wCw>P5!MzYLjeSQq9ByWE3*e}QG;B`k4~B`vzxl9y6ZJ~dXUscN;FYiZm< z!#2@U(`GHVvXWb|Q><~7HLbeZn%B}%Yd!SXrKhgldhX>yZKwLJy+Dn2YCK5|KfO?c z)u|pKXly4kn1L8a0&yJ#P|!S>d7~J4kQ>Z=X1o-_NKytH*Juy}!nhJkrwh9)xj*9O z#QumI|Bjp+=*}SLfbKiD2h`g5&ech5dkcrAKH%-c{nd(NE90Y99`=11K0mq~z56!T zemm!3?>@`p+Pib|DdQ{hNgmhUos*9rfnJ*MG;jA=9@qZkIy%yDpXKp(9X*%9os-W9 z^nwm&;(z-1?!EP2#s2~ZcTPF}Tt_dJ!HM`!DaZHmKMnL|9`EA+{|0&>ggaxuesyE} z5y)RG$iE(_<1Z5YXYBq1fDXL!D^|bq0004nX+uL$Nkc;*aB^>EX>4Tx0C=2zkvmAk zP!xv$riu?L4t5Z6$WV2$AS%UCt5Adrp;lTyrGo6|z4ik%oHdfl06-|wJnmD3rI^_!)k5$fFoV9Y5HSft^7|Q7@ z%Uq{5j06_31PLM(R8c}1Hlnoaq*zGNdECc8^3A0;2`WUiW!-cl+G_?P<>M z2X~ipsn$ct(EtDd24YJ`L;wH)0002_L%V+f000SaNLh0L01m?d01m?e$8V@)00007 zbV*G`2j&R@1OXy)7mrc^005&&L_t(I%f*o~4gpaVMGvJA(@1PUuhU8_MihGG?102V zEJCX@CAElzS|T}`rVCBa((?tj|;E_ z20#Po0`s_=sZCN)cQHl(-2~6%I?w_Hjw$JRq_0xsNyvM(^Q}BmZ|X_yrKA^;K1`9b xkhfKJRlm@V^PJkC_85l0p!VYpHmNK8hCAQcn5-LS6!8E6002ovPDHLkV1nc|+HL>< literal 0 HcmV?d00001 diff --git a/scripts/build-supported-devices-md.sh b/scripts/build-supported-devices-md.sh index d4aee4bae..b51f6e8fd 100755 --- a/scripts/build-supported-devices-md.sh +++ b/scripts/build-supported-devices-md.sh @@ -51,6 +51,7 @@ echo -e "- [Mouse Mats](#mouse-mats)" >> "$MAIN_FILE" echo -e "- [Headsets](#headsets)" >> "$MAIN_FILE" echo -e "- [Headset Stands](#headset-stands)" >> "$MAIN_FILE" echo -e "- [Gamepads](#gamepads)" >> "$MAIN_FILE" +echo -e "- [Accessories](#Accessories)" >> "$MAIN_FILE" echo -e "- [Lights](#lights)" >> "$MAIN_FILE" echo -e "- [Speakers](#speakers)" >> "$MAIN_FILE" echo -e "- [Virtual Devices](#virtual-devices)" >> "$MAIN_FILE" @@ -177,6 +178,9 @@ do Gamepad) gamepad+=$current_controller ;; + Accessory) + accessory+=$current_controller + ;; Light) light+=$current_controller ;; @@ -277,6 +281,7 @@ printf "\n## Mouse Mats\n${DATA_TABLE_HEAD}${DATA_TABLE_ALIGN}%s\n" "$(echo -e $ printf "\n## Headsets\n${DATA_TABLE_HEAD}${DATA_TABLE_ALIGN}%s\n" "$(echo -e ${headset}| sort)" >> "$MAIN_FILE" printf "\n## Headset Stands\n${DATA_TABLE_HEAD}${DATA_TABLE_ALIGN}%s\n" "$(echo -e ${headset_stand}| sort)" >> "$MAIN_FILE" printf "\n## Gamepads\n${DATA_TABLE_HEAD}${DATA_TABLE_ALIGN}%s\n" "$(echo -e ${gamepad}| sort)" >> "$MAIN_FILE" +printf "\n## Accessories\n${DATA_TABLE_HEAD}${DATA_TABLE_ALIGN}%s\n" "$(echo -e ${accessory}| sort)" >> "$MAIN_FILE" printf "\n## Lights\n${DATA_TABLE_HEAD}${DATA_TABLE_ALIGN}%s\n" "$(echo -e ${light}| sort)" >> "$MAIN_FILE" printf "\n## Speakers\n${DATA_TABLE_HEAD}${DATA_TABLE_ALIGN}%s\n" "$(echo -e ${speaker}| sort)" >> "$MAIN_FILE" printf "\n## Virtual Devices\n${DATA_TABLE_HEAD}${DATA_TABLE_ALIGN}%s\n" "$(echo -e ${virtual}| sort)" >> "$MAIN_FILE"