From d987d305efc7da475ce1fa96eb87a5d7f41897c2 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Fri, 12 Nov 2021 13:17:40 +0100 Subject: [PATCH] Theming: Extend theme with color roles for WelcomePage MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I1eb8b6231a15cdc427d6d2a08d657bd697379229 Reviewed-by: Henning Gründl Reviewed-by: Alessandro Portale Reviewed-by: Qt CI Bot --- .../imports/StudioTheme/Values.qml | 6 ++++++ share/qtcreator/themes/dark.creatortheme | 5 +++++ share/qtcreator/themes/default.creatortheme | 4 ++++ share/qtcreator/themes/design-light.creatortheme | 5 +++++ share/qtcreator/themes/design.creatortheme | 5 +++++ share/qtcreator/themes/flat-dark.creatortheme | 5 +++++ share/qtcreator/themes/flat-light.creatortheme | 5 +++++ share/qtcreator/themes/flat.creatortheme | 5 +++++ src/libs/utils/theme/theme.h | 7 ++++++- 9 files changed, 46 insertions(+), 1 deletion(-) diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml index fc6951eedbd..018187596b8 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml @@ -315,4 +315,10 @@ QtObject { property string themeListItemText: Theme.color(Theme.DSnavigatorText) property string themeListItemTextHover: Theme.color(Theme.DSnavigatorTextHover) property string themeListItemTextPress: Theme.color(Theme.DSnavigatorTextSelected) + + //Welcome Page + property string welcomeScreenBackground: Theme.color(Theme.DSwelcomeScreenBackground) + property string themeSubPanelBackground: Theme.color(Theme.DSsubPanelBackground) + property string themeThumbnailBackground: Theme.color(Theme.DSthumbnailBackground) + property string themeThumbnailLabelBackground: Theme.color(Theme.DSthumbnailLabelBackground) } diff --git a/share/qtcreator/themes/dark.creatortheme b/share/qtcreator/themes/dark.creatortheme index 7771dd876bc..5d62a28a00d 100644 --- a/share/qtcreator/themes/dark.creatortheme +++ b/share/qtcreator/themes/dark.creatortheme @@ -25,6 +25,11 @@ qmlDesignerButtonColor=ff3c3e40 ;DS controls theme START DSpanelBackground=ff323232 +DSwelcomeScreenBackground=ff242424 +DSsubPanelBackground=ff040404 +DSthumbnailBackground=ff292929 +DSthumbnailLabelBackground=ff3D3D3D + DSinteraction=ff2aafd3 DSerrorColor=ffdf3a3a DSwarningColor=warning diff --git a/share/qtcreator/themes/default.creatortheme b/share/qtcreator/themes/default.creatortheme index 63146feb886..1fe39754d33 100644 --- a/share/qtcreator/themes/default.creatortheme +++ b/share/qtcreator/themes/default.creatortheme @@ -16,6 +16,10 @@ qmlDesignerButtonColor=ff4c4e50 ;DS controls theme START DSpanelBackground=ffeaeaea +DSwelcomeScreenBackground=ffEAEAEA +DSsubPanelBackground=ffEFEFEF +DSthumbnailBackground=ffF2F2F2 +DSthumbnailLabelBackground=ffEBEBEB DSinteraction=ff2aafd3 DSerrorColor=ffdf3a3a DSwarningColor=warning diff --git a/share/qtcreator/themes/design-light.creatortheme b/share/qtcreator/themes/design-light.creatortheme index 4ee6c5166f4..25b83f151d8 100644 --- a/share/qtcreator/themes/design-light.creatortheme +++ b/share/qtcreator/themes/design-light.creatortheme @@ -30,6 +30,11 @@ backgroundColorDisabled=ff8e8e8e ;DS controls theme START DSpanelBackground=ffeaeaea +DSwelcomeScreenBackground=ffEAEAEA +DSsubPanelBackground=ffEFEFEF +DSthumbnailBackground=ffF2F2F2 +DSthumbnailLabelBackground=ffEBEBEB + DSinteraction=ff2aafd3 DSerrorColor=ffdf3a3a DSwarningColor=warning diff --git a/share/qtcreator/themes/design.creatortheme b/share/qtcreator/themes/design.creatortheme index 54b8bd0ad0e..882b69fd369 100644 --- a/share/qtcreator/themes/design.creatortheme +++ b/share/qtcreator/themes/design.creatortheme @@ -27,6 +27,11 @@ backgroundColorDisabled=ff444444 ;DS controls theme START DSpanelBackground=ff323232 +DSwelcomeScreenBackground=ff242424 +DSsubPanelBackground=ff040404 +DSthumbnailBackground=ff292929 +DSthumbnailLabelBackground=ff3D3D3D + DSinteraction=ff2aafd3 DSerrorColor=ffdf3a3a DSwarningColor=warning diff --git a/share/qtcreator/themes/flat-dark.creatortheme b/share/qtcreator/themes/flat-dark.creatortheme index 555c049a7b7..67c3a5822ad 100644 --- a/share/qtcreator/themes/flat-dark.creatortheme +++ b/share/qtcreator/themes/flat-dark.creatortheme @@ -29,6 +29,11 @@ qmlDesignerButtonColor=ff4c4e50 ;DS controls theme START DSpanelBackground=ff323232 +DSwelcomeScreenBackground=ff242424 +DSsubPanelBackground=ff040404 +DSthumbnailBackground=ff292929 +DSthumbnailLabelBackground=ff3D3D3D + DSinteraction=ff2aafd3 DSerrorColor=ffdf3a3a DSwarningColor=warning diff --git a/share/qtcreator/themes/flat-light.creatortheme b/share/qtcreator/themes/flat-light.creatortheme index e3fd6537224..f5a80b2c97a 100644 --- a/share/qtcreator/themes/flat-light.creatortheme +++ b/share/qtcreator/themes/flat-light.creatortheme @@ -25,6 +25,11 @@ qmlDesignerButtonColor=fff8f8f8 ;DS controls theme START DSpanelBackground=ffeaeaea +DSwelcomeScreenBackground=ffEAEAEA +DSsubPanelBackground=ffEFEFEF +DSthumbnailBackground=ffF2F2F2 +DSthumbnailLabelBackground=ffEBEBEB + DSinteraction=ff2aafd3 DSerrorColor=ffdf3a3a DSwarningColor=warning diff --git a/share/qtcreator/themes/flat.creatortheme b/share/qtcreator/themes/flat.creatortheme index b4769cbe741..59c21dd705a 100644 --- a/share/qtcreator/themes/flat.creatortheme +++ b/share/qtcreator/themes/flat.creatortheme @@ -23,6 +23,11 @@ qmlDesignerButtonColor=ff4c4e50 ;DS controls theme START DSpanelBackground=ff323232 +DSwelcomeScreenBackground=ff242424 +DSsubPanelBackground=ff040404 +DSthumbnailBackground=ff292929 +DSthumbnailLabelBackground=ff3D3D3D + DSinteraction=ff2aafd3 DSerrorColor=ffdf3a3a DSwarningColor=warning diff --git a/src/libs/utils/theme/theme.h b/src/libs/utils/theme/theme.h index 3f3249d71ea..f971a384b91 100644 --- a/src/libs/utils/theme/theme.h +++ b/src/libs/utils/theme/theme.h @@ -426,7 +426,12 @@ public: DSBackgroundColorNormal, DSBackgroundColorAlternate, - DSUnimportedModuleColor + DSUnimportedModuleColor, + + DSwelcomeScreenBackground, + DSsubPanelBackground, + DSthumbnailBackground, + DSthumbnailLabelBackground, }; enum Gradient {