From 0f4933ed840f1a059ff109b91c76d46555b58627 Mon Sep 17 00:00:00 2001 From: Ali Kianian Date: Mon, 18 Nov 2024 12:54:14 +0200 Subject: [PATCH] QmlDesigner: Add a theme color for table current cells MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QDS-14135 Change-Id: I0a46ac17491f0fd68dff315216a1b36744fc44ca Reviewed-by: Henning Gründl --- share/qtcreator/qmldesigner/devicemanager/Main.qml | 2 +- .../propertyEditorQmlSources/imports/StudioTheme/Values.qml | 2 ++ share/qtcreator/themes/dark.creatortheme | 3 +++ share/qtcreator/themes/default.creatortheme | 3 +++ share/qtcreator/themes/design-light.creatortheme | 3 +++ share/qtcreator/themes/design.creatortheme | 3 +++ share/qtcreator/themes/flat-dark.creatortheme | 3 +++ share/qtcreator/themes/flat-light.creatortheme | 3 +++ share/qtcreator/themes/flat.creatortheme | 3 +++ src/libs/utils/theme/theme.h | 1 + 10 files changed, 25 insertions(+), 1 deletion(-) diff --git a/share/qtcreator/qmldesigner/devicemanager/Main.qml b/share/qtcreator/qmldesigner/devicemanager/Main.qml index 68e54141a2d..ed83c164a01 100644 --- a/share/qtcreator/qmldesigner/devicemanager/Main.qml +++ b/share/qtcreator/qmldesigner/devicemanager/Main.qml @@ -31,7 +31,7 @@ Rectangle { required property bool selected required property bool current - color: tableView.currentRow === row ? "#08475B" : StudioTheme.Values.themePanelBackground + color: tableView.currentRow === row ? StudioTheme.Values.themeTableCellCurrent : StudioTheme.Values.themePanelBackground implicitWidth: StudioTheme.Values.cellWidth implicitHeight: StudioTheme.Values.cellHeight border { diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml index 961be1bf706..9d857513488 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml @@ -474,6 +474,8 @@ QtObject { property color themePillTextSelected: Theme.color(Theme.DSpillTextSelected) property color themePillTextEdit: Theme.color(Theme.DspillTextEdit) + property color themeTableCellCurrent: Theme.color(Theme.DStableCellCurrent) + // Control Style Mapping property ControlStyle controlStyle: DefaultStyle {} property ControlStyle connectionPopupControlStyle: ConnectionPopupControlStyle {} diff --git a/share/qtcreator/themes/dark.creatortheme b/share/qtcreator/themes/dark.creatortheme index 463204fd513..7e223b560f5 100644 --- a/share/qtcreator/themes/dark.creatortheme +++ b/share/qtcreator/themes/dark.creatortheme @@ -53,6 +53,8 @@ splitterBlue=ff64daff rgbBlue=ff64daff highlightBlue=ff57b9fc highlightHover=ff74CBFC +ds300=ff71d1ef +ds800=ff08475B ;DS Theme Palette END [Colors] @@ -204,6 +206,7 @@ DSactionKeyframe=ffe0e01b DSactionJIT=ff2db543 DStableHeaderBackground=ffff0000 +DStableCellCurrent=ds800 DStableHeaderText=ff00ff00 DSdockContainerBackground=ff242424 diff --git a/share/qtcreator/themes/default.creatortheme b/share/qtcreator/themes/default.creatortheme index e6cdab1bc30..c39d42a370b 100644 --- a/share/qtcreator/themes/default.creatortheme +++ b/share/qtcreator/themes/default.creatortheme @@ -45,6 +45,8 @@ splitterBlue=ff64daff rgbBlue=ff64daff highlightBlue=ff57b9fc highlightHover=ff74CBFC +ds300=ff71d1ef +ds800=ff08475B ;DS Theme Palette END [Colors] @@ -199,6 +201,7 @@ DSactionKeyframe=ffe0e01b DSactionJIT=ff2db543 DStableHeaderBackground=ffff0000 +DStableCellCurrent=ds300 DStableHeaderText=ff00ff00 DSdockContainerBackground=ff323232 diff --git a/share/qtcreator/themes/design-light.creatortheme b/share/qtcreator/themes/design-light.creatortheme index 5271d5fc57a..4f0e274e2de 100644 --- a/share/qtcreator/themes/design-light.creatortheme +++ b/share/qtcreator/themes/design-light.creatortheme @@ -58,6 +58,8 @@ splitterBlue=ff64daff rgbBlue=ff64daff highlightBlue=ff57b9fc highlightHover=ff74CBFC +ds300=ff71d1ef +ds800=ff08475B ;DS Theme Palette END [Colors] @@ -212,6 +214,7 @@ DSactionKeyframe=ffe0e01b DSactionJIT=ff2db543 DStableHeaderBackground=ffff0000 +DStableCellCurrent=ds300 DStableHeaderText=ff00ff00 DSdockContainerBackground=ff323232 diff --git a/share/qtcreator/themes/design.creatortheme b/share/qtcreator/themes/design.creatortheme index 874c5116e03..db9bed53a40 100644 --- a/share/qtcreator/themes/design.creatortheme +++ b/share/qtcreator/themes/design.creatortheme @@ -56,6 +56,8 @@ splitterBlue=ff64daff rgbBlue=ff64daff highlightBlue=ff57b9fc highlightHover=ff74CBFC +ds300=ff71d1ef +ds800=ff08475B ;DS Theme Palette END [Colors] @@ -229,6 +231,7 @@ DSactionKeyframe=ffe0e01b DSactionJIT=ff2db543 DStableHeaderBackground=ffff0000 +DStableCellCurrent=ds800 DStableHeaderText=ff00ff00 DSdockContainerBackground=ff242424 diff --git a/share/qtcreator/themes/flat-dark.creatortheme b/share/qtcreator/themes/flat-dark.creatortheme index bdf46614b05..1e5cadbd824 100644 --- a/share/qtcreator/themes/flat-dark.creatortheme +++ b/share/qtcreator/themes/flat-dark.creatortheme @@ -57,6 +57,8 @@ splitterBlue=ff64daff rgbBlue=ff64daff highlightBlue=ff57b9fc highlightHover=ff74CBFC +ds300=ff71d1ef +ds800=ff08475B ;DS Theme Palette END [Colors] @@ -209,6 +211,7 @@ DSactionKeyframe=ffe0e01b DSactionJIT=ff2db543 DStableHeaderBackground=ffff0000 +DStableCellCurrent=ds800 DStableHeaderText=ff00ff00 DSdockContainerBackground=ff242424 diff --git a/share/qtcreator/themes/flat-light.creatortheme b/share/qtcreator/themes/flat-light.creatortheme index a85d3654d88..253aa29f4e1 100644 --- a/share/qtcreator/themes/flat-light.creatortheme +++ b/share/qtcreator/themes/flat-light.creatortheme @@ -57,6 +57,8 @@ splitterBlue=ff64daff rgbBlue=ff64daff highlightBlue=ff57b9fc highlightHover=ff74CBFC +ds300=ff71d1ef +ds800=ff08475B ;DS Theme Palette END [Colors] @@ -211,6 +213,7 @@ DSactionKeyframe=ffe0e01b DSactionJIT=ff2db543 DStableHeaderBackground=ffff0000 +DStableCellCurrent=ds300 DStableHeaderText=ff00ff00 DSdockContainerBackground=ff323232 diff --git a/share/qtcreator/themes/flat.creatortheme b/share/qtcreator/themes/flat.creatortheme index 7fd222e168a..5998ff0fd5d 100644 --- a/share/qtcreator/themes/flat.creatortheme +++ b/share/qtcreator/themes/flat.creatortheme @@ -54,6 +54,8 @@ splitterBlue=ff64daff rgbBlue=ff64daff highlightBlue=ff57b9fc highlightHover=ff74CBFC +ds300=ff71d1ef +ds800=ff08475B ;DS Theme Palette END [Colors] @@ -206,6 +208,7 @@ DSactionKeyframe=ffe0e01b DSactionJIT=ff2db543 DStableHeaderBackground=ffff0000 +DStableCellCurrent=ds800 DStableHeaderText=ff00ff00 DSdockContainerBackground=ff242424 diff --git a/src/libs/utils/theme/theme.h b/src/libs/utils/theme/theme.h index 8d7e922e79d..38bc9763af6 100644 --- a/src/libs/utils/theme/theme.h +++ b/src/libs/utils/theme/theme.h @@ -414,6 +414,7 @@ public: DSactionJIT, DStableHeaderBackground, + DStableCellCurrent, DStableHeaderText, DSdockContainerBackground,