diff --git a/share/qtcreator/themes/dark.creatortheme b/share/qtcreator/themes/dark.creatortheme index 9eda6f21e32..976ccbe1741 100644 --- a/share/qtcreator/themes/dark.creatortheme +++ b/share/qtcreator/themes/dark.creatortheme @@ -50,9 +50,12 @@ FancyToolButtonSelectedColor=selectedBackground FutureProgressBackgroundColor=shadowBackground IconsBaseColor=ffdcdcdc IconsDisabledColor=textDisabled -IconsInfoColor=ff43aced -IconsWarningColor=fff9ce1f -IconsErrorColor=ffe8555a +IconsInfoColor=ff3099dc +IconsInfoToolBarColor=ff3099dc +IconsWarningColor=ffe0b716 +IconsWarningToolBarColor=ffe0b716 +IconsErrorColor=ffd84044 +IconsErrorToolBarColor=ffd84044 IconsRunColor=ff7fc341 IconsStopColor=ffe7353b IconsDebugColor=ffb8c6ff diff --git a/share/qtcreator/themes/default.creatortheme b/share/qtcreator/themes/default.creatortheme index b1de23c93f4..1ae7ffbfd1b 100644 --- a/share/qtcreator/themes/default.creatortheme +++ b/share/qtcreator/themes/default.creatortheme @@ -45,9 +45,12 @@ FancyToolButtonSelectedColor=32000000 FutureProgressBackgroundColor=ffff0000 IconsBaseColor=ffdcdcdc IconsDisabledColor=textDisabled -IconsInfoColor=ff43aced -IconsWarningColor=fff9ce1f -IconsErrorColor=ffe8555a +IconsInfoColor=ff3099dc +IconsInfoToolBarColor=ff43aced +IconsWarningColor=ffecbc1c +IconsWarningToolBarColor=fff9ce1f +IconsErrorColor=ffdf4f4f +IconsErrorToolBarColor=ffe8555a IconsRunColor=ff7fc341 IconsStopColor=ffe7353b IconsDebugColor=ffb8c6ff diff --git a/src/libs/utils/icon.cpp b/src/libs/utils/icon.cpp index fe2712df9fa..c47968e33f3 100644 --- a/src/libs/utils/icon.cpp +++ b/src/libs/utils/icon.cpp @@ -118,7 +118,7 @@ static QPixmap masksToIcon(const MasksAndColors &masks, const QPixmap &combinedM for (MasksAndColors::const_iterator maskImage = masks.constBegin(); maskImage != masks.constEnd(); ++maskImage) { - if (maskImage != masks.constBegin()) { + if (style == Icon::Style::TintedWithShadow && maskImage != masks.constBegin()) { // Punch a transparent outline around an overlay. p.save(); p.setOpacity(0.4); diff --git a/src/libs/utils/theme/theme.h b/src/libs/utils/theme/theme.h index 66af442723d..f7b28d6088e 100644 --- a/src/libs/utils/theme/theme.h +++ b/src/libs/utils/theme/theme.h @@ -136,8 +136,11 @@ public: IconsBaseColor, IconsDisabledColor, IconsInfoColor, + IconsInfoToolBarColor, IconsWarningColor, + IconsWarningToolBarColor, IconsErrorColor, + IconsErrorToolBarColor, IconsRunColor, IconsStopColor, IconsInterruptColor, diff --git a/src/plugins/coreplugin/core.qrc b/src/plugins/coreplugin/core.qrc index 8a03f97f912..46e55fb73bc 100644 --- a/src/plugins/coreplugin/core.qrc +++ b/src/plugins/coreplugin/core.qrc @@ -96,6 +96,8 @@ images/warning@2x.png images/info.png images/info@2x.png + images/warningfill.png + images/warningfill@2x.png images/dark_fileicon.png images/dark_foldericon.png images/Desktop.png diff --git a/src/plugins/coreplugin/coreicons.h b/src/plugins/coreplugin/coreicons.h index 5e835e8e2b4..0987af1175b 100644 --- a/src/plugins/coreplugin/coreicons.h +++ b/src/plugins/coreplugin/coreicons.h @@ -120,11 +120,20 @@ const Utils::Icon FILTER({ const Utils::Icon LINK({ {QLatin1String(":/core/images/linkicon.png"), Utils::Theme::IconsBaseColor}}); const Utils::Icon WARNING({ - {QLatin1String(":/core/images/warning.png"), Utils::Theme::IconsWarningColor}}); + {QLatin1String(":/core/images/warningfill.png"), Utils::Theme::BackgroundColorNormal}, + {QLatin1String(":/core/images/warning.png"), Utils::Theme::IconsWarningColor}}, Utils::Icon::Style::Tinted); +const Utils::Icon WARNING_TOOLBAR({ + {QLatin1String(":/core/images/warning.png"), Utils::Theme::IconsWarningToolBarColor}}); const Utils::Icon ERROR({ - {QLatin1String(":/core/images/error.png"), Utils::Theme::IconsErrorColor}}); + {QLatin1String(":/core/images/warningfill.png"), Utils::Theme::BackgroundColorNormal}, + {QLatin1String(":/core/images/error.png"), Utils::Theme::IconsErrorColor}}, Utils::Icon::Style::Tinted); +const Utils::Icon ERROR_TOOLBAR({ + {QLatin1String(":/core/images/error.png"), Utils::Theme::IconsErrorToolBarColor}}); const Utils::Icon INFO({ - {QLatin1String(":/core/images/info.png"), Utils::Theme::IconsInfoColor}}); + {QLatin1String(":/core/images/warningfill.png"), Utils::Theme::BackgroundColorNormal}, + {QLatin1String(":/core/images/info.png"), Utils::Theme::IconsInfoColor}}, Utils::Icon::Style::Tinted); +const Utils::Icon INFO_TOOLBAR({ + {QLatin1String(":/core/images/info.png"), Utils::Theme::IconsInfoToolBarColor}}); const Utils::Icon EXPAND({ {QLatin1String(":/find/images/expand.png"), Utils::Theme::IconsBaseColor}}); const Utils::Icon DEBUG_START_SMALL({ diff --git a/src/plugins/coreplugin/images/warningfill.png b/src/plugins/coreplugin/images/warningfill.png new file mode 100644 index 00000000000..b2b7bef0397 Binary files /dev/null and b/src/plugins/coreplugin/images/warningfill.png differ diff --git a/src/plugins/coreplugin/images/warningfill@2x.png b/src/plugins/coreplugin/images/warningfill@2x.png new file mode 100644 index 00000000000..853f50b8d50 Binary files /dev/null and b/src/plugins/coreplugin/images/warningfill@2x.png differ diff --git a/src/plugins/projectexplorer/buildprogress.cpp b/src/plugins/projectexplorer/buildprogress.cpp index 219fbbff1c4..e9a1584d302 100644 --- a/src/plugins/projectexplorer/buildprogress.cpp +++ b/src/plugins/projectexplorer/buildprogress.cpp @@ -87,8 +87,8 @@ BuildProgress::BuildProgress(TaskWindow *taskWindow, Qt::Orientation orientation m_errorIcon->setAlignment(Qt::AlignRight); m_warningIcon->setAlignment(Qt::AlignRight); - m_errorIcon->setPixmap(Core::Icons::ERROR.pixmap()); - m_warningIcon->setPixmap(Core::Icons::WARNING.pixmap()); + m_errorIcon->setPixmap(Core::Icons::ERROR_TOOLBAR.pixmap()); + m_warningIcon->setPixmap(Core::Icons::WARNING_TOOLBAR.pixmap()); m_contentWidget->hide(); diff --git a/src/plugins/projectexplorer/taskhub.cpp b/src/plugins/projectexplorer/taskhub.cpp index c791a00c72f..4973c92b387 100644 --- a/src/plugins/projectexplorer/taskhub.cpp +++ b/src/plugins/projectexplorer/taskhub.cpp @@ -101,8 +101,6 @@ void TaskMark::clicked() } TaskHub::TaskHub() - : m_errorIcon(Core::Icons::ERROR.icon()), - m_warningIcon(Core::Icons::WARNING.icon()) { m_instance = this; qRegisterMetaType("ProjectExplorer::Task"); diff --git a/src/plugins/projectexplorer/taskhub.h b/src/plugins/projectexplorer/taskhub.h index 82b138f49a3..6f8274a780b 100644 --- a/src/plugins/projectexplorer/taskhub.h +++ b/src/plugins/projectexplorer/taskhub.h @@ -83,9 +83,6 @@ private: TaskHub(); ~TaskHub(); - const QIcon m_errorIcon; - const QIcon m_warningIcon; - static QVector m_registeredCategories; friend class ProjectExplorerPlugin; diff --git a/src/plugins/projectexplorer/taskwindow.cpp b/src/plugins/projectexplorer/taskwindow.cpp index e3b6a219178..daa0fb36bcd 100644 --- a/src/plugins/projectexplorer/taskwindow.cpp +++ b/src/plugins/projectexplorer/taskwindow.cpp @@ -265,7 +265,7 @@ TaskWindow::TaskWindow() : d(new TaskWindowPrivate) d->m_listview->setContextMenuPolicy(Qt::ActionsContextMenu); d->m_filterWarningsButton = createFilterButton( - Core::Icons::WARNING.icon(), + Core::Icons::WARNING_TOOLBAR.icon(), tr("Show Warnings"), this, [this](bool show) { setShowWarnings(show); }); d->m_categoriesButton = new QToolButton; diff --git a/src/plugins/qmljstools/qmlconsolepane.cpp b/src/plugins/qmljstools/qmlconsolepane.cpp index 85ffc6333fb..5f55664634d 100644 --- a/src/plugins/qmljstools/qmlconsolepane.cpp +++ b/src/plugins/qmljstools/qmlconsolepane.cpp @@ -113,7 +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(Core::Icons::INFO.icon()); + m_showDebugButtonAction->setIcon(Core::Icons::INFO_TOOLBAR.icon()); connect(m_showDebugButtonAction, &Utils::SavedAction::toggled, m_proxyModel, &QmlConsoleProxyModel::setShowLogs); m_showDebugButton->setDefaultAction(m_showDebugButtonAction); @@ -127,7 +127,7 @@ QmlConsolePane::QmlConsolePane(QObject *parent) m_showWarningButtonAction->setToolTip(tr("Show warning messages.")); m_showWarningButtonAction->setCheckable(true); m_showWarningButtonAction->setChecked(true); - m_showWarningButtonAction->setIcon(Core::Icons::WARNING.icon()); + m_showWarningButtonAction->setIcon(Core::Icons::WARNING_TOOLBAR.icon()); connect(m_showWarningButtonAction, &Utils::SavedAction::toggled, m_proxyModel, &QmlConsoleProxyModel::setShowWarnings); m_showWarningButton->setDefaultAction(m_showWarningButtonAction); @@ -141,7 +141,7 @@ QmlConsolePane::QmlConsolePane(QObject *parent) m_showErrorButtonAction->setToolTip(tr("Show error messages.")); m_showErrorButtonAction->setCheckable(true); m_showErrorButtonAction->setChecked(true); - m_showErrorButtonAction->setIcon(Core::Icons::ERROR.icon()); + m_showErrorButtonAction->setIcon(Core::Icons::ERROR_TOOLBAR.icon()); connect(m_showErrorButtonAction, &Utils::SavedAction::toggled, m_proxyModel, &QmlConsoleProxyModel::setShowErrors); m_showErrorButton->setDefaultAction(m_showErrorButtonAction); diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg index 7f0d7b680bc..518e76f86cd 100644 --- a/src/tools/icons/qtcreatoricons.svg +++ b/src/tools/icons/qtcreatoricons.svg @@ -3032,6 +3032,23 @@ inkscape:connector-curvature="0" style="display:inline;fill:#000000" /> + + + +