feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Themed Icons: Introduce Utils::Icon

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/qmljstools/qmlconsoleitemdelegate.cpp
View File

@@ -32,7 +32,7 @@
#include "qmlconsoleedit.h"
#include <coreplugin/coreconstants.h>
#include <utils/themehelper.h>
#include <coreplugin/coreicons.h>
#include <QPainter>
#include <QTreeView>
@@ -72,9 +72,9 @@ namespace Internal {
QmlConsoleItemDelegate::QmlConsoleItemDelegate(QObject *parent) :
QStyledItemDelegate(parent),
m_logIcon(Utils::ThemeHelper::themedIcon(QLatin1String(Core::Constants::ICON_INFO))),
m_warningIcon(Utils::ThemeHelper::themedIcon(QLatin1String(Core::Constants::ICON_WARNING))),
m_errorIcon(Utils::ThemeHelper::themedIcon(QLatin1String(Core::Constants::ICON_ERROR))),
m_logIcon(Core::Icons::INFO.icon()),
m_warningIcon(Core::Icons::WARNING.icon()),
m_errorIcon(Core::Icons::ERROR.icon()),
m_expandIcon(QLatin1String(":/qmljstools/images/expand.png")),
m_collapseIcon(QLatin1String(":/qmljstools/images/collapse.png")),
m_prompt(QLatin1String(":/qmljstools/images/prompt.png")),

11
src/plugins/qmljstools/qmlconsolepane.cpp
View File

@@ -34,10 +34,10 @@
#include "qmlconsoleitemdelegate.h"
#include <coreplugin/coreconstants.h>
#include <coreplugin/coreicons.h>
#include <coreplugin/icore.h>
#include <coreplugin/findplaceholder.h>
#include <utils/savedaction.h>
#include <utils/themehelper.h>
#include <aggregation/aggregate.h>
#include <coreplugin/find/itemviewfind.h>
@@ -113,8 +113,7 @@ QmlConsolePane::QmlConsolePane(QObject *parent)
m_showDebugButtonAction->setToolTip(tr("Show debug, log, and info messages."));
m_showDebugButtonAction->setCheckable(true);
m_showDebugButtonAction->setChecked(true);
m_showDebugButtonAction->setIcon(
Utils::ThemeHelper::themedIcon(QLatin1String(Core::Constants::ICON_INFO)));
m_showDebugButtonAction->setIcon(Core::Icons::INFO.icon());
connect(m_showDebugButtonAction, &Utils::SavedAction::toggled,
m_proxyModel, &QmlConsoleProxyModel::setShowLogs);
m_showDebugButton->setDefaultAction(m_showDebugButtonAction);
@@ -128,8 +127,7 @@ QmlConsolePane::QmlConsolePane(QObject *parent)
m_showWarningButtonAction->setToolTip(tr("Show warning messages."));
m_showWarningButtonAction->setCheckable(true);
m_showWarningButtonAction->setChecked(true);
m_showWarningButtonAction->setIcon(Utils::ThemeHelper::themedIcon(
QLatin1String(Core::Constants::ICON_WARNING)));
m_showWarningButtonAction->setIcon(Core::Icons::WARNING.icon());
connect(m_showWarningButtonAction, &Utils::SavedAction::toggled,
m_proxyModel, &QmlConsoleProxyModel::setShowWarnings);
m_showWarningButton->setDefaultAction(m_showWarningButtonAction);
@@ -143,8 +141,7 @@ QmlConsolePane::QmlConsolePane(QObject *parent)
m_showErrorButtonAction->setToolTip(tr("Show error messages."));
m_showErrorButtonAction->setCheckable(true);
m_showErrorButtonAction->setChecked(true);
m_showErrorButtonAction->setIcon(Utils::ThemeHelper::themedIcon(
QLatin1String(Core::Constants::ICON_ERROR)));
m_showErrorButtonAction->setIcon(Core::Icons::ERROR.icon());
connect(m_showErrorButtonAction, &Utils::SavedAction::toggled, m_proxyModel, &QmlConsoleProxyModel::setShowErrors);
m_showErrorButton->setDefaultAction(m_showErrorButtonAction);