on xenial help sign in
removed loader
commitdbe88617918bdee44cb0e91f05b35ae866d39c6c authorAndrea Cimitan <andrea.cimitan@gmail.com> dateTue 23 Feb 2016, 16:30 (11 years ago) parentecd93c6
2 files changed+9−31
qml/Dash/PreviewView.qml+8−29 tests/qmltests/Dash/tst_PreviewView.qml+1−2
qml/Dash/PreviewView.qml+8−29
@@ -26,14 +26,9 @@ Item {
2626 property bool open: false
2727 property var scope: null
2828 property var scopeStyle: null
29−
3029 property alias showSignatureLine: header.showSignatureLine
31−
32− property alias currentItem: previewLoader.item
33− property var previewModel
34−
35− readonly property bool processing: currentItem && (!currentItem.previewModel.loaded
36− || currentItem.previewModel.processingAction)
30+ property alias previewModel: preview.previewModel
31+ readonly property bool processing: previewModel && (!previewModel.loaded || previewModel.processingAction)
3732
3833 signal backClicked()
3934
@@ -51,47 +46,31 @@ Item {
5146
5247 onOpenChanged: {
5348 if (!open) {
54− // Cancel any pending preview requests or actions
55− if (currentItem && currentItem.previewData !== undefined) {
56− currentItem.previewData.cancelAction();
57− }
5849 root.scope.cancelActivation();
5950 }
6051 }
6152
62− Loader {
63− id: previewLoader
64− objectName: "loader"
53+ Previews.Preview {
54+ id: preview
55+ objectName: "preview"
6556 anchors {
6657 top: header.bottom
6758 bottom: parent.bottom
6859 left: parent.left
6960 right: parent.right
7061 }
71−
72− sourceComponent: Previews.Preview {
73− id: preview
74− objectName: "preview"
75− height: previewLoader.height
76− width: previewLoader.width
77− }
78−
79− onLoaded: {
80− item.scopeStyle = Qt.binding(function() { return root.scopeStyle; });
81− item.previewModel = Qt.binding(function() { return root.previewModel; });
82− }
62+ scopeStyle: root.scopeStyle
8363 }
8464
8565 MouseArea {
8666 id: processingMouseArea
8767 objectName: "processingMouseArea"
8868 anchors {
89− left: parent.left
90− right: parent.right
9169 top: header.bottom
9270 bottom: parent.bottom
71+ left: parent.left
72+ right: parent.right
9373 }
94−
9574 enabled: root.processing
9675 }
9776}
tests/qmltests/Dash/tst_PreviewView.qml+1−2
@@ -86,8 +86,7 @@ Rectangle {
8686 }
8787
8888 function test_processing() {
89− verify(view.currentItem, "currentItem is not ready yet");
90− view.currentItem.previewModel.setLoaded(false);
89+ view.previewModel.setLoaded(false);
9190
9291 tryCompare(view, "processing", true);
9392