From c4438cc4c306ff2232ce026ab5adb8f2bcad613d Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Wed, 27 Sep 2017 06:21:52 +0200 Subject: [PATCH] Qnx: Have a proper default device icon Themable and HighDPI-able. Change-Id: Ieefa19f3a569d9b9fbb3349f9bb6ac67453eff1f Reviewed-by: hjk --- src/plugins/qnx/images/qnx-target.png | Bin 2810 -> 0 bytes src/plugins/qnx/images/qnxdevice.png | Bin 0 -> 428 bytes src/plugins/qnx/images/qnxdevice@2x.png | Bin 0 -> 899 bytes src/plugins/qnx/images/qnxdevicesmall.png | Bin 0 -> 247 bytes src/plugins/qnx/images/qnxdevicesmall@2x.png | Bin 0 -> 445 bytes src/plugins/qnx/qnx.qrc | 5 ++- src/plugins/qnx/qnxconfiguration.cpp | 1 - src/plugins/qnx/qnxconstants.h | 1 - src/plugins/qnx/qnxdevicefactory.cpp | 9 +++- src/tools/icons/qtcreatoricons.svg | 43 +++++++++++++++++++ 10 files changed, 55 insertions(+), 4 deletions(-) delete mode 100644 src/plugins/qnx/images/qnx-target.png create mode 100644 src/plugins/qnx/images/qnxdevice.png create mode 100644 src/plugins/qnx/images/qnxdevice@2x.png create mode 100644 src/plugins/qnx/images/qnxdevicesmall.png create mode 100644 src/plugins/qnx/images/qnxdevicesmall@2x.png diff --git a/src/plugins/qnx/images/qnx-target.png b/src/plugins/qnx/images/qnx-target.png deleted file mode 100644 index be59d15b821dcb5638067d3ac716cebfa2b26aed..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2810 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 diff --git a/src/plugins/qnx/images/qnxdevice.png b/src/plugins/qnx/images/qnxdevice.png new file mode 100644 index 0000000000000000000000000000000000000000..fedd002bf7df873958296d1f38358ce1040849b1 GIT binary patch literal 428 zcmeAS@N?(olHy`uVBq!ia0y~yU{C^K4h9AW26>$jIR*yCVow*x5R21iFMDgaFp3=e zSYK?q*wD!Hu!)nHT&u{^H8~=xm1k~wMGD`YwCQr_DdmYdZ#*_SYPx!P%5k4^^30rY z_DJfK=jl&Fw`ZS>{BQNVMDE4)2mdGDIC$;e&)M9OJde+QoV-;-W9Ni~BOmndmGH)SLdT_#{vFi#hr=ESF?NZ0bZ;c}dyS-t|;2 z@(Yp9e7WFh$l`{o-;>{5O|Rl@y1LTSW$9s#9?8a~F5FKy+DqK^W(dkUw?ybe=o_nv z&J0y4(hO()QluIr*D_yt?sDs3w8aN4?w&vATKaTP&)QX%yIo%4&jYtt3_Jd~<=F_V z*gMH-LQLtB?IjJ{-nU+3khmntAiK%;vdrB-7vC{3WY1zxxRhDq>yYB|ip{8M-qy^> zYi}O&7fJWu_r6qXljj|z?a=(XZxdsa-xDd0Z8y3YFFbXb#xUbTXXdxQd}}#pc?Rvg i??K%A9zFd3=iB?BB{Q!5Wm(=1iUv&Wu|j)l?K?)RevPrXLebH?^4|y$MTxFve)J3Vx=bG$z9b?>>2bX&V1(jl3jgj zOuSv?;pZlaZ|`ZmR@(7NU`fqa)}3b+tvASpulZ+NXMQ1X!$XhPi_Y7u3{kPY_Ll2} z_r>2T6K^j`u5HXd+oO=;cepp|ql4J>rHjm?_doiwa63y3*QBkPVIoDnku2giYPSw; zxt5~#p2J(|_R<~2Ujp%a8e z*|Ul(vlQh;>r7U+YP@UonjYoBTivEMukK;}=AVk$Oh37&uZ;QaRg{zh%3YqWelF{r G5}E+eTaOF? literal 0 HcmV?d00001 diff --git a/src/plugins/qnx/images/qnxdevicesmall.png b/src/plugins/qnx/images/qnxdevicesmall.png new file mode 100644 index 0000000000000000000000000000000000000000..34a5ba9432c6df0cfa594593f292f27c2c2d0e55 GIT binary patch literal 247 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4h9AW2CEqh_A)Rq?DKSS43UszJ!q)i!pOk( z;Cigm?Q~<0?GZdFUxanoW=^S3*cf9p=cfJy*GS38Ie8NuHM?7Xl^lNQF}L_t(Zu7Q zSr`-;7!sGx*u5>}N}l5%AC<3(syEp`&hWW+M?JXw@TR}oRcFJlS8x9MOeOMPciqj0 zi)#|iSN0|8-`p@cC(?VX-nGemdKI;Vst0K{Eo A%>V!Z literal 0 HcmV?d00001 diff --git a/src/plugins/qnx/images/qnxdevicesmall@2x.png b/src/plugins/qnx/images/qnxdevicesmall@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..ab2100c1e9bb03a95dc51e59dbc9dcce63be29ee GIT binary patch literal 445 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4h9AWhA=@@4F(3r7Ec$)5R22vKl~XCE_gcb zT(Dq)*AZp~ZPpV({q=q84oqcaDf$2Re?CXr&BfXi7`csYe*d4&eJ0^op-b9-jAycTIx0 z%Z*q6|34L&#vgEbrg8eZ`qs9?Djfx9{{Jr(2(ydINpou9|NCE_E6pIzE%*V4Q0i-@ zqLPDxhQcpS_iWj+<(G8;>+P_$QClDLc5G%maf_AfVs*meAMYOd1V$@voAx;50&k!| z=duSH7ald;yx+LSrK8EpgjFEkiaAm&VcG?56IMlmTJZ+YU{BAJCXe~5HeGMixY4Q| z|0k(=$qn}%A~Ed}6S|Dk-!et5$+`Z0_N_``hN_d-v{of?o&&{;r>mdKI;Vst074GR A6aWAK literal 0 HcmV?d00001 diff --git a/src/plugins/qnx/qnx.qrc b/src/plugins/qnx/qnx.qrc index 97a16398cc7..7a7d425e8d2 100644 --- a/src/plugins/qnx/qnx.qrc +++ b/src/plugins/qnx/qnx.qrc @@ -1,5 +1,8 @@ - images/qnx-target.png + images/qnxdevice.png + images/qnxdevice@2x.png + images/qnxdevicesmall.png + images/qnxdevicesmall@2x.png diff --git a/src/plugins/qnx/qnxconfiguration.cpp b/src/plugins/qnx/qnxconfiguration.cpp index 22718c63851..282e5980854 100644 --- a/src/plugins/qnx/qnxconfiguration.cpp +++ b/src/plugins/qnx/qnxconfiguration.cpp @@ -320,7 +320,6 @@ ProjectExplorer::Kit *QnxConfiguration::createKit( "Kit for %1 (%2)") .arg(displayName()) .arg(target.shortDescription())); - kit->setIconPath(FileName::fromString(QLatin1String(Constants::QNX_CATEGORY_ICON))); kit->setAutoDetected(true); kit->setAutoDetectionSource(envFile().toString()); diff --git a/src/plugins/qnx/qnxconstants.h b/src/plugins/qnx/qnxconstants.h index 979aa1e94e8..63d9a2d50b4 100644 --- a/src/plugins/qnx/qnxconstants.h +++ b/src/plugins/qnx/qnxconstants.h @@ -48,7 +48,6 @@ const char QNX_DEBUG_EXECUTABLE[] = "pdebug"; const char QNX_TOOLCHAIN_ID[] = "Qnx.QccToolChain"; // QNX settings constants -const char QNX_CATEGORY_ICON[] = ":/qnx/images/qnx-target.png"; const char QNX_SETTINGS_ID[] = "DD.Qnx Configuration"; const char QNX_CONFIGS_FILENAME[] = "qnxconfigurations.xml"; diff --git a/src/plugins/qnx/qnxdevicefactory.cpp b/src/plugins/qnx/qnxdevicefactory.cpp index f489c10d740..1546171afd7 100644 --- a/src/plugins/qnx/qnxdevicefactory.cpp +++ b/src/plugins/qnx/qnxdevicefactory.cpp @@ -30,6 +30,7 @@ #include "qnxdevice.h" #include +#include #include @@ -55,7 +56,13 @@ QList QnxDeviceFactory::availableCreationIds() const QIcon QnxDeviceFactory::iconForId(Core::Id type) const { Q_UNUSED(type) - return QIcon(); + using namespace Utils; + static const QIcon icon = + Icon::combinedIcon({Icon({{":/qnx/images/qnxdevicesmall.png", + Theme::PanelTextColorDark}}, Icon::Tint), + Icon({{":/qnx/images/qnxdevice.png", + Theme::IconsBaseColor}})}); + return icon; } bool QnxDeviceFactory::canCreate() const diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg index d27d37665e1..297f6aaff18 100644 --- a/src/tools/icons/qtcreatoricons.svg +++ b/src/tools/icons/qtcreatoricons.svg @@ -8637,6 +8637,49 @@ width="100%" height="100%" /> + + + + + + + + +