2017-04-27 18:30:36 +00:00
|
|
|
// SPDX-License-Identifier: GPL-2.0
|
2017-05-12 15:55:19 +00:00
|
|
|
import QtQuick 2.6
|
2017-10-12 12:25:22 +00:00
|
|
|
import QtQuick.Controls 2.2 as Controls
|
2015-07-23 11:46:02 +00:00
|
|
|
import QtQuick.Window 2.2
|
|
|
|
import QtQuick.Dialogs 1.2
|
2017-05-12 15:55:19 +00:00
|
|
|
import QtQuick.Layouts 1.3
|
2015-07-23 11:46:02 +00:00
|
|
|
import org.subsurfacedivelog.mobile 1.0
|
2018-09-27 20:09:26 +00:00
|
|
|
import org.kde.kirigami 2.4 as Kirigami
|
2015-07-23 11:46:02 +00:00
|
|
|
|
2016-03-08 20:26:54 +00:00
|
|
|
Kirigami.Page {
|
2015-07-23 11:46:02 +00:00
|
|
|
id: diveComputerDownloadWindow
|
2018-09-26 12:57:12 +00:00
|
|
|
leftPadding: Kirigami.Units.gridUnit / 2
|
|
|
|
rightPadding: Kirigami.Units.gridUnit / 2
|
|
|
|
topPadding: 0
|
|
|
|
bottomPadding: 0
|
2016-05-03 19:24:00 +00:00
|
|
|
title: qsTr("Dive Computer")
|
2018-02-16 10:17:20 +00:00
|
|
|
background: Rectangle { color: subsurfaceTheme.backgroundColor }
|
2015-07-23 11:46:02 +00:00
|
|
|
|
2017-06-16 08:22:44 +00:00
|
|
|
property alias dcImportModel: importModel
|
2017-07-09 23:07:03 +00:00
|
|
|
property bool divesDownloaded: false
|
2017-10-12 07:43:40 +00:00
|
|
|
property bool btEnabled: manager.btEnabled
|
|
|
|
property string btMessage: manager.btEnabled ? "" : qsTr("Bluetooth is not enabled")
|
2018-08-08 13:02:49 +00:00
|
|
|
property alias vendor: comboVendor.currentIndex
|
|
|
|
property alias product: comboProduct.currentIndex
|
|
|
|
property alias connection: comboConnection.currentIndex
|
2017-05-29 18:36:00 +00:00
|
|
|
|
2019-09-25 18:49:13 +00:00
|
|
|
DCImportModel {
|
|
|
|
id: importModel
|
2017-05-26 15:53:25 +00:00
|
|
|
|
2019-09-25 18:49:13 +00:00
|
|
|
onDownloadFinished : {
|
2017-07-09 23:07:03 +00:00
|
|
|
progressBar.visible = false
|
2019-09-25 18:49:13 +00:00
|
|
|
if (rowCount() > 0) {
|
2019-10-30 08:16:58 +00:00
|
|
|
manager.appendTextToLog(rowCount() + " dive downloaded")
|
2017-07-09 23:07:03 +00:00
|
|
|
divesDownloaded = true
|
|
|
|
} else {
|
2019-10-30 08:16:58 +00:00
|
|
|
manager.appendTextToLog("no new dives downloaded")
|
2017-07-09 23:07:03 +00:00
|
|
|
divesDownloaded = false
|
|
|
|
}
|
2017-05-28 09:44:24 +00:00
|
|
|
manager.appendTextToLog("DCDownloadThread finished")
|
2017-05-26 15:53:25 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-02-02 19:48:43 +00:00
|
|
|
ColumnLayout {
|
2015-07-23 11:46:02 +00:00
|
|
|
anchors.top: parent.top
|
|
|
|
height: parent.height
|
2016-02-02 19:48:43 +00:00
|
|
|
width: parent.width
|
2017-05-12 15:55:19 +00:00
|
|
|
GridLayout {
|
2017-10-19 13:41:05 +00:00
|
|
|
id: buttonGrid
|
2018-06-25 08:41:29 +00:00
|
|
|
Layout.alignment: Qt.AlignTop
|
|
|
|
Layout.topMargin: Kirigami.Units.smallSpacing * 4
|
2017-05-12 15:55:19 +00:00
|
|
|
columns: 2
|
2018-09-26 12:57:12 +00:00
|
|
|
rowSpacing: 0
|
2018-09-25 17:58:12 +00:00
|
|
|
Controls.Label {
|
|
|
|
text: qsTr(" Vendor name: ")
|
|
|
|
font.pointSize: subsurfaceTheme.regularPointSize
|
|
|
|
}
|
2017-10-12 12:25:22 +00:00
|
|
|
Controls.ComboBox {
|
2017-05-12 16:29:45 +00:00
|
|
|
id: comboVendor
|
2017-05-12 16:17:23 +00:00
|
|
|
Layout.fillWidth: true
|
2020-01-14 20:29:08 +00:00
|
|
|
Layout.preferredHeight: Kirigami.Units.gridUnit * 2.5
|
2017-05-12 16:17:23 +00:00
|
|
|
model: vendorList
|
2018-06-04 16:37:43 +00:00
|
|
|
currentIndex: -1
|
2017-10-12 12:25:22 +00:00
|
|
|
delegate: Controls.ItemDelegate {
|
2017-07-17 19:07:19 +00:00
|
|
|
width: comboVendor.width
|
2020-01-14 20:29:08 +00:00
|
|
|
height: Kirigami.Units.gridUnit * 2.5
|
2017-07-17 19:07:19 +00:00
|
|
|
contentItem: Text {
|
|
|
|
text: modelData
|
|
|
|
font.pointSize: subsurfaceTheme.regularPointSize
|
|
|
|
verticalAlignment: Text.AlignVCenter
|
|
|
|
elide: Text.ElideRight
|
|
|
|
}
|
|
|
|
highlighted: comboVendor.highlightedIndex === index
|
|
|
|
}
|
|
|
|
contentItem: Text {
|
|
|
|
text: comboVendor.displayText
|
|
|
|
font.pointSize: subsurfaceTheme.regularPointSize
|
|
|
|
leftPadding: Kirigami.Units.gridUnit * 0.5
|
|
|
|
horizontalAlignment: Text.AlignLeft
|
|
|
|
verticalAlignment: Text.AlignVCenter
|
|
|
|
elide: Text.ElideRight
|
|
|
|
}
|
2017-06-05 16:18:17 +00:00
|
|
|
onCurrentTextChanged: {
|
2018-06-20 03:07:08 +00:00
|
|
|
manager.DC_vendor = currentText
|
2018-06-10 16:33:28 +00:00
|
|
|
comboProduct.model = manager.getProductListFromVendor(currentText)
|
|
|
|
if (currentIndex == manager.getDetectedVendorIndex())
|
|
|
|
comboProduct.currentIndex = manager.getDetectedProductIndex(currentText)
|
2018-08-08 22:42:26 +00:00
|
|
|
if (currentText === "Atomic Aquatics") {
|
|
|
|
comboConnection.model = [ qsTr("USB device") ]
|
|
|
|
comboConnection.currentIndex = 0
|
|
|
|
} else {
|
|
|
|
comboConnection.model = connectionListModel
|
|
|
|
}
|
2017-06-05 16:18:17 +00:00
|
|
|
}
|
2017-05-12 16:17:23 +00:00
|
|
|
}
|
2018-09-25 17:58:12 +00:00
|
|
|
Controls.Label {
|
|
|
|
text: qsTr(" Dive Computer:")
|
|
|
|
font.pointSize: subsurfaceTheme.regularPointSize
|
|
|
|
}
|
2017-10-12 12:25:22 +00:00
|
|
|
Controls.ComboBox {
|
2017-05-12 16:29:45 +00:00
|
|
|
id: comboProduct
|
|
|
|
Layout.fillWidth: true
|
2020-01-14 20:29:08 +00:00
|
|
|
Layout.preferredHeight: Kirigami.Units.gridUnit * 2.5
|
2017-06-05 16:18:17 +00:00
|
|
|
model: null
|
2018-06-04 16:37:43 +00:00
|
|
|
currentIndex: -1
|
2017-10-12 12:25:22 +00:00
|
|
|
delegate: Controls.ItemDelegate {
|
2017-07-17 19:07:19 +00:00
|
|
|
width: comboProduct.width
|
2020-01-14 20:29:08 +00:00
|
|
|
height: Kirigami.Units.gridUnit * 2.5
|
2017-07-17 19:07:19 +00:00
|
|
|
contentItem: Text {
|
|
|
|
text: modelData
|
|
|
|
font.pointSize: subsurfaceTheme.regularPointSize
|
|
|
|
verticalAlignment: Text.AlignVCenter
|
|
|
|
elide: Text.ElideRight
|
|
|
|
}
|
|
|
|
highlighted: comboProduct.highlightedIndex === index
|
|
|
|
}
|
|
|
|
contentItem: Text {
|
|
|
|
text: comboProduct.displayText
|
|
|
|
font.pointSize: subsurfaceTheme.regularPointSize
|
|
|
|
leftPadding: Kirigami.Units.gridUnit * 0.5
|
|
|
|
horizontalAlignment: Text.AlignLeft
|
|
|
|
verticalAlignment: Text.AlignVCenter
|
|
|
|
elide: Text.ElideRight
|
|
|
|
}
|
2017-07-17 04:50:28 +00:00
|
|
|
onCurrentTextChanged: {
|
2018-06-20 03:07:08 +00:00
|
|
|
manager.DC_product = currentText
|
2018-06-10 16:33:28 +00:00
|
|
|
var newIdx = manager.getMatchingAddress(comboVendor.currentText, currentText)
|
2017-07-17 13:06:22 +00:00
|
|
|
if (newIdx != -1)
|
|
|
|
comboConnection.currentIndex = newIdx
|
2017-07-17 04:50:28 +00:00
|
|
|
}
|
|
|
|
|
Mobile: wrap up fixes for BT download on Android
Major functional change in this commit is the addition of found static BT devices
to the internal administration (on Android), in a way that is equivalent to
mobile-on-desktop. So, in both cases, the list of devices in the app are
as in the list of devices on the host OS (Linux or Android). To minimize code
duplication, the btDeviceDiscovered slot is split in two parts, the part to
act as slot for the Qt BT discovery agent (Linux, so mobile-on-desktop), and
the part only needed for Android.
Remaining to be fixed: the correct handling of the QML UI selection of
vendor/product. The first default dive computer is correctly detected,
all paired devices from the virtual vendow can be selected, but clicking
through vendors results in non logical selections. It is obvious why
this is, but a fix is not straigforward at this point.
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-12 08:38:24 +00:00
|
|
|
onModelChanged: {
|
2018-06-10 16:33:28 +00:00
|
|
|
currentIndex = manager.getDetectedProductIndex(comboVendor.currentText)
|
Mobile: wrap up fixes for BT download on Android
Major functional change in this commit is the addition of found static BT devices
to the internal administration (on Android), in a way that is equivalent to
mobile-on-desktop. So, in both cases, the list of devices in the app are
as in the list of devices on the host OS (Linux or Android). To minimize code
duplication, the btDeviceDiscovered slot is split in two parts, the part to
act as slot for the Qt BT discovery agent (Linux, so mobile-on-desktop), and
the part only needed for Android.
Remaining to be fixed: the correct handling of the QML UI selection of
vendor/product. The first default dive computer is correctly detected,
all paired devices from the virtual vendow can be selected, but clicking
through vendors results in non logical selections. It is obvious why
this is, but a fix is not straigforward at this point.
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-12 08:38:24 +00:00
|
|
|
}
|
2017-05-29 22:11:11 +00:00
|
|
|
}
|
2018-09-25 17:58:12 +00:00
|
|
|
Controls.Label {
|
|
|
|
text: qsTr(" Connection:")
|
|
|
|
font.pointSize: subsurfaceTheme.regularPointSize
|
|
|
|
}
|
2017-10-12 12:25:22 +00:00
|
|
|
Controls.ComboBox {
|
2017-07-17 04:50:28 +00:00
|
|
|
id: comboConnection
|
|
|
|
Layout.fillWidth: true
|
2020-01-14 20:29:08 +00:00
|
|
|
Layout.preferredHeight: Kirigami.Units.gridUnit * 2.5
|
2017-07-17 04:50:28 +00:00
|
|
|
model: connectionListModel
|
|
|
|
currentIndex: -1
|
2017-10-12 12:25:22 +00:00
|
|
|
delegate: Controls.ItemDelegate {
|
2017-07-17 19:07:19 +00:00
|
|
|
width: comboConnection.width
|
2020-01-14 20:29:08 +00:00
|
|
|
height: Kirigami.Units.gridUnit * 2.5
|
2017-07-17 19:07:19 +00:00
|
|
|
contentItem: Text {
|
|
|
|
text: modelData
|
|
|
|
font.pointSize: subsurfaceTheme.smallPointSize
|
|
|
|
verticalAlignment: Text.AlignVCenter
|
|
|
|
elide: Text.ElideRight
|
|
|
|
}
|
|
|
|
highlighted: comboConnection.highlightedIndex === index
|
|
|
|
}
|
|
|
|
contentItem: Text {
|
|
|
|
text: comboConnection.displayText
|
|
|
|
font.pointSize: subsurfaceTheme.smallPointSize
|
|
|
|
leftPadding: Kirigami.Units.gridUnit * 0.5
|
|
|
|
horizontalAlignment: Text.AlignLeft
|
|
|
|
verticalAlignment: Text.AlignVCenter
|
|
|
|
elide: Text.ElideRight
|
|
|
|
}
|
2017-07-17 13:36:44 +00:00
|
|
|
onCurrentTextChanged: {
|
2019-12-22 17:43:47 +00:00
|
|
|
var curVendor
|
|
|
|
var curProduct
|
|
|
|
var curDevice
|
2018-09-30 15:43:59 +00:00
|
|
|
dc1.enabled = dc2.enabled = dc3.enabled = dc4.enabled = true
|
|
|
|
for (var i = 1; i < 5; i++) {
|
2019-12-22 17:43:47 +00:00
|
|
|
switch (i) {
|
|
|
|
case 1:
|
|
|
|
curVendor = PrefDiveComputer.vendor1
|
|
|
|
curProduct = PrefDiveComputer.product1
|
|
|
|
curDevice = PrefDiveComputer.device1
|
|
|
|
break
|
|
|
|
case 2:
|
|
|
|
curVendor = PrefDiveComputer.vendor2
|
|
|
|
curProduct = PrefDiveComputer.product2
|
|
|
|
curDevice = PrefDiveComputer.device2
|
|
|
|
break
|
|
|
|
case 3:
|
|
|
|
curVendor = PrefDiveComputer.vendor3
|
|
|
|
curProduct = PrefDiveComputer.product3
|
|
|
|
curDevice = PrefDiveComputer.device3
|
|
|
|
break
|
|
|
|
case 4:
|
|
|
|
curVendor = PrefDiveComputer.vendor4
|
|
|
|
curProduct = PrefDiveComputer.product4
|
|
|
|
curDevice = PrefDiveComputer.device4
|
|
|
|
break
|
|
|
|
}
|
|
|
|
|
2018-09-30 15:43:59 +00:00
|
|
|
if (comboProduct.currentIndex === -1 && currentText === "FTDI"){
|
2019-12-22 17:43:47 +00:00
|
|
|
if ( curVendor === comboVendor.currentText && curDevice.toUpperCase() === currentText)
|
|
|
|
rememberedDCsGrid.setDC(curVendor, curProduct, curDevice)
|
2018-09-30 15:43:59 +00:00
|
|
|
}else if (comboProduct.currentIndex !== -1 && currentText === "FTDI") {
|
2020-03-09 17:52:46 +00:00
|
|
|
if ( curVendor === comboVendor.currentText && curProduct === comboProduct.currentText && curDevice.toUpperCase() === currentText) {
|
2019-12-22 17:43:47 +00:00
|
|
|
disableDC(i)
|
2018-10-09 17:08:03 +00:00
|
|
|
break
|
2018-09-30 15:43:59 +00:00
|
|
|
}
|
2019-12-22 17:43:47 +00:00
|
|
|
}else if ( curVendor === comboVendor.currentText && curProduct === comboProduct.currentText && curProduct +" " + curDevice === currentText) {
|
|
|
|
disableDC(i)
|
2018-10-09 17:08:03 +00:00
|
|
|
break
|
2019-12-22 17:43:47 +00:00
|
|
|
}else if ( curVendor === comboVendor.currentText && curProduct === comboProduct.currentText && curDevice === currentText) {
|
|
|
|
disableDC(i)
|
2018-10-09 17:08:03 +00:00
|
|
|
break
|
2018-09-30 15:43:59 +00:00
|
|
|
}
|
|
|
|
}
|
2018-10-09 17:19:00 +00:00
|
|
|
download.text = qsTr("Download")
|
2017-07-08 16:59:48 +00:00
|
|
|
}
|
2017-05-12 16:29:45 +00:00
|
|
|
}
|
2016-02-02 19:48:43 +00:00
|
|
|
}
|
2017-05-12 15:55:19 +00:00
|
|
|
|
2018-09-22 16:17:12 +00:00
|
|
|
Controls.Label {
|
|
|
|
text: qsTr(" Previously used dive computers: ")
|
2019-09-13 19:56:55 +00:00
|
|
|
font.pointSize: subsurfaceTheme.regularPointSize
|
2018-09-22 16:17:12 +00:00
|
|
|
visible: PrefDiveComputer.vendor1 !== ""
|
|
|
|
}
|
|
|
|
Flow {
|
2018-09-21 22:42:34 +00:00
|
|
|
id: rememberedDCsGrid
|
|
|
|
visible: PrefDiveComputer.vendor1 !== ""
|
|
|
|
Layout.alignment: Qt.AlignTop
|
2018-09-22 16:17:12 +00:00
|
|
|
Layout.topMargin: Kirigami.Units.smallSpacing * 2
|
|
|
|
spacing: Kirigami.Units.smallSpacing;
|
2018-09-23 09:21:19 +00:00
|
|
|
Layout.fillWidth: true
|
2018-09-21 22:42:34 +00:00
|
|
|
function setDC(vendor, product, device) {
|
|
|
|
comboVendor.currentIndex = comboVendor.find(vendor);
|
|
|
|
comboProduct.currentIndex = comboProduct.find(product);
|
2018-09-23 05:53:43 +00:00
|
|
|
comboConnection.currentIndex = manager.getConnectionIndex(device);
|
2018-09-21 22:42:34 +00:00
|
|
|
}
|
2019-12-22 17:43:47 +00:00
|
|
|
function disableDC(inx) {
|
|
|
|
switch (inx) {
|
|
|
|
case 1:
|
|
|
|
dc1.enabled = false
|
|
|
|
break;
|
|
|
|
case 2:
|
|
|
|
dc2.enabled = false
|
|
|
|
break;
|
|
|
|
case 3:
|
|
|
|
dc3.enabled = false
|
|
|
|
break;
|
|
|
|
case 4:
|
|
|
|
dc4.enabled = false
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-02-11 16:09:51 +00:00
|
|
|
TemplateButton {
|
2018-09-21 22:42:34 +00:00
|
|
|
id: dc1
|
|
|
|
visible: PrefDiveComputer.vendor1 !== ""
|
|
|
|
text: PrefDiveComputer.vendor1 + " - " + PrefDiveComputer.product1
|
|
|
|
onClicked: {
|
|
|
|
// update comboboxes
|
|
|
|
rememberedDCsGrid.setDC(PrefDiveComputer.vendor1, PrefDiveComputer.product1, PrefDiveComputer.device1)
|
|
|
|
}
|
|
|
|
}
|
2019-02-11 16:09:51 +00:00
|
|
|
TemplateButton {
|
2018-09-21 22:42:34 +00:00
|
|
|
id: dc2
|
|
|
|
visible: PrefDiveComputer.vendor2 !== ""
|
|
|
|
text: PrefDiveComputer.vendor2 + " - " + PrefDiveComputer.product2
|
|
|
|
onClicked: {
|
|
|
|
// update comboboxes
|
|
|
|
rememberedDCsGrid.setDC(PrefDiveComputer.vendor2, PrefDiveComputer.product2, PrefDiveComputer.device2)
|
|
|
|
}
|
|
|
|
}
|
2019-02-11 16:09:51 +00:00
|
|
|
TemplateButton {
|
2018-09-21 22:42:34 +00:00
|
|
|
id: dc3
|
|
|
|
visible: PrefDiveComputer.vendor3 !== ""
|
|
|
|
text: PrefDiveComputer.vendor3 + " - " + PrefDiveComputer.product3
|
|
|
|
onClicked: {
|
|
|
|
// update comboboxes
|
|
|
|
rememberedDCsGrid.setDC(PrefDiveComputer.vendor3, PrefDiveComputer.product3, PrefDiveComputer.device3)
|
|
|
|
}
|
|
|
|
}
|
2019-02-11 16:09:51 +00:00
|
|
|
TemplateButton {
|
2018-09-21 22:42:34 +00:00
|
|
|
id: dc4
|
|
|
|
visible: PrefDiveComputer.vendor4 !== ""
|
|
|
|
text: PrefDiveComputer.vendor4 + " - " + PrefDiveComputer.product4
|
|
|
|
onClicked: {
|
|
|
|
// update comboboxes
|
|
|
|
rememberedDCsGrid.setDC(PrefDiveComputer.vendor4, PrefDiveComputer.product4, PrefDiveComputer.device4)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-10-12 12:25:22 +00:00
|
|
|
Controls.ProgressBar {
|
2017-07-09 23:07:03 +00:00
|
|
|
id: progressBar
|
2018-06-25 08:41:29 +00:00
|
|
|
Layout.topMargin: Kirigami.Units.smallSpacing * 4
|
2016-02-02 19:48:43 +00:00
|
|
|
Layout.fillWidth: true
|
2017-06-25 22:52:07 +00:00
|
|
|
indeterminate: true
|
2017-05-12 15:55:19 +00:00
|
|
|
visible: false
|
2016-02-02 19:48:43 +00:00
|
|
|
}
|
2017-05-12 15:55:19 +00:00
|
|
|
|
2016-02-02 19:48:43 +00:00
|
|
|
RowLayout {
|
2017-10-19 13:41:05 +00:00
|
|
|
id: buttonBar
|
2018-06-25 08:41:29 +00:00
|
|
|
Layout.fillWidth: true
|
2019-05-05 23:07:15 +00:00
|
|
|
Layout.topMargin: Kirigami.Units.smallSpacing
|
2017-07-24 00:45:55 +00:00
|
|
|
spacing: Kirigami.Units.smallSpacing
|
2019-02-11 16:09:51 +00:00
|
|
|
TemplateButton {
|
2017-07-08 13:16:42 +00:00
|
|
|
id: download
|
2016-05-03 19:24:00 +00:00
|
|
|
text: qsTr("Download")
|
2018-10-10 08:01:02 +00:00
|
|
|
enabled: comboVendor.currentIndex != -1 && comboProduct.currentIndex != -1 &&
|
|
|
|
comboConnection.currentIndex != -1
|
2016-02-02 19:48:43 +00:00
|
|
|
onClicked: {
|
2017-06-13 07:54:21 +00:00
|
|
|
text = qsTr("Retry")
|
2018-12-21 22:53:43 +00:00
|
|
|
|
|
|
|
var connectionString = comboConnection.currentText
|
|
|
|
// separate BT address and BT name (if applicable)
|
|
|
|
// pattern that matches BT addresses
|
|
|
|
var btAddr = "(LE:)?([0-9A-Fa-f]{2}:){5}[0-9A-Fa-f]{2}";
|
|
|
|
|
|
|
|
// On iOS we store UUID instead of device address.
|
|
|
|
if (Qt.platform.os === 'ios')
|
|
|
|
btAddr = "(LE:)?\{?[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}\}";
|
|
|
|
|
|
|
|
var pattern = new RegExp(btAddr);
|
|
|
|
var devAddress = "";
|
|
|
|
devAddress = pattern.exec(connectionString);
|
|
|
|
if (devAddress !== null) {
|
|
|
|
manager.DC_bluetoothMode = true;
|
|
|
|
manager.DC_devName = devAddress[0]; // exec returns an array with the matched text in element 0
|
|
|
|
manager.retrieveBluetoothName();
|
|
|
|
manager.appendTextToLog("setting btName to " + manager.DC_devBluetoothName);
|
|
|
|
} else {
|
|
|
|
manager.DC_bluetoothMode = false;
|
|
|
|
manager.DC_devName = connectionString;
|
|
|
|
}
|
2019-05-05 23:07:15 +00:00
|
|
|
var message = "DCDownloadThread started for " + manager.DC_vendor + " " + manager.DC_product + " on " + manager.DC_devName;
|
|
|
|
message += " downloading " + (manager.DC_forceDownload ? "all" : "only new" ) + " dives";
|
|
|
|
manager.appendTextToLog(message)
|
2017-07-09 23:07:03 +00:00
|
|
|
progressBar.visible = true
|
2020-03-07 23:15:37 +00:00
|
|
|
divesDownloaded = false // this allows the progressMessage to be displayed
|
2019-09-25 18:49:13 +00:00
|
|
|
importModel.startDownload()
|
2016-02-02 19:48:43 +00:00
|
|
|
}
|
|
|
|
}
|
2019-02-11 16:09:51 +00:00
|
|
|
TemplateButton {
|
2016-02-02 19:48:43 +00:00
|
|
|
id:quitbutton
|
2017-07-19 07:16:47 +00:00
|
|
|
text: progressBar.visible ? qsTr("Cancel") : qsTr("Quit")
|
2016-02-02 19:48:43 +00:00
|
|
|
onClicked: {
|
2017-07-19 07:16:47 +00:00
|
|
|
manager.cancelDownloadDC()
|
2017-12-13 13:39:10 +00:00
|
|
|
if (!progressBar.visible) {
|
2020-03-09 17:52:46 +00:00
|
|
|
// remove the download page and show dive list
|
|
|
|
pageStack.pop(downloadFromDc)
|
|
|
|
rootItem.showDiveList()
|
2017-12-13 13:39:10 +00:00
|
|
|
download.text = qsTr("Download")
|
2017-12-13 14:30:51 +00:00
|
|
|
divesDownloaded = false
|
|
|
|
manager.progressMessage = ""
|
2020-03-09 17:52:46 +00:00
|
|
|
manager.appendTextToLog("exit DCDownload screen")
|
|
|
|
} else {
|
|
|
|
manager.appendTextToLog("cancel download")
|
2017-12-13 13:39:10 +00:00
|
|
|
}
|
2016-02-02 19:48:43 +00:00
|
|
|
}
|
|
|
|
}
|
2019-02-11 16:09:51 +00:00
|
|
|
TemplateButton {
|
2017-12-05 19:58:54 +00:00
|
|
|
id:rescanbutton
|
|
|
|
text: qsTr("Rescan")
|
2018-10-10 08:12:28 +00:00
|
|
|
enabled: manager.btEnabled
|
2017-12-05 19:58:54 +00:00
|
|
|
onClicked: {
|
|
|
|
manager.btRescan()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-10-12 12:25:22 +00:00
|
|
|
Controls.Label {
|
2018-06-27 23:27:59 +00:00
|
|
|
Layout.fillWidth: true
|
2017-07-24 00:45:55 +00:00
|
|
|
text: divesDownloaded ? qsTr(" Downloaded dives") :
|
2017-07-24 00:51:48 +00:00
|
|
|
(manager.progressMessage != "" ? qsTr("Info:") + " " + manager.progressMessage : btMessage)
|
2017-07-24 00:45:55 +00:00
|
|
|
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
|
|
|
|
}
|
2016-02-02 19:48:43 +00:00
|
|
|
}
|
2017-05-26 15:53:25 +00:00
|
|
|
|
2019-05-05 23:07:15 +00:00
|
|
|
RowLayout {
|
|
|
|
id: downloadOptions
|
|
|
|
Layout.fillWidth: true
|
|
|
|
Layout.topMargin: 0
|
|
|
|
spacing: Kirigami.Units.smallSpacing
|
|
|
|
SsrfCheckBox {
|
|
|
|
id: forceAll
|
|
|
|
checked: manager.DC_forceDownload
|
|
|
|
enabled: forceAllLabel.visible
|
|
|
|
visible: enabled
|
|
|
|
height: forceAllLabel.height - Kirigami.Units.smallSpacing;
|
|
|
|
width: height
|
|
|
|
onClicked: {
|
|
|
|
manager.DC_forceDownload = !manager.DC_forceDownload;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
Controls.Label {
|
|
|
|
id: forceAllLabel
|
|
|
|
text: qsTr("force downloading all dives")
|
|
|
|
visible: comboVendor.currentIndex != -1 && comboProduct.currentIndex != -1 &&
|
|
|
|
comboConnection.currentIndex != -1
|
|
|
|
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-05-29 17:55:36 +00:00
|
|
|
ListView {
|
2017-10-19 13:41:05 +00:00
|
|
|
id: dlList
|
2018-06-25 08:41:29 +00:00
|
|
|
Layout.topMargin: Kirigami.Units.smallSpacing * 4
|
2018-09-26 12:57:12 +00:00
|
|
|
Layout.bottomMargin: bottomButtons.height / 2
|
2017-05-29 17:55:36 +00:00
|
|
|
Layout.fillWidth: true
|
|
|
|
Layout.fillHeight: true
|
|
|
|
|
|
|
|
model : importModel
|
|
|
|
delegate : DownloadedDiveDelegate {
|
2017-05-29 18:36:00 +00:00
|
|
|
id: delegate
|
2017-06-25 23:12:07 +00:00
|
|
|
datetime: model.datetime ? model.datetime : ""
|
|
|
|
duration: model.duration ? model.duration : ""
|
|
|
|
depth: model.depth ? model.depth : ""
|
|
|
|
selected: model.selected ? model.selected : false
|
2017-05-29 18:36:00 +00:00
|
|
|
|
|
|
|
onClicked : {
|
2019-10-30 08:16:58 +00:00
|
|
|
manager.appendTextToLog("Selecting index" + index);
|
2017-05-29 18:36:00 +00:00
|
|
|
importModel.selectRow(index)
|
|
|
|
}
|
2016-02-02 19:48:43 +00:00
|
|
|
}
|
2017-05-12 15:55:19 +00:00
|
|
|
}
|
2019-10-21 21:16:49 +00:00
|
|
|
Controls.Label {
|
|
|
|
text: qsTr("Please wait while we record these dives...")
|
|
|
|
Layout.fillWidth: true
|
|
|
|
visible: acceptButton.busy
|
|
|
|
leftPadding: Kirigami.Units.gridUnit * 3 // trust me - that looks better
|
|
|
|
}
|
2016-02-02 19:48:43 +00:00
|
|
|
RowLayout {
|
2017-10-27 12:29:23 +00:00
|
|
|
id: bottomButtons
|
2017-10-12 12:25:22 +00:00
|
|
|
Controls.Label {
|
2017-06-25 23:12:45 +00:00
|
|
|
text: "" // Spacer on the left for hamburger menu
|
2019-09-21 23:30:12 +00:00
|
|
|
width: Kirigami.Units.gridUnit * 2.5
|
2017-06-25 23:12:45 +00:00
|
|
|
}
|
2019-02-11 16:09:51 +00:00
|
|
|
TemplateButton {
|
2017-05-28 10:22:46 +00:00
|
|
|
id: acceptButton
|
2019-10-21 21:16:49 +00:00
|
|
|
property bool busy: false
|
2017-07-09 23:07:03 +00:00
|
|
|
enabled: divesDownloaded
|
2016-05-03 19:24:00 +00:00
|
|
|
text: qsTr("Accept")
|
2018-09-26 12:57:12 +00:00
|
|
|
bottomPadding: Kirigami.Units.gridUnit / 2
|
2016-02-02 19:48:43 +00:00
|
|
|
onClicked: {
|
2019-10-29 18:19:31 +00:00
|
|
|
manager.appendTextToLog("Save downloaded dives that were selected")
|
2019-10-21 21:16:49 +00:00
|
|
|
busy = true
|
2019-11-03 14:38:19 +00:00
|
|
|
rootItem.showBusy("Save selected dives")
|
2019-10-29 18:19:31 +00:00
|
|
|
manager.appendTextToLog("temporary disconnecting dive list model")
|
|
|
|
diveList.diveListModel = null
|
|
|
|
manager.appendTextToLog("Record dives")
|
2017-05-28 18:48:30 +00:00
|
|
|
importModel.recordDives()
|
|
|
|
manager.saveChangesLocal()
|
2019-10-29 18:19:31 +00:00
|
|
|
manager.appendTextToLog("resetting model and refreshing the dive list")
|
2019-09-28 22:26:08 +00:00
|
|
|
diveModel.resetInternalData()
|
|
|
|
manager.refreshDiveList()
|
2019-10-29 18:19:31 +00:00
|
|
|
manager.appendTextToLog("pageStack popping Download page")
|
2019-10-25 23:59:06 +00:00
|
|
|
pageStack.pop()
|
2019-10-29 18:19:31 +00:00
|
|
|
manager.appendTextToLog("setting up the dive list model again")
|
|
|
|
diveList.diveListModel = diveModel
|
|
|
|
manager.appendTextToLog("pageStack switching to dive list")
|
|
|
|
showDiveList()
|
2017-12-13 13:39:10 +00:00
|
|
|
download.text = qsTr("Download")
|
2019-10-21 21:16:49 +00:00
|
|
|
busy = false
|
|
|
|
rootItem.hideBusy()
|
2017-12-13 14:30:51 +00:00
|
|
|
divesDownloaded = false
|
2019-10-29 18:19:31 +00:00
|
|
|
manager.appendTextToLog("switch to dive list has completed")
|
2015-07-23 11:46:02 +00:00
|
|
|
}
|
|
|
|
}
|
2017-10-12 12:25:22 +00:00
|
|
|
Controls.Label {
|
2016-02-02 19:48:43 +00:00
|
|
|
text: "" // Spacer between 2 button groups
|
|
|
|
Layout.fillWidth: true
|
|
|
|
}
|
2019-02-11 16:09:51 +00:00
|
|
|
TemplateButton {
|
2017-07-08 13:16:42 +00:00
|
|
|
id: select
|
2017-07-09 23:07:03 +00:00
|
|
|
enabled: divesDownloaded
|
2016-05-03 19:24:00 +00:00
|
|
|
text: qsTr("Select All")
|
2018-09-26 12:57:12 +00:00
|
|
|
bottomPadding: Kirigami.Units.gridUnit / 2
|
2017-05-29 18:36:00 +00:00
|
|
|
onClicked : {
|
|
|
|
importModel.selectAll()
|
|
|
|
}
|
2016-02-02 19:48:43 +00:00
|
|
|
}
|
2019-02-11 16:09:51 +00:00
|
|
|
TemplateButton {
|
2017-07-08 13:16:42 +00:00
|
|
|
id: unselect
|
2017-07-09 23:07:03 +00:00
|
|
|
enabled: divesDownloaded
|
2016-05-03 19:24:00 +00:00
|
|
|
text: qsTr("Unselect All")
|
2018-09-26 12:57:12 +00:00
|
|
|
bottomPadding: Kirigami.Units.gridUnit / 2
|
2017-05-29 18:36:00 +00:00
|
|
|
onClicked : {
|
|
|
|
importModel.selectNone()
|
|
|
|
}
|
2016-02-02 19:48:43 +00:00
|
|
|
}
|
|
|
|
}
|
2018-06-04 16:37:43 +00:00
|
|
|
|
|
|
|
onVisibleChanged: {
|
2018-09-23 09:44:05 +00:00
|
|
|
comboVendor.currentIndex = comboProduct.currentIndex = comboConnection.currentIndex = -1
|
2018-09-30 15:43:59 +00:00
|
|
|
dc1.enabled = dc2.enabled = dc3.enabled = dc4.enabled = true
|
|
|
|
if (visible) {
|
|
|
|
comboVendor.currentIndex = manager.getDetectedVendorIndex()
|
|
|
|
comboProduct.currentIndex = manager.getDetectedProductIndex(comboVendor.currentText)
|
|
|
|
comboConnection.currentIndex = manager.getMatchingAddress(comboVendor.currentText, comboProduct.currentText)
|
2018-12-21 22:53:43 +00:00
|
|
|
|
2018-06-04 16:37:43 +00:00
|
|
|
}
|
|
|
|
}
|
2015-07-23 11:46:02 +00:00
|
|
|
}
|
|
|
|
}
|