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

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 ...@@ -73,8 +73,8 @@ ProgressBarColorFinished=ff5aaa3c
ProgressBarColorNormal=hoverBackground ProgressBarColorNormal=hoverBackground
ProgressBarTitleColor=text ProgressBarTitleColor=text
QtOutputFormatter_LinkTextColor=ff0000ff QtOutputFormatter_LinkTextColor=ff0000ff
SearchResultWidgetBackgroundColor=shadowBackground InfoBarBackground=shadowBackground
SearchResultWidgetTextColor=text InfoBarText=text
TextColorDisabled=textDisabled TextColorDisabled=textDisabled
TextColorHighlight=ffff0000 TextColorHighlight=ffff0000
TextColorNormal=text TextColorNormal=text
......
...@@ -67,8 +67,8 @@ ProgressBarColorFinished=ff5aaa3c ...@@ -67,8 +67,8 @@ ProgressBarColorFinished=ff5aaa3c
ProgressBarColorNormal=b4ffffff ProgressBarColorNormal=b4ffffff
ProgressBarTitleColor=ffffffff ProgressBarTitleColor=ffffffff
QtOutputFormatter_LinkTextColor=ff0000aa QtOutputFormatter_LinkTextColor=ff0000aa
SearchResultWidgetBackgroundColor=ffffffe1 InfoBarBackground=ffffffe1
SearchResultWidgetTextColor=ff000000 InfoBarText=ff000000
TextColorDisabled=ff000000 TextColorDisabled=ff000000
TextColorHighlight=ffa0a0a4 TextColorHighlight=ffa0a0a4
TextColorNormal=ff000000 TextColorNormal=ff000000
......
...@@ -111,8 +111,8 @@ public: ...@@ -111,8 +111,8 @@ public:
ProgressBarColorError, ProgressBarColorError,
ProgressBarColorFinished, ProgressBarColorFinished,
ProgressBarColorNormal, ProgressBarColorNormal,
SearchResultWidgetBackgroundColor, InfoBarBackground,
SearchResultWidgetTextColor, InfoBarText,
TextColorDisabled, TextColorDisabled,
TextColorHighlight, TextColorHighlight,
TextColorNormal, TextColorNormal,
......
...@@ -96,8 +96,8 @@ SearchResultWidget::SearchResultWidget(QWidget *parent) : ...@@ -96,8 +96,8 @@ SearchResultWidget::SearchResultWidget(QWidget *parent) :
QFrame *topWidget = new QFrame; QFrame *topWidget = new QFrame;
QPalette pal; QPalette pal;
pal.setColor(QPalette::Window, creatorTheme()->color(Theme::SearchResultWidgetBackgroundColor)); pal.setColor(QPalette::Window, creatorTheme()->color(Theme::InfoBarBackground));
pal.setColor(QPalette::WindowText, creatorTheme()->color(Theme::SearchResultWidgetTextColor)); pal.setColor(QPalette::WindowText, creatorTheme()->color(Theme::InfoBarText));
topWidget->setPalette(pal); topWidget->setPalette(pal);
if (creatorTheme()->flag(Theme::DrawSearchResultWidgetFrame)) { if (creatorTheme()->flag(Theme::DrawSearchResultWidgetFrame)) {
topWidget->setFrameStyle(QFrame::Panel | QFrame::Raised); topWidget->setFrameStyle(QFrame::Panel | QFrame::Raised);
......
...@@ -33,6 +33,8 @@ ...@@ -33,6 +33,8 @@
#include "coreconstants.h" #include "coreconstants.h"
#include "icore.h" #include "icore.h"
#include <utils/theme/theme.h>
#include <QFrame> #include <QFrame>
#include <QHBoxLayout> #include <QHBoxLayout>
#include <QLabel> #include <QLabel>
...@@ -40,6 +42,8 @@ ...@@ -40,6 +42,8 @@
static const char C_SUPPRESSED_WARNINGS[] = "SuppressedWarnings"; static const char C_SUPPRESSED_WARNINGS[] = "SuppressedWarnings";
using namespace Utils;
namespace Core { namespace Core {
QSet<Id> InfoBar::globallySuppressed; QSet<Id> InfoBar::globallySuppressed;
...@@ -202,8 +206,8 @@ void InfoBarDisplay::update() ...@@ -202,8 +206,8 @@ void InfoBarDisplay::update()
QFrame *infoWidget = new QFrame; QFrame *infoWidget = new QFrame;
QPalette pal; QPalette pal;
pal.setColor(QPalette::Window, QColor(255, 255, 225)); pal.setColor(QPalette::Window, creatorTheme()->color(Theme::InfoBarBackground));
pal.setColor(QPalette::WindowText, Qt::black); pal.setColor(QPalette::WindowText, Theme::InfoBarText);
infoWidget->setPalette(pal); infoWidget->setPalette(pal);
infoWidget->setFrameStyle(QFrame::Panel | QFrame::Raised); infoWidget->setFrameStyle(QFrame::Panel | QFrame::Raised);
......
Supports Markdown
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