From 0ae57cfe921d6107848a7a66deb16861affffc89 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sat, 22 Sep 2018 22:53:43 -0700 Subject: Mobile/remember DCs: try to match device names We only store the address part of the connection name, so don't try to find an exact match, try to find the sub-string. Signed-off-by: Dirk Hohndel --- mobile-widgets/qml/DownloadFromDiveComputer.qml | 2 +- mobile-widgets/qmlmanager.cpp | 5 +++++ mobile-widgets/qmlmanager.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) (limited to 'mobile-widgets') diff --git a/mobile-widgets/qml/DownloadFromDiveComputer.qml b/mobile-widgets/qml/DownloadFromDiveComputer.qml index f90086ac9..a2545db13 100644 --- a/mobile-widgets/qml/DownloadFromDiveComputer.qml +++ b/mobile-widgets/qml/DownloadFromDiveComputer.qml @@ -183,7 +183,7 @@ Kirigami.Page { function setDC(vendor, product, device) { comboVendor.currentIndex = comboVendor.find(vendor); comboProduct.currentIndex = comboProduct.find(product); - comboConnection.currentIndex = comboConnection.find(device); + comboConnection.currentIndex = manager.getConnectionIndex(device); } SsrfButton { id: dc1 diff --git a/mobile-widgets/qmlmanager.cpp b/mobile-widgets/qmlmanager.cpp index d6c00c870..aa9cf3d75 100644 --- a/mobile-widgets/qmlmanager.cpp +++ b/mobile-widgets/qmlmanager.cpp @@ -1760,6 +1760,11 @@ int QMLManager::getDetectedProductIndex(const QString ¤tVendorText) return m_device_data->getDetectedProductIndex(currentVendorText); } +int QMLManager::getConnectionIndex(const QString &deviceSubstr) +{ + return connectionListModel.indexOf(deviceSubstr); +} + void QMLManager::showDownloadPage(QString deviceString) { // we pass the indices for the three combo boxes for vendor, product, and connection diff --git a/mobile-widgets/qmlmanager.h b/mobile-widgets/qmlmanager.h index b8f44d820..674db311c 100644 --- a/mobile-widgets/qmlmanager.h +++ b/mobile-widgets/qmlmanager.h @@ -87,6 +87,7 @@ public: Q_INVOKABLE int getMatchingAddress(const QString &vendor, const QString &product); Q_INVOKABLE int getDetectedVendorIndex(); Q_INVOKABLE int getDetectedProductIndex(const QString ¤tVendorText); + Q_INVOKABLE int getConnectionIndex(const QString &deviceSubstr); static QMLManager *instance(); Q_INVOKABLE void registerError(QString error); -- cgit v1.2.3-70-g09d2