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: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
@@ -37,7 +37,3 @@ FORMS += \
|
|||||||
pluginerrorview.ui \
|
pluginerrorview.ui \
|
||||||
plugindetailsview.ui \
|
plugindetailsview.ui \
|
||||||
pluginerroroverview.ui
|
pluginerroroverview.ui
|
||||||
RESOURCES += pluginview.qrc
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -43,10 +43,6 @@ Project {
|
|||||||
"pluginspec_p.h",
|
"pluginspec_p.h",
|
||||||
"pluginview.cpp",
|
"pluginview.cpp",
|
||||||
"pluginview.h",
|
"pluginview.h",
|
||||||
"pluginview.qrc",
|
|
||||||
"images/error.png",
|
|
||||||
"images/notloaded.png",
|
|
||||||
"images/ok.png",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
Export {
|
Export {
|
||||||
|
|||||||
@@ -31,7 +31,7 @@
|
|||||||
|
|
||||||
#include <utils/algorithm.h>
|
#include <utils/algorithm.h>
|
||||||
#include <utils/categorysortfiltermodel.h>
|
#include <utils/categorysortfiltermodel.h>
|
||||||
#include <utils/icon.h>
|
#include <utils/utilsicons.h>
|
||||||
#include <utils/itemviews.h>
|
#include <utils/itemviews.h>
|
||||||
#include <utils/qtcassert.h>
|
#include <utils/qtcassert.h>
|
||||||
#include <utils/treemodel.h>
|
#include <utils/treemodel.h>
|
||||||
@@ -90,22 +90,16 @@ static const QIcon &icon(IconIndex icon)
|
|||||||
using namespace Utils;
|
using namespace Utils;
|
||||||
switch (icon) {
|
switch (icon) {
|
||||||
case OkIcon: {
|
case OkIcon: {
|
||||||
static const QIcon ok =
|
static const QIcon ok = Utils::Icons::OK.icon();
|
||||||
Icon({{QLatin1String(":/extensionsystem/images/ok.png"),
|
|
||||||
Theme::IconsRunToolBarColor}}, Icon::Tint).icon();
|
|
||||||
return ok;
|
return ok;
|
||||||
}
|
}
|
||||||
case ErrorIcon: {
|
case ErrorIcon: {
|
||||||
static const QIcon error =
|
static const QIcon error = Utils::Icons::ERROR.icon();
|
||||||
Icon({{QLatin1String(":/extensionsystem/images/error.png"),
|
|
||||||
Theme::IconsErrorColor}}, Icon::Tint).icon();
|
|
||||||
return error;
|
return error;
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
case NotLoadedIcon: {
|
case NotLoadedIcon: {
|
||||||
static const QIcon notLoaded =
|
static const QIcon notLoaded = Utils::Icons::NOTLOADED.icon();
|
||||||
Icon({{QLatin1String(":/extensionsystem/images/notloaded.png"),
|
|
||||||
Theme::IconsErrorColor}}, Icon::Tint).icon();
|
|
||||||
return notLoaded;
|
return notLoaded;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,10 +0,0 @@
|
|||||||
<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>
|
|
||||||
|
Before Width: | Height: | Size: 137 B After Width: | Height: | Size: 137 B |
|
Before Width: | Height: | Size: 263 B After Width: | Height: | Size: 263 B |
|
Before Width: | Height: | Size: 94 B After Width: | Height: | Size: 94 B |
|
Before Width: | Height: | Size: 96 B After Width: | Height: | Size: 96 B |
|
Before Width: | Height: | Size: 165 B After Width: | Height: | Size: 165 B |
|
Before Width: | Height: | Size: 221 B After Width: | Height: | Size: 221 B |
@@ -25,5 +25,11 @@
|
|||||||
<file>images/locked@2x.png</file>
|
<file>images/locked@2x.png</file>
|
||||||
<file>images/unlocked.png</file>
|
<file>images/unlocked.png</file>
|
||||||
<file>images/unlocked@2x.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>
|
</qresource>
|
||||||
</RCC>
|
</RCC>
|
||||||
|
|||||||
@@ -50,6 +50,12 @@ const Utils::Icon ZOOM({
|
|||||||
{QLatin1String(":/utils/images/zoom.png"), Utils::Theme::PanelTextColorMid}}, Utils::Icon::Tint);
|
{QLatin1String(":/utils/images/zoom.png"), Utils::Theme::PanelTextColorMid}}, Utils::Icon::Tint);
|
||||||
const Utils::Icon ZOOM_TOOLBAR({
|
const Utils::Icon ZOOM_TOOLBAR({
|
||||||
{QLatin1String(":/utils/images/zoom.png"), Utils::Theme::IconsBaseColor}});
|
{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 Icons
|
||||||
} // namespace Utils
|
} // 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" />
|
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>
|
||||||
<g
|
<g
|
||||||
id="src/libs/extensionsystem/images/ok">
|
id="src/libs/utils/images/ok">
|
||||||
<rect
|
<rect
|
||||||
y="584"
|
y="584"
|
||||||
x="297"
|
x="297"
|
||||||
@@ -1374,7 +1374,7 @@
|
|||||||
sodipodi:nodetypes="ccc" />
|
sodipodi:nodetypes="ccc" />
|
||||||
</g>
|
</g>
|
||||||
<g
|
<g
|
||||||
id="src/libs/extensionsystem/images/error"
|
id="src/libs/utils/images/error"
|
||||||
transform="translate(2,0)">
|
transform="translate(2,0)">
|
||||||
<rect
|
<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"
|
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>
|
</g>
|
||||||
<g
|
<g
|
||||||
id="src/libs/extensionsystem/images/notloaded"
|
id="src/libs/utils/images/notloaded"
|
||||||
transform="translate(8,0)">
|
transform="translate(8,0)">
|
||||||
<rect
|
<rect
|
||||||
y="584"
|
y="584"
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 198 KiB After Width: | Height: | Size: 198 KiB |