tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Align behaviour of the desktop app with the Android app

Browse source 
Summary: Now devices are shown same as in Android app, as in Kirigami app (kcapp)

Test Plan:
* Build kdeconnect, using the experimental version
* Try pairing, unpairing, connecting and disconnected devices.
* See the difference.

Reviewers: albertvaka, #kde_connect, nicolasfella

Reviewed By: #kde_connect, nicolasfella

Subscribers: nicolasfella, kdeconnect

Tags: #kde_connect

Differential Revision: https://phabricator.kde.org/D16935
This commit is contained in:
Alex Kovrigin 2018-11-26 22:08:42 +01:00 committed by Nicolas Fella
parent 7ef1da4914
commit 1cee137dcb
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/qml/FindDevicesPage.qml
View file

@ -49,18 +49,18 @@ Kirigami.ScrollablePage
text: switch (parseInt(section)) text: switch (parseInt(section))
{ {
case DevicesModel.Paired: case DevicesModel.Paired:
return i18n("Paired") return i18n("Remembered")
case DevicesModel.Reachable: case DevicesModel.Reachable:
return i18n("Reachable") return i18n("Available")
case (DevicesModel.Reachable | DevicesModel.Paired): case (DevicesModel.Reachable | DevicesModel.Paired):
return i18n("Paired & Reachable") return i18n("Connected")
} }
} }
} }
model: DevicesSortProxyModel { model: DevicesSortProxyModel {
sourceModel: DevicesModel { displayFilter: DevicesModel.Reachable } sourceModel: DevicesModel {}
} }
delegate: Kirigami.BasicListItem { delegate: Kirigami.BasicListItem {
width: ListView.view.width width: ListView.view.width

4
app/qml/main.qml
View file

@ -104,12 +104,12 @@ Kirigami.ApplicationWindow
property var objects: [findDevicesAction] property var objects: [findDevicesAction]
Instantiator { Instantiator {
model: DevicesSortProxyModel { model: DevicesSortProxyModel {
sourceModel: DevicesModel { displayFilter: DevicesModel.Paired } sourceModel: DevicesModel { displayFilter: DevicesModel.Paired | DevicesModel.Reachable }
} }
delegate: Kirigami.Action { delegate: Kirigami.Action {
iconName: model.iconName iconName: model.iconName
text: display + "\n" + toolTip text: display + "\n" + toolTip
enabled: status & DevicesModel.Reachable visible: status & DevicesModel.Reachable
checked: pageStack.currentItem && pageStack.currentItem.currentDevice == device checked: pageStack.currentItem && pageStack.currentItem.currentDevice == device
onTriggered: { onTriggered: {
root.pageStack.clear() root.pageStack.clear()