diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -91,7 +91,7 @@ PURPOSE "Required for kcapp" URL "https://www.kde.org/products/kirigami/" TYPE RUNTIME -) + ) add_subdirectory(app) endif() add_subdirectory(plugins) diff --git a/smsapp/qml/ConversationDisplay.qml b/smsapp/qml/ConversationDisplay.qml --- a/smsapp/qml/ConversationDisplay.qml +++ b/smsapp/qml/ConversationDisplay.qml @@ -43,10 +43,11 @@ id: model sortOrder: Qt.AscendingOrder sortRole: ConversationModel.DateRole - sourceModel: ConversationModel { + readonly property var convsModel: ConversationModel { deviceId: device.id() threadId: page.conversationId } + sourceModel: convsModel } spacing: Kirigami.Units.largeSpacing diff --git a/smsapp/qml/ConversationList.qml b/smsapp/qml/ConversationList.qml --- a/smsapp/qml/ConversationList.qml +++ b/smsapp/qml/ConversationList.qml @@ -34,7 +34,8 @@ model: DevicesSortProxyModel { id: devicesModel //TODO: make it possible to filter if they can do sms - sourceModel: DevicesModel { displayFilter: DevicesModel.Paired | DevicesModel.Reachable } + readonly property var devicesModel: DevicesModel { displayFilter: DevicesModel.Paired | DevicesModel.Reachable } + sourceModel: devicesModel onRowsInserted: if (devicesCombo.currentIndex < 0) { devicesCombo.currentIndex = 0 } @@ -63,9 +64,10 @@ sortOrder: Qt.DescendingOrder sortRole: ConversationListModel.DateRole filterCaseSensitivity: Qt.CaseInsensitive - sourceModel: ConversationListModel { + readonly property var convsModel: ConversationListModel { deviceId: device ? device.id() : "" } + sourceModel: convsModel } header: TextField {