Demo updates

Since the Neptune was used in recent demos for CES 2016, some offline changes were made and now they are pushed upstream. Changes: - new layout for Music application - unit conversion, metric to imp US - other UI improvements. Change-Id: I202eb88c382e840990b988d03e22d3b9f0d67fc1 Reviewed-by: Juergen Bocklage-Ryannel <[email protected]>
Kfanup · Feb 18, 2016 · 92bb87e · 92bb87e
1 parent b3f10d1
commit 92bb87e
Show file tree

Hide file tree

Showing 178 changed files with 1,570 additions and 499 deletions.
diff --git a/DimAndCsd.qml b/DimAndCsd.qml
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 Pelagicore AG
+** Copyright (C) 2016 Pelagicore AG
 ** Contact: http://www.qt.io/ or http://www.pelagicore.com/
 **
 ** This file is part of the Neptune IVI UI.

diff --git a/Main1024x768.qml b/Main1024x768.qml
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 Pelagicore AG
+** Copyright (C) 2016 Pelagicore AG
 ** Contact: http://www.qt.io/ or http://www.pelagicore.com/
 **
 ** This file is part of the Neptune IVI UI.

diff --git a/Main1280x800.qml b/Main1280x800.qml
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 Pelagicore AG
+** Copyright (C) 2016 Pelagicore AG
 ** Contact: http://www.qt.io/ or http://www.pelagicore.com/
 **
 ** This file is part of the Neptune IVI UI.

diff --git a/Main1920x1080.qml b/Main1920x1080.qml
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 Pelagicore AG
+** Copyright (C) 2016 Pelagicore AG
 ** Contact: http://www.qt.io/ or http://www.pelagicore.com/
 **
 ** This file is part of the Neptune IVI UI.

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Prerequisite
 
-Qt >= 5.2 (development done with Qt 5.5)
+Qt >= 5.5
 Unix system
 
 # Folder Structure
@@ -17,23 +17,27 @@ Unix system
 
 # Build
 
-build datasource qml plugin
+* Build datasource qml plugin
+
+        $ cd plugins/datasource
+
+        $ qmake && make && make install
 
 * Run scripts within the plugins/scripts folder to scan the media on the system
 
-    $ cd plugins/datasource
-    $ qmake && make && make install
+# Run entire UI
 
-# Run
+        $ qmlscene -I modules/ -I am-dummyimports/ DimAndCsd.qml
 
-    $ qmlscene -I modules -I am-dummyimports MainXXXX.qml
+or with the Application Manager
 
-or
+        $ appman --recreate-database -c $AM_CONFIG_FILE -c am-config.yaml
 
-    $ appman --recreate-database -c $AM_CONFIG_FILE -c am-config.yaml --verbose
+where `AM_CONFIG_FILE` is the path to the Application Manager `config.yaml` file (inside the template-opt folder within the Application Manager delivery). The default `config.yaml` points to the `/opt/am` folder. If that folder does not exists, make sure to update the config.yaml settings to the corresponding paths.
 
-where AM_CONFIG_FILE is path to the config.yaml file provided by the Application Manager
+# Media
 
+To get the media used within the Music and Movie app, download the zipped file and place the media.db and media folder inside the home folder. The download link: https://seafile.pelagicore.net/f/3713457142/
 
 # Common Terms Used In The Project
 

diff --git a/SimuMain.qml b/SimuMain.qml
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 Pelagicore AG
+** Copyright (C) 2016 Pelagicore AG
 ** Contact: http://www.qt.io/ or http://www.pelagicore.com/
 **
 ** This file is part of the Neptune IVI UI.

diff --git a/am-dummyimports/io/qt/ApplicationInstaller/ApplicationInstaller.js b/am-dummyimports/io/qt/ApplicationInstaller/ApplicationInstaller.js
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 Pelagicore AG
+** Copyright (C) 2016 Pelagicore AG
 ** Contact: http://www.qt.io/ or http://www.pelagicore.com/
 **
 ** This file is part of the Neptune IVI UI.

diff --git a/am-dummyimports/io/qt/ApplicationManager/ApplicationManager.qml b/am-dummyimports/io/qt/ApplicationManager/ApplicationManager.qml
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 Pelagicore AG
+** Copyright (C) 2016 Pelagicore AG
 ** Contact: http://www.qt.io/ or http://www.pelagicore.com/
 **
 ** This file is part of the Neptune IVI UI.

diff --git a/...t/ApplicationManager/PelagicoreWindow.qml → ...ationManager/ApplicationManagerWindow.qml b/...t/ApplicationManager/PelagicoreWindow.qml → ...ationManager/ApplicationManagerWindow.qml
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 Pelagicore AG
+** Copyright (C) 2016 Pelagicore AG
 ** Contact: http://www.qt.io/ or http://www.pelagicore.com/
 **
 ** This file is part of the Neptune IVI UI.

diff --git a/am-dummyimports/io/qt/ApplicationManager/WindowManager.qml b/am-dummyimports/io/qt/ApplicationManager/WindowManager.qml
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 Pelagicore AG
+** Copyright (C) 2016 Pelagicore AG
 ** Contact: http://www.qt.io/ or http://www.pelagicore.com/
 **
 ** This file is part of the Neptune IVI UI.

diff --git a/apps/NotAvailableYet.qml b/apps/NotAvailableYet.qml
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 Pelagicore AG
+** Copyright (C) 2016 Pelagicore AG
 ** Contact: http://www.qt.io/ or http://www.pelagicore.com/
 **
 ** This file is part of the Neptune IVI UI.

diff --git a/apps/com.pelagicore.browser/Browser.qml b/apps/com.pelagicore.browser/Browser.qml
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 Pelagicore AG
+** Copyright (C) 2016 Pelagicore AG
 ** Contact: http://www.qt.io/ or http://www.pelagicore.com/
 **
 ** This file is part of the Neptune IVI UI.

diff --git a/apps/com.pelagicore.movies/MovieCoverDelegate.qml b/apps/com.pelagicore.movies/MovieCoverDelegate.qml
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 Pelagicore AG
+** Copyright (C) 2016 Pelagicore AG
 ** Contact: http://www.qt.io/ or http://www.pelagicore.com/
 **
 ** This file is part of the Neptune IVI UI.

diff --git a/apps/com.pelagicore.movies/MoviePlayer.qml b/apps/com.pelagicore.movies/MoviePlayer.qml
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 Pelagicore AG
+** Copyright (C) 2016 Pelagicore AG
 ** Contact: http://www.qt.io/ or http://www.pelagicore.com/
 **
 ** This file is part of the Neptune IVI UI.

diff --git a/apps/com.pelagicore.movies/MovieProvider.qml b/apps/com.pelagicore.movies/MovieProvider.qml
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 Pelagicore AG
+** Copyright (C) 2016 Pelagicore AG
 ** Contact: http://www.qt.io/ or http://www.pelagicore.com/
 **
 ** This file is part of the Neptune IVI UI.

diff --git a/apps/com.pelagicore.movies/MovieTracks.qml b/apps/com.pelagicore.movies/MovieTracks.qml
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 Pelagicore AG
+** Copyright (C) 2016 Pelagicore AG
 ** Contact: http://www.qt.io/ or http://www.pelagicore.com/
 **
 ** This file is part of the Neptune IVI UI.

diff --git a/apps/com.pelagicore.movies/Movies.qml b/apps/com.pelagicore.movies/Movies.qml
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 Pelagicore AG
+** Copyright (C) 2016 Pelagicore AG
 ** Contact: http://www.qt.io/ or http://www.pelagicore.com/
 **
 ** This file is part of the Neptune IVI UI.

diff --git a/apps/com.pelagicore.music/AlbumScreen.qml b/apps/com.pelagicore.music/AlbumScreen.qml
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 Pelagicore AG
+** Copyright (C) 2016 Pelagicore AG
 ** Contact: http://www.qt.io/ or http://www.pelagicore.com/
 **
 ** This file is part of the Neptune IVI UI.

diff --git a/apps/com.pelagicore.music/ClusterWidget.qml b/apps/com.pelagicore.music/ClusterWidget.qml
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 Pelagicore AG
+** Copyright (C) 2016 Pelagicore AG
 ** Contact: http://www.qt.io/ or http://www.pelagicore.com/
 **
 ** This file is part of the Neptune IVI UI.

diff --git a/apps/com.pelagicore.music/CoverItem.qml b/apps/com.pelagicore.music/CoverItem.qml
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 Pelagicore AG
+** Copyright (C) 2016 Pelagicore AG
 ** Contact: http://www.qt.io/ or http://www.pelagicore.com/
 **
 ** This file is part of the Neptune IVI UI.

diff --git a/apps/com.pelagicore.music/CurrentTrackScreen.qml b/apps/com.pelagicore.music/CurrentTrackScreen.qml
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 Pelagicore AG
+** Copyright (C) 2016 Pelagicore AG
 ** Contact: http://www.qt.io/ or http://www.pelagicore.com/
 **
 ** This file is part of the Neptune IVI UI.
@@ -44,13 +44,16 @@ UIScreen {
     title: 'Music'
 
     property var track: MusicProvider.currentEntry
+    property bool libraryVisible: false
 
     signal showAlbums()
 
     ColumnLayout {
-        width: Style.hspan(14)
+        id: musicControl
+        width: Style.hspan(12)
         height: Style.vspan(20)
-        anchors.centerIn: parent
+        anchors.horizontalCenter: parent.horizontalCenter
+        anchors.verticalCenter: parent.verticalCenter
         spacing: 0
         Spacer {}
         RowLayout {
@@ -76,7 +79,7 @@ UIScreen {
                 width: Style.cellWidth * 6
                 height: Style.cellHeight * 12
 
-                items: MusicProvider.model
+                items: MusicProvider.nowPlaying.model
 
                 currentViewIndex: MusicProvider.currentIndex
 
@@ -108,20 +111,40 @@ UIScreen {
                 }
             }
         }
-        Slider {
+
+        RowLayout {
             anchors.horizontalCenter: parent.horizontalCenter
-            hspan: 10
-            value: MusicService.position
-            minimum: 0.00
-            maximum: MusicService.duration
-            vspan: 1
-            function valueToString() {
-                return Math.floor(value/60000) + ':' + Math.floor((value/1000)%60)
+            spacing: 10
+
+            Label {
+                hspan: 1
+                text: MusicService.currentTime
+                font.pixelSize: Style.fontSizeS
             }
-            onActiveValueChanged: {
-                MusicService.seek(activeValue)
+
+            Slider {
+                id: slider
+                //anchors.horizontalCenter: parent.horizontalCenter
+                hspan: 9
+                value: MusicService.position
+                minimum: 0.00
+                maximum: MusicService.duration
+                vspan: 1
+                function valueToString() {
+                    return Math.floor(value/60000) + ':' + Math.floor((value/1000)%60)
+                }
+                onActiveValueChanged: {
+                    MusicService.seek(activeValue)
+                }
+            }
+
+            Label {
+                hspan: 1
+                text: MusicService.durationTime
+                font.pixelSize: Style.fontSizeS
             }
         }
+
         RowLayout {
             anchors.horizontalCenter: parent.horizontalCenter
             spacing: 0
@@ -175,10 +198,107 @@ UIScreen {
         }
     }
 
-    PlaylistContainer {
-            onClicked: pathView.currentViewIndex = index
+    Library {
+        id: library
+        x: parent.width
+        opacity: 0
+        visible: opacity > 0
+        onClose: {
+            root.libraryVisible = false
+        }
+    }
+
+    UIElement {
+        id: sourceOption
+        hspan: 4
+        vspan: 12
+        anchors.right: musicControl.left
+        anchors.rightMargin: 60
+        anchors.verticalCenter: parent.verticalCenter
+        anchors.verticalCenterOffset: -60
+
+        Column {
+            spacing: 1
+            Button {
+                hspan: 4
+                vspan: 4
+                text: "BLUETOOTH"
+                label.font.pixelSize: Style.fontSizeL
+            }
+            Button {
+                hspan: 4
+                vspan: 4
+                text: "USB"
+                enabled: false
+                label.font.pixelSize: Style.fontSizeL
+            }
+            Button {
+                hspan: 4
+                vspan: 4
+                text: "SPOTIFY"
+                enabled: false
+                label.font.pixelSize: Style.fontSizeL
+            }
+        }
+    }
+
+    TextTool {
+        id: libraryButton
+        hspan: 3
+        vspan: 5
+        anchors.left: musicControl.right
+        anchors.leftMargin: 30
+        anchors.verticalCenter: parent.verticalCenter
+        size: 72
+
+        name: "music"
+        text: "LIBRARY"
+
+        onClicked: root.libraryVisible = true
     }
 
     Component.onCompleted: MusicProvider.selectRandomTracks()
 
+    states: State {
+        name: "libaryMode"; when: root.libraryVisible
+
+        PropertyChanges {
+            target: library
+            opacity: 1
+            x: root.width - library.width
+        }
+
+        PropertyChanges {
+            target: libraryButton
+            opacity: 0
+        }
+
+        PropertyChanges {
+            target: sourceOption
+            opacity: 0
+        }
+
+        AnchorChanges {
+            target: musicControl
+            anchors.horizontalCenter: undefined
+        }
+
+        PropertyChanges {
+            target: musicControl
+            x: 0
+        }
+    }
+
+    transitions: Transition {
+        from: ""; to: "libaryMode"; reversible: true
+
+        ParallelAnimation {
+            NumberAnimation { target: library; properties: "opacity"; duration: 400 }
+            NumberAnimation { target: library; properties: "x"; duration: 300 }
+            NumberAnimation { target: libraryButton; properties: "opacity"; duration: 300 }
+            NumberAnimation { target: sourceOption; properties: "opacity"; duration: 300 }
+            NumberAnimation { target: musicControl; properties: "x"; duration: 300 }
+        }
+    }
+
 }