QmlDesigner: Add 3d axis colors to theme

Task-number: QDS-2404 Change-Id: I16f9deb7ba6698adafdd1cc0c8bec868731e1aa8 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-10 14:31:59 +03:00
parent b9b725eafa
commit 6eee8aa99d
9 changed files with 30 additions and 1 deletions
--- 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)
 }
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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 {