From 1cee137dcbb9ed2944313f50da9a27b947983ad5 Mon Sep 17 00:00:00 2001
From: Alex Kovrigin <a.kovrigin0@gmail.com>
Date: Mon, 26 Nov 2018 22:08:42 +0100
Subject: [PATCH] Align behaviour of the desktop app with the Android app

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
---
 app/qml/FindDevicesPage.qml | 8 ++++----
 app/qml/main.qml            | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/qml/FindDevicesPage.qml b/app/qml/FindDevicesPage.qml
index 12b9790ce..667f58138 100644
--- a/app/qml/FindDevicesPage.qml
+++ b/app/qml/FindDevicesPage.qml
@@ -49,18 +49,18 @@ Kirigami.ScrollablePage
                 text: switch (parseInt(section))
                 {
                     case DevicesModel.Paired:
-                        return i18n("Paired")
+                        return i18n("Remembered")
                     case DevicesModel.Reachable:
-                        return i18n("Reachable")
+                        return i18n("Available")
                     case (DevicesModel.Reachable | DevicesModel.Paired):
-                        return i18n("Paired & Reachable")
+                        return i18n("Connected")
                 }
 
             }
         }
 
         model: DevicesSortProxyModel {
-            sourceModel: DevicesModel { displayFilter: DevicesModel.Reachable }
+            sourceModel: DevicesModel {}
         }
         delegate: Kirigami.BasicListItem {
             width: ListView.view.width
diff --git a/app/qml/main.qml b/app/qml/main.qml
index d30469b70..5e7a067a4 100644
--- a/app/qml/main.qml
+++ b/app/qml/main.qml
@@ -104,12 +104,12 @@ Kirigami.ApplicationWindow
         property var objects: [findDevicesAction]
         Instantiator {
             model: DevicesSortProxyModel {
-                sourceModel: DevicesModel { displayFilter: DevicesModel.Paired }
+                sourceModel: DevicesModel { displayFilter: DevicesModel.Paired | DevicesModel.Reachable }
             }
             delegate: Kirigami.Action {
                 iconName: model.iconName
                 text: display + "\n" + toolTip
-                enabled: status & DevicesModel.Reachable
+                visible: status & DevicesModel.Reachable
                 checked: pageStack.currentItem && pageStack.currentItem.currentDevice == device
                 onTriggered: {
                     root.pageStack.clear()