Themed Icons: Introduce Utils::Icon

Instead of describing icons via file name or in the themed icons case
via
a string that is a list of mask/color pairs, we have now a class for it.

Icons are now listed in per-plugin *icons.h headers.

RunControl::m_icon was The only place left where an icon property was in
fact a string. This patch changes that member to be a Utils::Icon.

Change-Id: Ibcfa8bb25e6d2e330c567ee7ccc0b97ead603177
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
Alessandro Portale
2015-11-23 16:41:54 +01:00
parent 00c75cd7eb
commit 033862f305
139 changed files with 1090 additions and 629 deletions

View File

@@ -31,9 +31,8 @@
#include "buildprogress.h"
#include "projectexplorerconstants.h"
#include <coreplugin/coreconstants.h>
#include <coreplugin/coreicons.h>
#include <utils/stylehelper.h>
#include <utils/themehelper.h>
#include <QVBoxLayout>
#include <QHBoxLayout>
@@ -88,10 +87,8 @@ BuildProgress::BuildProgress(TaskWindow *taskWindow, Qt::Orientation orientation
m_errorIcon->setAlignment(Qt::AlignRight);
m_warningIcon->setAlignment(Qt::AlignRight);
m_errorIcon->setPixmap(Utils::ThemeHelper::themedIconPixmap(
QLatin1String(Core::Constants::ICON_ERROR)));
m_warningIcon->setPixmap(Utils::ThemeHelper::themedIconPixmap(
QLatin1String(Core::Constants::ICON_WARNING)));
m_errorIcon->setPixmap(Core::Icons::ERROR.pixmap());
m_warningIcon->setPixmap(Core::Icons::WARNING.pixmap());
m_contentWidget->hide();