Commit 98f7a00e authored by Alessandro Portale's avatar Alessandro Portale Committed by Thomas Hartmann

Move "Ok", "Error" and "Notloaded" icons from ExtentionSystem to Utils

These icons are useful in other situations (e.g. QmlDesigner)

Change-Id: I31751b8ca8fea34c532d54d423e5fef07b370a4a
Reviewed-by: default avatarThomas Hartmann <Thomas.Hartmann@theqtcompany.com>
parent 13fbcb2d
......@@ -37,7 +37,3 @@ FORMS += \
pluginerrorview.ui \
plugindetailsview.ui \
pluginerroroverview.ui
RESOURCES += pluginview.qrc
......@@ -43,10 +43,6 @@ Project {
"pluginspec_p.h",
"pluginview.cpp",
"pluginview.h",
"pluginview.qrc",
"images/error.png",
"images/notloaded.png",
"images/ok.png",
]
Export {
......
......@@ -31,7 +31,7 @@
#include <utils/algorithm.h>
#include <utils/categorysortfiltermodel.h>
#include <utils/icon.h>
#include <utils/utilsicons.h>
#include <utils/itemviews.h>
#include <utils/qtcassert.h>
#include <utils/treemodel.h>
......@@ -90,22 +90,16 @@ static const QIcon &icon(IconIndex icon)
using namespace Utils;
switch (icon) {
case OkIcon: {
static const QIcon ok =
Icon({{QLatin1String(":/extensionsystem/images/ok.png"),
Theme::IconsRunToolBarColor}}, Icon::Tint).icon();
static const QIcon ok = Utils::Icons::OK.icon();
return ok;
}
case ErrorIcon: {
static const QIcon error =
Icon({{QLatin1String(":/extensionsystem/images/error.png"),
Theme::IconsErrorColor}}, Icon::Tint).icon();
static const QIcon error = Utils::Icons::ERROR.icon();
return error;
}
default:
case NotLoadedIcon: {
static const QIcon notLoaded =
Icon({{QLatin1String(":/extensionsystem/images/notloaded.png"),
Theme::IconsErrorColor}}, Icon::Tint).icon();
static const QIcon notLoaded = Utils::Icons::NOTLOADED.icon();
return notLoaded;
}
}
......
<RCC>
<qresource prefix="/extensionsystem">
<file>images/ok.png</file>
<file>images/ok@2x.png</file>
<file>images/error.png</file>
<file>images/error@2x.png</file>
<file>images/notloaded.png</file>
<file>images/notloaded@2x.png</file>
</qresource>
</RCC>
......@@ -25,5 +25,11 @@
<file>images/locked@2x.png</file>
<file>images/unlocked.png</file>
<file>images/unlocked@2x.png</file>
<file>images/error.png</file>
<file>images/error@2x.png</file>
<file>images/notloaded.png</file>
<file>images/notloaded@2x.png</file>
<file>images/ok.png</file>
<file>images/ok@2x.png</file>
</qresource>
</RCC>
......@@ -50,6 +50,12 @@ const Utils::Icon ZOOM({
{QLatin1String(":/utils/images/zoom.png"), Utils::Theme::PanelTextColorMid}}, Utils::Icon::Tint);
const Utils::Icon ZOOM_TOOLBAR({
{QLatin1String(":/utils/images/zoom.png"), Utils::Theme::IconsBaseColor}});
const Utils::Icon OK({
{QLatin1String(":/utils/images/ok.png"), Utils::Theme::IconsRunToolBarColor}}, Icon::Tint);
const Utils::Icon NOTLOADED({
{QLatin1String(":/utils/images/notloaded.png"), Utils::Theme::IconsErrorColor}}, Icon::Tint);
const Utils::Icon ERROR({
{QLatin1String(":/utils/images/error.png"), Utils::Theme::IconsErrorColor}}, Icon::Tint);
} // namespace Icons
} // namespace Utils
......@@ -1358,7 +1358,7 @@
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
</g>
<g
id="src/libs/extensionsystem/images/ok">
id="src/libs/utils/images/ok">
<rect
y="584"
x="297"
......@@ -1374,7 +1374,7 @@
sodipodi:nodetypes="ccc" />
</g>
<g
id="src/libs/extensionsystem/images/error"
id="src/libs/utils/images/error"
transform="translate(2,0)">
<rect
style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
......@@ -1401,7 +1401,7 @@
</g>
</g>
<g
id="src/libs/extensionsystem/images/notloaded"
id="src/libs/utils/images/notloaded"
transform="translate(8,0)">
<rect
y="584"
......
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