Add RangeSlider

This is basically Slider, except with two handles.
It's used to specify a range of values.

Task-number: QTBUG-48667
Change-Id: Ib4f9afe5dc8343e307610943d338a2b574a01e4d
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>

13 files changed, 170 insertions, 0 deletions

diff --git a/src/imports/controls/RangeSlider.qml b/src/imports/controls/RangeSlider.qml
new file mode 100644
index 00000000..e301eed2
--- /dev/null
+++ b/src/imports/controls/RangeSlider.qml
@@ -0,0 +1,136 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt Labs Controls module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** 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 The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/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 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.6
+import Qt.labs.controls 1.0
+import Qt.labs.templates 1.0 as T
+
+T.RangeSlider {
+    id: control
+
+    implicitWidth: Math.max(background ? background.implicitWidth : 0,
+        Math.max(track ? track.implicitWidth : 0,
+            first.handle ? first.handle.implicitWidth : 0,
+                second.handle ? second.handle.implicitWidth : 0) + leftPadding + rightPadding)
+    implicitHeight: Math.max(background ? background.implicitHeight : 0,
+        Math.max(track ? track.implicitHeight : 0,
+            first.handle ? first.handle.implicitHeight : 0,
+                second.handle ? second.handle.implicitHeight : 0) + topPadding + bottomPadding)
+
+    padding: 6
+
+    //! [firstHandle]
+    first.handle: Rectangle {
+        x: control.leftPadding + (horizontal ? control.first.visualPosition * (control.availableWidth - width) : (control.availableWidth - width) / 2)
+        y: control.topPadding + (horizontal ? (control.availableHeight - height) / 2 : control.first.visualPosition * (control.availableHeight - height))
+        implicitWidth: 20
+        implicitHeight: 20
+        radius: width / 2
+        border.width: activeFocus ? 2 : 1
+        border.color: activeFocus ? control.Theme.focusColor : control.Theme.frameColor
+        color: control.Theme.backgroundColor
+
+        readonly property bool horizontal: control.orientation === Qt.Horizontal
+
+        Rectangle {
+            x: (parent.width - width) / 2
+            y: (parent.height - height) / 2
+            width: 12
+            height: 12
+            radius: width / 2
+
+            color: Qt.tint(!control.enabled ? control.Theme.disabledColor :
+                            parent.activeFocus ? control.Theme.focusColor : control.Theme.accentColor,
+                            control.first.pressed ? control.Theme.pressColor : "transparent")
+        }
+    }
+    //! [firstHandle]
+
+    //! [secondHandle]
+    second.handle: Rectangle {
+        x: control.leftPadding + (horizontal ? control.second.visualPosition * (control.availableWidth - width) : (control.availableWidth - width) / 2)
+        y: control.topPadding + (horizontal ? (control.availableHeight - height) / 2 : control.second.visualPosition * (control.availableHeight - height))
+        implicitWidth: 20
+        implicitHeight: 20
+        radius: width / 2
+        border.width: activeFocus ? 2 : 1
+        border.color: activeFocus ? control.Theme.focusColor : control.Theme.frameColor
+        color: control.Theme.backgroundColor
+
+        readonly property bool horizontal: control.orientation === Qt.Horizontal
+
+        Rectangle {
+            x: (parent.width - width) / 2
+            y: (parent.height - height) / 2
+            width: 12
+            height: 12
+            radius: width / 2
+
+            color: Qt.tint(!control.enabled ? control.Theme.disabledColor :
+                            parent.activeFocus ? control.Theme.focusColor : control.Theme.accentColor,
+                            control.second.pressed ? control.Theme.pressColor : "transparent")
+        }
+    }
+    //! [secondHandle]
+
+    //! [track]
+    track: Rectangle {
+        x: control.leftPadding + (horizontal ? 0 : (control.availableWidth - width) / 2)
+        y: control.topPadding + (horizontal ? (control.availableHeight - height) / 2 : 0)
+        implicitWidth: horizontal ? 200 : 6
+        implicitHeight: horizontal ? 6 : 200
+        width: horizontal ? control.availableWidth : implicitWidth
+        height: horizontal ? implicitHeight : control.availableHeight
+
+        readonly property bool horizontal: control.orientation === Qt.Horizontal
+
+        radius: 3
+        border.color: control.Theme.frameColor
+        color: control.Theme.backgroundColor
+        scale: horizontal && control.mirrored ? -1 : 1
+
+        Rectangle {
+            x: parent.horizontal ? control.first.position * parent.width : 2
+            y: parent.horizontal ? 2 : control.second.visualPosition * parent.height + 2
+            width: parent.horizontal ? control.second.position * parent.width - control.first.position * parent.width - 4 : 2
+            height: parent.horizontal ? 2 : control.second.position * parent.height - control.first.position * parent.height - 4
+
+            radius: 3
+            color: control.enabled ? control.Theme.accentColor : control.Theme.disabledColor
+        }
+    }
+    //! [track]
+}
diff --git a/src/imports/controls/controls.pri b/src/imports/controls/controls.pri
index ee9c2e63..41651a24 100644
--- a/src/imports/controls/controls.pri
+++ b/src/imports/controls/controls.pri
@@ -11,6 +11,7 @@ QML_FILES = \
     PageIndicator.qml \
     ProgressBar.qml \
     RadioButton.qml \
+    RangeSlider.qml \
     ScrollBar.qml \
     ScrollIndicator.qml \
     Slider.qml \
diff --git a/src/imports/controls/doc/images/qtlabscontrols-rangeslider-background.png b/src/imports/controls/doc/images/qtlabscontrols-rangeslider-background.png
new file mode 100644
index 00000000..5b3c603b
--- /dev/null
+++ b/src/imports/controls/doc/images/qtlabscontrols-rangeslider-background.png
diff --git a/src/imports/controls/doc/images/qtlabscontrols-rangeslider-disabled.png b/src/imports/controls/doc/images/qtlabscontrols-rangeslider-disabled.png
new file mode 100644
index 00000000..0194a240
--- /dev/null
+++ b/src/imports/controls/doc/images/qtlabscontrols-rangeslider-disabled.png
diff --git a/src/imports/controls/doc/images/qtlabscontrols-rangeslider-first-handle-focused.png b/src/imports/controls/doc/images/qtlabscontrols-rangeslider-first-handle-focused.png
new file mode 100644
index 00000000..390a6399
--- /dev/null
+++ b/src/imports/controls/doc/images/qtlabscontrols-rangeslider-first-handle-focused.png
diff --git a/src/imports/controls/doc/images/qtlabscontrols-rangeslider-first-handle.png b/src/imports/controls/doc/images/qtlabscontrols-rangeslider-first-handle.png
new file mode 100644
index 00000000..e04ed6df
--- /dev/null
+++ b/src/imports/controls/doc/images/qtlabscontrols-rangeslider-first-handle.png
diff --git a/src/imports/controls/doc/images/qtlabscontrols-rangeslider-normal.png b/src/imports/controls/doc/images/qtlabscontrols-rangeslider-normal.png
new file mode 100644
index 00000000..7032728a
--- /dev/null
+++ b/src/imports/controls/doc/images/qtlabscontrols-rangeslider-normal.png
diff --git a/src/imports/controls/doc/images/qtlabscontrols-rangeslider-second-handle-focused.png b/src/imports/controls/doc/images/qtlabscontrols-rangeslider-second-handle-focused.png
new file mode 100644
index 00000000..803f8141
--- /dev/null
+++ b/src/imports/controls/doc/images/qtlabscontrols-rangeslider-second-handle-focused.png
diff --git a/src/imports/controls/doc/images/qtlabscontrols-rangeslider-second-handle.png b/src/imports/controls/doc/images/qtlabscontrols-rangeslider-second-handle.png
new file mode 100644
index 00000000..0fe3d630
--- /dev/null
+++ b/src/imports/controls/doc/images/qtlabscontrols-rangeslider-second-handle.png
diff --git a/src/imports/controls/doc/images/qtlabscontrols-rangeslider-track.png b/src/imports/controls/doc/images/qtlabscontrols-rangeslider-track.png
new file mode 100644
index 00000000..685a9d44
--- /dev/null
+++ b/src/imports/controls/doc/images/qtlabscontrols-rangeslider-track.png
diff --git a/src/imports/controls/doc/images/qtlabscontrols-rangeslider.gif b/src/imports/controls/doc/images/qtlabscontrols-rangeslider.gif
new file mode 100644
index 00000000..afd909f3
--- /dev/null
+++ b/src/imports/controls/doc/images/qtlabscontrols-rangeslider.gif
diff --git a/src/imports/controls/doc/src/qtlabscontrols-customize.qdoc b/src/imports/controls/doc/src/qtlabscontrols-customize.qdoc
index ec3bf839..89ff8456 100644
--- a/src/imports/controls/doc/src/qtlabscontrols-customize.qdoc
+++ b/src/imports/controls/doc/src/qtlabscontrols-customize.qdoc
@@ -207,6 +207,38 @@
             \snippet RadioButton.qml indicator
 
 
+    \section1 Customizing RangeSlider
+
+        RangeSlider consists of four visual items:
+        \l {Control::background}{background}, \l {RangeSlider::track}{track},
+        \l {RangeSlider::first}{first.handle} and
+        \l {RangeSlider::second.handle}{second.handle}.
+
+        \section3 Background
+
+            \image qtlabscontrols-rangeslider-background.png
+
+            RangeSlider has no background item by default.
+
+        \section3 Track
+
+            \image qtlabscontrols-rangeslider-track.png
+
+            \snippet RangeSlider.qml track
+
+        \section3 First Handle
+
+            \image qtlabscontrols-rangeslider-first-handle.png
+
+            \snippet RangeSlider.qml firstHandle
+
+        \section3 Second Handle
+
+            \image qtlabscontrols-rangeslider-second-handle.png
+
+            \snippet RangeSlider.qml secondHandle
+
+
     \section1 Customizing ScrollBar
 
         ScrollBar consists of two visual items: \l {Control::background}{background}
diff --git a/src/imports/controls/qtlabscontrolsplugin.cpp b/src/imports/controls/qtlabscontrolsplugin.cpp
index d1d88be2..8d042381 100644
--- a/src/imports/controls/qtlabscontrolsplugin.cpp
+++ b/src/imports/controls/qtlabscontrolsplugin.cpp
@@ -81,6 +81,7 @@ void QtLabsControlsPlugin::registerTypes(const char *uri)
     qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/PageIndicator.qml"))), uri, 1, 0, "PageIndicator");
     qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/ProgressBar.qml"))), uri, 1, 0, "ProgressBar");
     qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/RadioButton.qml"))), uri, 1, 0, "RadioButton");
+    qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/RangeSlider.qml"))), uri, 1, 0, "RangeSlider");
     qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/ScrollBar.qml"))), uri, 1, 0, "ScrollBar");
     qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/ScrollIndicator.qml"))), uri, 1, 0, "ScrollIndicator");
     qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/Slider.qml"))), uri, 1, 0, "Slider");