summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKonstantin Kolodiy <KKolodiy@luxoft.com>2014-06-30 16:01:04 +0400
committerKonstantin Kolodiy <KKolodiy@luxoft.com>2014-06-30 16:01:04 +0400
commit8d9b1c64b019bae6863c6250c5403568e6d2c7fb (patch)
tree51a99bfad081e1512f38641f1c21a931632fc322
parent7b73945ae2e891cabf744788fa6377ef4db259fb (diff)
downloadsdl_core-8d9b1c64b019bae6863c6250c5403568e6d2c7fb.tar.gz
APPLINK-7918: Send notification SystemError
-rw-r--r--src/components/qt_hmi/qml_model_qt5/models/SettingsSourceModel.qml6
-rw-r--r--src/components/qt_hmi/qml_model_qt5/views/SettingsSourceView.qml28
-rw-r--r--src/components/qt_hmi/qml_model_qt5/views/SystemErrorView.qml89
3 files changed, 106 insertions, 17 deletions
diff --git a/src/components/qt_hmi/qml_model_qt5/models/SettingsSourceModel.qml b/src/components/qt_hmi/qml_model_qt5/models/SettingsSourceModel.qml
index 470277c589..2acc5a5186 100644
--- a/src/components/qt_hmi/qml_model_qt5/models/SettingsSourceModel.qml
+++ b/src/components/qt_hmi/qml_model_qt5/models/SettingsSourceModel.qml
@@ -77,4 +77,10 @@ ListModel
appId: 0
action: ""
}
+ ListElement {
+ title: "System Error"
+ qml: "./views/SystemErrorView.qml"
+ appId: 0
+ action: ""
+ }
}
diff --git a/src/components/qt_hmi/qml_model_qt5/views/SettingsSourceView.qml b/src/components/qt_hmi/qml_model_qt5/views/SettingsSourceView.qml
index 2319ae748c..72cf73112f 100644
--- a/src/components/qt_hmi/qml_model_qt5/views/SettingsSourceView.qml
+++ b/src/components/qt_hmi/qml_model_qt5/views/SettingsSourceView.qml
@@ -50,31 +50,25 @@ GeneralView {
Item {
anchors.fill: parent
- GridMenu {
+ ScrollableListView {
id: menu
model: dataContainer.settingsSourceModel
anchors.left: parent.left
anchors.right: parent.right
anchors.top: parent.top
anchors.bottom: bottomPanel.top
- columnsOnPage: 1
- rows: 7
- delegate: GridItem {
- width: menu.width / menu.columnsOnPage
- height: menu.height / menu.rows
- OvalButton {
- text: title
- onReleased: {
- if (qml) {
- contentLoader.go(qml, appId);
- } else {
- itemActivated(action);
- }
+ delegate: OvalButton {
+ text: title
+ onReleased: {
+ if (qml) {
+ contentLoader.go(qml, appId);
+ } else {
+ itemActivated(action);
}
- anchors.centerIn: parent
- fontSize: Constants.fontSize
- width: parent.width * 2 / 3
}
+ anchors.left: parent.left
+ anchors.right: parent.right
+ fontSize: Constants.fontSize
}
}
diff --git a/src/components/qt_hmi/qml_model_qt5/views/SystemErrorView.qml b/src/components/qt_hmi/qml_model_qt5/views/SystemErrorView.qml
new file mode 100644
index 0000000000..058282ae00
--- /dev/null
+++ b/src/components/qt_hmi/qml_model_qt5/views/SystemErrorView.qml
@@ -0,0 +1,89 @@
+/**
+ * Copyright (c) 2014, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+import QtQuick 2.0
+import "../models"
+import "../controls"
+import "../hmi_api/Common.js" as Common
+import "../models/Constants.js" as Constants
+
+GeneralView {
+ Item {
+ anchors.fill: parent
+ Text {
+ id: title
+ text: "System Error:"
+ anchors.top: parent.top
+ anchors.left: parent.left
+ anchors.right: parent.right
+ font.pixelSize: Constants.fontSize
+ color: Constants.primaryColor
+ height: Constants.fontSize + Constants.panelPadding
+ }
+
+ ScrollableListView {
+ id: menu
+ model: systemErrorList
+ anchors.left: parent.left
+ anchors.right: parent.right
+ anchors.top: title.bottom
+ anchors.bottom: bottomPanel.top
+ delegate: OvalButton {
+ text: name
+ onClicked: sdlSDL.onSystemError(Common.SystemError[name]);
+ anchors.left: parent.left
+ anchors.right: parent.right
+ fontSize: Constants.fontSize
+ }
+ }
+
+ ListModel {
+ id: systemErrorList
+
+ Component.onCompleted: {
+ for (var name in Common.SystemError) {
+ append({name: name});
+ }
+ }
+ }
+
+ Item {
+ id: bottomPanel
+ // 1/4 bottom screen
+ anchors.bottom: parent.bottom
+ anchors.left: parent.left
+ height: 1/4 * parent.height
+ width: parent.width
+
+ BackButton { anchors.centerIn: parent }
+ }
+ }
+}