QmlDesigner.propertyEditor: fix buttons for color editing

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

@@ -1,39 +1,51 @@
 import Qt 4.7
 import Bauhaus 1.0
 
-QGroupBox {
+QWidget {
-    id: colorTypeButtons
+    property bool showGradientButton
-    layout: HorizontalLayout {
-        topMargin: 6
-        rightMargin: 10;
-        Label {
-            text: "Type"
-        }
 
-        QWidget {
+    property bool gradient: gradientButton.checked
-            fixedHeight: 32
+    property bool none: noneButton.checked
+    property bool solid: solidButton.checked
 
-            QPushButton {
+    property bool setGradient: false
-                id: noneButton
+    property bool setNone: false
-                checkable: true
+    property bool setSolid: false
-                fixedWidth: 32
-                fixedHeight: 32
-                styleSheetFile: "nonecolorbutton.css";
 
-                onToggled: {
+    onSetGradientChanged: {
-                    if (checked) {
+        if (setGradient == true) {
-                        gradientButton.checked = false;
+            gradientButton.checked = true;
-                        solidButton.checked = false;
+            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: 32
+        x: 0
         checkable: true
-                fixedWidth: 32
+        checked: true
-                fixedHeight: 32
+        fixedWidth: 31
+        fixedHeight: 28
 
         styleSheetFile: "solidcolorbutton.css";
 
@@ -43,26 +55,58 @@ QGroupBox {
                 noneButton.checked = false;
             }
         }
-
+        onClicked: {
+            gradientButton.checked = false;
+            noneButton.checked = false;
+            checked = true;
         }
+    }
+
     QPushButton {
+        visible: showGradientButton
         id: gradientButton
-                x: 64
+        x: 31
         checkable: true
-                fixedWidth: 32
+        fixedWidth: 31
-                fixedHeight: 32
+        fixedHeight: 28
 
         styleSheetFile: "gradientcolorbutton.css";
 
+
         onToggled: {
             if (checked) {
                 solidButton.checked = false;
                 noneButton.checked = false;
             }
         }
+
+        onClicked: {
+            solidButton.checked = false;
+            noneButton.checked = false;
+            checked = true;
         }
     }
 
+    QPushButton {
+        id: noneButton
+        x: showGradientButton ? 62 : 31;
+        checkable: true
+        fixedWidth: 31
+        fixedHeight: 28
+        styleSheetFile: "nonecolorbutton.css";
+
+        onToggled: {
+            if (checked) {
+                gradientButton.checked = false;
+                solidButton.checked = false;
+            }
         }
 
+        onClicked: {
+            gradientButton.checked = false;
+            solidButton.checked = false;
+            checked = true;
+        }
+
+    }
 }