From 1584328da983cc525dfbbc6d41b4951b7c6a6ddf Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Wed, 2 Mar 2016 16:23:45 +0100 Subject: [PATCH] AutoTest: Add some theming support for results pane Change-Id: I6641dc92d54ea20263656fa77157d7d853cf0287 Reviewed-by: Alessandro Portale --- share/qtcreator/themes/dark.creatortheme | 8 ++++++ share/qtcreator/themes/darkframe.creatortheme | 8 ++++++ share/qtcreator/themes/default.creatortheme | 8 ++++++ src/libs/utils/theme/theme.h | 8 ++++++ src/plugins/autotest/testresult.cpp | 27 ++++++++++--------- 5 files changed, 46 insertions(+), 13 deletions(-) diff --git a/share/qtcreator/themes/dark.creatortheme b/share/qtcreator/themes/dark.creatortheme index 761b0e44395..339b2f2d2ad 100644 --- a/share/qtcreator/themes/dark.creatortheme +++ b/share/qtcreator/themes/dark.creatortheme @@ -113,6 +113,14 @@ OutputPanes_NormalMessageTextColor=text OutputPanes_StdErrTextColor=ffff6666 OutputPanes_StdOutTextColor=text OutputPanes_WarningMessageTextColor=fff3c300 +OutputPanes_TestPassTextColor=ff00b400 +OutputPanes_TestFailTextColor=ffc82828 +OutputPanes_TestXFailTextColor=ff28dc28 +OutputPanes_TestXPassTextColor=ffdc2828 +OutputPanes_TestSkipTextColor=ff828282 +OutputPanes_TestWarnTextColor=ffc8c800 +OutputPanes_TestFatalTextColor=ffb42828 +OutputPanes_TestDebugTextColor=ff329696 OutputPaneButtonFlashColor=error OutputPaneToggleButtonTextColorChecked=text OutputPaneToggleButtonTextColorUnchecked=text diff --git a/share/qtcreator/themes/darkframe.creatortheme b/share/qtcreator/themes/darkframe.creatortheme index 7ba032d41fa..96689bcdd8c 100644 --- a/share/qtcreator/themes/darkframe.creatortheme +++ b/share/qtcreator/themes/darkframe.creatortheme @@ -115,6 +115,14 @@ OutputPanes_NormalMessageTextColor=ff0000aa OutputPanes_StdErrTextColor=ffaa0000 OutputPanes_StdOutTextColor=ff000000 OutputPanes_WarningMessageTextColor=ff808000 +OutputPanes_TestPassTextColor=ff009900 +OutputPanes_TestFailTextColor=ffa00000 +OutputPanes_TestXFailTextColor=ff28f028 +OutputPanes_TestXPassTextColor=fff02828 +OutputPanes_TestSkipTextColor=ff787878 +OutputPanes_TestWarnTextColor=ffd0bb00 +OutputPanes_TestFatalTextColor=ff640000 +OutputPanes_TestDebugTextColor=ff329696 OutputPaneButtonFlashColor=ffff0000 OutputPaneToggleButtonTextColorChecked=toolBarItem OutputPaneToggleButtonTextColorUnchecked=toolBarItem diff --git a/share/qtcreator/themes/default.creatortheme b/share/qtcreator/themes/default.creatortheme index 04bb840388a..ac9513e0442 100644 --- a/share/qtcreator/themes/default.creatortheme +++ b/share/qtcreator/themes/default.creatortheme @@ -107,6 +107,14 @@ OutputPanes_NormalMessageTextColor=ff0000aa OutputPanes_StdErrTextColor=ffaa0000 OutputPanes_StdOutTextColor=ff000000 OutputPanes_WarningMessageTextColor=ff808000 +OutputPanes_TestPassTextColor=ff009900 +OutputPanes_TestFailTextColor=ffa00000 +OutputPanes_TestXFailTextColor=ff28f028 +OutputPanes_TestXPassTextColor=fff02828 +OutputPanes_TestSkipTextColor=ff787878 +OutputPanes_TestWarnTextColor=ffd0bb00 +OutputPanes_TestFatalTextColor=ff640000 +OutputPanes_TestDebugTextColor=ff329696 OutputPaneButtonFlashColor=ffff0000 OutputPaneToggleButtonTextColorChecked=ffffffff OutputPaneToggleButtonTextColorUnchecked=ff000000 diff --git a/src/libs/utils/theme/theme.h b/src/libs/utils/theme/theme.h index 9c2b92c6209..080390aad53 100644 --- a/src/libs/utils/theme/theme.h +++ b/src/libs/utils/theme/theme.h @@ -160,6 +160,14 @@ public: OutputPanes_StdErrTextColor, OutputPanes_StdOutTextColor, OutputPanes_WarningMessageTextColor, + OutputPanes_TestPassTextColor, + OutputPanes_TestFailTextColor, + OutputPanes_TestXFailTextColor, + OutputPanes_TestXPassTextColor, + OutputPanes_TestSkipTextColor, + OutputPanes_TestWarnTextColor, + OutputPanes_TestFatalTextColor, + OutputPanes_TestDebugTextColor, /* Debugger Log Window */ diff --git a/src/plugins/autotest/testresult.cpp b/src/plugins/autotest/testresult.cpp index a7f3cc34638..baf262b250c 100644 --- a/src/plugins/autotest/testresult.cpp +++ b/src/plugins/autotest/testresult.cpp @@ -25,6 +25,8 @@ #include "testresult.h" +#include + namespace Autotest { namespace Internal { @@ -119,29 +121,28 @@ QColor TestResult::colorForType(const Result::Type type) if (type >= Result::INTERNAL_MESSAGES_BEGIN && type <= Result::INTERNAL_MESSAGES_END) return QColor("transparent"); + Utils::Theme *creatorTheme = Utils::creatorTheme(); switch (type) { case Result::Pass: - return QColor("#009900"); + return creatorTheme->color(Utils::Theme::OutputPanes_TestPassTextColor); case Result::Fail: - return QColor("#a00000"); + return creatorTheme->color(Utils::Theme::OutputPanes_TestFailTextColor); case Result::ExpectedFail: - return QColor("#00ff00"); + return creatorTheme->color(Utils::Theme::OutputPanes_TestXFailTextColor); case Result::UnexpectedPass: - return QColor("#ff0000"); + return creatorTheme->color(Utils::Theme::OutputPanes_TestXPassTextColor); case Result::Skip: - return QColor("#787878"); - case Result::BlacklistedPass: - return QColor(0, 0, 0); - case Result::BlacklistedFail: - return QColor(0, 0, 0); + return creatorTheme->color(Utils::Theme::OutputPanes_TestSkipTextColor); case Result::MessageDebug: - return QColor("#329696"); + return creatorTheme->color(Utils::Theme::OutputPanes_TestDebugTextColor); case Result::MessageWarn: - return QColor("#d0bb00"); + return creatorTheme->color(Utils::Theme::OutputPanes_TestWarnTextColor); case Result::MessageFatal: - return QColor("#640000"); + return creatorTheme->color(Utils::Theme::OutputPanes_TestFatalTextColor); + case Result::BlacklistedPass: + case Result::BlacklistedFail: default: - return QColor("#000000"); + return creatorTheme->color(Utils::Theme::OutputPanes_StdOutTextColor); } }