From 1c223b09c310d65ca554cae455cdc74fc33da60f Mon Sep 17 00:00:00 2001 From: "Robert C. Helling" Date: Thu, 7 Dec 2017 14:40:23 +0100 Subject: [PATCH] Show BT device names first Show them left of address (so they are in the user's view) rather than on the right. Signed-off-by: Robert C. Helling --- core/btdiscovery.cpp | 2 +- mobile-widgets/qml/DownloadFromDiveComputer.qml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/btdiscovery.cpp b/core/btdiscovery.cpp index 9594ccb89..63a1df5fd 100644 --- a/core/btdiscovery.cpp +++ b/core/btdiscovery.cpp @@ -195,7 +195,7 @@ void BTDiscovery::btDeviceDiscoveredMain(const btPairedDevice &device) btVP.vendorIdx = vendorList.indexOf(vendor); btVP.productIdx = productList[vendor].indexOf(newDevice); btDCs << btVP; - connectionListModel.addAddress(device.address + " (" + newDevice + ")"); + connectionListModel.addAddress(newDevice + " " + device.address); return; } connectionListModel.addAddress(device.address); diff --git a/mobile-widgets/qml/DownloadFromDiveComputer.qml b/mobile-widgets/qml/DownloadFromDiveComputer.qml index 199f6aa67..eafc22150 100644 --- a/mobile-widgets/qml/DownloadFromDiveComputer.qml +++ b/mobile-widgets/qml/DownloadFromDiveComputer.qml @@ -199,7 +199,7 @@ Kirigami.Page { text = qsTr("Retry") // strip any BT Name from the address var devName = downloadThread.deviceData.devName - downloadThread.deviceData.devName = devName.replace(/ (.*)$/, "") + downloadThread.deviceData.devName = devName.replace(/^(.*) /, "") manager.appendTextToLog("DCDownloadThread started for " + downloadThread.deviceData.product + " on "+ downloadThread.deviceData.devName) progressBar.visible = true downloadThread.start()