Commit d54da12a authored by Alessandro Portale's avatar Alessandro Portale
Browse files

CPlusPlus, Utils: Move namespace icon from CPlusPlus to Utils



...so that it can be used in the ScxmlEditor plugin

Change-Id: I0e0ed050f7765bcc901db3bb2c3273456a228b5e
Reviewed-by: Alessandro Portale's avatarAlessandro Portale <alessandro.portale@qt.io>
parent 9c924f73
......@@ -215,7 +215,7 @@ QIcon Icons::iconForType(IconType type)
}
case NamespaceIconType: {
const static QIcon icon(Icon({
{QLatin1String(":/codemodel/images/namespace.png"), Theme::IconsCodeModelKeywordColor}
{QLatin1String(":/utils/images/namespace.png"), Theme::IconsCodeModelKeywordColor}
}, Icon::Tint).icon());
return icon;
}
......
......@@ -8,8 +8,6 @@
<file>images/keyword@2x.png</file>
<file>images/macro.png</file>
<file>images/macro@2x.png</file>
<file>images/namespace.png</file>
<file>images/namespace@2x.png</file>
<file>images/signal.png</file>
<file>images/signal@2x.png</file>
<file>images/slot.png</file>
......
......@@ -166,5 +166,7 @@
<file>images/zoomout_overlay@2x.png</file>
<file>images/fittoview.png</file>
<file>images/fittoview@2x.png</file>
<file>images/namespace.png</file>
<file>images/namespace@2x.png</file>
</qresource>
</RCC>
......@@ -21,7 +21,6 @@
<file>images/colorthemes.png</file>
<file>images/final.png</file>
<file>images/font_color.png</file>
<file>images/fullnamespace.png</file>
<file>images/history.png</file>
<file>images/icon-export-canvas.png</file>
<file>images/icon-export-canvas@2x.png</file>
......
......@@ -57,7 +57,7 @@ ActionHandler::ActionHandler(QObject *parent)
{ Utils::Icon({{":/utils/images/editpaste.png", Utils::Theme::IconsBaseColor}}), AH::tr("Paste"), AH::tr("Paste (Ctrl + V)"), "Ctrl+V", false },
{ Utils::Icons::SNAPSHOT_TOOLBAR, AH::tr("Screenshot"), AH::tr("Screenshot (Ctrl + Shift + C)"), "Ctrl+Shift+C", false },
{ Utils::Icon({{":/scxmleditor/images/icon-export-canvas.png", Utils::Theme::IconsBaseColor}}), AH::tr("Export to Image"), AH::tr("Export to Image"), "Ctrl+Shift+E", false },
{ Utils::Icon(":/scxmleditor/images/fullnamespace.png"), AH::tr("Toggle Full Namespace"), AH::tr("Toggle Full Namespace"), "Ctrl+Shift+N", true },
{ Utils::Icon({{":/utils/images/namespace.png", Utils::Theme::IconsBaseColor}}), AH::tr("Toggle Full Namespace"), AH::tr("Toggle Full Namespace"), "Ctrl+Shift+N", true },
{ Utils::Icon({{":/scxmleditor/images/align_left.png", Utils::Theme::IconsBaseColor}}), AH::tr("Align Left"), AH::tr("Align Left (Ctrl+L,1)"), "Ctrl+L,1", false },
{ Utils::Icon({{":/scxmleditor/images/align_right.png", Utils::Theme::IconsBaseColor}}), AH::tr("Align Right"), AH::tr("Align Right (Ctrl+L,2)"), "Ctrl+L,2", false },
......
......@@ -4775,7 +4775,7 @@
style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.69999999;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
</g>
<g
id="src/libs/cplusplus/images/namespace">
id="src/libs/utils/images/namespace">
<rect
y="552"
x="361"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment