Update settings page and remove settings in mycloud page

- update settings page with some additional settings mockup
- added several new listitem variant

Task-number: QTAUTO-554
Change-Id: Ic5af72f7c2803a37ab0f9c9f664b686d5d0ea138
Reviewed-by: Lukáš Tinkl <ltinkl@luxoft.com>

28 files changed, 366 insertions, 121 deletions

diff --git a/imports/shared/controls/ListItem.qml b/imports/shared/controls/ListItem.qml
index a6eb82d..cb331eb 100644
--- a/imports/shared/controls/ListItem.qml
+++ b/imports/shared/controls/ListItem.qml
@@ -39,42 +39,50 @@ import utils 1.0
 ItemDelegate {
     id: root
 
+    anchors.left: parent.left
+    anchors.leftMargin: Style.hspan(2)
+
     property alias icon: icon.name
     property alias hasChildren: childIndicator.visible
 
-    background: Item {
-        anchors.fill: root
-    }
-
-    contentItem: Control {
+    contentItem: Item {
         anchors.fill: root
         RowLayout {
             height: parent.height
 
             Symbol {
                 id: icon
-                Layout.preferredWidth: Style.hspan(2)
+                Layout.preferredWidth: Style.hspan(1)
                 Layout.fillHeight: true
                 opacity: 0.4
+                visible: name !== ""
+            }
+
+            Item {
+                id: placeHolder
+                width: Style.hspan(0.2)
+                height: parent.height
+                visible: !icon.visible
             }
 
             Label {
                 id: titleLabel
                 Layout.preferredWidth: Style.hspan(18)
                 Layout.fillHeight: true
-                text: root.text
                 elide: Text.ElideRight
+                text: root.text
             }
+        }
 
-            Icon {
-                id: childIndicator
-                Layout.preferredWidth: Style.hspan(2)
-                Layout.fillHeight: true
-                source: Style.icon("cloud_arrow")
-            }
+        Icon {
+            id: childIndicator
+            anchors.right: parent.right
+            width: Style.hspan(1)
+            Layout.fillHeight: true
+            source: Style.icon("cloud_arrow")
         }
 
-        Control {
+        Item {
             width: root.width
             anchors.verticalCenter: parent.bottom
             anchors.horizontalCenter: parent.horizontalCenter
diff --git a/imports/shared/controls/ListItemRadioButton.qml b/imports/shared/controls/ListItemRadioButton.qml
index eb5c7ac..c0a1cd6 100644
--- a/imports/shared/controls/ListItemRadioButton.qml
+++ b/imports/shared/controls/ListItemRadioButton.qml
@@ -45,18 +45,18 @@ ListItem {
 
     // Replace this with asset when available
     Rectangle {
-        width: Style.vspan(0.6)
+        width: Style.hspan(0.4)
         height: width
         radius: width
-        border.width: Style.vspan(0.08)
+        border.width: Style.hspan(0.04)
         border.color: Style.colorWhite
         anchors.verticalCenter: parent.verticalCenter
         anchors.right: parent.right
-        anchors.rightMargin: Style.vspan(6)
+        anchors.rightMargin: Style.vspan(4)
         color: "transparent"
 
         Rectangle {
-            width: Style.vspan(0.3)
+            width: Style.hspan(0.3)
             height: width
             radius: width
             anchors.centerIn: parent
diff --git a/sysui/settings/system/SystemSettings.qml b/imports/shared/controls/ListItemSwitch.qml
index 46269fe..5ece787 100644
--- a/sysui/settings/system/SystemSettings.qml
+++ b/imports/shared/controls/ListItemSwitch.qml
@@ -30,36 +30,22 @@
 ****************************************************************************/
 
 import QtQuick 2.6
+import QtQuick.Layouts 1.0
 import QtQuick.Controls 2.2
 
 import controls 1.0
 import utils 1.0
-import models.settings 1.0
 
-Item {
+ListItem {
     id: root
-    width: Style.hspan(24)
-    height: Style.vspan(20)
-
-    ListModel {
-        id: pageModel
-        ListElement {
-            title: "Language Settings"
-            page: "language/LanguageSettings.qml"
-        }
-    }
-
-    ListView {
-        id: settingsListView
-        model: pageModel
-        anchors.fill: parent
-        boundsBehavior: Flickable.StopAtBounds
-        delegate: ListItem {
-            width: settingsListView.width
-            height: Style.vspan(2)
-            text: title
-            onClicked: stackView.push(Qt.resolvedUrl(page))
-        }
 
+    Switch {
+        id: switchControl
+        Layout.preferredWidth: Style.hspan(5)
+        Layout.fillHeight: true
+        anchors.verticalCenter: parent.verticalCenter
+        anchors.right: parent.right
+        checked: root.checked
+        onClicked: root.clicked()
     }
 }
diff --git a/imports/shared/controls/ListViewManager.qml b/imports/shared/controls/ListViewManager.qml
index 222c187..c05e115 100644
--- a/imports/shared/controls/ListViewManager.qml
+++ b/imports/shared/controls/ListViewManager.qml
@@ -37,6 +37,7 @@ import utils 1.0
 ListView {
     id: root
     clip: true
+    boundsBehavior: Flickable.StopAtBounds
     ScrollBar.vertical: ScrollBar { }
 }
 
diff --git a/imports/shared/controls/qmldir b/imports/shared/controls/qmldir
index f6d66e9..fe6b909 100644
--- a/imports/shared/controls/qmldir
+++ b/imports/shared/controls/qmldir
@@ -17,6 +17,7 @@ ListViewManager 1.0 ListViewManager.qml
 Divider 1.0 Divider.qml
 ListItem 1.0 ListItem.qml
 ListItemRadioButton 1.0 ListItemRadioButton.qml
+ListItemSwitch 1.0 ListItemSwitch.qml
 AppStackView 1.0 AppStackView.qml
 Popup 1.0 Popup.qml
 LetterPicker 1.0 LetterPicker.qml
diff --git a/imports/system/models/settings/SettingsModel.qml b/imports/system/models/settings/SettingsModel.qml
index f3eb69a..e0fa682 100644
--- a/imports/system/models/settings/SettingsModel.qml
+++ b/imports/system/models/settings/SettingsModel.qml
@@ -41,6 +41,14 @@ QtObject {
     property string unitSystem: "metric"  // "metric" or "imp_us"
     readonly property bool metric: unitSystem === "metric"
 
+    readonly property ListModel profiles: ListModel {
+        ListElement { name: "Driver 1" }
+        ListElement { name: "Driver 2" }
+        ListElement { name: "Driver 3" }
+        ListElement { name: "Driver 4" }
+    }
+    property int currentProfileIndex: 0
+
     readonly property ListModel languages: ListModel {
         ListElement { name: "en_GB" }
         ListElement { name: "en_US" }
@@ -57,6 +65,10 @@ QtObject {
     property Component zoomTransition: Zoom {}
     property Component tumbleTransition: Tumble {}
 
+    property bool appUpdatesEnabled: false
+    property bool liveTrafficEnabled: false
+    property bool satelliteViewEnabled: false
+
     property int windowTransitionsIndex: 0
 
     property ListModel entries: ListModel {
diff --git a/sysui/cloud/Store/AppGridItemDelegate.qml b/sysui/cloud/AppGridItemDelegate.qml
index a9ffc44..a9ffc44 100644
--- a/sysui/cloud/Store/AppGridItemDelegate.qml
+++ b/sysui/cloud/AppGridItemDelegate.qml
diff --git a/sysui/cloud/Store/AppGridView.qml b/sysui/cloud/AppGridView.qml
index 4e079e9..4e079e9 100644
--- a/sysui/cloud/Store/AppGridView.qml
+++ b/sysui/cloud/AppGridView.qml
diff --git a/sysui/cloud/Store/AppStore.qml b/sysui/cloud/AppStore.qml
index 6a0b598..6a0b598 100644
--- a/sysui/cloud/Store/AppStore.qml
+++ b/sysui/cloud/AppStore.qml
diff --git a/sysui/cloud/Store/AppStoreController.qml b/sysui/cloud/AppStoreController.qml
index eaf212d..eaf212d 100644
--- a/sysui/cloud/Store/AppStoreController.qml
+++ b/sysui/cloud/AppStoreController.qml
diff --git a/sysui/cloud/CloudPage.qml b/sysui/cloud/CloudPage.qml
index 12b9710..de4f324 100644
--- a/sysui/cloud/CloudPage.qml
+++ b/sysui/cloud/CloudPage.qml
@@ -46,20 +46,7 @@ UIPage {
         symbolName: 'my_cloud'
     }
 
-    TabView {
+    StoreScreen {
         anchors.fill: parent
-        tabWidth: Style.hspan(3)
-        tabs: [
-            {
-                title : "SETTINGS",
-                url : Qt.resolvedUrl("Settings/SettingsScreen.qml"),
-                properties : {}
-            },
-            {
-                title : "APP STORE",
-                url : Qt.resolvedUrl("Store/StoreScreen.qml"),
-                properties : {}
-            },
-        ]
     }
 }
diff --git a/sysui/cloud/Store/JSONBackend.js b/sysui/cloud/JSONBackend.js
index e48f149..e48f149 100644
--- a/sysui/cloud/Store/JSONBackend.js
+++ b/sysui/cloud/JSONBackend.js
diff --git a/sysui/cloud/Store/JSONModel.qml b/sysui/cloud/JSONModel.qml
index 72acb98..72acb98 100644
--- a/sysui/cloud/Store/JSONModel.qml
+++ b/sysui/cloud/JSONModel.qml
diff --git a/sysui/cloud/Store/LoadingPage.qml b/sysui/cloud/LoadingPage.qml
index 4bf80b9..4bf80b9 100644
--- a/sysui/cloud/Store/LoadingPage.qml
+++ b/sysui/cloud/LoadingPage.qml
diff --git a/sysui/cloud/Store/NotFoundOverlay.qml b/sysui/cloud/NotFoundOverlay.qml
index b47aaaa..b47aaaa 100644
--- a/sysui/cloud/Store/NotFoundOverlay.qml
+++ b/sysui/cloud/NotFoundOverlay.qml
diff --git a/sysui/cloud/Store/StoreScreen.qml b/sysui/cloud/StoreScreen.qml
index 83d49ae..83d49ae 100644
--- a/sysui/cloud/Store/StoreScreen.qml
+++ b/sysui/cloud/StoreScreen.qml
diff --git a/sysui/settings/Settings.qml b/sysui/settings/Settings.qml
index 1fa46af..cc76b0d 100644
--- a/sysui/settings/Settings.qml
+++ b/sysui/settings/Settings.qml
@@ -68,19 +68,38 @@ Page {
         anchors.topMargin: Style.hspan(0.5)
         horizontalAlignment: Text.AlignHCenter
         visible: root.opacity === 1.0
-        text: "Neptune Settings"
     }
 
     ListModel {
         id: pageModel
         ListElement {
-            title: "General"
-            page: "general/GeneralSettings.qml"
+            title: "Profile Settings"
+            page: "driverprofile/ProfileSettings.qml"
+            iconName: "profile"
         }
 
         ListElement {
-            title: "System"
-            page: "system/SystemSettings.qml"
+            title: "Animation Settings"
+            page: "animation/AnimationsSettings.qml"
+            iconName: "settings"
+        }
+
+        ListElement {
+            title: "System Monitor"
+            page: "systemmonitor/MainScreen.qml"
+            iconName: "insurance"
+        }
+
+        ListElement {
+            title: "Language Settings"
+            page: "language/LanguageSettings.qml"
+            iconName: "information"
+        }
+
+        ListElement {
+            title: "Other Settings"
+            page: "other/OtherSettings.qml"
+            iconName: "settings"
         }
     }
 
@@ -96,20 +115,25 @@ Page {
         initialItem: Item {
             width: stackView.width
             height: stackView.height
-            ListView {
+            ListViewManager {
                 id: settingsListView
                 model: pageModel
                 anchors.fill: parent
-                boundsBehavior: Flickable.StopAtBounds
                 delegate: ListItem {
-                    width: Style.hspan(22)
+                    width: Style.hspan(20)
                     height: Style.vspan(2)
                     text: title
+                    icon: iconName
                     onClicked: stackView.push(Qt.resolvedUrl(page))
                 }
-
             }
         }
+
+        onCurrentItemChanged: {
+            settingsTitle.text = "Neptune Settings"
+            if (stackView.depth > 0 && currentItem.title !== undefined)
+                settingsTitle.text = currentItem.title
+        }
     }
 
     Tool {
diff --git a/sysui/settings/general/animation/AnimationsSettings.qml b/sysui/settings/animation/AnimationsSettings.qml
index 0698082..2823e51 100644
--- a/sysui/settings/general/animation/AnimationsSettings.qml
+++ b/sysui/settings/animation/AnimationsSettings.qml
@@ -41,23 +41,24 @@ Item {
     width: Style.hspan(24)
     height: Style.vspan(20)
 
+    property string title: "Animation Settings"
+
     Label {
-        id: title
+        id: settingsTitle
         anchors.top: parent.top
         anchors.topMargin: Style.vspan(1)
         anchors.left: settingsListView.left
         text: "Window Transitions:"
     }
 
-    ListView {
+    ListViewManager {
         id: settingsListView
-        width: Style.hspan(22)
+        width: Style.hspan(20)
         height: parent.height
         anchors.horizontalCenter: parent.horizontalCenter
         anchors.top: title.bottom
         anchors.topMargin: Style.vspan(0.8)
         model: SettingsModel.windowTransitions
-        boundsBehavior: Flickable.StopAtBounds
         delegate: ListItemRadioButton {
             width: settingsListView.width
             height: Style.vspan(2)
diff --git a/sysui/settings/general/GeneralSettings.qml b/sysui/settings/driverprofile/ProfileSettings.qml
index bab19d5..00c38f3 100644
--- a/sysui/settings/general/GeneralSettings.qml
+++ b/sysui/settings/driverprofile/ProfileSettings.qml
@@ -41,25 +41,33 @@ Item {
     width: Style.hspan(24)
     height: Style.vspan(20)
 
-    ListModel {
-        id: pageModel
-        ListElement {
-            title: "Animation Settings"
-            page: "animation/AnimationsSettings.qml"
-        }
+    property string title: "Profile Settings"
+
+    Label {
+        id: settingsTitle
+        anchors.top: parent.top
+        anchors.topMargin: Style.vspan(1)
+        anchors.left: settingsListView.left
+        text: "Driver Profile:"
     }
 
-    ListView {
+    ListViewManager {
         id: settingsListView
-        model: pageModel
-        anchors.fill: parent
-        boundsBehavior: Flickable.StopAtBounds
-        delegate: ListItem {
+        width: Style.hspan(20)
+        height: parent.height
+        anchors.horizontalCenter: parent.horizontalCenter
+        anchors.top: title.bottom
+        anchors.topMargin: Style.vspan(0.8)
+        model: SettingsModel.profiles
+        delegate: ListItemRadioButton {
             width: settingsListView.width
             height: Style.vspan(2)
-            text: title
-            onClicked: stackView.push(Qt.resolvedUrl(page))
+            text: name
+            hasChildren: false
+            selected: SettingsModel.currentProfileIndex === index
+            onClicked: {
+                SettingsModel.currentProfileIndex = index
+            }
         }
-
     }
 }
diff --git a/sysui/settings/system/language/LanguageSettings.qml b/sysui/settings/language/LanguageSettings.qml
index e93f5f2..ba02b4b 100644
--- a/sysui/settings/system/language/LanguageSettings.qml
+++ b/sysui/settings/language/LanguageSettings.qml
@@ -41,23 +41,24 @@ Item {
     width: Style.hspan(24)
     height: Style.vspan(20)
 
+    property string title: "Language Settings"
+
     Label {
-        id: title
+        id: settingsTitle
         anchors.top: parent.top
         anchors.topMargin: Style.vspan(1)
         anchors.left: settingsListView.left
         text: "System Language:"
     }
 
-    ListView {
+    ListViewManager {
         id: settingsListView
-        width: Style.hspan(22)
+        width: Style.hspan(20)
         height: parent.height
         anchors.horizontalCenter: parent.horizontalCenter
         anchors.top: title.bottom
         anchors.topMargin: Style.vspan(0.8)
         model: SettingsModel.languages
-        boundsBehavior: Flickable.StopAtBounds
         delegate: ListItemRadioButton {
             width: settingsListView.width
             height: Style.vspan(2)
diff --git a/sysui/settings/other/OtherSettings.qml b/sysui/settings/other/OtherSettings.qml
new file mode 100644
index 0000000..ad49963
--- /dev/null
+++ b/sysui/settings/other/OtherSettings.qml
@@ -0,0 +1,157 @@
+/****************************************************************************
+**
+** 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.Layouts 1.0
+import QtQuick.Controls 2.0
+
+import controls 1.0
+import utils 1.0
+import models.settings 1.0
+import models.application 1.0
+
+Item {
+    id: root
+    width: Style.hspan(24)
+    height: Style.vspan(20)
+
+    property string title: "Others Settings"
+
+    Label {
+        id: unitTitle
+        anchors.top: parent.top
+        anchors.topMargin: Style.vspan(1)
+        anchors.left: units.left
+        text: "Units:"
+    }
+
+    ListItem {
+        id: units
+        width: Style.hspan(20)
+        height: Style.vspan(2)
+        anchors.horizontalCenter: parent.horizontalCenter
+        anchors.top: unitTitle.bottom
+        anchors.topMargin: Style.vspan(0.8)
+
+        text: "Units of Measurement";
+        icon: "fees";
+        hasChildren: false
+
+        onClicked: {
+            if (SettingsModel.unitSystem === "imp_us")
+                SettingsModel.unitSystem = "metric"
+            else
+                SettingsModel.unitSystem = "imp_us"
+        }
+
+        RowLayout {
+            width: Style.hspan(4)
+            anchors.right: units.right
+            anchors.verticalCenter: parent.verticalCenter
+            spacing: 10
+
+            SettingsRadioButton {
+                id: imperial
+                buttonText: "Imperial"
+                checked: SettingsModel.unitSystem === "imp_us"
+                onClicked: SettingsModel.unitSystem = "imp_us"
+            }
+
+            SettingsRadioButton {
+                id: metric
+                buttonText: "Metric"
+                checked: SettingsModel.unitSystem === "metric"
+                onClicked: SettingsModel.unitSystem = "metric"
+            }
+        }
+    }
+
+    Label {
+        id: appUpdatesTitle
+        anchors.top: units.bottom
+        anchors.topMargin: Style.vspan(1)
+        anchors.left: units.left
+        text: "Application:"
+    }
+
+    ListItemSwitch {
+        id: appUpdates
+        width: Style.hspan(20)
+        height: Style.vspan(2)
+        anchors.horizontalCenter: parent.horizontalCenter
+        anchors.top: appUpdatesTitle.bottom
+        anchors.topMargin: Style.vspan(0.8)
+
+        text: "Application Updates";
+        icon: "updates";
+        hasChildren: false
+        checked: SettingsModel.appUpdatesEnabled
+        onClicked: SettingsModel.appUpdatesEnabled = !SettingsModel.appUpdatesEnabled
+    }
+
+    Label {
+        id: trafficTitle
+        anchors.top: appUpdates.bottom
+        anchors.topMargin: Style.vspan(1)
+        anchors.left: appUpdates.left
+        text: "Navigation:"
+    }
+
+    ListItemSwitch {
+        id: liveTraffic
+        width: Style.hspan(20)
+        height: Style.vspan(2)
+        anchors.horizontalCenter: parent.horizontalCenter
+        anchors.top: trafficTitle.bottom
+        anchors.topMargin: Style.vspan(0.8)
+
+        text: "Live Traffic Information"
+        icon: "warning"
+        hasChildren: false
+        checked: SettingsModel.liveTrafficEnabled
+        onClicked: SettingsModel.liveTrafficEnabled = !SettingsModel.liveTrafficEnabled
+    }
+
+    ListItemSwitch {
+        id: satelliteView
+        width: Style.hspan(20)
+        height: Style.vspan(2)
+        anchors.horizontalCenter: parent.horizontalCenter
+        anchors.top: liveTraffic.bottom
+        anchors.topMargin: Style.vspan(0.8)
+
+        text: "Satellite View"
+        icon: "compass"
+        hasChildren: false
+        checked: SettingsModel.satelliteViewEnabled
+        onClicked: SettingsModel.satelliteViewEnabled = !SettingsModel.satelliteViewEnabled
+    }
+}
diff --git a/sysui/settings/other/SettingsRadioButton.qml b/sysui/settings/other/SettingsRadioButton.qml
new file mode 100644
index 0000000..2770886
--- /dev/null
+++ b/sysui/settings/other/SettingsRadioButton.qml
@@ -0,0 +1,65 @@
+/****************************************************************************
+**
+** 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.2
+
+import utils 1.0
+
+RadioButton {
+    id: root
+
+    property alias buttonText: buttonLabel.text
+    contentItem: Label {
+        id: buttonLabel
+        width: Style.hspan(10)
+    }
+
+    indicator: Rectangle {
+        implicitWidth: Style.hspan(0.4)
+        implicitHeight: implicitWidth
+        anchors.verticalCenter: parent.verticalCenter
+        anchors.right: parent.left
+        radius: implicitWidth
+        border.width: Style.vspan(0.08)
+        border.color: Style.colorWhite
+        color: "transparent"
+
+        Rectangle {
+            implicitWidth: Style.hspan(0.3)
+            implicitHeight: implicitWidth
+            radius: implicitWidth
+            anchors.centerIn: parent
+            color: Style.colorOrange
+            visible: root.checked
+        }
+    }
+}
diff --git a/sysui/dev/SystemMonitor/AppPanel.qml b/sysui/settings/systemmonitor/AppPanel.qml
index 8f16dd0..8f16dd0 100644
--- a/sysui/dev/SystemMonitor/AppPanel.qml
+++ b/sysui/settings/systemmonitor/AppPanel.qml
diff --git a/sysui/dev/SystemMonitor/CPUGraph.qml b/sysui/settings/systemmonitor/CPUGraph.qml
index e9f89db..e9f89db 100644
--- a/sysui/dev/SystemMonitor/CPUGraph.qml
+++ b/sysui/settings/systemmonitor/CPUGraph.qml
diff --git a/sysui/dev/SystemMonitor/InfoPanel.qml b/sysui/settings/systemmonitor/InfoPanel.qml
index 3a308fa..3a308fa 100644
--- a/sysui/dev/SystemMonitor/InfoPanel.qml
+++ b/sysui/settings/systemmonitor/InfoPanel.qml
diff --git a/sysui/dev/SystemMonitor/MainScreen.qml b/sysui/settings/systemmonitor/MainScreen.qml
index 557d507..f35b6f0 100644
--- a/sysui/dev/SystemMonitor/MainScreen.qml
+++ b/sysui/settings/systemmonitor/MainScreen.qml
@@ -35,20 +35,14 @@ import controls 1.0
 import QtApplicationManager 1.0
 import models.application 1.0
 
-UIScreen {
+Item {
     id: root
 
+    property string title: "System Monitor"
     property int timeInterval: 200
 
     Component.onCompleted: checkReporting()
 
-    onBackScreen: {
-        SystemMonitor.cpuLoadReportingEnabled = false
-        SystemMonitor.fpsReportingEnabled = false
-        SystemMonitor.memoryReportingEnabled = false
-        ApplicationManagerModel.releaseApplicationSurface(root)
-    }
-
     function checkReporting() {
         SystemMonitor.reportingInterval = root.timeInterval
         SystemMonitor.count = 50
diff --git a/sysui/dev/SystemMonitor/MemoryGraph.qml b/sysui/settings/systemmonitor/MemoryGraph.qml
index 59e5123..59e5123 100644
--- a/sysui/dev/SystemMonitor/MemoryGraph.qml
+++ b/sysui/settings/systemmonitor/MemoryGraph.qml
diff --git a/sysui/dev/SystemMonitor/SystemPanel.qml b/sysui/settings/systemmonitor/SystemPanel.qml
index e0fa3f9..ddc6766 100644
--- a/sysui/dev/SystemMonitor/SystemPanel.qml
+++ b/sysui/settings/systemmonitor/SystemPanel.qml
@@ -69,7 +69,7 @@ UIPage {
         width: root.width/2
         height: root.mergeReport ? 0 : root.height/7
         anchors.horizontalCenter: parent.horizontalCenter
-        anchors.top: root.top
+        anchors.top: parent.top
         anchors.topMargin: root.height/12
         opacity: root.mergeReport ? 0: 1
 
@@ -293,31 +293,31 @@ UIPage {
 
     }
 
-    Rectangle {
-        id: rotatingBox
-        width: 60
-        height: 60
-        anchors.top: root.top
-        anchors.topMargin: 50
-        anchors.left: root.left
-        anchors.leftMargin: 150
-        color: "white"
-
-        RotationAnimation {
-            id: animator
-            target: rotatingBox;
-            from: 0;
-            to: 360;
-            loops: Animation.Infinite
-            duration: 1000
-            running: true
-        }
-
-        MouseArea {
-            anchors.fill: parent
-            onClicked: animator.running = !animator.running
-        }
-    }
+//    Rectangle {
+//        id: rotatingBox
+//        width: 60
+//        height: 60
+//        anchors.top: root.top
+//        anchors.topMargin: 50
+//        anchors.left: root.left
+//        anchors.leftMargin: 150
+//        color: "white"
+
+//        RotationAnimation {
+//            id: animator
+//            target: rotatingBox;
+//            from: 0;
+//            to: 360;
+//            loops: Animation.Infinite
+//            duration: 1000
+//            running: true
+//        }
+
+//        MouseArea {
+//            anchors.fill: parent
+//            onClicked: animator.running = !animator.running
+//        }
+//    }
 
     Button {
         width: Style.hspan(3)