git.iko.soy/unity8
on xenial help sign in
ClientIndicator: be more informative about loading failures for dynamically created objects
c3abcf5Marco Trevisan (Treviño)
qml/Panel/Indicators/client/IndicatorsClient.qml+7−1
compare with xenial
unifiedsplit
@@ -19,7 +19,6 @@
19
19
20import QtQuick 2.4
20import QtQuick 2.4
21import Ubuntu.Components 1.3
21import Ubuntu.Components 1.3
22−import Ubuntu.Components.ListItems 1.3 as ListItem
23
22
24Rectangle {
23Rectangle {
25 color: theme.palette.normal.background
24 color: theme.palette.normal.background
@@ -37,6 +36,13 @@ Rectangle {
37 function reset() {
36 function reset() {
38 clear();
37 clear();
39 var component = Qt.createComponent("IndicatorsList.qml");
38 var component = Qt.createComponent("IndicatorsList.qml");
39+ if (component.status != Component.Ready) {
40+ if (component.status == Component.Error)
41+ console.error("Error:"+ component.errorString());
42+
43+ return;
44+ }
45+
40 var page = component.createObject(pages, {"profile": indicatorProfile});
46 var page = component.createObject(pages, {"profile": indicatorProfile});
41 push(page);
47 push(page);
42 }
48 }
qml/Panel/Indicators/client/IndicatorsList.qml+7
@@ -58,6 +58,13 @@ Page {
58
58
59 onClicked: {
59 onClicked: {
60 var new_page = Qt.createComponent("IndicatorRepresentation.qml");
60 var new_page = Qt.createComponent("IndicatorRepresentation.qml");
61+ if (new_page.status != Component.Ready) {
62+ if (new_page.status == Component.Error)
63+ console.error("Error:"+ new_page.errorString());
64+
65+ return;
66+ }
67+
61 page.pageStack.push(new_page.createObject(pages), {"indicatorProperties" : model.indicatorProperties });
68 page.pageStack.push(new_page.createObject(pages), {"indicatorProperties" : model.indicatorProperties });
62 }
69 }
63 }
70 }