From b7d0902257e12b9d8ad651ad6389a70ea4ef8907 Mon Sep 17 00:00:00 2001 From: Samuel Ghinet Date: Wed, 13 Oct 2021 09:20:01 +0300 Subject: [PATCH] Add new theme colors necessary for New Project Dialog on QDS We need colors for the dialog box background, and for warning text messages. Note: We currently don't have carefully picked colors for warning, so I used standard yellow (ffff00). The values, for each theme, will need to be adjusted later on. Task-number: QDS-4490 Change-Id: I257522216b03610d9f12951e7cb6f7cfa182489f Reviewed-by: Alessandro Portale --- .../propertyEditorQmlSources/imports/StudioTheme/Values.qml | 5 +++++ share/qtcreator/themes/dark.creatortheme | 4 ++++ share/qtcreator/themes/default.creatortheme | 4 ++++ share/qtcreator/themes/design-light.creatortheme | 4 ++++ share/qtcreator/themes/design.creatortheme | 4 ++++ share/qtcreator/themes/flat-dark.creatortheme | 4 ++++ share/qtcreator/themes/flat-light.creatortheme | 4 ++++ share/qtcreator/themes/flat.creatortheme | 4 ++++ src/libs/utils/theme/theme.h | 4 ++++ 9 files changed, 37 insertions(+) diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml index 9e72fea4153..031921c8ba0 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml @@ -205,6 +205,7 @@ QtObject { property string themeInteraction: Theme.color(Theme.DSinteraction) property string themeError: Theme.color(Theme.DSerrorColor) + property string themeWarning: Theme.color(Theme.DSwarningColor) property string themeDisabled: Theme.color(Theme.DSdisabledColor) property string themeAliasIconChecked: Theme.color(Theme.DSnavigatorAliasIconChecked) @@ -220,6 +221,10 @@ QtObject { property string themeControlOutlineInteraction: Theme.color(Theme.DScontrolOutlineInteraction) property string themeControlOutlineDisabled: Theme.color(Theme.DScontrolOutlineDisabled) + // Panels & Panes + property string themeBackgroundColorNormal: Theme.color(Theme.DSBackgroundColorNormal) + property string themeBackgroundColorAlternate: Theme.color(Theme.DSBackgroundColorAlternate) + // Text colors property string themeTextColor: Theme.color(Theme.DStextColor) property string themeTextColorDisabled: Theme.color(Theme.DStextColorDisabled) diff --git a/share/qtcreator/themes/dark.creatortheme b/share/qtcreator/themes/dark.creatortheme index 4f92228aa36..e0e02c6d49d 100644 --- a/share/qtcreator/themes/dark.creatortheme +++ b/share/qtcreator/themes/dark.creatortheme @@ -27,6 +27,7 @@ DSpanelBackground=ff323232 DSinteraction=ff2aafd3 DSerrorColor=ffdf3a3a +DSwarningColor=warning DSdisabledColor=ff707070 DScontrolBackground=ff323232 @@ -154,6 +155,9 @@ DStoolTipText=ffdadada DSUnimportedModuleColor=ffe33c2e +DSBackgroundColorAlternate=alternateBackground +DSBackgroundColorNormal=normalBackground + ;DS controls theme END BackgroundColorAlternate=alternateBackground diff --git a/share/qtcreator/themes/default.creatortheme b/share/qtcreator/themes/default.creatortheme index aeabe826906..9a7729b9cf0 100644 --- a/share/qtcreator/themes/default.creatortheme +++ b/share/qtcreator/themes/default.creatortheme @@ -18,6 +18,7 @@ DSpanelBackground=ffeaeaea DSinteraction=ff2aafd3 DSerrorColor=ffdf3a3a +DSwarningColor=warning DSdisabledColor=ff8e8e8e DScontrolBackground=ffeaeaea @@ -145,6 +146,9 @@ DStoolTipText=ffdadada DSUnimportedModuleColor=ffe33c2e +DSBackgroundColorAlternate=alternateBackground +DSBackgroundColorNormal=normalBackground + ;DS controls theme END BackgroundColorAlternate=ff3d3d3d diff --git a/share/qtcreator/themes/design-light.creatortheme b/share/qtcreator/themes/design-light.creatortheme index 70ee4462cb6..9f5dae6d574 100644 --- a/share/qtcreator/themes/design-light.creatortheme +++ b/share/qtcreator/themes/design-light.creatortheme @@ -32,6 +32,7 @@ DSpanelBackground=ffeaeaea DSinteraction=ff2aafd3 DSerrorColor=ffdf3a3a +DSwarningColor=warning DSdisabledColor=ff8e8e8e DScontrolBackground=ffeaeaea @@ -159,6 +160,9 @@ DStoolTipText=ffdadada DSUnimportedModuleColor=ffe33c2e +DSBackgroundColorAlternate=alternateBackground +DSBackgroundColorNormal=normalBackground + ;DS controls theme END BackgroundColorAlternate=alternateBackground diff --git a/share/qtcreator/themes/design.creatortheme b/share/qtcreator/themes/design.creatortheme index daffe924a6a..8fe6d59b5d8 100644 --- a/share/qtcreator/themes/design.creatortheme +++ b/share/qtcreator/themes/design.creatortheme @@ -29,6 +29,7 @@ DSpanelBackground=ff323232 DSinteraction=ff2aafd3 DSerrorColor=ffdf3a3a +DSwarningColor=warning DSdisabledColor=ff707070 DScontrolBackground=ff323232 @@ -156,6 +157,9 @@ DStoolTipText=ffdadada DSUnimportedModuleColor=ffe33c2e +DSBackgroundColorAlternate=alternateBackground +DSBackgroundColorNormal=normalBackground + ;DS controls theme END BackgroundColorAlternate=alternateBackground diff --git a/share/qtcreator/themes/flat-dark.creatortheme b/share/qtcreator/themes/flat-dark.creatortheme index 6265003f1df..a09df062adb 100644 --- a/share/qtcreator/themes/flat-dark.creatortheme +++ b/share/qtcreator/themes/flat-dark.creatortheme @@ -31,6 +31,7 @@ DSpanelBackground=ff323232 DSinteraction=ff2aafd3 DSerrorColor=ffdf3a3a +DSwarningColor=warning DSdisabledColor=ff707070 DScontrolBackground=ff323232 @@ -158,6 +159,9 @@ DStoolTipText=ffdadada DSUnimportedModuleColor=ffe33c2e +DSBackgroundColorAlternate=alternateBackground +DSBackgroundColorNormal=normalBackground + ;DS controls theme END BackgroundColorAlternate=alternateBackground diff --git a/share/qtcreator/themes/flat-light.creatortheme b/share/qtcreator/themes/flat-light.creatortheme index b98478d134d..c7704cfb783 100644 --- a/share/qtcreator/themes/flat-light.creatortheme +++ b/share/qtcreator/themes/flat-light.creatortheme @@ -27,6 +27,7 @@ DSpanelBackground=ffeaeaea DSinteraction=ff2aafd3 DSerrorColor=ffdf3a3a +DSwarningColor=warning DSdisabledColor=ff8e8e8e DScontrolBackground=ffeaeaea @@ -154,6 +155,9 @@ DStoolTipText=ffdadada DSUnimportedModuleColor=ffe33c2e +DSBackgroundColorAlternate=alternateBackground +DSBackgroundColorNormal=normalBackground + ;DS controls theme END BackgroundColorAlternate=alternateBackground diff --git a/share/qtcreator/themes/flat.creatortheme b/share/qtcreator/themes/flat.creatortheme index b6c8f09d9e4..17e3b1aafd0 100644 --- a/share/qtcreator/themes/flat.creatortheme +++ b/share/qtcreator/themes/flat.creatortheme @@ -25,6 +25,7 @@ DSpanelBackground=ff323232 DSinteraction=ff2aafd3 DSerrorColor=ffdf3a3a +DSwarningColor=warning DSdisabledColor=ff707070 DScontrolBackground=ff323232 @@ -152,6 +153,9 @@ DStoolTipText=ffdadada DSUnimportedModuleColor=ffe33c2e +DSBackgroundColorAlternate=alternateBackground +DSBackgroundColorNormal=normalBackground + ;DS controls theme END BackgroundColorAlternate=alternateBackground diff --git a/src/libs/utils/theme/theme.h b/src/libs/utils/theme/theme.h index 3af43ed6f9e..3f3249d71ea 100644 --- a/src/libs/utils/theme/theme.h +++ b/src/libs/utils/theme/theme.h @@ -309,6 +309,7 @@ public: DSpanelBackground, DSinteraction, DSerrorColor, + DSwarningColor, DSdisabledColor, DScontrolBackground, DScontrolBackgroundInteraction, @@ -422,6 +423,9 @@ public: DStoolTipOutline, DStoolTipText, + DSBackgroundColorNormal, + DSBackgroundColorAlternate, + DSUnimportedModuleColor };