QmlDesigner: Remove programmatical derivation of theme colors

The Qt Quick Designer synthesized a few theme colors from existing theme
colors. That was in order to prevent the need for 6 theme colors being
defined in every theme. It turned out, however, that being able to
define these if favorable.

Todo in follow-up commit: remove QmlDesigner::Theme::qmlDesigner...()
functions, and fix up the qml, accordingly.

Change-Id: Ica85df5472cd7b9da8bf215eb6dbdcf608a4fb2d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>

5 files changed, 36 insertions, 4 deletions

diff --git a/share/qtcreator/themes/dark.creatortheme b/share/qtcreator/themes/dark.creatortheme
index 6b16c8a891..b38fbb7446 100644
--- a/share/qtcreator/themes/dark.creatortheme
+++ b/share/qtcreator/themes/dark.creatortheme
@@ -217,6 +217,12 @@ QmlDesigner_BackgroundColor=ff3c3e40
 QmlDesigner_HighlightColor=ff46a2da
 QmlDesigner_FormEditorSelectionColor=ff4ba2ff
 QmlDesigner_FormEditorForegroundColor=ffffffff
+QmlDesigner_BackgroundColorDarkAlternate=ff3c3e40
+QmlDesigner_BackgroundColorDarker=ff151515
+QmlDesigner_BorderColor=SplitterColor
+QmlDesigner_ButtonColor=ff505050
+QmlDesigner_TabDark=shadowBackground
+QmlDesigner_TabLight=text
 
 [Flags]
 ComboBoxDrawTextShadow=false
diff --git a/share/qtcreator/themes/default.creatortheme b/share/qtcreator/themes/default.creatortheme
index c5cf6b9c23..1807f52179 100644
--- a/share/qtcreator/themes/default.creatortheme
+++ b/share/qtcreator/themes/default.creatortheme
@@ -8,10 +8,12 @@ darkText=ff000000
 textDisabled=88a0a0a0
 error=ffdf4f4f
 warning=ffecbc1c
+shadowBackground=ff232323
+splitterColor=ff151515
 
 [Colors]
 BackgroundColorAlternate=ff3d3d3d
-BackgroundColorDark=ff232323
+BackgroundColorDark=shadowBackground
 BackgroundColorHover=ff515151
 BackgroundColorNormal=ffffffff
 BackgroundColorSelected=ff151515
@@ -104,7 +106,7 @@ ProgressBarColorFinished=ff5aaa3c
 ProgressBarColorNormal=b4ffffff
 ProgressBarTitleColor=ffffffff
 ProgressBarBackgroundColor=18ffffff
-SplitterColor=ff151515
+SplitterColor=splitterColor
 TextColorDisabled=ff000000
 TextColorError=ffff0000
 TextColorHighlight=ffa0a0a4
@@ -187,7 +189,13 @@ ClangCodeModel_Warning_TextMarkColor=warning
 QmlDesigner_BackgroundColor=ff4c4e50
 QmlDesigner_HighlightColor=ff46a2da
 QmlDesigner_FormEditorSelectionColor=ff4ba2ff
-QmlDesigner_FormEditorForegroundColor=ffffffff
+QmlDesigner_FormEditorForegroundColor=brightText
+QmlDesigner_BackgroundColorDarkAlternate=ff4c4e50
+QmlDesigner_BackgroundColorDarker=ff4e4e4e
+QmlDesigner_BorderColor=splitterColor
+QmlDesigner_ButtonColor=ff7a7a7a
+QmlDesigner_TabDark=shadowBackground
+QmlDesigner_TabLight=brightText
 
 [Flags]
 ComboBoxDrawTextShadow=true
diff --git a/share/qtcreator/themes/flat-dark.creatortheme b/share/qtcreator/themes/flat-dark.creatortheme
index f433bcb098..0cab8b31d0 100644
--- a/share/qtcreator/themes/flat-dark.creatortheme
+++ b/share/qtcreator/themes/flat-dark.creatortheme
@@ -201,6 +201,12 @@ QmlDesigner_BackgroundColor=ff4c4e50
 QmlDesigner_HighlightColor=ff3f91c4
 QmlDesigner_FormEditorSelectionColor=ff4ba2ff
 QmlDesigner_FormEditorForegroundColor=ffffffff
+QmlDesigner_BackgroundColorDarkAlternate=ff4c4e50
+QmlDesigner_BackgroundColorDarker=ff262728
+QmlDesigner_BorderColor=splitter
+QmlDesigner_ButtonColor=ff595b5c
+QmlDesigner_TabDark=shadowBackground
+QmlDesigner_TabLight=text
 
 PaletteWindow=normalBackground
 PaletteWindowText=text
diff --git a/share/qtcreator/themes/flat-light.creatortheme b/share/qtcreator/themes/flat-light.creatortheme
index 1975996d23..bba1c19ae1 100644
--- a/share/qtcreator/themes/flat-light.creatortheme
+++ b/share/qtcreator/themes/flat-light.creatortheme
@@ -199,6 +199,12 @@ QmlDesigner_BackgroundColor=fff8f8f8
 QmlDesigner_HighlightColor=ff46a2da
 QmlDesigner_FormEditorSelectionColor=ff4ba2ff
 QmlDesigner_FormEditorForegroundColor=ffffffff
+QmlDesigner_BackgroundColorDarkAlternate=fff8f8f8
+QmlDesigner_BackgroundColorDarker=fff5f5f5
+QmlDesigner_BorderColor=splitter
+QmlDesigner_ButtonColor=ffcccccc
+QmlDesigner_TabDark=ff585858
+QmlDesigner_TabLight=ffd0d0d0
 
 [Flags]
 ComboBoxDrawTextShadow=false
diff --git a/share/qtcreator/themes/flat.creatortheme b/share/qtcreator/themes/flat.creatortheme
index d6864c5abd..1913dac186 100644
--- a/share/qtcreator/themes/flat.creatortheme
+++ b/share/qtcreator/themes/flat.creatortheme
@@ -156,7 +156,7 @@ Debugger_WatchItem_ValueChanged=ffbf0303
 Debugger_Breakpoint_TextMarkColor=ffff4040
 
 Welcome_TextColor=ff000000
-Welcome_ForegroundPrimaryColor=ff404244
+Welcome_ForegroundPrimaryColor=shadowBackground
 Welcome_ForegroundSecondaryColor=ff727476
 Welcome_BackgroundColor=normalBackground
 Welcome_ButtonBackgroundColor=normalBackground
@@ -197,6 +197,12 @@ QmlDesigner_BackgroundColor=ff4c4e50
 QmlDesigner_HighlightColor=ff46a2da
 QmlDesigner_FormEditorSelectionColor=ff4ba2ff
 QmlDesigner_FormEditorForegroundColor=ffffffff
+QmlDesigner_BackgroundColorDarkAlternate=ff4c4e50
+QmlDesigner_BackgroundColorDarker=ff262728
+QmlDesigner_BorderColor=splitter
+QmlDesigner_ButtonColor=ff595b5c
+QmlDesigner_TabDark=shadowBackground
+QmlDesigner_TabLight=ffffffff
 
 [Flags]
 ComboBoxDrawTextShadow=false