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 <cristian.adam@qt.io>
This commit is contained in:
Alessandro Portale
2021-03-03 00:10:07 +01:00
parent b4de69795f
commit d38a49a9d6
8 changed files with 71 additions and 4 deletions

View File

@@ -46,7 +46,9 @@ CMakeInputsNode::CMakeInputsNode(const Utils::FilePath &cmakeLists) :
{ {
setPriority(Node::DefaultPriority - 10); // Bottom most! setPriority(Node::DefaultPriority - 10); // Bottom most!
setDisplayName(QCoreApplication::translate("CMakeFilesProjectNode", "CMake Modules")); 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); setListInProject(false);
} }

Binary file not shown.

After

Width:  |  Height:  |  Size: 461 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 792 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 583 B

View File

@@ -24,7 +24,6 @@
<file>images/debugger_overlay_small@2x.png</file> <file>images/debugger_overlay_small@2x.png</file>
<file>images/analyzer_overlay_small.png</file> <file>images/analyzer_overlay_small.png</file>
<file>images/analyzer_overlay_small@2x.png</file> <file>images/analyzer_overlay_small@2x.png</file>
<file>images/session.png</file>
<file>images/BuildSettings.png</file> <file>images/BuildSettings.png</file>
<file>images/CodeStyleSettings.png</file> <file>images/CodeStyleSettings.png</file>
<file>images/RunSettings.png</file> <file>images/RunSettings.png</file>
@@ -67,6 +66,8 @@
<file>images/fileoverlay_product@2x.png</file> <file>images/fileoverlay_product@2x.png</file>
<file>images/fileoverlay_group.png</file> <file>images/fileoverlay_group.png</file>
<file>images/fileoverlay_group@2x.png</file> <file>images/fileoverlay_group@2x.png</file>
<file>images/fileoverlay_modules.png</file>
<file>images/fileoverlay_modules@2x.png</file>
<file>images/fileoverlay_ui.png</file> <file>images/fileoverlay_ui.png</file>
<file>images/fileoverlay_ui@2x.png</file> <file>images/fileoverlay_ui@2x.png</file>
<file>images/fileoverlay_scxml.png</file> <file>images/fileoverlay_scxml.png</file>

View File

@@ -215,6 +215,7 @@ const char PROJECTTREE_ID[] = "Projects";
const char FILEOVERLAY_QT[]=":/projectexplorer/images/fileoverlay_qt.png"; const char FILEOVERLAY_QT[]=":/projectexplorer/images/fileoverlay_qt.png";
const char FILEOVERLAY_GROUP[] = ":/projectexplorer/images/fileoverlay_group.png"; const char FILEOVERLAY_GROUP[] = ":/projectexplorer/images/fileoverlay_group.png";
const char FILEOVERLAY_PRODUCT[] = ":/projectexplorer/images/fileoverlay_product.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_QML[]=":/projectexplorer/images/fileoverlay_qml.png";
const char FILEOVERLAY_UI[]=":/projectexplorer/images/fileoverlay_ui.png"; const char FILEOVERLAY_UI[]=":/projectexplorer/images/fileoverlay_ui.png";
const char FILEOVERLAY_QRC[]=":/projectexplorer/images/fileoverlay_qrc.png"; const char FILEOVERLAY_QRC[]=":/projectexplorer/images/fileoverlay_qrc.png";

View File

@@ -334,8 +334,6 @@ void IconLister::addProjectExplorerIcons()
{QIcon(":/projectexplorer/images/category_buildrun.png"), "category_buildrun.png", prefix, {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/BuildSettings.png"), "BuildSettings.png", prefix,
""}, ""},
{QIcon(":/projectexplorer/images/CodeStyleSettings.png"), "CodeStyleSettings.png", prefix, {QIcon(":/projectexplorer/images/CodeStyleSettings.png"), "CodeStyleSettings.png", prefix,

View File

@@ -18,6 +18,18 @@
sodipodi:docname="qtcreatoricons.svg"> sodipodi:docname="qtcreatoricons.svg">
<defs <defs
id="defs4"> id="defs4">
<linearGradient
inkscape:collect="always"
id="linearGradient2550">
<stop
style="stop-color:#459933;stop-opacity:1"
offset="0"
id="stop2546" />
<stop
style="stop-color:#79cc66;stop-opacity:1"
offset="1"
id="stop2548" />
</linearGradient>
<linearGradient <linearGradient
inkscape:collect="always" inkscape:collect="always"
id="linearGradient3970"> id="linearGradient3970">
@@ -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 " 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" /> id="feColorMatrix2747" />
</filter> </filter>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient2550"
id="linearGradient2552"
x1="74"
y1="530.5"
x2="75"
y2="534"
gradientUnits="userSpaceOnUse" />
</defs> </defs>
<sodipodi:namedview <sodipodi:namedview
id="base" id="base"
@@ -9355,6 +9376,50 @@
cy="531" cy="531"
r="1.5" /> r="1.5" />
</g> </g>
<g
id="src/plugins/projectexplorer/images/fileoverlay_modules"
transform="translate(176)">
<use
x="0"
y="0"
xlink:href="#transparentBackgroundRect"
id="use2538"
width="100%"
transform="translate(80,68)"
height="100%" />
<path
style="opacity:0.75;fill:#ffffff;stroke:#ffffff;stroke-linejoin:round"
d="m 68.5,529.19 7.5,-3.69 3.5,1.7 V 531.8 L 72,535.5 68.5,533.8 Z"
id="path4572"
sodipodi:nodetypes="ccccccc" />
<use
x="0"
y="0"
xlink:href="#g2810"
id="use2833"
transform="translate(4,-2)"
width="100%"
height="100%" />
<g
id="g2810"
transform="translate(-1)">
<path
style="fill:#97d98c;fill-opacity:1"
d="m 70,529.5 3,-1.5 3,1.5 -3,5.5 z"
id="path2816"
sodipodi:nodetypes="ccccc" />
<path
style="fill:url(#linearGradient2552);fill-opacity:1"
d="m 76,529.5 v 4 l -3,1.5 -3,-2.5 z"
id="path2814"
sodipodi:nodetypes="ccccc" />
<path
style="fill:#2e7326;fill-opacity:1"
d="m 70,529.5 v 4 l 3,1.5 v -4 z"
id="path2812"
sodipodi:nodetypes="ccccc" />
</g>
</g>
<g <g
id="src/libs/utils/images/filesave"> id="src/libs/utils/images/filesave">
<rect <rect

Before

Width:  |  Height:  |  Size: 381 KiB

After

Width:  |  Height:  |  Size: 383 KiB