aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnatoly Kozlov <AnKozlov@luxoft.com>2018-03-22 16:32:10 +0100
committerDaniel d'Andrada <daniel.dandrada@luxoft.com>2018-03-29 09:49:24 +0000
commit8877d7cc39622b7cb36d9c312fc89ea3a7040df6 (patch)
tree3a8b76b171cc3d92c3a924825ec02f7d1ccf4ed7
parent07b994d496b42011720c275f32e36b8e0656c06d (diff)
[vehicle functions] Remove a custom slider
- In order to use standard components RoofSlider has been replaced with Slider Change-Id: I46540e6bc202b63e55445d11273ad206ea6b2428 Reviewed-by: Daniel d'Andrada <daniel.dandrada@luxoft.com>
-rw-r--r--apps/com.luxoft.vehicle/RoofPanel.qml3
-rw-r--r--apps/com.luxoft.vehicle/RoofSlider.qml94
2 files changed, 2 insertions, 95 deletions
diff --git a/apps/com.luxoft.vehicle/RoofPanel.qml b/apps/com.luxoft.vehicle/RoofPanel.qml
index e97614f4..b6b61c76 100644
--- a/apps/com.luxoft.vehicle/RoofPanel.qml
+++ b/apps/com.luxoft.vehicle/RoofPanel.qml
@@ -30,6 +30,7 @@
****************************************************************************/
import QtQuick 2.9
+import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import animations 1.0
@@ -40,7 +41,7 @@ Item {
property real roofOpenProgress: 0.0
- RoofSlider {
+ Slider {
id: roofSlider
anchors.top: parent.top
diff --git a/apps/com.luxoft.vehicle/RoofSlider.qml b/apps/com.luxoft.vehicle/RoofSlider.qml
deleted file mode 100644
index c223b2c5..00000000
--- a/apps/com.luxoft.vehicle/RoofSlider.qml
+++ /dev/null
@@ -1,94 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 Pelagicore AG
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Neptune 3 IVI UI.
-**
-** $QT_BEGIN_LICENSE:GPL-QTAS$
-** Commercial License Usage
-** Licensees holding valid commercial Qt Automotive Suite 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 https://www.qt.io/terms-conditions.
-** For further information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 or (at your option) any later version
-** approved by the KDE Free Qt Foundation. The licenses are as published by
-** the Free Software Foundation and appearing in the file LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-** SPDX-License-Identifier: GPL-3.0
-**
-****************************************************************************/
-
-import QtQuick 2.6
-import QtQuick.Controls 2.2
-import QtGraphicalEffects 1.0
-
-import com.pelagicore.styles.neptune 3.0
-
-Slider {
- id: root
-
- background: Item {
- implicitWidth: root.width
- implicitHeight: 110
-
- Rectangle {
- anchors.verticalCenter: parent.verticalCenter
- implicitWidth: root.width * root.visualPosition
- implicitHeight: 11
-
- color: "#555352"
- border.width: 1
- border.color: "#6d6b69"
-
- Rectangle {
- anchors.left: parent.right
- implicitWidth: root.width * (1 - root.visualPosition)
- implicitHeight: 11
-
- color: "#d5d0ce"
- border.width: 1
- border.color: "#e0dbd8"
- }
- }
- }
-
- handle: Item {
- width: 52
- height: 110
- x: root.leftPadding + root.visualPosition * (root.availableWidth - width)
- y: root.topPadding + root.availableHeight / 2 - height / 2
-
- RectangularGlow {
- id: glow
-
- anchors.fill: rect
- glowRadius: 2
- spread: 0.1
- color: NeptuneStyle.contrastColor
- opacity: 0.5
- cornerRadius: rect.radius
- }
-
- Rectangle {
- id: rect
-
- anchors.centerIn: parent
- implicitWidth: 52
- implicitHeight: 110
-
- color: NeptuneStyle.offMainColor
- radius: implicitWidth / 2
- }
- }
-}