From d54da12af90242d168d883212c0ef27f83c7f4c8 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Wed, 26 Oct 2016 12:38:12 +0200 Subject: [PATCH] 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 --- src/libs/cplusplus/Icons.cpp | 2 +- src/libs/cplusplus/cplusplus.qrc | 2 -- .../{cplusplus => utils}/images/namespace.png | Bin .../{cplusplus => utils}/images/namespace@2x.png | Bin src/libs/utils/utils.qrc | 2 ++ src/plugins/scxmleditor/common/common.qrc | 1 - .../scxmleditor/common/images/fullnamespace.png | Bin 108 -> 0 bytes .../plugin_interface/actionhandler.cpp | 2 +- src/tools/icons/qtcreatoricons.svg | 2 +- 9 files changed, 5 insertions(+), 6 deletions(-) rename src/libs/{cplusplus => utils}/images/namespace.png (100%) rename src/libs/{cplusplus => utils}/images/namespace@2x.png (100%) delete mode 100644 src/plugins/scxmleditor/common/images/fullnamespace.png diff --git a/src/libs/cplusplus/Icons.cpp b/src/libs/cplusplus/Icons.cpp index 7a539c67eb8..27e4b92d09f 100644 --- a/src/libs/cplusplus/Icons.cpp +++ b/src/libs/cplusplus/Icons.cpp @@ -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; } diff --git a/src/libs/cplusplus/cplusplus.qrc b/src/libs/cplusplus/cplusplus.qrc index d0135fdee80..32d9a712495 100644 --- a/src/libs/cplusplus/cplusplus.qrc +++ b/src/libs/cplusplus/cplusplus.qrc @@ -8,8 +8,6 @@ images/keyword@2x.png images/macro.png images/macro@2x.png - images/namespace.png - images/namespace@2x.png images/signal.png images/signal@2x.png images/slot.png diff --git a/src/libs/cplusplus/images/namespace.png b/src/libs/utils/images/namespace.png similarity index 100% rename from src/libs/cplusplus/images/namespace.png rename to src/libs/utils/images/namespace.png diff --git a/src/libs/cplusplus/images/namespace@2x.png b/src/libs/utils/images/namespace@2x.png similarity index 100% rename from src/libs/cplusplus/images/namespace@2x.png rename to src/libs/utils/images/namespace@2x.png diff --git a/src/libs/utils/utils.qrc b/src/libs/utils/utils.qrc index dd551f21fc2..9c6e7c6a08a 100644 --- a/src/libs/utils/utils.qrc +++ b/src/libs/utils/utils.qrc @@ -166,5 +166,7 @@ images/zoomout_overlay@2x.png images/fittoview.png images/fittoview@2x.png + images/namespace.png + images/namespace@2x.png diff --git a/src/plugins/scxmleditor/common/common.qrc b/src/plugins/scxmleditor/common/common.qrc index df4997beca5..7981a023097 100644 --- a/src/plugins/scxmleditor/common/common.qrc +++ b/src/plugins/scxmleditor/common/common.qrc @@ -21,7 +21,6 @@ images/colorthemes.png images/final.png images/font_color.png - images/fullnamespace.png images/history.png images/icon-export-canvas.png images/icon-export-canvas@2x.png diff --git a/src/plugins/scxmleditor/common/images/fullnamespace.png b/src/plugins/scxmleditor/common/images/fullnamespace.png deleted file mode 100644 index ee890ccf5b637ab75d4a28c491223e8cd2103676..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 108 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;IMrH;E2G1=owlgp=um$*pxH2#>{Q39qWV1pr z0|NtNNswPKgTu2MX$%YuBAzaeAso@k2@0H7PCQmP5#lbu!0?TkjsN50^~V@M#<=>q JtaD0e0sv5a9b5na diff --git a/src/plugins/scxmleditor/plugin_interface/actionhandler.cpp b/src/plugins/scxmleditor/plugin_interface/actionhandler.cpp index dfa715be8e7..660293186f6 100644 --- a/src/plugins/scxmleditor/plugin_interface/actionhandler.cpp +++ b/src/plugins/scxmleditor/plugin_interface/actionhandler.cpp @@ -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 }, diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg index e0f41d12d98..7d55635c446 100644 --- a/src/tools/icons/qtcreatoricons.svg +++ b/src/tools/icons/qtcreatoricons.svg @@ -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" /> + id="src/libs/utils/images/namespace">