diff options
author | Samuel Ghinet <samuel.ghinet@qt.io> | 2021-10-13 09:20:01 +0300 |
---|---|---|
committer | Samuel Ghinet <samuel.ghinet@qt.io> | 2021-10-14 12:32:29 +0000 |
commit | df8b62c6fa80cc98ef5d8ad148a4921ccdda8661 (patch) | |
tree | 15d8cc668d81f43d967d834516b388dff5fd45c3 | |
parent | 8aa68fb8e4215b823a790f1fd39d9dc4f38b0945 (diff) |
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: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
-rw-r--r-- | share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml | 5 | ||||
-rw-r--r-- | share/qtcreator/themes/dark.creatortheme | 4 | ||||
-rw-r--r-- | share/qtcreator/themes/default.creatortheme | 4 | ||||
-rw-r--r-- | share/qtcreator/themes/design-light.creatortheme | 4 | ||||
-rw-r--r-- | share/qtcreator/themes/design.creatortheme | 4 | ||||
-rw-r--r-- | share/qtcreator/themes/flat-dark.creatortheme | 4 | ||||
-rw-r--r-- | share/qtcreator/themes/flat-light.creatortheme | 4 | ||||
-rw-r--r-- | share/qtcreator/themes/flat.creatortheme | 4 | ||||
-rw-r--r-- | src/libs/utils/theme/theme.h | 4 |
9 files changed, 37 insertions, 0 deletions
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml index 716dfc3b28..eb4e1dca8f 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml @@ -207,6 +207,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) @@ -222,6 +223,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 4f92228aa3..e0e02c6d49 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 aeabe82690..9a7729b9cf 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 70ee4462cb..9f5dae6d57 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 daffe924a6..8fe6d59b5d 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 6265003f1d..a09df062ad 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 b98478d134..c7704cfb78 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 b6c8f09d9e..17e3b1aafd 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 a4fd112786..c2b34d0797 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 }; |