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/git/gitsubmiteditorwidget.cpp | |
| parent | 00c75cd7ebde4f191c15e92550db369163a95b68 (diff) | |
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/git/gitsubmiteditorwidget.cpp')
| -rw-r--r-- | src/plugins/git/gitsubmiteditorwidget.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/plugins/git/gitsubmiteditorwidget.cpp b/src/plugins/git/gitsubmiteditorwidget.cpp index 19bfdfe888..eabd61e319 100644 --- a/src/plugins/git/gitsubmiteditorwidget.cpp +++ b/src/plugins/git/gitsubmiteditorwidget.cpp @@ -34,8 +34,8 @@ #include "logchangedialog.h" #include <coreplugin/coreconstants.h> +#include <coreplugin/coreicons.h> #include <utils/completingtextedit.h> -#include <utils/themehelper.h> #include <QRegExpValidator> #include <QTextEdit> @@ -61,8 +61,7 @@ GitSubmitEditorWidget::GitSubmitEditorWidget() : new GitSubmitHighlighter(descriptionEdit()); m_emailValidator = new QRegExpValidator(QRegExp(QLatin1String("[^@ ]+@[^@ ]+\\.[a-zA-Z]+")), this); - const QPixmap error = - Utils::ThemeHelper::themedIconPixmap(QLatin1String(Core::Constants::ICON_ERROR)); + const QPixmap error = Core::Icons::ERROR.pixmap(); m_gitSubmitPanelUi.invalidAuthorLabel->setPixmap(error); m_gitSubmitPanelUi.invalidEmailLabel->setToolTip(tr("Provide a valid email to commit.")); m_gitSubmitPanelUi.invalidEmailLabel->setPixmap(error); |