Commit 685ea302 authored by Orgad Shaneh's avatar Orgad Shaneh Committed by Orgad Shaneh

Theming: Enable theming info bar

Use same role for info bar and search result widget

Change-Id: Ibe1f226d4ea8edaafb3daa1cc629e23a48322cf2
Reviewed-by: default avatarThorben Kroeger <thorbenkroeger@gmail.com>
Reviewed-by: default avatarAlessandro Portale <alessandro.portale@digia.com>
parent c00e69ac
......@@ -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
......
......@@ -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
......
......@@ -111,8 +111,8 @@ public:
ProgressBarColorError,
ProgressBarColorFinished,
ProgressBarColorNormal,
SearchResultWidgetBackgroundColor,
SearchResultWidgetTextColor,
InfoBarBackground,
InfoBarText,
TextColorDisabled,
TextColorHighlight,
TextColorNormal,
......
......@@ -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);
......
......@@ -33,6 +33,8 @@
#include "coreconstants.h"
#include "icore.h"
#include <utils/theme/theme.h>
#include <QFrame>
#include <QHBoxLayout>
#include <QLabel>
......@@ -40,6 +42,8 @@
static const char C_SUPPRESSED_WARNINGS[] = "SuppressedWarnings";
using namespace Utils;
namespace Core {
QSet<Id> 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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment