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 14e21b87..fcddfa44 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 4b33c2db..835ea9a5 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 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!to-c^M}lmsP~D-;yvr)B1( zDwI?fq$;FVWTr7NRNQ(yJ$BL?HJ;Y{k*?DkR9cP{8Q6#3beuMyxvY9uy4uOTrSF4R z`ATk>&{|`+ApOvf*XJew9dK1G_Q;y&eNHf3Yh{7!@yC@@V}pHm?~{A9_;V8fcZS0% z8Bc4rRQ(LU@%3@*ahZ}mx0>UX--Iu4f1tdgl(?JXP#r}26cw9ekU6fR@V)MPm$BZXa_fHGt*}f=$w}?o;shPt2jYpZ61}d^mmDC7a z?lt*Xp0w$b85J8ArsnC~ewGxoLpN+v*us-+Rk1P~r1}|ZJb#>P{kA9d{Ph!t#p*kZ z6eV*1{0}&^pZA{+XYn>wLD&6To#OU{>0OF=62_~~u&}c5vhIh)F+Uz({&g^j)$y*8 zwcUnek9i6;YS-xAoWokz_3e(6$eMUY1;J-wD$YzyhLbf?yN>0!T)4=%LaBJ#5q6FV zTIDJyJz1Vl-1vEx^m~ci_^@+(&REQ5VEXOBle1wzgSP6?UmKr9IET7UUX^D0b%AU4 zv^kre&Cy-&ylz&6(bk-_yrZkS)x*!{y^Gr;rq^T~;H?+7XG)NEdsnAcQs|HH2tK+1cj^13*BuidERo23apG`WztO8BQL~LM zUzxewcYf-%*|%K3djI6iDhYh-oAvXiFYmR4Zyb)VEiNAAIbtE$aa*Z@^=x-!iC3ri z&Z9bF$Cd@SP1<#%#jjgJV435Z$$4e+PwG0N1O6-K{fU2a$mzTF3DyO_Pra4Ss{MOz ztM8jTt=^Y4Zq!Q1$1zvO+Gl+Yzg@ln8UA-%&}lFC!9VARw2JXOYnK)`Sq28i)=X#T z08eLUSjuN$sF+hb(c0s1fJoc_WnKJQd}RWKCjv@0Drg-ITpiHDwJ>cJ<=^fN9^ zShB-{YaJ`Qe0M0jczUdC46EY@#z!xnEP0`%I&Zc})RBq@MfU%y|IM#H&)QNoGc)Ws z%Yv8NW_let>Qff_rplF{i6e=}aAxGOIV!3TqvO9{@h%mA8u_obK5YK1%@P6vo#`_Z zZyk|7veEbUgFXH-X|9o~cItBGFPo0^$AsI|J&q}ed@wW7cmY4s&^Y3lux%cel(~DMKb3SpAfq{W7$=lt9 z;Xep2*t>i(0|NtRfk$L90|Vb-5N14{zaoW!fq}im)7O>#87CvNg|ynuIjIZ`4DOyT zjv*GOlT#d6|4Vi-_v}#VFl2D$6=rU2;Oy7^|MA1h=S>Ht*<6_2j4m;p+wx)loDEWJ t8y!|@{}Z0Q`k%1$ryi9XZK1jhN0^0J=i3O_GcYhPc)I$ztaD0e0sy1{Z1n&D literal 0 HcmV?d00001 diff --git a/qt/accessory_dark.png b/qt/accessory_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..ab4a1e6d6a9d4e3637dbbad306ec04a92e5e471d GIT binary patch literal 1488 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!to3#&pRN`ey06$*;-(=u~X z6-p`#QWa7wGSe6sDsEk!9ysZ-7LV)ytzD5!LL5hm3}&plc`*84%!bE)m)^ZwGI@Tw z78|$Xlj;VQE&sl6zbqf~=!!`y#+u;50=G`WFZ%RryeB`#? zmkYl6m;22x!v{v}`rFGk?RC%LFX`OF{v|ohadE6V=kA;`zUl>g@_J|J#xCD=BJBFz z!eyK4Us*X@-&2=9Uy{qgsb$(aT|CnE%;&slwz`@l;#Vr~N!Gowz4c1@tk(OP4ijcy zw`M81&UCky`L#r-h08~ZGx?My;qItMth@4xBH&yFSP5vQ@#1# z^|x=mIs#1IX`j02I@ge`k6Yz?afFNK4~<)y(|VHD?cjQHHgx-fkaIc)olG zTl%z1qte1m9H(%&Ts5zelA*+P3~6>P}7CREE4 znB1e;=e$m3zSAXDZ^yet6Yf;~A zOWtl=o@e{LDB$+WIxYWz$8%@-1Rd6wy^^qWik@PHjJnl~#u+SZA5AzC98V`a>v5jo zm}gKNxj{2z!V*5SD-{CFhc;}=c;0-MeP{cQiMO2ZJW($)xv;lchVgECp8AzrKjy8T zd}AAT`?7P%-xtnbj;ysdBad*-d?nHRU``KP$uU;p~J>hkr|zZ5@wVSD;xqwnwi zceB%f)Q4a8R=*hf?aS`H|NJ(--}6$JX>ZMjy^)J0`|4`S*_7KQUV)<<52EDBn;-m0R6ohzVz!C%%^ qg>!WUtS4QsIxDUWIuWwA`vcqOTKC&Ldu!uBZt-;Wb6Mw<&;$VT8L$%o literal 0 HcmV?d00001 diff --git a/qt/resources.qrc b/qt/resources.qrc index 671d3410..cee5b9bb 100644 --- a/qt/resources.qrc +++ b/qt/resources.qrc @@ -52,5 +52,9 @@ OpenRGBGreyscale.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 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!toURQ-glmsP~D-;yvr)B1( zDwI?fq$;FVWTr7NRNQ(yJ$BL?HJ;Y{k*?DkR9cP{8Q6#3beuMyxvY9uy4uOTrSF4R z`ATk>&{|`+ApOvf*XJew9dK1G_Q;y&eNHf3Yh{7!@yC@@V}pHm?~{A9_;V8fcZS0% z8Bc4rRQ(LU@%3@*ahZ}mx0>UX--Iu4f1tdgl(?i+8aN1j*Rd^&mB&r2M0^VvQ2i`RSqG1+)W^5g4e@RqZIYyw8b-ZidMIYH(c1W6+&5jQkuH_4dxv$1`5+jQ$>1B`d<_*EO-N&nD-G#$vxUTQ!Y+=T_eO z5}CGlWo*d)Df1V&iJRVAGHw3dD+#=5{Q_J1gk#S*^awZZ&}E9auxEzr@+lP)qt7HI z=5VE|tnBuEv897CQR;}*%e3!~@7i~;ewBZ8?7yp?PRah}7=~Tz@9bN6?fUze+egmD z?l9?Xy4(Koq3MR}Ul)hfZ>?poLV~~KS!Vrs%=llVZ9n6ZKl6+}FgZf z>Ff+k_6!Uab807AdmIiBY5Tvdi(iYcOrY>YK?riBm7NPsc1b?O_qy$ik^45)$YnX|`y~>m?B$7c1`^ zw}0|WwMg@cR^!BEM$wE3vGzaY|IAxEb^fd`lbi|{d_G!e=hm<;c0pkAocGDcGv_cI zOn=~&|5Lj(;o0ObQQqA$jDK$*I9lo*{H@`%Y{G|=6MSz@ZQ9aOBUfR+IR6wA^LB^# zv&^?Yv-Fd1FgdGL$t)wow3zi&-1o}z^51vanM1_lQ95>H=O_Gg@oER5U+OU3ON7#OB|x;Tbd zoIZMCBbQ^M#IcX^vz5{(YHyf-a!pJR&$@#l}Z(P69;P&Ry{u7I9Xa8!s|AA#z Wos!O(uuvnApFCatT-G@yGywo5NSNyY 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 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!toBdS6oN`ey06$*;-(=u~X z6-p`#QWa7wGSe6sDsG*fo;&HW22b1n;x1bzA&$<+2?n9X&9?vcC0NVf^*pcgF=XvZ z2_0_5{rx?=@BVtf{@uTW2k*IyyXrojV$(Mx`B_ur&$lN&``DfPT=%g5;M}{hc?Ld= zwKw#(zWK*mw$snz+JdL|-sS8+yp7#T={@7&2+5tl%Vw***>h9#UE`-+yg_DreM=v% zUBCOWPwM}xrETA~=$oy(yH-&vB#UYNfjw+9p5NTYbLdB*#*5E3!hbZ5}T?t7JYIaSyp?TUwU=;5=p(?PeTb!}{sj>i7#8Ph}UmDnG7>Sz>si*LV*@%dd03%MQ5T{`hIhP>R58_nZQ~5bmmmd*l5n!(jp>~^P!G0tf%SM#f%jTl^hp!s013SM|yE- zs(ET=O3jYBxFFDV@~T;Bx?(!BB8*Ho=cpF*-C$N-zUF4pxuqMlBUUJcHP$z#K2+5y zoT#e1>&B$%L4kIrVJlZ=ZJm{!dB^Fn*~OsCX}a4tO^V(ayryuf>DpblW?jD&m~H#z z#?s~M?pD2f>Xf_u*V?@fy=7T8p1k&Z1Dda{lvB*eQ8${=DB;djD9aLX!DdF~Vu{KL z(r0SY_J|zv2x61Io*}?|XoryZa_-&QJMAAmJMynX`hVXX=@;h|o;SR+-p+pI){k>n zJ#(tL+n3orczgKo)vjdi$BV<{zSTLDVDuov79m+1A9xEHe>iB{2(TgWbUMQ)~n=KM` zq~bx5{lDse^Q+IZwp7i`3_H%U;N`ZNUPq4ll!d;ja^+{@Na8V^8F_4uit5AY`0rP| zOU0i?{;RDIn?Gx_gn&S2`pm>zN2HHz^u7IHkH1WsYow~3x}5pTrX&3^;Wl-TV+tZ4 z%uF<%J4>BUxVzOX?A8oX-`HCxM5~p5jpN?5>+QTBY zk%d!9BqY#D(rnR|*GnQiE>_+-ZvW($YLVs>t;UJTjG`G6V(ov(|CzUT>ik(>COH)@ z_k|EG3o!n4U=qP)9h82{craJ1Ar_*=ti*@O=# zC-~l++O(ymMy|qsasDYL=IsveXPIw*X6Yy2U~*Qgl37NEX))`mxbKza<-hOzdz*Rg zJ$w1|qLtU2Ph4bRU|>t~c6VU_gP+d3>lqjrI14-?iy0XB4ude`@%$Aj3=9nHC7!;n z?9VtESs0ay#QQjn@H8uHw{OebevWj zt8VRRiBhthwS1<*57y;BkJdlG`~6?LP}VZPt6QrA)@Lp3`^i%JF#A(c?O)G+?hPz# z4$Lo@KJS>l(l;oe+|c#^U6%7ttS&II^l84VT(UmsiRX#xt)JK01m(Z-e7kgs_(VIO ziJK>E4=oMdf1&U5oLdXNNwn=>@a-|L*-Gs{ZPxd1&R8RzCh`&FKTlUbmvv4FO#tLI B+HL>< literal 0 HcmV?d00001 diff --git a/scripts/build-supported-devices-md.sh b/scripts/build-supported-devices-md.sh index d4aee4ba..b51f6e8f 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"