diff options
author | Nedim Hadzic <nedim.hadzic@pelagicore.com> | 2017-06-23 10:04:59 +0200 |
---|---|---|
committer | Nedim Hadzic <nedim.hadzic@pelagicore.com> | 2017-06-23 08:56:37 +0000 |
commit | 3fc862c8893775d7c822500af7d87b1199e0a576 (patch) | |
tree | cf2fef920b41e7dc96edd62094e8f86598d9d78a | |
parent | 17749bf068d466cbf84dd09f270cff992dbecc30 (diff) |
Remove Navigation model
This model does not have real purpose
and should be removed. It was added only for
one demo.
Change-Id: I6e2ef295140400130a013f6edeb6cbe7b12e0bbe
Reviewed-by: Bramastyo Harimukti Santoso <bramastyo.harimukti.santoso@pelagicore.com>
-rw-r--r-- | imports/system/models/application/ApplicationManagerModel.qml | 1 | ||||
-rw-r--r-- | imports/system/models/navigation/NavigationModel.qml | 58 | ||||
-rw-r--r-- | imports/system/models/navigation/qmldir | 1 | ||||
-rw-r--r-- | sysui/cluster/Notifications.qml | 3 | ||||
-rw-r--r-- | sysui/cluster/RightDial.qml | 1 | ||||
-rw-r--r-- | sysui/widgets/MapWidget.qml | 9 |
6 files changed, 1 insertions, 72 deletions
diff --git a/imports/system/models/application/ApplicationManagerModel.qml b/imports/system/models/application/ApplicationManagerModel.qml index 2038109..edd6f8a 100644 --- a/imports/system/models/application/ApplicationManagerModel.qml +++ b/imports/system/models/application/ApplicationManagerModel.qml @@ -32,7 +32,6 @@ pragma Singleton import QtQuick 2.0 import QtApplicationManager 1.0 -import models.navigation 1.0 import utils 1.0 QtObject { diff --git a/imports/system/models/navigation/NavigationModel.qml b/imports/system/models/navigation/NavigationModel.qml deleted file mode 100644 index c103150..0000000 --- a/imports/system/models/navigation/NavigationModel.qml +++ /dev/null @@ -1,58 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 Pelagicore AG -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Neptune 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 -** -****************************************************************************/ - -pragma Singleton - -import QtQuick 2.0 - -QtObject { - id: root - - property string defaultNavApp - - property string distanceString - property string etaString - property string lastKnownDirection - - property string currentStreet - - property bool nightMode - property bool satelliteMode - - function toggleNightMode() { - nightMode = !nightMode - satelliteMode = false - } - - function toggleSatelliteMode() { - satelliteMode = !satelliteMode - } -} diff --git a/imports/system/models/navigation/qmldir b/imports/system/models/navigation/qmldir deleted file mode 100644 index 9bc74a5..0000000 --- a/imports/system/models/navigation/qmldir +++ /dev/null @@ -1 +0,0 @@ -singleton NavigationModel 1.0 NavigationModel.qml diff --git a/sysui/cluster/Notifications.qml b/sysui/cluster/Notifications.qml index f585e48..f179528 100644 --- a/sysui/cluster/Notifications.qml +++ b/sysui/cluster/Notifications.qml @@ -32,7 +32,6 @@ import QtQuick 2.6 import controls 1.0 import utils 1.0 -import models.navigation 1.0 Item { width: background.width @@ -48,7 +47,7 @@ Item { } Image { - source: Style.symbol(NavigationModel.nextTurnImage, 0, false) + source: Style.symbol("arrow", 0, false) anchors.horizontalCenter: distanceText.horizontalCenter anchors.top: background.top height: 50 diff --git a/sysui/cluster/RightDial.qml b/sysui/cluster/RightDial.qml index a8acd39..0d00034 100644 --- a/sysui/cluster/RightDial.qml +++ b/sysui/cluster/RightDial.qml @@ -34,7 +34,6 @@ import utils 1.0 import QtQuick.Controls 2.1 import controls 1.0 import models.vehicle 1.0 -import models.navigation 1.0 Item { id: root diff --git a/sysui/widgets/MapWidget.qml b/sysui/widgets/MapWidget.qml index 9f240a6..7d299c3 100644 --- a/sysui/widgets/MapWidget.qml +++ b/sysui/widgets/MapWidget.qml @@ -35,7 +35,6 @@ import QtQuick.Controls 2.1 import controls 1.0 import utils 1.0 -import models.navigation 1.0 import models.application 1.0 UIPanel { @@ -49,14 +48,6 @@ UIPanel { id: dummyBase anchors.fill: parent source: "heremap.png" - visible: NavigationModel.defaultNavApp ? false : true - } - - Label { - id: loadingLabel - anchors.centerIn: parent - text: "Loading Map Widget ..." - visible: NavigationModel.defaultNavApp ? true : false } } |