mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-30 22:20:21 +00:00
9f34f4f97d
If the dive list is connected to the model while the model is updated with the downloaded dives, sometimes the UI hangs completely. Disconnecting the model and then reconnecting it does add a fairly noticeable delay on longer dive lists, so there are tradeoffs here. Of course the obvious solution is to make reconnecting the model faster... Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
447 lines
14 KiB
QML
447 lines
14 KiB
QML
// SPDX-License-Identifier: GPL-2.0
|
|
import QtQuick 2.6
|
|
import QtQuick.Controls 2.2 as Controls
|
|
import QtQuick.Window 2.2
|
|
import QtQuick.Dialogs 1.2
|
|
import QtQuick.Layouts 1.3
|
|
import org.subsurfacedivelog.mobile 1.0
|
|
import org.kde.kirigami 2.4 as Kirigami
|
|
|
|
Kirigami.Page {
|
|
id: diveComputerDownloadWindow
|
|
leftPadding: Kirigami.Units.gridUnit / 2
|
|
rightPadding: Kirigami.Units.gridUnit / 2
|
|
topPadding: 0
|
|
bottomPadding: 0
|
|
title: qsTr("Dive Computer")
|
|
background: Rectangle { color: subsurfaceTheme.backgroundColor }
|
|
|
|
property alias dcImportModel: importModel
|
|
property bool divesDownloaded: false
|
|
property bool btEnabled: manager.btEnabled
|
|
property string btMessage: manager.btEnabled ? "" : qsTr("Bluetooth is not enabled")
|
|
property alias vendor: comboVendor.currentIndex
|
|
property alias product: comboProduct.currentIndex
|
|
property alias connection: comboConnection.currentIndex
|
|
|
|
DCImportModel {
|
|
id: importModel
|
|
|
|
onDownloadFinished : {
|
|
progressBar.visible = false
|
|
if (rowCount() > 0) {
|
|
manager.appendTextToLog(rowCount() + " dive downloaded")
|
|
divesDownloaded = true
|
|
} else {
|
|
manager.appendTextToLog("no new dives downloaded")
|
|
divesDownloaded = false
|
|
}
|
|
manager.appendTextToLog("DCDownloadThread finished")
|
|
}
|
|
}
|
|
|
|
ColumnLayout {
|
|
anchors.top: parent.top
|
|
height: parent.height
|
|
width: parent.width
|
|
GridLayout {
|
|
id: buttonGrid
|
|
Layout.alignment: Qt.AlignTop
|
|
Layout.topMargin: Kirigami.Units.smallSpacing * 4
|
|
columns: 2
|
|
rowSpacing: 0
|
|
Controls.Label {
|
|
text: qsTr(" Vendor name: ")
|
|
font.pointSize: subsurfaceTheme.regularPointSize
|
|
}
|
|
Controls.ComboBox {
|
|
id: comboVendor
|
|
Layout.fillWidth: true
|
|
Layout.preferredHeight: fontMetrics.height * 2.5
|
|
model: vendorList
|
|
currentIndex: -1
|
|
delegate: Controls.ItemDelegate {
|
|
width: comboVendor.width
|
|
height: fontMetrics.height * 2.0
|
|
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
|
|
}
|
|
onCurrentTextChanged: {
|
|
manager.DC_vendor = currentText
|
|
comboProduct.model = manager.getProductListFromVendor(currentText)
|
|
if (currentIndex == manager.getDetectedVendorIndex())
|
|
comboProduct.currentIndex = manager.getDetectedProductIndex(currentText)
|
|
if (currentText === "Atomic Aquatics") {
|
|
comboConnection.model = [ qsTr("USB device") ]
|
|
comboConnection.currentIndex = 0
|
|
} else {
|
|
comboConnection.model = connectionListModel
|
|
}
|
|
}
|
|
}
|
|
Controls.Label {
|
|
text: qsTr(" Dive Computer:")
|
|
font.pointSize: subsurfaceTheme.regularPointSize
|
|
}
|
|
Controls.ComboBox {
|
|
id: comboProduct
|
|
Layout.fillWidth: true
|
|
Layout.preferredHeight: fontMetrics.height * 2.5
|
|
model: null
|
|
currentIndex: -1
|
|
delegate: Controls.ItemDelegate {
|
|
width: comboProduct.width
|
|
height: fontMetrics.height * 2.0
|
|
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
|
|
}
|
|
onCurrentTextChanged: {
|
|
manager.DC_product = currentText
|
|
var newIdx = manager.getMatchingAddress(comboVendor.currentText, currentText)
|
|
if (newIdx != -1)
|
|
comboConnection.currentIndex = newIdx
|
|
}
|
|
|
|
onModelChanged: {
|
|
currentIndex = manager.getDetectedProductIndex(comboVendor.currentText)
|
|
}
|
|
}
|
|
Controls.Label {
|
|
text: qsTr(" Connection:")
|
|
font.pointSize: subsurfaceTheme.regularPointSize
|
|
}
|
|
Controls.ComboBox {
|
|
id: comboConnection
|
|
Layout.fillWidth: true
|
|
Layout.preferredHeight: fontMetrics.height * 2.5
|
|
model: connectionListModel
|
|
currentIndex: -1
|
|
delegate: Controls.ItemDelegate {
|
|
width: comboConnection.width
|
|
height: fontMetrics.height * 2.0
|
|
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
|
|
}
|
|
onCurrentTextChanged: {
|
|
dc1.enabled = dc2.enabled = dc3.enabled = dc4.enabled = true
|
|
for (var i = 1; i < 5; i++) {
|
|
if (comboProduct.currentIndex === -1 && currentText === "FTDI"){
|
|
if ( eval("PrefDiveComputer.vendor" + i) === comboVendor.currentText && eval("PrefDiveComputer.device" + i).toUpperCase() === currentText)
|
|
rememberedDCsGrid.setDC(eval("PrefDiveComputer.vendor" + i), eval("PrefDiveComputer.product" + i), ("PrefDiveComputer.device" + i))
|
|
}else if (comboProduct.currentIndex !== -1 && currentText === "FTDI") {
|
|
if ( eval("PrefDiveComputer.vendor" + i) === comboVendor.currentText && eval("PrefDiveComputer.product" + i) === comboProduct.currentText && eval("PrefDiveComputer.device" + i).toUpperCase() === currentText) {
|
|
eval("dc"+ i + ".enabled = false")
|
|
break
|
|
}
|
|
}else if ( eval("PrefDiveComputer.vendor" + i) === comboVendor.currentText && eval("PrefDiveComputer.product" + i) === comboProduct.currentText && eval("PrefDiveComputer.product" + i) +" " + eval("PrefDiveComputer.device" + i) === currentText) {
|
|
eval("dc"+ i + ".enabled = false")
|
|
break
|
|
}else if ( eval("PrefDiveComputer.vendor" + i) === comboVendor.currentText && eval("PrefDiveComputer.product" + i) === comboProduct.currentText && eval("PrefDiveComputer.device" + i) === currentText) {
|
|
eval("dc"+ i + ".enabled = false")
|
|
break
|
|
}
|
|
}
|
|
download.text = qsTr("Download")
|
|
}
|
|
}
|
|
}
|
|
|
|
Controls.Label {
|
|
text: qsTr(" Previously used dive computers: ")
|
|
font.pointSize: subsurfaceTheme.regularPointSize
|
|
visible: PrefDiveComputer.vendor1 !== ""
|
|
}
|
|
Flow {
|
|
id: rememberedDCsGrid
|
|
visible: PrefDiveComputer.vendor1 !== ""
|
|
Layout.alignment: Qt.AlignTop
|
|
Layout.topMargin: Kirigami.Units.smallSpacing * 2
|
|
spacing: Kirigami.Units.smallSpacing;
|
|
Layout.fillWidth: true
|
|
function setDC(vendor, product, device) {
|
|
comboVendor.currentIndex = comboVendor.find(vendor);
|
|
comboProduct.currentIndex = comboProduct.find(product);
|
|
comboConnection.currentIndex = manager.getConnectionIndex(device);
|
|
}
|
|
SsrfButton {
|
|
id: dc1
|
|
visible: PrefDiveComputer.vendor1 !== ""
|
|
text: PrefDiveComputer.vendor1 + " - " + PrefDiveComputer.product1
|
|
onClicked: {
|
|
// update comboboxes
|
|
rememberedDCsGrid.setDC(PrefDiveComputer.vendor1, PrefDiveComputer.product1, PrefDiveComputer.device1)
|
|
}
|
|
}
|
|
SsrfButton {
|
|
id: dc2
|
|
visible: PrefDiveComputer.vendor2 !== ""
|
|
text: PrefDiveComputer.vendor2 + " - " + PrefDiveComputer.product2
|
|
onClicked: {
|
|
// update comboboxes
|
|
rememberedDCsGrid.setDC(PrefDiveComputer.vendor2, PrefDiveComputer.product2, PrefDiveComputer.device2)
|
|
}
|
|
}
|
|
SsrfButton {
|
|
id: dc3
|
|
visible: PrefDiveComputer.vendor3 !== ""
|
|
text: PrefDiveComputer.vendor3 + " - " + PrefDiveComputer.product3
|
|
onClicked: {
|
|
// update comboboxes
|
|
rememberedDCsGrid.setDC(PrefDiveComputer.vendor3, PrefDiveComputer.product3, PrefDiveComputer.device3)
|
|
}
|
|
}
|
|
SsrfButton {
|
|
id: dc4
|
|
visible: PrefDiveComputer.vendor4 !== ""
|
|
text: PrefDiveComputer.vendor4 + " - " + PrefDiveComputer.product4
|
|
onClicked: {
|
|
// update comboboxes
|
|
rememberedDCsGrid.setDC(PrefDiveComputer.vendor4, PrefDiveComputer.product4, PrefDiveComputer.device4)
|
|
}
|
|
}
|
|
}
|
|
|
|
Controls.ProgressBar {
|
|
id: progressBar
|
|
Layout.topMargin: Kirigami.Units.smallSpacing * 4
|
|
Layout.fillWidth: true
|
|
indeterminate: true
|
|
visible: false
|
|
}
|
|
|
|
RowLayout {
|
|
id: buttonBar
|
|
Layout.fillWidth: true
|
|
Layout.topMargin: Kirigami.Units.smallSpacing
|
|
spacing: Kirigami.Units.smallSpacing
|
|
SsrfButton {
|
|
id: download
|
|
text: qsTr("Download")
|
|
enabled: comboVendor.currentIndex != -1 && comboProduct.currentIndex != -1 &&
|
|
comboConnection.currentIndex != -1
|
|
onClicked: {
|
|
text = qsTr("Retry")
|
|
|
|
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;
|
|
}
|
|
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)
|
|
progressBar.visible = true
|
|
importModel.startDownload()
|
|
}
|
|
}
|
|
SsrfButton {
|
|
id:quitbutton
|
|
text: progressBar.visible ? qsTr("Cancel") : qsTr("Quit")
|
|
onClicked: {
|
|
manager.cancelDownloadDC()
|
|
if (!progressBar.visible) {
|
|
pageStack.pop();
|
|
download.text = qsTr("Download")
|
|
divesDownloaded = false
|
|
manager.progressMessage = ""
|
|
}
|
|
manager.appendTextToLog("exit DCDownload screen")
|
|
}
|
|
}
|
|
SsrfButton {
|
|
id:rescanbutton
|
|
text: qsTr("Rescan")
|
|
enabled: manager.btEnabled
|
|
onClicked: {
|
|
manager.btRescan()
|
|
}
|
|
}
|
|
|
|
Controls.Label {
|
|
Layout.fillWidth: true
|
|
text: divesDownloaded ? qsTr(" Downloaded dives") :
|
|
(manager.progressMessage != "" ? qsTr("Info:") + " " + manager.progressMessage : btMessage)
|
|
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
|
|
}
|
|
}
|
|
|
|
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
|
|
}
|
|
}
|
|
|
|
ListView {
|
|
id: dlList
|
|
Layout.topMargin: Kirigami.Units.smallSpacing * 4
|
|
Layout.bottomMargin: bottomButtons.height / 2
|
|
Layout.fillWidth: true
|
|
Layout.fillHeight: true
|
|
|
|
model : importModel
|
|
delegate : DownloadedDiveDelegate {
|
|
id: delegate
|
|
datetime: model.datetime ? model.datetime : ""
|
|
duration: model.duration ? model.duration : ""
|
|
depth: model.depth ? model.depth : ""
|
|
selected: model.selected ? model.selected : false
|
|
|
|
onClicked : {
|
|
manager.appendTextToLog("Selecting index" + index);
|
|
importModel.selectRow(index)
|
|
}
|
|
}
|
|
}
|
|
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
|
|
}
|
|
RowLayout {
|
|
id: bottomButtons
|
|
Controls.Label {
|
|
text: "" // Spacer on the left for hamburger menu
|
|
width: Kirigami.Units.gridUnit * 2.5
|
|
}
|
|
SsrfButton {
|
|
id: acceptButton
|
|
property bool busy: false
|
|
enabled: divesDownloaded
|
|
text: qsTr("Accept")
|
|
bottomPadding: Kirigami.Units.gridUnit / 2
|
|
onClicked: {
|
|
manager.appendTextToLog("Save downloaded dives that were selected")
|
|
busy = true
|
|
rootItem.showBusy()
|
|
manager.appendTextToLog("temporary disconnecting dive list model")
|
|
diveList.diveListModel = null
|
|
manager.appendTextToLog("Record dives")
|
|
importModel.recordDives()
|
|
manager.saveChangesLocal()
|
|
manager.appendTextToLog("resetting model and refreshing the dive list")
|
|
diveModel.resetInternalData()
|
|
manager.refreshDiveList()
|
|
manager.appendTextToLog("pageStack popping Download page")
|
|
pageStack.pop()
|
|
manager.appendTextToLog("setting up the dive list model again")
|
|
diveList.diveListModel = diveModel
|
|
manager.appendTextToLog("pageStack switching to dive list")
|
|
showDiveList()
|
|
download.text = qsTr("Download")
|
|
busy = false
|
|
rootItem.hideBusy()
|
|
divesDownloaded = false
|
|
manager.appendTextToLog("switch to dive list has completed")
|
|
}
|
|
}
|
|
Controls.Label {
|
|
text: "" // Spacer between 2 button groups
|
|
Layout.fillWidth: true
|
|
}
|
|
SsrfButton {
|
|
id: select
|
|
enabled: divesDownloaded
|
|
text: qsTr("Select All")
|
|
bottomPadding: Kirigami.Units.gridUnit / 2
|
|
onClicked : {
|
|
importModel.selectAll()
|
|
}
|
|
}
|
|
SsrfButton {
|
|
id: unselect
|
|
enabled: divesDownloaded
|
|
text: qsTr("Unselect All")
|
|
bottomPadding: Kirigami.Units.gridUnit / 2
|
|
onClicked : {
|
|
importModel.selectNone()
|
|
}
|
|
}
|
|
}
|
|
|
|
onVisibleChanged: {
|
|
comboVendor.currentIndex = comboProduct.currentIndex = comboConnection.currentIndex = -1
|
|
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)
|
|
|
|
}
|
|
}
|
|
}
|
|
}
|