From 2de96e86ac7da9796637d8b9866fb1727e87d5ea Mon Sep 17 00:00:00 2001 From: Nicolas Fella Date: Mon, 26 Nov 2018 15:51:28 +0100 Subject: [PATCH] Revert "Fix device name display in app" This reverts commit 3865307619993dd5301f9a377f84f875470374d2. --- app/qml/FindDevicesPage.qml | 2 +- app/qml/main.qml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/qml/FindDevicesPage.qml b/app/qml/FindDevicesPage.qml index b005b899a..12b9790ce 100644 --- a/app/qml/FindDevicesPage.qml +++ b/app/qml/FindDevicesPage.qml @@ -65,7 +65,7 @@ Kirigami.ScrollablePage delegate: Kirigami.BasicListItem { width: ListView.view.width icon: iconName - label: deviceName + "\n" + toolTip + label: display + "\n" + toolTip onClicked: { pageStack.push( deviceComp, diff --git a/app/qml/main.qml b/app/qml/main.qml index af891f084..d30469b70 100644 --- a/app/qml/main.qml +++ b/app/qml/main.qml @@ -108,7 +108,7 @@ Kirigami.ApplicationWindow } delegate: Kirigami.Action { iconName: model.iconName - text: deviceName + "\n" + toolTip + text: display + "\n" + toolTip enabled: status & DevicesModel.Reachable checked: pageStack.currentItem && pageStack.currentItem.currentDevice == device onTriggered: {