From 49aa04bf1ea9144a6cf5adb6081d24a3ff23e1a3 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Fri, 17 Apr 2015 13:07:13 +0200 Subject: [PATCH] Git: Use colors from theme Change-Id: I1627f7d55d50f302f76c591345c021a3b400e43e Reviewed-by: David Schulz --- src/plugins/git/changeselectiondialog.cpp | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/plugins/git/changeselectiondialog.cpp b/src/plugins/git/changeselectiondialog.cpp index 2ae5304756..43b59431f7 100644 --- a/src/plugins/git/changeselectiondialog.cpp +++ b/src/plugins/git/changeselectiondialog.cpp @@ -36,6 +36,8 @@ #include +#include + #include #include #include @@ -49,6 +51,8 @@ #include #include +using namespace Utils; + namespace Git { namespace Internal { @@ -186,15 +190,17 @@ void ChangeSelectionDialog::acceptShow() //! Set commit message in details void ChangeSelectionDialog::setDetails(int exitCode) { + Theme *theme = creatorTheme(); + QPalette palette; if (exitCode == 0) { m_ui->detailsText->setPlainText(QString::fromUtf8(m_process->readAllStandardOutput())); - palette.setColor(QPalette::Text, Qt::black); + palette.setColor(QPalette::Text, theme->color(Theme::TextColorNormal)); m_ui->changeNumberEdit->setPalette(palette); enableButtons(true); } else { m_ui->detailsText->setPlainText(tr("Error: Unknown reference")); - palette.setColor(QPalette::Text, Qt::red); + palette.setColor(QPalette::Text, theme->color(Theme::TextColorError)); m_ui->changeNumberEdit->setPalette(palette); } } @@ -244,13 +250,14 @@ void ChangeSelectionDialog::recalculateDetails() const QString workingDir = workingDirectory(); QPalette palette = m_ui->workingDirectoryEdit->palette(); + Theme *theme = creatorTheme(); if (workingDir.isEmpty()) { m_ui->detailsText->setPlainText(tr("Error: Bad working directory.")); - palette.setColor(QPalette::Text, Qt::red); + palette.setColor(QPalette::Text, theme->color(Theme::TextColorError)); m_ui->workingDirectoryEdit->setPalette(palette); return; } else { - palette.setColor(QPalette::Text, Qt::black); + palette.setColor(QPalette::Text, theme->color(Theme::TextColorNormal)); m_ui->workingDirectoryEdit->setPalette(palette); } -- GitLab