feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

MiniProjectTargetSelector: Merge palette setup code

Browse Source 
Change-Id: I899ba5e7b7d2a128580f302937274e617c084cf6
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-10-13 16:12:41 +02:00
parent 23ab77bfa8
commit 18c8fefc8d
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/projectexplorer/miniprojecttargetselector.cpp
View File

@@ -552,12 +552,6 @@ KitAreaWidget::KitAreaWidget(QWidget *parent) : QWidget(parent),
m_layout->setMargin(3); m_layout->setMargin(3);
setAutoFillBackground(true); setAutoFillBackground(true);
connect(KitManager::instance(), &KitManager::kitUpdated, this, &KitAreaWidget::updateKit); connect(KitManager::instance(), &KitManager::kitUpdated, this, &KitAreaWidget::updateKit);
QPalette p = palette();
p.setColor(QPalette::Window, creatorTheme()->color(Theme::MiniProjectTargetSelectorSummaryBackgroundColor).name());
p.setColor(QPalette::Button, creatorTheme()->color(Theme::MiniProjectTargetSelectorSummaryBackgroundColor).name());
p.setColor(QPalette::ButtonText, creatorTheme()->color(Theme::MiniProjectTargetSelectorTextColor).name());
setPalette(p);
} }
KitAreaWidget::~KitAreaWidget() KitAreaWidget::~KitAreaWidget()
@@ -662,11 +656,12 @@ MiniProjectTargetSelector::MiniProjectTargetSelector(QAction *targetSelectorActi
m_hideOnRelease(false) m_hideOnRelease(false)
{ {
QPalette p; QPalette p;
p.setColor(QPalette::Text, creatorTheme()->color(Theme::MiniProjectTargetSelectorTextColor));
p.setColor(QPalette::Foreground, creatorTheme()->color(Theme::MiniProjectTargetSelectorTextColor)); p.setColor(QPalette::Foreground, creatorTheme()->color(Theme::MiniProjectTargetSelectorTextColor));
p.setColor(QPalette::Text, creatorTheme()->color(Theme::MiniProjectTargetSelectorTextColor));
p.setColor(QPalette::ButtonText, creatorTheme()->color(Theme::MiniProjectTargetSelectorTextColor)); p.setColor(QPalette::ButtonText, creatorTheme()->color(Theme::MiniProjectTargetSelectorTextColor));
p.setColor(QPalette::Background, creatorTheme()->color(Theme::MiniProjectTargetSelectorBackgroundColor)); p.setColor(QPalette::Background, creatorTheme()->color(Theme::MiniProjectTargetSelectorSummaryBackgroundColor));
p.setColor(QPalette::Base, creatorTheme()->color(Theme::MiniProjectTargetSelectorSummaryBackgroundColor)); p.setColor(QPalette::Base, creatorTheme()->color(Theme::MiniProjectTargetSelectorSummaryBackgroundColor));
p.setColor(QPalette::Button, creatorTheme()->color(Theme::MiniProjectTargetSelectorSummaryBackgroundColor).name());
setPalette(p); setPalette(p);
setProperty("panelwidget", true); setProperty("panelwidget", true);