From 4ab130ed9f1a3298d81d97edcd18d8b63ad0080d Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@qt.io>
Date: Fri, 5 Aug 2016 10:21:41 +0200
Subject: [PATCH] Utils: Rename the "error" icon to "broken"
It is only used in the pluginview, and "broken" fits in better with
"ok" and "notloaded" for plugin states. Also, we avoid confusion with
the "error" icon in coreicons.h.
Change-Id: I44159a878f60eacf46780b27b4d9c4f31601a9dc
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
---
src/libs/extensionsystem/pluginview.cpp | 2 +-
src/libs/utils/images/{error.png => broken.png} | Bin
.../utils/images/{error@2x.png => broken@2x.png} | Bin
src/libs/utils/utils.qrc | 4 ++--
src/libs/utils/utilsicons.h | 4 ++--
.../componentcore/qmldesignericonprovider.cpp | 2 +-
src/tools/icons/qtcreatoricons.svg | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
rename src/libs/utils/images/{error.png => broken.png} (100%)
rename src/libs/utils/images/{error@2x.png => broken@2x.png} (100%)
diff --git a/src/libs/extensionsystem/pluginview.cpp b/src/libs/extensionsystem/pluginview.cpp
index 1de716af1ea..c99fd50b35d 100644
--- a/src/libs/extensionsystem/pluginview.cpp
+++ b/src/libs/extensionsystem/pluginview.cpp
@@ -94,7 +94,7 @@ static const QIcon &icon(IconIndex icon)
return ok;
}
case ErrorIcon: {
- static const QIcon error = Utils::Icons::ERROR.icon();
+ static const QIcon error = Utils::Icons::BROKEN.icon();
return error;
}
default:
diff --git a/src/libs/utils/images/error.png b/src/libs/utils/images/broken.png
similarity index 100%
rename from src/libs/utils/images/error.png
rename to src/libs/utils/images/broken.png
diff --git a/src/libs/utils/images/error@2x.png b/src/libs/utils/images/broken@2x.png
similarity index 100%
rename from src/libs/utils/images/error@2x.png
rename to src/libs/utils/images/broken@2x.png
diff --git a/src/libs/utils/utils.qrc b/src/libs/utils/utils.qrc
index 604fda2a064..7e18b4e2310 100644
--- a/src/libs/utils/utils.qrc
+++ b/src/libs/utils/utils.qrc
@@ -25,8 +25,8 @@
<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/broken.png</file>
+ <file>images/broken@2x.png</file>
<file>images/notloaded.png</file>
<file>images/notloaded@2x.png</file>
<file>images/ok.png</file>
diff --git a/src/libs/utils/utilsicons.h b/src/libs/utils/utilsicons.h
index aa74759f9c8..28f271dff00 100644
--- a/src/libs/utils/utilsicons.h
+++ b/src/libs/utils/utilsicons.h
@@ -54,8 +54,8 @@ 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);
+const Utils::Icon BROKEN({
+ {QLatin1String(":/utils/images/broken.png"), Utils::Theme::IconsErrorColor}}, Icon::Tint);
} // namespace Icons
} // namespace Utils
diff --git a/src/plugins/qmldesigner/components/componentcore/qmldesignericonprovider.cpp b/src/plugins/qmldesigner/components/componentcore/qmldesignericonprovider.cpp
index 6efb9c8d5e8..680280d4fb1 100644
--- a/src/plugins/qmldesigner/components/componentcore/qmldesignericonprovider.cpp
+++ b/src/plugins/qmldesigner/components/componentcore/qmldesignericonprovider.cpp
@@ -83,7 +83,7 @@ QPixmap QmlDesignerIconProvider::requestPixmap(const QString &id, QSize *size, c
{ ":/utils/images/ok.png", Theme::IconsBaseColor}}, Icon::Tint).pixmap();
else if (id == "error")
result = Icon({
- { ":/utils/images/error.png", Theme::IconsBaseColor}}, Icon::Tint).pixmap();
+ { ":/utils/images/broken.png", Theme::IconsBaseColor}}, Icon::Tint).pixmap();
else if (id == "anchor-top")
result = Icon({
{ ":/qmldesigner/images/anchor_top.png", Theme::IconsBaseColor},
diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg
index befc258e142..4b6b60ebf16 100644
--- a/src/tools/icons/qtcreatoricons.svg
+++ b/src/tools/icons/qtcreatoricons.svg
@@ -1043,7 +1043,7 @@
sodipodi:nodetypes="ccc" />
</g>
<g
- id="src/libs/utils/images/error"
+ id="src/libs/utils/images/broken"
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"
--
GitLab