QmlDesigner.PropertyEditor: Also style SliderSpinBox

Moving the spin box style into its own component so it can
be shared.

Change-Id: I7e838a487c89106590e87eac6c725f68ce9c50f9
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>

3 files changed, 95 insertions, 52 deletions

diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomSpinBoxStyle.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomSpinBoxStyle.qml
new file mode 100644
index 0000000000..1e11856a22
--- /dev/null
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomSpinBoxStyle.qml
@@ -0,0 +1,86 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+****************************************************************************/
+
+import QtQuick 2.1
+import QtQuick.Controls 1.1 as Controls
+import QtQuick.Controls.Styles 1.1
+
+SpinBoxStyle {
+
+    selectionColor: spinBox.textColor
+    selectedTextColor: "black"
+    textColor: spinBox.textColor
+    padding.top: 3
+    padding.bottom: 1
+
+    incrementControl: Item {
+        implicitWidth: 14
+        implicitHeight: parent.height/2
+        opacity: styleData.upEnabled ? styleData.upPressed ? 0.5 : 1 : 0.5
+        Image {
+            source: "images/up-arrow.png"
+            anchors.centerIn: parent
+            anchors.verticalCenterOffset: 2
+            anchors.horizontalCenterOffset: -4
+        }
+    }
+
+    decrementControl: Item {
+        implicitWidth: 14
+        implicitHeight: parent.height/2
+        opacity: styleData.downEnabled ? styleData.downPressed ? 0.5 : 1 : 0.5
+        Image {
+            source: "images/down-arrow.png"
+            anchors.centerIn: parent
+            anchors.verticalCenterOffset: -1
+            anchors.horizontalCenterOffset: -4
+        }
+    }
+
+    background: Rectangle {
+        implicitWidth: Math.max(60, styleData.contentWidth)
+        implicitHeight: 23
+        border.color: borderColor
+        radius: 3
+        gradient: Gradient {
+            GradientStop {color: "#2c2c2c" ; position: 0}
+            GradientStop {color: "#343434" ; position: 0.15}
+            GradientStop {color: "#373737" ; position: 1}
+        }
+        Rectangle {
+            border.color: highlightColor
+            anchors.fill: parent
+            anchors.margins: -1
+            color: "transparent"
+            radius: 4
+            opacity: 0.3
+            visible: control.activeFocus
+        }
+    }
+}
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/SliderSpinBox.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/SliderSpinBox.qml
index 7b3c20a395..a36f9acf9a 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/SliderSpinBox.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/SliderSpinBox.qml
@@ -34,6 +34,10 @@ SpinBox {
     id: spinBox
     width: 76
 
+    property color borderColor: "#222"
+    property color highlightColor: "orange"
+    property color textColor: "#eee"
+
     function showSlider() {
         timer.stop()
         timer2.start()
@@ -106,4 +110,8 @@ SpinBox {
                 slider.opacity = 0;
         }
     }
+
+    style: CustomSpinBoxStyle {
+
+    }
 }
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/SpinBox.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/SpinBox.qml
index a093a6603e..6e5f6c06db 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/SpinBox.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/SpinBox.qml
@@ -90,57 +90,6 @@ Controls.SpinBox {
         }
     }
 
-    style: SpinBoxStyle {
-
-        selectionColor: spinBox.textColor
-        selectedTextColor: "black"
-        textColor: spinBox.textColor
-        padding.top: 3
-        padding.bottom: 1
-
-        incrementControl: Item {
-            implicitWidth: 14
-            implicitHeight: parent.height/2
-            opacity: styleData.upEnabled ? styleData.upPressed ? 0.5 : 1 : 0.5
-            Image {
-                source: "images/up-arrow.png"
-                anchors.centerIn: parent
-                anchors.verticalCenterOffset: 2
-                anchors.horizontalCenterOffset: -4
-            }
-        }
-
-        decrementControl: Item {
-            implicitWidth: 14
-            implicitHeight: parent.height/2
-            opacity: styleData.downEnabled ? styleData.downPressed ? 0.5 : 1 : 0.5
-            Image {
-                source: "images/down-arrow.png"
-                anchors.centerIn: parent
-                anchors.verticalCenterOffset: -1
-                anchors.horizontalCenterOffset: -4
-            }
-        }
-
-        background: Rectangle {
-            implicitWidth: Math.max(60, styleData.contentWidth)
-            implicitHeight: 23
-            border.color: borderColor
-            radius: 3
-            gradient: Gradient {
-                GradientStop {color: "#2c2c2c" ; position: 0}
-                GradientStop {color: "#343434" ; position: 0.15}
-                GradientStop {color: "#373737" ; position: 1}
-            }
-            Rectangle {
-                border.color: highlightColor
-                anchors.fill: parent
-                anchors.margins: -1
-                color: "transparent"
-                radius: 4
-                opacity: 0.3
-                visible: control.activeFocus
-            }
-        }
+    style: CustomSpinBoxStyle {
     }
 }