QmlDesigner.propertyEditor: fix buttons for color editing

share/qtcreator/qmldesigner/propertyeditor/Qt/ColorTypeButtons.qml

@@ -1,68 +1,112 @@
 import Qt 4.7
 import Bauhaus 1.0
 
-QGroupBox {
+QWidget {
-    id: colorTypeButtons
+    property bool showGradientButton
-    layout: HorizontalLayout {
+
-        topMargin: 6
+    property bool gradient: gradientButton.checked
-        rightMargin: 10;
+    property bool none: noneButton.checked
-        Label {
+    property bool solid: solidButton.checked
-            text: "Type"
+
+    property bool setGradient: false
+    property bool setNone: false
+    property bool setSolid: false
+
+    onSetGradientChanged: {
+        if (setGradient == true) {
+            gradientButton.checked = true;
+            setGradient = false;
+        }
+    }
+
+    onSetNoneChanged: {
+        if (setNone == true) {
+            noneButton.checked = true;
+            setNone = false;
+        }
+    }
+
+    onSetSolidChanged: {
+        if (setSolid == true) {
+            solidButton.checked = true;
+            setSolid = false;
+        }
+    }
+
+    fixedHeight: 28
+    fixedWidth: 93
+    width: fixedWidth
+    height: fixedHeight
+    enabled: isBaseState
+
+    QPushButton {
+        id: solidButton
+        x: 0
+        checkable: true
+        checked: true
+        fixedWidth: 31
+        fixedHeight: 28
+
+        styleSheetFile: "solidcolorbutton.css";
+
+        onToggled: {
+            if (checked) {
+                gradientButton.checked = false;
+                noneButton.checked = false;
+            }
+        }
+        onClicked: {
+            gradientButton.checked = false;
+            noneButton.checked = false;
+            checked = true;
+        }
+    }
+
+    QPushButton {
+        visible: showGradientButton
+        id: gradientButton
+        x: 31
+        checkable: true
+        fixedWidth: 31
+        fixedHeight: 28
+
+        styleSheetFile: "gradientcolorbutton.css";
+
+
+        onToggled: {
+            if (checked) {
+                solidButton.checked = false;
+                noneButton.checked = false;
+            }
         }
 
-        QWidget {
+        onClicked: {
-            fixedHeight: 32
+            solidButton.checked = false;
+            noneButton.checked = false;
+            checked = true;
+        }
+    }
 
-            QPushButton {
+    QPushButton {
-                id: noneButton
+        id: noneButton
-                checkable: true
+        x: showGradientButton ? 62 : 31;
-                fixedWidth: 32
+        checkable: true
-                fixedHeight: 32
+        fixedWidth: 31
-                styleSheetFile: "nonecolorbutton.css";
+        fixedHeight: 28
-
+        styleSheetFile: "nonecolorbutton.css";
-                onToggled: {
-                    if (checked) {
-                        gradientButton.checked = false;
-                        solidButton.checked = false;
-                    }
-                }
 
+        onToggled: {
+            if (checked) {
+                gradientButton.checked = false;
+                solidButton.checked = false;
             }
-            QPushButton {
+        }
-                id: solidButton
-                x: 32
-                checkable: true
-                fixedWidth: 32
-                fixedHeight: 32
 
-                styleSheetFile: "solidcolorbutton.css";
+        onClicked: {
-
+            gradientButton.checked = false;
-                onToggled: {
+            solidButton.checked = false;
-                    if (checked) {
+            checked = true;
-                        gradientButton.checked = false;
-                        noneButton.checked = false;
-                    }
-                }
-
-            }
-            QPushButton {
-                id: gradientButton
-                x: 64
-                checkable: true
-                fixedWidth: 32
-                fixedHeight: 32
-
-                styleSheetFile: "gradientcolorbutton.css";
-
-                onToggled: {
-                    if (checked) {
-                        solidButton.checked = false;
-                        noneButton.checked = false;
-                    }
-                }
-            }
         }
 
     }
-
 }