From 7b63813cdb2f0e7d0babb7e6bbd0a3e564a3fb03 Mon Sep 17 00:00:00 2001 From: NicolasNewman Date: Thu, 25 Mar 2021 15:14:56 -0400 Subject: [PATCH] Add storage device type Commit amended from original XPG Spectrix S40G merge request by Adam Honse --- RGBController/RGBController.cpp | 2 ++ RGBController/RGBController.h | 1 + qt/OpenRGBDialog2.cpp | 3 +++ qt/resources.qrc | 2 ++ qt/storage.png | Bin 0 -> 2930 bytes qt/storage_dark.png | Bin 0 -> 2915 bytes 6 files changed, 8 insertions(+) create mode 100644 qt/storage.png create mode 100644 qt/storage_dark.png diff --git a/RGBController/RGBController.cpp b/RGBController/RGBController.cpp index 5f177a0e..4cb9a7c4 100644 --- a/RGBController/RGBController.cpp +++ b/RGBController/RGBController.cpp @@ -1605,6 +1605,8 @@ std::string device_type_to_str(device_type type) return "Light"; case DEVICE_TYPE_SPEAKER: return "Speaker"; + case DEVICE_TYPE_STORAGE: + return "Storage"; case DEVICE_TYPE_VIRTUAL: return "Virtual"; default: diff --git a/RGBController/RGBController.h b/RGBController/RGBController.h index 28e4af03..08410340 100644 --- a/RGBController/RGBController.h +++ b/RGBController/RGBController.h @@ -131,6 +131,7 @@ enum DEVICE_TYPE_LIGHT, DEVICE_TYPE_SPEAKER, DEVICE_TYPE_VIRTUAL, + DEVICE_TYPE_STORAGE, DEVICE_TYPE_UNKNOWN }; diff --git a/qt/OpenRGBDialog2.cpp b/qt/OpenRGBDialog2.cpp index c2d5b244..cbe6728a 100644 --- a/qt/OpenRGBDialog2.cpp +++ b/qt/OpenRGBDialog2.cpp @@ -73,6 +73,9 @@ static QString GetIconString(device_type type, bool dark) case DEVICE_TYPE_VIRTUAL: filename = "virtual"; break; + case DEVICE_TYPE_STORAGE: + filename = "storage"; + break; default: filename = "unknown"; break; diff --git a/qt/resources.qrc b/qt/resources.qrc index af368c38..ba8ec8c7 100644 --- a/qt/resources.qrc +++ b/qt/resources.qrc @@ -46,5 +46,7 @@ wireless_dark.png console.png console_dark.png + storage.png + storage_dark.png diff --git a/qt/storage.png b/qt/storage.png new file mode 100644 index 0000000000000000000000000000000000000000..e61a83db3c758db311250ca965d20ac184284227 GIT binary patch literal 2930 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_rK<%#etZ2wxwokg&dz0$52&wylyQ$U=n(-v9;Y{GwC^Gd%;{WCH_J1#?S1Lo*XoO9LGRBLgD? zeM2LC14~^)Ln~8rD-#n1C{VIfuqjGOvkG!?gW6S;l4h%vQBqQ1rLSLJUanVete0Pu zu5V~*X{m2uq;F)TTa=QfTU?n}l31aeSF8*(!6mggxhS)sBr`ux0c2ugQhsTPt&$Sd z*oxc&xUqS~&|pf=&(*I;EYLU9GXQxB?AMfJxVnPUq8za0Darb&IjOm+c_qdAhI)o@ zwFMdZCHch}`8bS*OQTp&kz3&F3%3KSTXJ*ZRuq@GmX+XFT^v$bkg6Y)TAW{6l$`2X zmYP?h4D)tzNl+>xJh57asy!$*4X(K)GYyAckPM2aQY$iXC+v6^xAZ3>7rOGxJjN%ZoKZet>F7bxABqwN)}QFf!CNFw!-$2r)FWGBUF= zGS)RPwK6b(DD}-x$xN$6R%)zkU>ss(WMyJxWo&|?G_@o#C9x!tpyHHdtF-*0+{6-F zrOe#K^i=(VymTc6c+6Tk=jY@X`R1pj+A0|%i+egd2NdO}W#**XDisI0J1Ka&I-40< znwjYu=^28Z>+5UfnO9trn3tUD>0+x?kz1gbnVDi`Y>}8|VrFirn`U8Xq-&gNVy>HH zX_%&KYMhv4Zf;;{VPT#G)9;d>Tnb8+ApMXGnv$QKnPP=-p1E1FsYPm1nr@1Pg@vwx zrHQ$&g{7IPuDO{-TAHDuk+GSX5zI9IqRjNnyu=)2Q$emu$xN}bOfgEfOtvu8O-e~L z&^1dnG1av&H8j_?G`BD_H8C?bF*Gn&QUE0jEB~U*)Vz{JP)4*>GK307fRblUDMZlR z$iTqBK;IBVLgga~$Rngf^D;|pm5h`WKnV*H{J{l@$*Ewwz+wTJ6{$H9E}6NhdBvIe zdA3T1W>D2&nMhO_P;m#!kyaj=#U=SgmCynyIJFSU%E?p!XF{vQWQg;VK}k3@MF}dL zi6s(=3oeMUEVs4yhYzgx^veUs?&CtZk)Xd5do-4_5Iy6|5GZORC zQ&Vh}^p(i>Oj4p*s-d}YvaW@RS+Z`Dg^8(dQc_ZqZjxnUqDhKzl93S}&!CqZH1Q3)b;3KEMFb5l!Fi;8WP(u(qP6%q>yax#;_IZMARF9lkO!85x;NxlN2jKUdc zDXB%7NNE7s7Pu1>sAwO-6h~Z%2MK+Q6i2&A(g(F7AjN<_xXwl@As~DgNJzSY;s#vN zT45^-h)sh*scBXzNCi4+MK8qud`gROP^tlY9H}{Fr(gpX3UYA+F~KcAP%F?*0nxln z%}cRWDpInyJ0`oepMim4f~SjPh(+(zAVFuY(Y~D?Jz~69Ln0IsYLnX=1nTLHC7*dS+zA5iGtG7zfX?ggE zEK3hF=hbIV$oz4d+F1HOCc8kPQ}XB9*0zNYP9*l~&5k-yn)mmVQM1<9J_pITX};Tz kP5pX)y-m&U1z|fFfALs3F31#}4r y85}Sb4q9e0Nm}bqW}N^ literal 0 HcmV?d00001 diff --git a/qt/storage_dark.png b/qt/storage_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..5bb9937ba7322db32a9f91c2a6faf3bda4a13c93 GIT binary patch literal 2915 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_rK<%#etZ2wxwokg&dz0$52&wylyQ$U=n(-v9;Y{GwC^Gd%;{WCH_J1#?S1Lo*XoO9LGRBLgD? zeM2LC14~^)Ln~8rD-#n1C{VIfuqjGOvkG!?gW6S;l4h%vQBqQ1rLSLJUanVete0Pu zu5V~*X{m2uq;F)TTa=QfTU?n}l31aeSF8*(!6mggxhS)sBr`ux0c2ugQhsTPt&$Sd z*oxc&xUqS~&|pf=&(*I;EYLU9GXQxB?AMfJxVnPUq8za0Darb&IjOm+c_qdAhI)o@ zwFMdZCHch}`8bS*OQTp&kz3&F3%3KSTXJ*ZRuq@GmX+XFT^v$bkg6Y)TAW{6l$`2X zmYP?h4D)tzNl+>xJh57asy!$*4X(K)GYyAckPM2aQY$iXC+v6^xAZ3>7rOGxJjN%ZoKZet>F7bxABqwN)}QFf!CNFw!-$2r)FWGBUF= zGS)RPwK6b(DD}-x$xN$6R%)zkU>ss(WMyJ(WoV9~G_@o#C9x!tpyHHdtF-*0+{6-F zrOe#K^i=(VymTc6c+6Tk=jY@X`R1pj+A0|%i+egd2NdO}W#**XDisI0J1Ka&I-40< znwjYu=^28Z>+5UfnO9trn3tUD>0+x?kz1gbnVDjhnqrx1n3|NVYiew6uA7!@lA>#o zYHX=%mYSHDmS|#}Xpo!=)9;d>Tnb8+ApMXGnv$QKnPP=-o>{VKa-xxmv2JpTMVhW< zs)?y?Vq&tPu92llQnI0exuLlQB=CHFt^A8J(=+oDbC691xhf?y#mX|pDA_XE!caFU zCDB0F3}lXlsiC>9rMZQfsfn4fiJ^hHk^(4MfQ(7aD@g=pL|Y|8s9*#rdFGTt1kH^M z3=9nP4M8MSK9YbuLOL`rv&2@(NJ#;dupq%7T#%TY3bqR@7LZwyniJuYnVXtdoSC0z zt7K>fRSlMjM3n&*cc2_;<&jxjl3!E_Es%m!3!$u>Oa*Wzv`S2dI6oPbgi}+Lpu(A0 zB9XY@f*4z#k(!4$X+xA1=ckpFCl;kTrl;nW5X?IIxEx=cScc!}Cdn2S$tDISx=AKU zrn(l%CKkFD$%z)a24+SU1|})y#)-z3Fs~y!9h}t+O{`4KtPJ6~k{qW)gEcuLF)uwe z#a2mQiG0r_o2D2UC8k>HnwX}h=q4tb80aP@rw`l$vIhf>fZBR`f#b&!@Bq2c;UY$B~*-b_zCNp&%DG5EI<;1GNI}6cEkJ z)Vvg1r6MJJyQq?sFG7QeW@ha zcryF@Btb2uP3Z?&_e{@?6gqIwkzu-u)>N+#Tr