From 40d0f17ae2f6d3919dade1e438408e1063a1916e Mon Sep 17 00:00:00 2001 From: Adam Honse Date: Mon, 25 May 2020 13:57:04 -0500 Subject: [PATCH] Update icons --- qt/OpenRGBDialog2.cpp | 68 ++++++++++++++++++++++------------- qt/dram.png | Bin 0 -> 640 bytes qt/fan.png | Bin 0 -> 675 bytes qt/fan.svg | 1 - qt/gpu.png | Bin 0 -> 676 bytes qt/graphics-card.svg | 1 - qt/headset.png | Bin 0 -> 660 bytes qt/headsetstand.png | Bin 0 -> 657 bytes qt/keyboard.png | Bin 0 -> 665 bytes qt/keyboard.svg | 82 ------------------------------------------ qt/ledstrip.png | Bin 0 -> 633 bytes qt/motherboard.png | Bin 0 -> 653 bytes qt/motherboard.svg | 80 ----------------------------------------- qt/mouse.png | Bin 0 -> 663 bytes qt/mouse.svg | 5 --- qt/mousemat.png | Bin 0 -> 658 bytes qt/ram.svg | 1 - qt/resources.qrc | 18 ++++++---- qt/software.png | Bin 0 -> 655 bytes qt/tools.png | Bin 0 -> 661 bytes 20 files changed, 56 insertions(+), 200 deletions(-) create mode 100644 qt/dram.png create mode 100644 qt/fan.png delete mode 100644 qt/fan.svg create mode 100644 qt/gpu.png delete mode 100644 qt/graphics-card.svg create mode 100644 qt/headset.png create mode 100644 qt/headsetstand.png create mode 100644 qt/keyboard.png delete mode 100644 qt/keyboard.svg create mode 100644 qt/ledstrip.png create mode 100644 qt/motherboard.png delete mode 100644 qt/motherboard.svg create mode 100644 qt/mouse.png delete mode 100644 qt/mouse.svg create mode 100644 qt/mousemat.png delete mode 100644 qt/ram.svg create mode 100644 qt/software.png create mode 100644 qt/tools.png diff --git a/qt/OpenRGBDialog2.cpp b/qt/OpenRGBDialog2.cpp index 2c1d31bc9..007acba3e 100644 --- a/qt/OpenRGBDialog2.cpp +++ b/qt/OpenRGBDialog2.cpp @@ -115,30 +115,40 @@ OpenRGBDialog2::OpenRGBDialog2(std::vector& bus, std::vec switch(control[dev_idx]->type) { case DEVICE_TYPE_MOTHERBOARD: - NewLabelString += ":/motherboard.svg"; + NewLabelString += ":/motherboard.png"; break; case DEVICE_TYPE_DRAM: - NewLabelString += ":/ram.svg"; + NewLabelString += ":/dram.png"; break; case DEVICE_TYPE_GPU: - NewLabelString += ":/graphics-card.svg"; + NewLabelString += ":/gpu.png"; break; case DEVICE_TYPE_COOLER: - NewLabelString += ":/fan.svg"; + NewLabelString += ":/fan.png"; break; case DEVICE_TYPE_LEDSTRIP: - //break; + NewLabelString += ":/ledstrip.png"; + break; case DEVICE_TYPE_KEYBOARD: - //break; + NewLabelString += ":/keyboard.png"; + break; case DEVICE_TYPE_MOUSE: - //break; + NewLabelString += ":/mouse.png"; + break; + case DEVICE_TYPE_MOUSEMAT: + NewLabelString += ":/mousemat.png"; + break; case DEVICE_TYPE_HEADSET: - //break; + NewLabelString += ":/headset.png"; + break; + case DEVICE_TYPE_HEADSET_STAND: + NewLabelString += ":/headsetstand.png"; + break; case DEVICE_TYPE_UNKNOWN: - NewLabelString += ":/keyboard.svg"; + NewLabelString += ":/unknown.png"; break; } - NewLabelString += "' height='15' width='15'>" + QString::fromStdString(control[dev_idx]->name) + ""; + NewLabelString += "' height='16' width='16'>" + QString::fromStdString(control[dev_idx]->name) + ""; QLabel *NewTabLabel = new QLabel(); NewTabLabel->setText(NewLabelString); @@ -167,30 +177,40 @@ OpenRGBDialog2::OpenRGBDialog2(std::vector& bus, std::vec switch(control[dev_idx]->type) { case DEVICE_TYPE_MOTHERBOARD: - NewLabelString += ":/motherboard.svg"; + NewLabelString += ":/motherboard.png"; break; case DEVICE_TYPE_DRAM: - NewLabelString += ":/ram.svg"; + NewLabelString += ":/dram.png"; break; case DEVICE_TYPE_GPU: - NewLabelString += ":/graphics-card.svg"; + NewLabelString += ":/gpu.png"; break; case DEVICE_TYPE_COOLER: - NewLabelString += ":/fan.svg"; + NewLabelString += ":/fan.png"; break; case DEVICE_TYPE_LEDSTRIP: - //break; + NewLabelString += ":/ledstrip.png"; + break; case DEVICE_TYPE_KEYBOARD: - //break; + NewLabelString += ":/keyboard.png"; + break; case DEVICE_TYPE_MOUSE: - //break; + NewLabelString += ":/mouse.png"; + break; + case DEVICE_TYPE_MOUSEMAT: + NewLabelString += ":/mousemat.png"; + break; case DEVICE_TYPE_HEADSET: - //break; + NewLabelString += ":/headset.png"; + break; + case DEVICE_TYPE_HEADSET_STAND: + NewLabelString += ":/headsetstand.png"; + break; case DEVICE_TYPE_UNKNOWN: - NewLabelString += ":/keyboard.svg"; + NewLabelString += ":/unknown.png"; break; } - NewLabelString += "' height='15' width='15'>" + QString::fromStdString(control[dev_idx]->name) + ""; + NewLabelString += "' height='16 width='16'>" + QString::fromStdString(control[dev_idx]->name) + ""; QLabel *NewTabLabel = new QLabel(); NewTabLabel->setText(NewLabelString); @@ -209,8 +229,8 @@ OpenRGBDialog2::OpenRGBDialog2(std::vector& bus, std::vec ui->InformationTabBar->addTab(SMBusToolsPage, ""); QString SMBusToolsLabelString = "
SMBus Tools
"; + SMBusToolsLabelString += ":/tools.png"; + SMBusToolsLabelString += "' height='16' width='16'>SMBus Tools"; QLabel *SMBusToolsTabLabel = new QLabel(); SMBusToolsTabLabel->setText(SMBusToolsLabelString); @@ -227,8 +247,8 @@ OpenRGBDialog2::OpenRGBDialog2(std::vector& bus, std::vec ui->InformationTabBar->addTab(SoftInfoPage, ""); QString SoftwareLabelString = "
Software
"; + SoftwareLabelString += ":/software.png"; + SoftwareLabelString += "' height='16' width='16'>Software"; QLabel *SoftwareTabLabel = new QLabel(); SoftwareTabLabel->setText(SoftwareLabelString); diff --git a/qt/dram.png b/qt/dram.png new file mode 100644 index 0000000000000000000000000000000000000000..9fdeb2fd6d534c92a9c6fe8e48c87f300f70383d GIT binary patch literal 640 zcmV-`0)PF9P)EX>4Tx04R}tkv&MmKpe$iQ;Q;%B6d)5$j~}j5EXIMDionYs1;guFuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|}?mh0_0YbgZG^=YI&~)2O zCE{WxyDE0SB7h$4XRTait$Xqp26Ot#GS_L2Ab~|JL4pVcRg_SMjTo&uDHc++ANTMNyMBpW3b{&P z#tGnm2CnqBzfuQgK1r{& zwa5_=+6FGJ+nTZmTgF zj20++-Q(RooxS~grq$mMVZw5tMkZ`v00006VoOIv0RI600RN!9r;`8x010qNS#tmY zE+YT{E+YYWr9XB6000McNlirueSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{003A?L_t(I%k7gp3IH((L}z60f91DTK!i=mTBM21fQa)E z4X9J0W}RPPNv#l`v1m6;+ZyB~6-!J+NFo6Ll@B;Z`;0000EX>4Tx04R}tkv&MmKpe$iQ;Q;%B6d)5$j~}j5EXIMDionYs1;guFuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|}?mh0_0YbgZG^=YI&~)2O zCE{WxyDE0SB7h$4XRTait$Xqp26Ot#GS_L2Ab~|JL4pVcRg_SMjTo&uDHc++ANTMNyMBpW3b{&P z#tGnm2CnqBzfuQgK1r{& zwa5_=+6FGJ+nTZmTgF zj20++-Q(RooxS~grq$mMVZw5tMkZ`v00006VoOIv0RI600RN!9r;`8x010qNS#tmY zE+YT{E+YYWr9XB6000McNlirueSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{004VQL_t(I%cYY`3cw%?MDs%Lf92_>LXe4CbS3C~qeO(_ zVr4{xB>n;ihR(rE3fOy&0LiCvB \ No newline at end of file diff --git a/qt/gpu.png b/qt/gpu.png new file mode 100644 index 0000000000000000000000000000000000000000..46c499b6610a68b64552514902e646b6ee208ab1 GIT binary patch literal 676 zcmV;V0$crwP)EX>4Tx04R}tkv&MmKpe$iQ;Q;%B6d)5$j~}j5EXIMDionYs1;guFuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|}?mh0_0YbgZG^=YI&~)2O zCE{WxyDE0SB7h$4XRTait$Xqp26Ot#GS_L2Ab~|JL4pVcRg_SMjTo&uDHc++ANTMNyMBpW3b{&P z#tGnm2CnqBzfuQgK1r{& zwa5_=+6FGJ+nTZmTgF zj20++-Q(RooxS~grq$mMVZw5tMkZ`v00006VoOIv0RI600RN!9r;`8x010qNS#tmY zE+YT{E+YYWr9XB6000McNlirueSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{004YRL_t(I%dL_@4!|G?1b2-8|MK?G+7QLWYPq=z!m!xZ zNg&CRWSgA=bJ(WFgCqg{qxtXP+6ih*dM>fcsF$&;`_eWo2}t# \ No newline at end of file diff --git a/qt/headset.png b/qt/headset.png new file mode 100644 index 0000000000000000000000000000000000000000..ee2044feb3797fa93867f97d18aff17ebe1ad72c GIT binary patch literal 660 zcmV;F0&D$=P)EX>4Tx04R}tkv&MmKpe$iQ;Q;%B6d)5$j~}j5EXIMDionYs1;guFuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|}?mh0_0YbgZG^=YI&~)2O zCE{WxyDE0SB7h$4XRTait$Xqp26Ot#GS_L2Ab~|JL4pVcRg_SMjTo&uDHc++ANTMNyMBpW3b{&P z#tGnm2CnqBzfuQgK1r{& zwa5_=+6FGJ+nTZmTgF zj20++-Q(RooxS~grq$mMVZw5tMkZ`v00006VoOIv0RI600RN!9r;`8x010qNS#tmY zE+YT{E+YYWr9XB6000McNlirueSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{003-BL_t(I%dJz<4gfI(Q`!Ija_{Mq&WTx^Cz+zfK+-0* z;sb!PB1vp`W$-3PP!;!Xvc{C9SM)j(yra94<2T(itlQAm%@8xWFf&H~v_{2737t87 uw=l8a3v}*b!?+Breaec(={sjvs!bk_8cPd>8H&pQ0000EX>4Tx04R}tkv&MmKpe$iQ;Q;%B6d)5$j~}j5EXIMDionYs1;guFuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|}?mh0_0YbgZG^=YI&~)2O zCE{WxyDE0SB7h$4XRTait$Xqp26Ot#GS_L2Ab~|JL4pVcRg_SMjTo&uDHc++ANTMNyMBpW3b{&P z#tGnm2CnqBzfuQgK1r{& zwa5_=+6FGJ+nTZmTgF zj20++-Q(RooxS~grq$mMVZw5tMkZ`v00006VoOIv0RI600RN!9r;`8x010qNS#tmY zE+YT{E+YYWr9XB6000McNliru02y>eSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{003!8L_t(I%dL_@4gett1GmKgf4O@yK~hknJ(&tsCV=F3 zqoGUyGL>edgWiu20ao4;pa^I3 rwPUww?M-~bpd)xV)edB%T>sz)hqXExq&x2|00000NkvXXu0mjf*(eh9 literal 0 HcmV?d00001 diff --git a/qt/keyboard.png b/qt/keyboard.png new file mode 100644 index 0000000000000000000000000000000000000000..913f019d82c3ae5bb496895791111842a23c668c GIT binary patch literal 665 zcmV;K0%rY*P)EX>4Tx04R}tkv&MmKpe$iQ;Q;%B6d)5$j~}j5EXIMDionYs1;guFuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|}?mh0_0YbgZG^=YI&~)2O zCE{WxyDE0SB7h$4XRTait$Xqp26Ot#GS_L2Ab~|JL4pVcRg_SMjTo&uDHc++ANTMNyMBpW3b{&P z#tGnm2CnqBzfuQgK1r{& zwa5_=+6FGJ+nTZmTgF zj20++-Q(RooxS~grq$mMVZw5tMkZ`v00006VoOIv0RI600RN!9r;`8x010qNS#tmY zE+YT{E+YYWr9XB6000McNlirueSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{0041GL_t(I%e_-U4!|G?Yj@uR_Wy@=7bI>0F)UdV#RO;@ zR7yewlAe%6Bsh?Rww6c4Mt500000NkvXXu0mjfUW6B6 literal 0 HcmV?d00001 diff --git a/qt/keyboard.svg b/qt/keyboard.svg deleted file mode 100644 index e8cfc7a12..000000000 --- a/qt/keyboard.svg +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/qt/ledstrip.png b/qt/ledstrip.png new file mode 100644 index 0000000000000000000000000000000000000000..943cb3e767879aecd7a23821803cf344eee7c7c3 GIT binary patch literal 633 zcmV-<0*3vGP)EX>4Tx04R}tkv&MmKpe$iQ;Q;%B6d)5$j~}j5EXIMDionYs1;guFuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|}?mh0_0YbgZG^=YI&~)2O zCE{WxyDE0SB7h$4XRTait$Xqp26Ot#GS_L2Ab~|JL4pVcRg_SMjTo&uDHc++ANTMNyMBpW3b{&P z#tGnm2CnqBzfuQgK1r{& zwa5_=+6FGJ+nTZmTgF zj20++-Q(RooxS~grq$mMVZw5tMkZ`v00006VoOIv0RI600RN!9r;`8x010qNS#tmY zE+YT{E+YYWr9XB6000McNlirueSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{002=*L_t(I%k7gf4uCKW1AVCf|MGQU0aU4lAhF=lgJYi* z)Ks*ksP6+vQi9NuMCH+SaM(ZvaORyDs9c+@cx8y~xM#F+=CQYW8RD&w{}<8$UTZH8 TfP+9q00000NkvXXu0mjf519_~ literal 0 HcmV?d00001 diff --git a/qt/motherboard.png b/qt/motherboard.png new file mode 100644 index 0000000000000000000000000000000000000000..e95b114b8f6e0afba65f1a412b6b1e68beca8e90 GIT binary patch literal 653 zcmV;80&@L{P)EX>4Tx04R}tkv&MmKpe$iQ;Q;%B6d)5$j~}j5EXIMDionYs1;guFuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|}?mh0_0YbgZG^=YI&~)2O zCE{WxyDE0SB7h$4XRTait$Xqp26Ot#GS_L2Ab~|JL4pVcRg_SMjTo&uDHc++ANTMNyMBpW3b{&P z#tGnm2CnqBzfuQgK1r{& zwa5_=+6FGJ+nTZmTgF zj20++-Q(RooxS~grq$mMVZw5tMkZ`v00006VoOIv0RI600RN!9r;`8x010qNS#tmY zE+YT{E+YYWr9XB6000McNlirueSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{003o4L_t(I%e|9P3cw%?L-WM@Upf2PoQ#S}WrAqYKGUd3 zvXU(WaOnfv5AfR+jFP0<2SA&yDlFOh(|~%y*kiY_p5^yUZUsz~Fk;n(O;M>tCQcRD n2Jp6t!3%9mzj`nvr@r$A%H%2sgLBS$00000NkvXXu0mjf - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/qt/mouse.png b/qt/mouse.png new file mode 100644 index 0000000000000000000000000000000000000000..7727a588ca692da27940086a36eb24339a97791a GIT binary patch literal 663 zcmV;I0%-k-P)EX>4Tx04R}tkv&MmKpe$iQ;Q;%B6d)5$j~}j5EXIMDionYs1;guFuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|}?mh0_0YbgZG^=YI&~)2O zCE{WxyDE0SB7h$4XRTait$Xqp26Ot#GS_L2Ab~|JL4pVcRg_SMjTo&uDHc++ANTMNyMBpW3b{&P z#tGnm2CnqBzfuQgK1r{& zwa5_=+6FGJ+nTZmTgF zj20++-Q(RooxS~grq$mMVZw5tMkZ`v00006VoOIv0RI600RN!9r;`8x010qNS#tmY zE+YT{E+YYWr9XB6000McNlirueSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{003`EL_t(I%gvL`4uCKSgIBWme`M>$B@DaH#Dj9=rw~2> z$(9Yk>?lSOQ+^g0#Wl&r!*u|_JdqNP_R_u==x$MUACD#&MY+Jy3CB89SfTAt59YrV xLQq&HLj=_XR3ew}xcSXDRuyi)ad$L|%n7MEMjcp#2qORh002ovPDHLkV1iz!7-9eb literal 0 HcmV?d00001 diff --git a/qt/mouse.svg b/qt/mouse.svg deleted file mode 100644 index 8bdb60652..000000000 --- a/qt/mouse.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/qt/mousemat.png b/qt/mousemat.png new file mode 100644 index 0000000000000000000000000000000000000000..fc6cc1cfcf668d8c39caadc5715f8e4ead4dd8e3 GIT binary patch literal 658 zcmV;D0&V??P)EX>4Tx04R}tkv&MmKpe$iQ;Q;%B6d)5$j~}j5EXIMDionYs1;guFuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|}?mh0_0YbgZG^=YI&~)2O zCE{WxyDE0SB7h$4XRTait$Xqp26Ot#GS_L2Ab~|JL4pVcRg_SMjTo&uDHc++ANTMNyMBpW3b{&P z#tGnm2CnqBzfuQgK1r{& zwa5_=+6FGJ+nTZmTgF zj20++-Q(RooxS~grq$mMVZw5tMkZ`v00006VoOIv0RI600RN!9r;`8x010qNS#tmY zE+YT{E+YYWr9XB6000McNlirueSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{003%9L_t(I%e_-U4!|G?YYqSZa(7tBb|{-@ww_R+LSrcj zB!vY?A^|85nWzX|4bS^4(E&*fY$7V=w-pkjYQ7g|?1;zgOO;OlXz=t;Vs?d=1|57u s;6|-<2x|~huEA+z%{1!+0N}2j4~vvTAG0GGdjJ3c07*qoM6N<$g84@hx&QzG literal 0 HcmV?d00001 diff --git a/qt/ram.svg b/qt/ram.svg deleted file mode 100644 index 83df533aa..000000000 --- a/qt/ram.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/qt/resources.qrc b/qt/resources.qrc index 4e7697c2d..955c16ae4 100644 --- a/qt/resources.qrc +++ b/qt/resources.qrc @@ -1,11 +1,17 @@ OpenRGB.png - motherboard.svg - ram.svg - graphics-card.svg - fan.svg - keyboard.svg - mouse.svg + motherboard.png + dram.png + gpu.png + fan.png + ledstrip.png + keyboard.png + mouse.png + mousemat.png + headset.png + headsetstand.png + tools.png + software.png diff --git a/qt/software.png b/qt/software.png new file mode 100644 index 0000000000000000000000000000000000000000..54c99262cda5e8b4db79acbf7cbc58dfd6c2d314 GIT binary patch literal 655 zcmV;A0&x9_P)EX>4Tx04R}tkv&MmKpe$iQ;Q;%B6d)5$j~}j5EXIMDionYs1;guFuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|}?mh0_0YbgZG^=YI&~)2O zCE{WxyDE0SB7h$4XRTait$Xqp26Ot#GS_L2Ab~|JL4pVcRg_SMjTo&uDHc++ANTMNyMBpW3b{&P z#tGnm2CnqBzfuQgK1r{& zwa5_=+6FGJ+nTZmTgF zj20++-Q(RooxS~grq$mMVZw5tMkZ`v00006VoOIv0RI600RN!9r;`8x010qNS#tmY zE+YT{E+YYWr9XB6000McNlirueSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{003u6L_t(I%f*sQ62Kq~LZOrUU-@;V(>iL6F3QeN01-<< z2M9?5yfbW@crG%-MKpSwE6T4Yj1FhYLxOA`|2w#Jh{)KV66}^K9bzjMqpkp-C8{CX p?p|DRQ+|P#1n^2O2DZ{KxBEX>4Tx04R}tkv&MmKpe$iQ;Q;%B6d)5$j~}j5EXIMDionYs1;guFuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|}?mh0_0YbgZG^=YI&~)2O zCE{WxyDE0SB7h$4XRTait$Xqp26Ot#GS_L2Ab~|JL4pVcRg_SMjTo&uDHc++ANTMNyMBpW3b{&P z#tGnm2CnqBzfuQgK1r{& zwa5_=+6FGJ+nTZmTgF zj20++-Q(RooxS~grq$mMVZw5tMkZ`v00006VoOIv0RI600RN!9r;`8x010qNS#tmY zE+YT{E+YYWr9XB6000McNlirueSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{003=CL_t(I%cYZ14!|G?LwRQRzjF8E44XP3@FfY*LMxK2 z5?8bk7)X+M-Ywhw&5<+}{LS)-q!CEv8=)kjvhM-)<4z=00000NkvXXu0mjfRFoCh literal 0 HcmV?d00001