Skip to content

Commit

Permalink
Moved CarDemo component to a module
Browse files Browse the repository at this point in the history
Moved the CarDemo component in the My Car page to a module. This makes it
easier to replace it with a different component, such as the Qt3D-based
component (in a separate repository).

Change-Id: I91147a1aa7483b9045feee9964cea4528c348836
Reviewed-by: Dominik Holland <[email protected]>
  • Loading branch information
mpersano committed Oct 3, 2016
1 parent d981152 commit 800bcbf
Show file tree
Hide file tree
Showing 4 changed files with 51 additions and 4 deletions.
36 changes: 36 additions & 0 deletions imports/shared/visualization/CarVisualization.qml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/****************************************************************************
**
** Copyright (C) 2016 Pelagicore AG
** Contact: http://www.qt.io/ or http://www.pelagicore.com/
**
** This file is part of the Neptune IVI UI.
**
** $QT_BEGIN_LICENSE:GPL3-PELAGICORE$
** Commercial License Usage
** Licensees holding valid commercial Pelagicore Neptune IVI UI
** 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
** Pelagicore. For licensing terms and conditions, contact us at:
** http://www.pelagicore.com.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.GPLv3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU General Public License version 3 requirements will be
** met: http://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
**
** SPDX-License-Identifier: GPL-3.0
**
****************************************************************************/

import QtQuick 2.1

Image {
property int overviewItem: 0
source: "white.png"
}
1 change: 1 addition & 0 deletions imports/shared/visualization/qmldir
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CarVisualization 1.0 CarVisualization.qml
File renamed without changes
18 changes: 14 additions & 4 deletions sysui/MyCar/MyCarOverview.qml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import QtQuick 2.1
import QtQuick.Layouts 1.0
import controls 1.0
import utils 1.0
import visualization 1.0

UIElement {
id: root
Expand Down Expand Up @@ -78,17 +79,26 @@ UIElement {
Layout.fillHeight: true

Loader {
id: demoLoader
width: parent.width
height: Style.vspan(15)
sourceComponent: carDemo
sourceComponent: carOverview
}
}
}

Component {
id: carDemo
Image {
source: "white.png"
id: carOverview
CarVisualization { }
}

Connections {
target: view
onCurrentIndexChanged: {
if (demoLoader.status == Loader.Ready) {
var demo = demoLoader.item;
demo.overviewItem = view.currentIndex;
}
}
}
}

0 comments on commit 800bcbf

Please sign in to comment.