Theme: add controls theme to creator themes and map to controls theme values

Change-Id: Iec6f217e8d3ae6e7f72fdf86c282e1b11b225626 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-04-16 17:09:59 +02:00
parent d7520dece5
commit 96cd1bffae
6 changed files with 220 additions and 47 deletions
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml
@@ -80,54 +80,42 @@ QtObject {

    // Theme Colors

-    // Dark Theme Defaults
-    property string themeControlBackground: "#242424"
-    property string themeControlOutline: "#404040"
-    property string themeTextColor: "#ffffff"
-    property string themeDisabledTextColor: "#909090"
-
-    property string themePanelBackground: "#2a2a2a"
-    property string themeHoverHighlight: "#313131"
-    property string themeColumnBackground: "#363636"
-    property string themeFocusEdit: "#444444"
-    property string themeFocusDrag: "#565656"
-
-    property string themeControlBackgroundPressed: "#606060"
-    property string themeControlBackgroundChecked: "#565656"
-
-    property string themeInteraction: "#029de0"
-
-    property string themeSliderActiveTrack: "#606060"
-    property string themeSliderInactiveTrack: "#404040"
-    property string themeSliderHandle: "#505050"
-
-    property string themeSliderActiveTrackHover: "#7f7f7f"
-    property string themeSliderInactiveTrackHover: "#505050"
-    property string themeSliderHandleHover: "#606060"
-
-    property string themeSliderActiveTrackFocus: "#aaaaaa"
-    property string themeSliderInactiveTrackFocus: "#606060"
-    property string themeSliderHandleFocus: values.themeInteraction
-
-    property string themeErrorColor: "#df3a3a"
+    // COLORS NOW COME FROM THE THEME FILES
+    property string themeControlBackground: Theme.color(Theme.DScontrolBackground)
+    property string themeControlOutline: Theme.color(Theme.DScontrolOutline)
+    property string themeTextColor: Theme.color(Theme.DStextColor)
+    property string themeDisabledTextColor: Theme.color(Theme.DSdisabledTextColor)
+    property string themePanelBackground: Theme.color(Theme.DSpanelBackground)
+    property string themeHoverHighlight: Theme.color(Theme.DShoverHighlight)
+    property string themeColumnBackground: Theme.color(Theme.DScolumnBackground)
+    property string themeFocusEdit: Theme.color(Theme.DSfocusEdit)
+    property string themeFocusDrag: Theme.color(Theme.DSfocusDrag)
+    property string themeControlBackgroundPressed: Theme.color(Theme.DScontrolBackgroundPressed)
+    property string themeControlBackgroundChecked: Theme.color(Theme.DScontrolBackgroundChecked)
+    property string themeInteraction: Theme.color(Theme.DSinteraction)
+    property string themeSliderActiveTrack: Theme.color(Theme.DSsliderActiveTrack)
+    property string themeSliderInactiveTrack: Theme.color(Theme.DSsliderInactiveTrack)
+    property string themeSliderHandle: Theme.color(Theme.DSsliderHandle)
+    property string themeSliderActiveTrackHover: Theme.color(Theme.DSactiveTrackHover)
+    property string themeSliderInactiveTrackHover: Theme.color(Theme.DSsliderInactiveTrackHover)
+    property string themeSliderHandleHover: Theme.color(Theme.DSsliderHandleHover)
+    property string themeSliderActiveTrackFocus: Theme.color(Theme.DSsliderActiveTrackFocus)
+    property string themeSliderInactiveTrackFocus:Theme.color(Theme.DSsliderInactiveTrackFocus)
+    property string themeSliderHandleFocus: Theme.color(Theme.DSsliderHandleFocus)
+    property string themeErrorColor: Theme.color(Theme.DSerrorColor)

    // NEW NEW NEW NEW NEW
-    property string themeControlBackgroundDisabled: "#363636"
-    property string themeControlOutlineDisabled: "#404040"
-    property string themeTextColorDisabled: "#606060"
-
-    property string themeTextSelectionColor: "#029de0"
-    property string themeTextSelectedTextColor: "#ffffff"
-
-    property string themeScrollBarTrack: "#404040"
-    property string themeScrollBarHandle: "#505050"
-
-    property string themeControlBackgroundInteraction: "#404040" // TODO Name. Right now themeFocusEdit is used for all 'edit' states. Is that correct? Different color!
-
-    property string themeTranslationIndicatorBorder: "#7f7f7f"
-
-    property string themeSectionHeadBackground: "#191919"
+    property string themeControlBackgroundDisabled: Theme.color(Theme.DScontrolBackgroundDisabled)
+    property string themeControlOutlineDisabled: Theme.color(Theme.DScontrolOutlineDisabled)
+    property string themeTextColorDisabled: Theme.color(Theme.DStextColorDisabled)
+    property string themeTextSelectionColor: Theme.color(Theme.DStextSelectionColor)
+    property string themeTextSelectedTextColor:Theme.color(Theme.DStextSelectedTextColor)
+    property string themeScrollBarTrack: Theme.color(Theme.DSscrollBarTrack)
+    property string themeScrollBarHandle: Theme.color(Theme.DSscrollBarHandle)
+    property string themeControlBackgroundInteraction: Theme.color(Theme.DScontrolBackgroundInteraction) // TODO Name. Right now themeFocusEdit is used for all 'edit' states. Is that correct? Different color!
+    property string themeTranslationIndicatorBorder: Theme.color(Theme.DStranlsationIndicatorBorder)
+    property string themeSectionHeadBackground: Theme.color(Theme.DSsectionHeadBackground)

    // Taken out of Constants.js
-    property string themeChangedStateText: "#99ccff"
+    property string themeChangedStateText: Theme.color(Theme.DSchangedStateText)
 }
--- a/share/qtcreator/themes/dark.creatortheme
+++ b/share/qtcreator/themes/dark.creatortheme
@@ -22,6 +22,43 @@ backgroundColorDisabled=ff444444
 qmlDesignerButtonColor=ff3c3e40

 [Colors]
+
+;DS controls theme START
+DScontrolBackground=ff404040
+DScontrolOutline=ff595959
+DStextColor=ffffffff
+DSdisabledTextColor=ff909090
+DSpanelBackground=ff454444
+DShoverHighlight=ff313131
+DScolumnBackground=ff363636
+DSfocusEdit=ff444444
+DSfocusDrag=ff565656
+DScontrolBackgroundPressed=ff7a7a7a
+DScontrolBackgroundChecked=ff565656
+DSinteraction=ff3f91c4
+DSsliderActiveTrack=ff7a7a7a
+DSsliderInactiveTrack=ff4d4d4d
+DSsliderHandle=ff505050
+DSsliderActiveTrackHover=ff7f7f7f
+DSsliderInactiveTrackHover=ff505050
+DSsliderHandleHover=ff7a7a7a
+DSsliderActiveTrackFocus=ffaaaaaa
+DSsliderInactiveTrackFocus=ff7a7a7a
+DSsliderHandleFocus=ff3f91c4
+DSerrorColor=ffdf3a3a
+DScontrolBackgroundDisabled=ff363636
+DScontrolOutlineDisabled=ff4d4d4d
+DStextColorDisabled=ff7a7a7a
+DStextSelectionColor=ff3f91c4
+DStextSelectedTextColor=ffffffff
+DSscrollBarTrack=ff4d4d4d
+DSscrollBarHandle=ff505050
+DScontrolBackgroundInteraction=ff4d4d4d
+DStranslationIndicatorBorder=ff7f7f7f
+DSsectionHeadBackground=ff424242
+DSchangedStateText=ff99ccff
+;DS controls theme END
+
 BackgroundColorAlternate=alternateBackground
 BackgroundColorDark=shadowBackground
 BackgroundColorHover=hoverBackground
--- a/share/qtcreator/themes/default.creatortheme
+++ b/share/qtcreator/themes/default.creatortheme
@@ -13,6 +13,43 @@ splitterColor=ff151515
 qmlDesignerButtonColor=ff4c4e50

 [Colors]
+
+;DS controls theme START
+DScontrolBackground=ff404040
+DScontrolOutline=ff595959
+DStextColor=ffffffff
+DSdisabledTextColor=ff909090
+DSpanelBackground=ff454444
+DShoverHighlight=ff313131
+DScolumnBackground=ff363636
+DSfocusEdit=ff444444
+DSfocusDrag=ff565656
+DScontrolBackgroundPressed=ff7a7a7a
+DScontrolBackgroundChecked=ff565656
+DSinteraction=ff3f91c4
+DSsliderActiveTrack=ff7a7a7a
+DSsliderInactiveTrack=ff4d4d4d
+DSsliderHandle=ff505050
+DSsliderActiveTrackHover=ff7f7f7f
+DSsliderInactiveTrackHover=ff505050
+DSsliderHandleHover=ff7a7a7a
+DSsliderActiveTrackFocus=ffaaaaaa
+DSsliderInactiveTrackFocus=ff7a7a7a
+DSsliderHandleFocus=ff3f91c4
+DSerrorColor=ffdf3a3a
+DScontrolBackgroundDisabled=ff363636
+DScontrolOutlineDisabled=ff4d4d4d
+DStextColorDisabled=ff7a7a7a
+DStextSelectionColor=ff3f91c4
+DStextSelectedTextColor=ffffffff
+DSscrollBarTrack=ff4d4d4d
+DSscrollBarHandle=ff505050
+DScontrolBackgroundInteraction=ff4d4d4d
+DStranslationIndicatorBorder=ff7f7f7f
+DSsectionHeadBackground=ff424242
+DSchangedStateText=ff99ccff
+;DS controls theme END
+
 BackgroundColorAlternate=ff3d3d3d
 BackgroundColorDark=shadowBackground
 BackgroundColorHover=ff515151
--- a/share/qtcreator/themes/flat-dark.creatortheme
+++ b/share/qtcreator/themes/flat-dark.creatortheme
@@ -26,6 +26,43 @@ backgroundColorDisabled=ff444444
 qmlDesignerButtonColor=ff4c4e50

 [Colors]
+
+;DS controls theme START
+DScontrolBackground=ff404040
+DScontrolOutline=ff595959
+DStextColor=ffffffff
+DSdisabledTextColor=ff909090
+DSpanelBackground=ff454444
+DShoverHighlight=ff313131
+DScolumnBackground=ff363636
+DSfocusEdit=ff444444
+DSfocusDrag=ff565656
+DScontrolBackgroundPressed=ff7a7a7a
+DScontrolBackgroundChecked=ff565656
+DSinteraction=ff1d545c
+DSsliderActiveTrack=ff7a7a7a
+DSsliderInactiveTrack=ff4d4d4d
+DSsliderHandle=ff505050
+DSsliderActiveTrackHover=ff7f7f7f
+DSsliderInactiveTrackHover=ff505050
+DSsliderHandleHover=ff7a7a7a
+DSsliderActiveTrackFocus=ffaaaaaa
+DSsliderInactiveTrackFocus=ff7a7a7a
+DSsliderHandleFocus=ff1d545c
+DSerrorColor=ffdf3a3a
+DScontrolBackgroundDisabled=ff363636
+DScontrolOutlineDisabled=ff4d4d4d
+DStextColorDisabled=ff7a7a7a
+DStextSelectionColor=ff1d545c
+DStextSelectedTextColor=ffffffff
+DSscrollBarTrack=ff4d4d4d
+DSscrollBarHandle=ff505050
+DScontrolBackgroundInteraction=ff4d4d4d
+DStranslationIndicatorBorder=ff7f7f7f
+DSsectionHeadBackground=ff424242
+DSchangedStateText=ff99ccff
+;DS controls theme END
+
 BackgroundColorAlternate=alternateBackground
 BackgroundColorDark=shadowBackground
 BackgroundColorHover=hoverBackground
@@ -202,7 +239,7 @@ CodeModel_Error_TextMarkColor=error
 CodeModel_Warning_TextMarkColor=warning

 QmlDesigner_BackgroundColor=qmlDesignerButtonColor
-QmlDesigner_HighlightColor=ff3f91c4
+QmlDesigner_HighlightColor=ff1d545c
 QmlDesigner_FormEditorSelectionColor=ff4ba2ff
 QmlDesigner_FormEditorForegroundColor=ffffffff
 QmlDesigner_BackgroundColorDarkAlternate=qmlDesignerButtonColor
--- a/share/qtcreator/themes/flat-light.creatortheme
+++ b/share/qtcreator/themes/flat-light.creatortheme
@@ -22,6 +22,43 @@ warning=ffecbc1c
 qmlDesignerButtonColor=fff8f8f8

 [Colors]
+
+;DS controls theme START
+DScontrolBackground=ffffffff
+DScontrolOutline=ff777777
+DStextColor=ff242424
+DSdisabledTextColor=ff505050
+DSpanelBackground=fff2f2f2
+DShoverHighlight=ffe6e6e6
+DScolumnBackground=ffaaaaaa
+DSfocusEdit=ffeaeaea
+DSfocusDrag=ffd1d1d1
+DScontrolBackgroundPressed=ff505050
+DScontrolBackgroundChecked=ff5e5e5e
+DSinteraction=ff0492c9
+DSsliderActiveTrack=ff363636
+DSsliderInactiveTrack=ffe6e6e6
+DSsliderHandle=ff777777
+DSsliderActiveTrackHover=ff7f7f7f
+DSsliderInactiveTrackHover=ff5e5e5e
+DSsliderHandleHover=ff505050
+DSsliderActiveTrackFocus=ff363636
+DSsliderInactiveTrackFocus=ff505050
+DSsliderHandleFocus=ff0492c9
+DSerrorColor=ffdf3a3a
+DScontrolBackgroundDisabled=ffaaaaaa
+DScontrolOutlineDisabled=ff777777
+DStextColorDisabled=ff505050
+DStextSelectionColor=ff0492c9
+DStextSelectedTextColor=ffffffff
+DSscrollBarTrack=ff777777
+DSscrollBarHandle=ff505050
+DScontrolBackgroundInteraction=ff777777
+DStranslationIndicatorBorder=ffebebeb
+DSsectionHeadBackground=ffebebeb
+DSchangedStateText=ff99ccff
+;DS controls theme END
+
 BackgroundColorAlternate=alternateBackground
 BackgroundColorDark=shadowBackground
 BackgroundColorHover=hoverBackground
--- a/share/qtcreator/themes/flat.creatortheme
+++ b/share/qtcreator/themes/flat.creatortheme
@@ -20,6 +20,43 @@ splitter=ff313131
 qmlDesignerButtonColor=ff4c4e50

 [Colors]
+
+;DS controls theme START
+DScontrolBackground=ff404040
+DScontrolOutline=ff595959
+DStextColor=ffffffff
+DSdisabledTextColor=ff909090
+DSpanelBackground=ff454444
+DShoverHighlight=ff313131
+DScolumnBackground=ff363636
+DSfocusEdit=ff444444
+DSfocusDrag=ff565656
+DScontrolBackgroundPressed=ff7a7a7a
+DScontrolBackgroundChecked=ff565656
+DSinteraction=ff3f91c4
+DSsliderActiveTrack=ff7a7a7a
+DSsliderInactiveTrack=ff4d4d4d
+DSsliderHandle=ff505050
+DSsliderActiveTrackHover=ff7f7f7f
+DSsliderInactiveTrackHover=ff505050
+DSsliderHandleHover=ff7a7a7a
+DSsliderActiveTrackFocus=ffaaaaaa
+DSsliderInactiveTrackFocus=ff7a7a7a
+DSsliderHandleFocus=ff3f91c4
+DSerrorColor=ffdf3a3a
+DScontrolBackgroundDisabled=ff363636
+DScontrolOutlineDisabled=ff4d4d4d
+DStextColorDisabled=ff7a7a7a
+DStextSelectionColor=ff3f91c4
+DStextSelectedTextColor=ffffffff
+DSscrollBarTrack=ff4d4d4d
+DSscrollBarHandle=ff505050
+DScontrolBackgroundInteraction=ff4d4d4d
+DStranslationIndicatorBorder=ff7f7f7f
+DSsectionHeadBackground=ff424242
+DSchangedStateText=ff99ccff
+;DS controls theme END
+
 BackgroundColorAlternate=alternateBackground
 BackgroundColorDark=shadowBackground
 BackgroundColorHover=hoverBackground