From ff9506b21bbb9910256841dcb577bcb2e19047e8 Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Sun, 13 Jan 2019 10:58:04 +0200 Subject: Import: don't add to new trip while downloading Since process_imported_dives() can add dives to a newly generated trip, this need not be done in the downloading code. This makes data flow distinctly simpler, as no trip table and no add-new-trip flag has to be passed down to the libdivecomputer glue code. Moreover, since now the trip creation is done at the import step rather than the download step, the latest status of the "add to new trip" checkbox will be considered. Signed-off-by: Berthold Stoeger --- mobile-widgets/qml/DownloadFromDiveComputer.qml | 2 +- mobile-widgets/qmlmanager.cpp | 10 ---------- mobile-widgets/qmlmanager.h | 4 ---- 3 files changed, 1 insertion(+), 15 deletions(-) (limited to 'mobile-widgets') diff --git a/mobile-widgets/qml/DownloadFromDiveComputer.qml b/mobile-widgets/qml/DownloadFromDiveComputer.qml index 332a978dd..a1403b07d 100644 --- a/mobile-widgets/qml/DownloadFromDiveComputer.qml +++ b/mobile-widgets/qml/DownloadFromDiveComputer.qml @@ -28,7 +28,7 @@ Kirigami.Page { id: downloadThread onFinished : { - importModel.repopulate(table, trips) + importModel.repopulate(table) progressBar.visible = false if (dcImportModel.rowCount() > 0) { console.log(dcImportModel.rowCount() + " dive downloaded") diff --git a/mobile-widgets/qmlmanager.cpp b/mobile-widgets/qmlmanager.cpp index 5e858f9cf..cc5072a63 100644 --- a/mobile-widgets/qmlmanager.cpp +++ b/mobile-widgets/qmlmanager.cpp @@ -1803,11 +1803,6 @@ bool QMLManager::DC_bluetoothMode() const return DCDeviceData::instance()->bluetoothMode(); } -bool QMLManager::DC_createNewTrip() const -{ - return DCDeviceData::instance()->createNewTrip(); -} - bool QMLManager::DC_saveDump() const { return DCDeviceData::instance()->saveDump(); @@ -1853,11 +1848,6 @@ void QMLManager::DC_setForceDownload(bool force) DCDeviceData::instance()->setForceDownload(force); } -void QMLManager::DC_setCreateNewTrip(bool create) -{ - DCDeviceData::instance()->setCreateNewTrip(create); -} - void QMLManager::DC_setSaveDump(bool dumpMode) { DCDeviceData::instance()->setSaveDump(dumpMode); diff --git a/mobile-widgets/qmlmanager.h b/mobile-widgets/qmlmanager.h index 2812ae08f..5636af379 100644 --- a/mobile-widgets/qmlmanager.h +++ b/mobile-widgets/qmlmanager.h @@ -45,7 +45,6 @@ class QMLManager : public QObject { Q_PROPERTY(QString descriptor READ DC_descriptor) Q_PROPERTY(bool DC_forceDownload READ DC_forceDownload WRITE DC_setForceDownload) Q_PROPERTY(bool DC_bluetoothMode READ DC_bluetoothMode WRITE DC_setBluetoothMode) - Q_PROPERTY(bool DC_createNewTrip READ DC_createNewTrip WRITE DC_setCreateNewTrip) Q_PROPERTY(bool DC_saveDump READ DC_saveDump WRITE DC_setSaveDump) Q_PROPERTY(int DC_deviceId READ DC_deviceId WRITE DC_setDeviceId) Q_PROPERTY(QString pluggedInDeviceName MEMBER m_pluggedInDeviceName NOTIFY pluggedInDeviceNameChanged) @@ -75,9 +74,6 @@ public: bool DC_bluetoothMode() const; void DC_setBluetoothMode(bool mode); - bool DC_createNewTrip() const; - void DC_setCreateNewTrip(bool create); - bool DC_saveDump() const; void DC_setSaveDump(bool dumpMode); -- cgit v1.2.3-70-g09d2