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>
This commit is contained in:
Ulf Hermann
2016-08-05 10:21:41 +02:00
parent 1853f01a5b
commit 4ab130ed9f
7 changed files with 7 additions and 7 deletions

View File

@@ -94,7 +94,7 @@ static const QIcon &icon(IconIndex icon)
return ok; return ok;
} }
case ErrorIcon: { case ErrorIcon: {
static const QIcon error = Utils::Icons::ERROR.icon(); static const QIcon error = Utils::Icons::BROKEN.icon();
return error; return error;
} }
default: default:

View File

Before

Width:  |  Height:  |  Size: 137 B

After

Width:  |  Height:  |  Size: 137 B

View File

Before

Width:  |  Height:  |  Size: 263 B

After

Width:  |  Height:  |  Size: 263 B

View File

@@ -25,8 +25,8 @@
<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/broken.png</file>
<file>images/error@2x.png</file> <file>images/broken@2x.png</file>
<file>images/notloaded.png</file> <file>images/notloaded.png</file>
<file>images/notloaded@2x.png</file> <file>images/notloaded@2x.png</file>
<file>images/ok.png</file> <file>images/ok.png</file>

View File

@@ -54,8 +54,8 @@ const Utils::Icon OK({
{QLatin1String(":/utils/images/ok.png"), Utils::Theme::IconsRunToolBarColor}}, Icon::Tint); {QLatin1String(":/utils/images/ok.png"), Utils::Theme::IconsRunToolBarColor}}, Icon::Tint);
const Utils::Icon NOTLOADED({ const Utils::Icon NOTLOADED({
{QLatin1String(":/utils/images/notloaded.png"), Utils::Theme::IconsErrorColor}}, Icon::Tint); {QLatin1String(":/utils/images/notloaded.png"), Utils::Theme::IconsErrorColor}}, Icon::Tint);
const Utils::Icon ERROR({ const Utils::Icon BROKEN({
{QLatin1String(":/utils/images/error.png"), Utils::Theme::IconsErrorColor}}, Icon::Tint); {QLatin1String(":/utils/images/broken.png"), Utils::Theme::IconsErrorColor}}, Icon::Tint);
} // namespace Icons } // namespace Icons
} // namespace Utils } // namespace Utils

View File

@@ -83,7 +83,7 @@ QPixmap QmlDesignerIconProvider::requestPixmap(const QString &id, QSize *size, c
{ ":/utils/images/ok.png", Theme::IconsBaseColor}}, Icon::Tint).pixmap(); { ":/utils/images/ok.png", Theme::IconsBaseColor}}, Icon::Tint).pixmap();
else if (id == "error") else if (id == "error")
result = Icon({ 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") else if (id == "anchor-top")
result = Icon({ result = Icon({
{ ":/qmldesigner/images/anchor_top.png", Theme::IconsBaseColor}, { ":/qmldesigner/images/anchor_top.png", Theme::IconsBaseColor},

View File

@@ -1043,7 +1043,7 @@
sodipodi:nodetypes="ccc" /> sodipodi:nodetypes="ccc" />
</g> </g>
<g <g
id="src/libs/utils/images/error" id="src/libs/utils/images/broken"
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"

Before

Width:  |  Height:  |  Size: 200 KiB

After

Width:  |  Height:  |  Size: 200 KiB