Remove left-over settings in cloud page

Task-number: QAUTO-554
Change-Id: Ib8288b3c026a0738ede3fb207d457647bc8c2ad3
Reviewed-by: Daniel d'Andrada <daniel.dandrada@luxoft.com>

4 files changed, 4 insertions, 142 deletions

diff --git a/sysui/cloud/CloudPage.qml b/sysui/cloud/CloudPage.qml
index de4f324..c5ff5a8 100644
--- a/sysui/cloud/CloudPage.qml
+++ b/sysui/cloud/CloudPage.qml
@@ -46,7 +46,7 @@ UIPage {
         symbolName: 'my_cloud'
     }
 
-    StoreScreen {
-        anchors.fill: parent
+    AppStoreController {
+        anchors.fill: parent; anchors.topMargin: Style.vspan(1)
     }
 }
diff --git a/sysui/cloud/JSONBackend.js b/sysui/cloud/JSONBackend.js
index e48f149..c207df4 100644
--- a/sysui/cloud/JSONBackend.js
+++ b/sysui/cloud/JSONBackend.js
@@ -57,7 +57,7 @@ function serverCall(url, data, dataReadyFunction, xhr) {
         xhr = new XMLHttpRequest()
     }
 
-    console.log(Logging.sysui, "HTTP GET to " + url);
+    console.log("HTTP GET to " + url);
     if (xhr.readyState != 0) {
         xhr.abort();
     }
@@ -70,7 +70,7 @@ function serverCall(url, data, dataReadyFunction, xhr) {
                 var data = JSON.parse(xhr.responseText);
                 return dataReadyFunction(data)
             } else {
-                console.log(Logging.sysui, "JSONBackend: " + xhr.status + xhr.statusText)
+                console.log("JSONBackend: " + xhr.status + xhr.statusText)
                 errorCounter++
                 if (errorCounter >= 3 && errorFunc) {
                     errorFunc()
diff --git a/sysui/cloud/Settings/SettingsScreen.qml b/sysui/cloud/Settings/SettingsScreen.qml
deleted file mode 100644
index e80f4a5..0000000
--- a/sysui/cloud/Settings/SettingsScreen.qml
+++ /dev/null
@@ -1,93 +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
-**
-****************************************************************************/
-
-import QtQml.Models 2.2
-import QtQuick 2.6
-import QtQuick.Controls 2.0
-
-import controls 1.0
-import utils 1.0
-import models.settings 1.0
-import models.application 1.0
-
-Control {
-    id: root
-    width: Style.hspan(24)
-    height: Style.vspan(21)
-
-    ListViewManager {
-        id: view
-
-        anchors.horizontalCenter: parent.horizontalCenter
-        anchors.top: parent.top;
-        anchors.bottom: parent.bottom
-        width: Style.hspan(16)
-
-        model: ObjectModel {
-            SettingsItemDelegate {
-                text: "USER PROFILE"; icon: "profile"; checked: true; hasChildren: true
-            }
-            SettingsItemDelegate {
-                text: "SERVICE & SUPPORT"; icon: "service"; checkable: false
-            }
-            SettingsItemDelegate {
-                text: "TRAFFIC INFORMATION"; icon: "warning"; checked: true; hasChildren: true
-            }
-            SettingsItemDelegate {
-                text: "METRIC SYSTEM"; icon: "fees"; checked: true; hasChildren: false
-                onClicked: {
-                    SettingsModel.unitSystem = checked ? "metric" : "imp_us";
-                }
-            }
-            SettingsItemDelegate {
-                text: "APP UPDATES"; icon: "updates"; checked: true; hasChildren: true
-            }
-            SettingsItemDelegate {
-                text: "SYSTEM MONITOR"; icon: "insurance"; checkable: false; hasChildren: true
-                onClicked: {
-                    systemMonitorLoader.active = true
-                    ApplicationManagerModel.applicationSurfaceReady(systemMonitorLoader.item, false)
-                }
-            }
-        }
-    }
-
-
-    // TODO: Fix this relative loading. E.g. do not use '..' in paths here
-    Loader {
-        id: systemMonitorLoader
-        active: false
-        source: Qt.resolvedUrl("../../dev/SystemMonitor/MainScreen.qml")
-    }
-
-    Tracer {}
-
-}
diff --git a/sysui/cloud/StoreScreen.qml b/sysui/cloud/StoreScreen.qml
deleted file mode 100644
index 83d49ae..0000000
--- a/sysui/cloud/StoreScreen.qml
+++ /dev/null
@@ -1,45 +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
-**
-****************************************************************************/
-
-import QtQuick 2.6
-import QtQuick.Controls 2.0
-import QtQuick.Layouts 1.0
-
-import controls 1.0
-import utils 1.0
-
-Item {
-    id: root
-
-    AppStoreController {
-        anchors.fill: parent; anchors.topMargin: Style.vspan(1)
-    }
-}