diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.qrc b/src/plugins/cmakeprojectmanager/cmakeproject.qrc index 4b5080980a6565852457ebd85f292100b7e9a255..6926b1d41de767b79c5c75ed21432c0ebd3044a5 100644 --- a/src/plugins/cmakeprojectmanager/cmakeproject.qrc +++ b/src/plugins/cmakeprojectmanager/cmakeproject.qrc @@ -1,5 +1,7 @@ <RCC> <qresource prefix="/cmakeproject"> <file>CMakeProjectManager.mimetypes.xml</file> + <file>images/fileoverlay_cmake.png</file> + <file>images/fileoverlay_cmake@2x.png</file> </qresource> </RCC> diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectconstants.h b/src/plugins/cmakeprojectmanager/cmakeprojectconstants.h index 1f6c33411ea1923f54d67c982ebd3fa3f62c7728..94abe1c1fdcb41bf119e65c299e5c1f43a160647 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectconstants.h +++ b/src/plugins/cmakeprojectmanager/cmakeprojectconstants.h @@ -54,5 +54,8 @@ const char CMAKE_SETTINGSPAGE_ID[] = "Z.CMake"; // Snippets const char CMAKE_SNIPPETS_GROUP_ID[] = "CMake"; +// Icons +const char FILEOVERLAY_CMAKE[] = ":/cmakeproject/images/fileoverlay_cmake.png"; + } // namespace Constants } // namespace CMakeProjectManager diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp index dba81e9c275b0bb6b769a200780e36d0a59fe439..cffcc282a628776805186cecfee6a619e29c0e08 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp @@ -37,9 +37,11 @@ #include "cmaketoolmanager.h" #include "cmakekitinformation.h" -#include <utils/mimetypes/mimedatabase.h> +#include <coreplugin/fileiconprovider.h> #include <projectexplorer/kitmanager.h> +#include <utils/mimetypes/mimedatabase.h> + using namespace CMakeProjectManager::Internal; bool CMakeProjectPlugin::initialize(const QStringList & /*arguments*/, QString *errorMessage) @@ -47,6 +49,9 @@ bool CMakeProjectPlugin::initialize(const QStringList & /*arguments*/, QString * Q_UNUSED(errorMessage) Utils::MimeDatabase::addMimeTypes(QLatin1String(":cmakeproject/CMakeProjectManager.mimetypes.xml")); + Core::FileIconProvider::registerIconOverlayForSuffix(Constants::FILEOVERLAY_CMAKE, "cmake"); + Core::FileIconProvider::registerIconOverlayForFilename(Constants::FILEOVERLAY_CMAKE, "CMakeLists.txt"); + addAutoReleasedObject(new Internal::CMakeSnippetProvider); addAutoReleasedObject(new CMakeSettingsPage); addAutoReleasedObject(new CMakeManager); diff --git a/src/plugins/cmakeprojectmanager/images/fileoverlay_cmake.png b/src/plugins/cmakeprojectmanager/images/fileoverlay_cmake.png new file mode 100644 index 0000000000000000000000000000000000000000..95104870c26f2e32eaac7bac672d3e02407e91e4 Binary files /dev/null and b/src/plugins/cmakeprojectmanager/images/fileoverlay_cmake.png differ diff --git a/src/plugins/cmakeprojectmanager/images/fileoverlay_cmake@2x.png b/src/plugins/cmakeprojectmanager/images/fileoverlay_cmake@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..805db2fabd72a4222526da3c54171eaa8c1e5da9 Binary files /dev/null and b/src/plugins/cmakeprojectmanager/images/fileoverlay_cmake@2x.png differ diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg index ea755809a84229fedd01606382b268805f120e98..e6e5e59dcbf5b08277b1dad8a59769c24216e83f 100644 --- a/src/tools/icons/qtcreatoricons.svg +++ b/src/tools/icons/qtcreatoricons.svg @@ -6764,6 +6764,39 @@ inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccc" /> </g> + <g + id="src/plugins/cmakeprojectmanager/images/fileoverlay_cmake"> + <rect + style="fill:none" + id="rect6843-2-6" + width="16" + height="16" + x="192" + y="520" /> + <path + d="m 197,535 5,-9.5 5,9.5 z" + id="path5434" + inkscape:connector-curvature="0" + style="fill:#ffffff;fill-opacity:0.74901961;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:0.74901961" /> + <path + sodipodi:nodetypes="cccc" + inkscape:connector-curvature="0" + id="path4544" + d="M 202.70313,533.34375 207,535 l -5,-9.5 z" + style="fill:#ce3434;fill-opacity:1" /> + <path + sodipodi:nodetypes="cccc" + inkscape:connector-curvature="0" + id="path4544-6" + d="M 202.46673,530.56042 202,525.5 197,535 Z" + style="fill:#4a4bd0;fill-opacity:1" /> + <path + sodipodi:nodetypes="cccc" + inkscape:connector-curvature="0" + id="path4544-6-2" + d="M 200.23323,532.37183 197,535 l 10,0 z" + style="fill:#0dbf0d;fill-opacity:1" /> + </g> <g transform="translate(-48,32)" id="src/plugins/baremetal/images/baremetaldevice">