diff --git a/share/qtcreator/themes/dark.creatortheme b/share/qtcreator/themes/dark.creatortheme index 3eb1628fd1c..8f0ea2c5e96 100644 --- a/share/qtcreator/themes/dark.creatortheme +++ b/share/qtcreator/themes/dark.creatortheme @@ -73,8 +73,8 @@ ProgressBarColorFinished=ff5aaa3c ProgressBarColorNormal=hoverBackground ProgressBarTitleColor=text QtOutputFormatter_LinkTextColor=ff0000ff -SearchResultWidgetBackgroundColor=shadowBackground -SearchResultWidgetTextColor=text +InfoBarBackground=shadowBackground +InfoBarText=text TextColorDisabled=textDisabled TextColorHighlight=ffff0000 TextColorNormal=text diff --git a/share/qtcreator/themes/default.creatortheme b/share/qtcreator/themes/default.creatortheme index dc99f182a8f..8b831be6214 100644 --- a/share/qtcreator/themes/default.creatortheme +++ b/share/qtcreator/themes/default.creatortheme @@ -67,8 +67,8 @@ ProgressBarColorFinished=ff5aaa3c ProgressBarColorNormal=b4ffffff ProgressBarTitleColor=ffffffff QtOutputFormatter_LinkTextColor=ff0000aa -SearchResultWidgetBackgroundColor=ffffffe1 -SearchResultWidgetTextColor=ff000000 +InfoBarBackground=ffffffe1 +InfoBarText=ff000000 TextColorDisabled=ff000000 TextColorHighlight=ffa0a0a4 TextColorNormal=ff000000 diff --git a/src/libs/utils/theme/theme.h b/src/libs/utils/theme/theme.h index a8d5bfcbc3a..adb2af0bb7e 100644 --- a/src/libs/utils/theme/theme.h +++ b/src/libs/utils/theme/theme.h @@ -111,8 +111,8 @@ public: ProgressBarColorError, ProgressBarColorFinished, ProgressBarColorNormal, - SearchResultWidgetBackgroundColor, - SearchResultWidgetTextColor, + InfoBarBackground, + InfoBarText, TextColorDisabled, TextColorHighlight, TextColorNormal, diff --git a/src/plugins/coreplugin/find/searchresultwidget.cpp b/src/plugins/coreplugin/find/searchresultwidget.cpp index b61799dfa75..4da40807c34 100644 --- a/src/plugins/coreplugin/find/searchresultwidget.cpp +++ b/src/plugins/coreplugin/find/searchresultwidget.cpp @@ -96,8 +96,8 @@ SearchResultWidget::SearchResultWidget(QWidget *parent) : QFrame *topWidget = new QFrame; QPalette pal; - pal.setColor(QPalette::Window, creatorTheme()->color(Theme::SearchResultWidgetBackgroundColor)); - pal.setColor(QPalette::WindowText, creatorTheme()->color(Theme::SearchResultWidgetTextColor)); + pal.setColor(QPalette::Window, creatorTheme()->color(Theme::InfoBarBackground)); + pal.setColor(QPalette::WindowText, creatorTheme()->color(Theme::InfoBarText)); topWidget->setPalette(pal); if (creatorTheme()->flag(Theme::DrawSearchResultWidgetFrame)) { topWidget->setFrameStyle(QFrame::Panel | QFrame::Raised); diff --git a/src/plugins/coreplugin/infobar.cpp b/src/plugins/coreplugin/infobar.cpp index 8ea0ec6e4da..a4a495545f7 100644 --- a/src/plugins/coreplugin/infobar.cpp +++ b/src/plugins/coreplugin/infobar.cpp @@ -33,6 +33,8 @@ #include "coreconstants.h" #include "icore.h" +#include + #include #include #include @@ -40,6 +42,8 @@ static const char C_SUPPRESSED_WARNINGS[] = "SuppressedWarnings"; +using namespace Utils; + namespace Core { QSet InfoBar::globallySuppressed; @@ -202,8 +206,8 @@ void InfoBarDisplay::update() QFrame *infoWidget = new QFrame; QPalette pal; - pal.setColor(QPalette::Window, QColor(255, 255, 225)); - pal.setColor(QPalette::WindowText, Qt::black); + pal.setColor(QPalette::Window, creatorTheme()->color(Theme::InfoBarBackground)); + pal.setColor(QPalette::WindowText, Theme::InfoBarText); infoWidget->setPalette(pal); infoWidget->setFrameStyle(QFrame::Panel | QFrame::Raised);