From d38a49a9d616b02a43b53a7fa7235b6cb368d891 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Wed, 3 Mar 2021 00:10:07 +0100 Subject: [PATCH] CMakeProjectManager: Conform Modules icon The Modules node in the tree of a loaded CMake project looks quite different than the rest of the icons. Also, it is neither available as High-DPI variant nor do we have the original vector graphics for it. Thich change fixes the above issues. Task-number: QTCREATORBUG-25412 Change-Id: I4ad5853330424f9fec2520b8b539a325b6c80176 Reviewed-by: Cristian Adam --- .../cmakeprojectmanager/cmakeprojectnodes.cpp | 4 +- .../images/fileoverlay_modules.png | Bin 0 -> 461 bytes .../images/fileoverlay_modules@2x.png | Bin 0 -> 792 bytes .../projectexplorer/images/session.png | Bin 583 -> 0 bytes .../projectexplorer/projectexplorer.qrc | 3 +- .../projectexplorerconstants.h | 1 + src/tools/iconlister/iconlister.cpp | 2 - src/tools/icons/qtcreatoricons.svg | 65 ++++++++++++++++++ 8 files changed, 71 insertions(+), 4 deletions(-) create mode 100644 src/plugins/projectexplorer/images/fileoverlay_modules.png create mode 100644 src/plugins/projectexplorer/images/fileoverlay_modules@2x.png delete mode 100644 src/plugins/projectexplorer/images/session.png diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp index 002a2b82623..211aca4065d 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp @@ -46,7 +46,9 @@ CMakeInputsNode::CMakeInputsNode(const Utils::FilePath &cmakeLists) : { setPriority(Node::DefaultPriority - 10); // Bottom most! setDisplayName(QCoreApplication::translate("CMakeFilesProjectNode", "CMake Modules")); - setIcon(QIcon(":/projectexplorer/images/session.png")); // TODO: Use a better icon! + static const QIcon modulesIcon = Core::FileIconProvider::directoryIcon( + ProjectExplorer::Constants::FILEOVERLAY_MODULES); + setIcon(modulesIcon); setListInProject(false); } diff --git a/src/plugins/projectexplorer/images/fileoverlay_modules.png b/src/plugins/projectexplorer/images/fileoverlay_modules.png new file mode 100644 index 0000000000000000000000000000000000000000..0ebdea29e5c1833df16ce01fe0282ed0a6dec2d9 GIT binary patch literal 461 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0XB4ude`@%$Aj z3=9mCC9V-A!TD(=<%vb94CUqJdYO6I#mR{Use1WE>9gP2NHH)lMtQn8hFJ8zopf5e zB~hkze*QDnQ_m-#&{cf0N$QYW9`~lH_KuMe(VIgjscur}n%g@i+GEzSwivavg#lfy z(Q4dn$%$?=B+J6ieXE`S`HvX;zt83qQ#`XKn5bq(1ua(LKJbf|Wmdzx%?~^uo;zDs z>7l=F)t6lkov~$HJ;!t=JYkAz$WutYVI44k&cp{b|33d(@mtRSeP1WzcE;HBgOmSs z6qZ)sbrDtDuFD&Id_V$>> zVV~!h+^(=POfDAoD+{|;uFSAi6CQ%m#dGBBw3Q zh{~E~vU}6^7uoVTRZ>=OxPRrB)lNz~oNu3}9+cF2-Apzv-r42@?}wZfF*1j$MHv_v O7(8A5T-G@yGywqm0LeoD literal 0 HcmV?d00001 diff --git a/src/plugins/projectexplorer/images/fileoverlay_modules@2x.png b/src/plugins/projectexplorer/images/fileoverlay_modules@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..96c940d5c767f131a06666571344759c2d7cd441 GIT binary patch literal 792 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}oCO|{#S9Fx?I6t9|MX)j z0|SF(iEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$QVa}COFdm2Ln2z=PP^|N zoG5YJ{(WNJw6@KW#^F(djf*(aN`hUUotP%t^4Db1iUq6xaj)OQ;l-u(Vp;q(*GX#v z7Ot6~7vvP=Zl&T+WgCmHecW+2_f_ccL)`7(E6@M_JLmhuJ?EJvQ>O&F z{oj4WD@SYT7KW`3i_N|Yyby9~2^VoNwp$>XZ_vtoK>0zdKvG#Gg8wcz5Zbh`+-SK8`&+G*R-};eq(pjt$VN0>ZfkKdbMG*&nm}#KkNkO%yS5wqElOU zQFuboJZ7l|Q@7;Lf&J`EH80+#UU|>n(UkH$N>WNvWeHoLh^p1CbNk-D?O~ya8=5fHIsRU;}@Cpzb{p&Z|FIb7bPJ?_auq=VHjSGlhRGUs!$HdL_IW@LVYR`0aStqf?s27yi^w zzp;I#xYzn`($jpH%p2Skj|4BaR4Es(YB-&7^!eTA=9Sy6*5^z9F-%}zVZBj3u1~$g zL?JGjIVmjYYJm3s_RcG{><3miuKV+>Z<$f~-MHeu z=-Y%HTmR1OU#ru7hb4Jh&p#7~j|+5jUVEgTah-N2b8%C>5x=>~VSPhUDd|~N53?h# ztxJvg8Wk(n&FL2G(-v@|xjFy(uPGBx zKI#yc=t|F7XdIiRyt>P6mAmd0rqDN=mT;6Gv3$PrqU4un$yc}fUyXmqbd>qQ;ea&{ z=6rDsJ8^u~3cU%c-M1&Qnornsf4ZPOQ^w2SOKT?mNLFBvyrm$QZeXj|_%SiBfI0rd zZ=)BU6RP#X-rBGpub4GCS?I<3`PH|+-ad4>x$wl)e@5YKyU#w?x%l%)nuyDe{gu)6 zeiG^yQ;tZR%sBh}j*bSs}@a`?4Kp{hSyW7#KWV{an^LB{Ts5V1)@u diff --git a/src/plugins/projectexplorer/projectexplorer.qrc b/src/plugins/projectexplorer/projectexplorer.qrc index 76a913e8df1..b09c7e26da0 100644 --- a/src/plugins/projectexplorer/projectexplorer.qrc +++ b/src/plugins/projectexplorer/projectexplorer.qrc @@ -24,7 +24,6 @@ images/debugger_overlay_small@2x.png images/analyzer_overlay_small.png images/analyzer_overlay_small@2x.png - images/session.png images/BuildSettings.png images/CodeStyleSettings.png images/RunSettings.png @@ -67,6 +66,8 @@ images/fileoverlay_product@2x.png images/fileoverlay_group.png images/fileoverlay_group@2x.png + images/fileoverlay_modules.png + images/fileoverlay_modules@2x.png images/fileoverlay_ui.png images/fileoverlay_ui@2x.png images/fileoverlay_scxml.png diff --git a/src/plugins/projectexplorer/projectexplorerconstants.h b/src/plugins/projectexplorer/projectexplorerconstants.h index 5bc3a8da3f0..e0f7fa80459 100644 --- a/src/plugins/projectexplorer/projectexplorerconstants.h +++ b/src/plugins/projectexplorer/projectexplorerconstants.h @@ -215,6 +215,7 @@ const char PROJECTTREE_ID[] = "Projects"; const char FILEOVERLAY_QT[]=":/projectexplorer/images/fileoverlay_qt.png"; const char FILEOVERLAY_GROUP[] = ":/projectexplorer/images/fileoverlay_group.png"; const char FILEOVERLAY_PRODUCT[] = ":/projectexplorer/images/fileoverlay_product.png"; +const char FILEOVERLAY_MODULES[] = ":/projectexplorer/images/fileoverlay_modules.png"; const char FILEOVERLAY_QML[]=":/projectexplorer/images/fileoverlay_qml.png"; const char FILEOVERLAY_UI[]=":/projectexplorer/images/fileoverlay_ui.png"; const char FILEOVERLAY_QRC[]=":/projectexplorer/images/fileoverlay_qrc.png"; diff --git a/src/tools/iconlister/iconlister.cpp b/src/tools/iconlister/iconlister.cpp index e8b9d3eb18d..d3d084e8ca5 100644 --- a/src/tools/iconlister/iconlister.cpp +++ b/src/tools/iconlister/iconlister.cpp @@ -334,8 +334,6 @@ void IconLister::addProjectExplorerIcons() {QIcon(":/projectexplorer/images/category_buildrun.png"), "category_buildrun.png", prefix, ""}, - {QIcon(":/projectexplorer/images/session.png"), "session.png", prefix, - ""}, {QIcon(":/projectexplorer/images/BuildSettings.png"), "BuildSettings.png", prefix, ""}, {QIcon(":/projectexplorer/images/CodeStyleSettings.png"), "CodeStyleSettings.png", prefix, diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg index e0bec68332c..bc5658d99cd 100644 --- a/src/tools/icons/qtcreatoricons.svg +++ b/src/tools/icons/qtcreatoricons.svg @@ -18,6 +18,18 @@ sodipodi:docname="qtcreatoricons.svg"> + + + + @@ -587,6 +599,15 @@ values="0.66 0 0 0.35 0.0182292 0.02 0.66 0.02 0.35 0.0182292 0.08 0.08 0.66 0.35 0.02 0 0 0 1 0 " id="feColorMatrix2747" /> + + + + + + + + + + +