diff options
| author | Alessandro Portale <alessandro.portale@theqtcompany.com> | 2015-11-23 16:41:54 +0100 |
|---|---|---|
| committer | Alessandro Portale <alessandro.portale@theqtcompany.com> | 2015-11-25 12:30:52 +0000 |
| commit | 033862f3057818df3123d07fc6cb34e193250c53 (patch) | |
| tree | 884de0b3b8ac16e548e4f585bd8c821aa890f8b4 /src/plugins/coreplugin/navigationsubwidget.cpp | |
| parent | 00c75cd7ebde4f191c15e92550db369163a95b68 (diff) | |
| download | qt-creator-033862f3057818df3123d07fc6cb34e193250c53.tar.gz | |
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>
Diffstat (limited to 'src/plugins/coreplugin/navigationsubwidget.cpp')
| -rw-r--r-- | src/plugins/coreplugin/navigationsubwidget.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/plugins/coreplugin/navigationsubwidget.cpp b/src/plugins/coreplugin/navigationsubwidget.cpp index 80ad67c0a9..ce1b20a43b 100644 --- a/src/plugins/coreplugin/navigationsubwidget.cpp +++ b/src/plugins/coreplugin/navigationsubwidget.cpp @@ -31,13 +31,12 @@ #include "navigationsubwidget.h" #include "navigationwidget.h" -#include "coreconstants.h" +#include "coreicons.h" #include "inavigationwidgetfactory.h" #include "actionmanager/command.h" #include "id.h" #include <utils/styledbar.h> -#include <utils/themehelper.h> #include <QDebug> @@ -75,8 +74,7 @@ NavigationSubWidget::NavigationSubWidget(NavigationWidget *parentWidget, int pos toolBarLayout->addWidget(m_navigationComboBox); QToolButton *splitAction = new QToolButton(); - splitAction->setIcon(Utils::ThemeHelper::themedIcon( - QLatin1String(Constants::ICON_SPLIT_HORIZONTAL))); + splitAction->setIcon(Icons::SPLIT_HORIZONTAL.icon()); splitAction->setToolTip(tr("Split")); splitAction->setPopupMode(QToolButton::InstantPopup); splitAction->setProperty("noArrow", true); @@ -85,8 +83,7 @@ NavigationSubWidget::NavigationSubWidget(NavigationWidget *parentWidget, int pos connect(m_splitMenu, &QMenu::aboutToShow, this, &NavigationSubWidget::populateSplitMenu); m_closeButton = new QToolButton(); - m_closeButton->setIcon( - Utils::ThemeHelper::themedIcon(QLatin1String(Constants::ICON_CLOSE_SPLIT_BOTTOM))); + m_closeButton->setIcon(Icons::CLOSE_SPLIT_BOTTOM.icon()); m_closeButton->setToolTip(tr("Close")); toolBarLayout->addWidget(splitAction); |