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

@@ -32,10 +32,9 @@
#include "ui_customwidgetwidgetswizardpage.h"
#include "classdefinition.h"
#include <coreplugin/coreconstants.h>
#include <coreplugin/coreicons.h>
#include <utils/wizard.h>
#include <utils/themehelper.h>
#include <QTimer>
@@ -53,11 +52,9 @@ CustomWidgetWidgetsWizardPage::CustomWidgetWidgetsWizardPage(QWidget *parent) :
{
m_ui->setupUi(this);
m_ui->tabStackWidget->setLayout(m_tabStackLayout);
m_ui->addButton->setIcon(Utils::ThemeHelper::themedIcon(
QLatin1String(Core::Constants::ICON_PLUS)));
m_ui->addButton->setIcon(Core::Icons::PLUS.icon());
connect(m_ui->addButton, SIGNAL(clicked()), m_ui->classList, SLOT(startEditingNewClassItem()));
m_ui->deleteButton->setIcon(Utils::ThemeHelper::themedIcon(
QLatin1String(Core::Constants::ICON_MINUS)));
m_ui->deleteButton->setIcon(Core::Icons::MINUS.icon());
connect(m_ui->deleteButton, SIGNAL(clicked()), m_ui->classList, SLOT(removeCurrentClass()));
m_ui->deleteButton->setEnabled(false);