diff options
author | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2020-08-10 14:31:59 +0300 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2020-08-11 06:55:09 +0000 |
commit | 6eee8aa99d41685a5fa6b61321e34fbfc84ca852 (patch) | |
tree | d8a5d7f19ad8fb182aa84b93fd396ede878365ab | |
parent | b9b725eafa3f3fa3971973b732fd3d582750136b (diff) |
QmlDesigner: Add 3d axis colors to theme
Task-number: QDS-2404
Change-Id: I16f9deb7ba6698adafdd1cc0c8bec868731e1aa8
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
-rw-r--r-- | share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml | 5 | ||||
-rw-r--r-- | share/qtcreator/themes/dark.creatortheme | 3 | ||||
-rw-r--r-- | share/qtcreator/themes/default.creatortheme | 3 | ||||
-rw-r--r-- | share/qtcreator/themes/design-light.creatortheme | 3 | ||||
-rw-r--r-- | share/qtcreator/themes/design.creatortheme | 3 | ||||
-rw-r--r-- | share/qtcreator/themes/flat-dark.creatortheme | 3 | ||||
-rw-r--r-- | share/qtcreator/themes/flat-light.creatortheme | 3 | ||||
-rw-r--r-- | share/qtcreator/themes/flat.creatortheme | 3 | ||||
-rw-r--r-- | src/libs/utils/theme/theme.h | 5 |
9 files changed, 30 insertions, 1 deletions
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml index 65cc7f3cfc..dfba7236bf 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml @@ -124,4 +124,9 @@ QtObject { // Taken out of Constants.js property string themeChangedStateText: Theme.color(Theme.DSchangedStateText) + + // 3D + property string theme3DAxisXColor: Theme.color(Theme.DS3DAxisXColor) + property string theme3DAxisYColor: Theme.color(Theme.DS3DAxisYColor) + property string theme3DAxisZColor: Theme.color(Theme.DS3DAxisZColor) } diff --git a/share/qtcreator/themes/dark.creatortheme b/share/qtcreator/themes/dark.creatortheme index fa4a6ab330..944256eeea 100644 --- a/share/qtcreator/themes/dark.creatortheme +++ b/share/qtcreator/themes/dark.creatortheme @@ -57,6 +57,9 @@ DScontrolBackgroundInteraction=ff4d4d4d DStranslationIndicatorBorder=ff7f7f7f DSsectionHeadBackground=ff424242 DSchangedStateText=ff99ccff +DS3DAxisXColor=ffe00000 +DS3DAxisYColor=ff009900 +DS3DAxisZColor=ff6060ff ;DS controls theme END BackgroundColorAlternate=alternateBackground diff --git a/share/qtcreator/themes/default.creatortheme b/share/qtcreator/themes/default.creatortheme index 8686733ab4..2710025524 100644 --- a/share/qtcreator/themes/default.creatortheme +++ b/share/qtcreator/themes/default.creatortheme @@ -48,6 +48,9 @@ DScontrolBackgroundInteraction=ff4d4d4d DStranslationIndicatorBorder=ff7f7f7f DSsectionHeadBackground=ff424242 DSchangedStateText=ff99ccff +DS3DAxisXColor=ffe00000 +DS3DAxisYColor=ff009900 +DS3DAxisZColor=ff6060ff ;DS controls theme END BackgroundColorAlternate=ff3d3d3d diff --git a/share/qtcreator/themes/design-light.creatortheme b/share/qtcreator/themes/design-light.creatortheme index 788b4680eb..ef52ec12cd 100644 --- a/share/qtcreator/themes/design-light.creatortheme +++ b/share/qtcreator/themes/design-light.creatortheme @@ -61,6 +61,9 @@ DScontrolBackgroundInteraction=ff777777 DStranslationIndicatorBorder=ffebebeb DSsectionHeadBackground=ffebebeb DSchangedStateText=ff99ccff +DS3DAxisXColor=ffff0000 +DS3DAxisYColor=ff00A000 +DS3DAxisZColor=ff0000ff ;DS controls theme END BackgroundColorAlternate=alternateBackground diff --git a/share/qtcreator/themes/design.creatortheme b/share/qtcreator/themes/design.creatortheme index 914a717bdf..996befe891 100644 --- a/share/qtcreator/themes/design.creatortheme +++ b/share/qtcreator/themes/design.creatortheme @@ -61,6 +61,9 @@ DScontrolBackgroundInteraction=ff404040 DStranslationIndicatorBorder=ff7f7f7f DSsectionHeadBackground=ff191919 DSchangedStateText=ff99ccff +DS3DAxisXColor=ffd00000 +DS3DAxisYColor=ff009900 +DS3DAxisZColor=ff5050ff ;DS controls theme END BackgroundColorAlternate=alternateBackground diff --git a/share/qtcreator/themes/flat-dark.creatortheme b/share/qtcreator/themes/flat-dark.creatortheme index 1df02cd463..89150801ff 100644 --- a/share/qtcreator/themes/flat-dark.creatortheme +++ b/share/qtcreator/themes/flat-dark.creatortheme @@ -61,6 +61,9 @@ DScontrolBackgroundInteraction=ff4d4d4d DStranslationIndicatorBorder=ff7f7f7f DSsectionHeadBackground=ff424242 DSchangedStateText=ff99ccff +DS3DAxisXColor=ffe00000 +DS3DAxisYColor=ff009900 +DS3DAxisZColor=ff6060ff ;DS controls theme END BackgroundColorAlternate=alternateBackground diff --git a/share/qtcreator/themes/flat-light.creatortheme b/share/qtcreator/themes/flat-light.creatortheme index b8b4e7eabd..9c07ef1f6e 100644 --- a/share/qtcreator/themes/flat-light.creatortheme +++ b/share/qtcreator/themes/flat-light.creatortheme @@ -57,6 +57,9 @@ DScontrolBackgroundInteraction=ff777777 DStranslationIndicatorBorder=ffebebeb DSsectionHeadBackground=ffebebeb DSchangedStateText=ff99ccff +DS3DAxisXColor=ffff0000 +DS3DAxisYColor=ff00A000 +DS3DAxisZColor=ff0000ff ;DS controls theme END BackgroundColorAlternate=alternateBackground diff --git a/share/qtcreator/themes/flat.creatortheme b/share/qtcreator/themes/flat.creatortheme index e80a8d85f1..2565972643 100644 --- a/share/qtcreator/themes/flat.creatortheme +++ b/share/qtcreator/themes/flat.creatortheme @@ -55,6 +55,9 @@ DScontrolBackgroundInteraction=ff4d4d4d DStranslationIndicatorBorder=ff7f7f7f DSsectionHeadBackground=ff424242 DSchangedStateText=ff99ccff +DS3DAxisXColor=ffe00000 +DS3DAxisYColor=ff009900 +DS3DAxisZColor=ff6060ff ;DS controls theme END BackgroundColorAlternate=alternateBackground diff --git a/src/libs/utils/theme/theme.h b/src/libs/utils/theme/theme.h index e0f6e9cdb9..21ecc007c5 100644 --- a/src/libs/utils/theme/theme.h +++ b/src/libs/utils/theme/theme.h @@ -342,7 +342,10 @@ public: DScontrolBackgroundInteraction, DStranslationIndicatorBorder, DSsectionHeadBackground, - DSchangedStateText + DSchangedStateText, + DS3DAxisXColor, + DS3DAxisYColor, + DS3DAxisZColor }; enum Gradient { |