forked from qt-creator/qt-creator
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:
@@ -32,7 +32,7 @@
|
||||
|
||||
#include "styleanimator.h"
|
||||
|
||||
#include <coreplugin/coreconstants.h>
|
||||
#include "coreicons.h"
|
||||
|
||||
#include <utils/algorithm.h>
|
||||
#include <utils/hostosinfo.h>
|
||||
@@ -40,7 +40,6 @@
|
||||
|
||||
#include <utils/fancymainwindow.h>
|
||||
#include <utils/theme/theme.h>
|
||||
#include <utils/themehelper.h>
|
||||
|
||||
#include <QApplication>
|
||||
#include <QComboBox>
|
||||
@@ -139,8 +138,8 @@ public:
|
||||
ManhattanStylePrivate::ManhattanStylePrivate() :
|
||||
lineeditImage(StyleHelper::dpiSpecificImageFile(QStringLiteral(":/core/images/inputfield.png"))),
|
||||
lineeditImage_disabled(StyleHelper::dpiSpecificImageFile(QStringLiteral(":/core/images/inputfield_disabled.png"))),
|
||||
extButtonPixmap(ThemeHelper::themedIconPixmap(QLatin1String(":/core/images/extension.png"))),
|
||||
closeButtonPixmap(QLatin1String(Core::Constants::ICON_CLOSE_BUTTON))
|
||||
extButtonPixmap(Core::Icons::TOOLBAR_EXTENSION.pixmap()),
|
||||
closeButtonPixmap(Core::Icons::CLOSE_BUTTON.pixmap())
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user