From 819be91cb699705f610319735c3cfca7ed3650b5 Mon Sep 17 00:00:00 2001 From: Ilya Kitaev Date: Mon, 3 Oct 2016 00:03:37 +0300 Subject: [PATCH] Integrating TransactionHistoryModel --- MiddlePanel.qml | 2 ++ pages/History.qml | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/MiddlePanel.qml b/MiddlePanel.qml index 43fbed47..10ed6321 100644 --- a/MiddlePanel.qml +++ b/MiddlePanel.qml @@ -37,6 +37,7 @@ Rectangle { property Transfer transferView: Transfer { } property Receive receiveView: Receive { } property History historyView: History { } + property Item currentView onCurrentViewChanged: { @@ -81,6 +82,7 @@ Rectangle { }, State { name: "History" PropertyChanges { target: root; currentView: historyView } + PropertyChanges { target: historyView; model: appWindow.currentWallet.historyModel } }, State { name: "Transfer" PropertyChanges { target: root; currentView: transferView } diff --git a/pages/History.qml b/pages/History.qml index 72046f0d..8fce5110 100644 --- a/pages/History.qml +++ b/pages/History.qml @@ -32,8 +32,13 @@ import moneroComponents.Wallet 1.0 import moneroComponents.WalletManager 1.0 Rectangle { + id: root + property ListModel model: testModel + color: "#F0EEEE" + + Text { id: filterHeaderText anchors.left: parent.left @@ -365,7 +370,7 @@ Rectangle { anchors.leftMargin: 14 anchors.rightMargin: 14 onContentYChanged: flickableScroll.flickableContentYChanged() - model: testModel + model: root.model } } }