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-07-08 16:59:48 +00:00
|
|
|
import QtQuick.Controls 2.2
|
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
|
2017-03-31 14:15:14 +00:00
|
|
|
import org.kde.kirigami 2.0 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
|
2016-02-02 19:48:43 +00:00
|
|
|
anchors.top:parent.top
|
2015-07-23 11:46:02 +00:00
|
|
|
width: parent.width
|
|
|
|
height: parent.height
|
2016-02-02 19:48:43 +00:00
|
|
|
Layout.fillWidth: true;
|
2016-05-03 19:24:00 +00:00
|
|
|
title: qsTr("Dive Computer")
|
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-07-12 11:16:37 +00:00
|
|
|
property bool btEnabled: manager.btEnabled()
|
2017-07-24 00:51:48 +00:00
|
|
|
property string btMessage: manager.btEnabled() ? "" : qsTr("Bluetooth is not enabled")
|
2017-05-29 18:36:00 +00:00
|
|
|
|
2017-05-26 14:40:50 +00:00
|
|
|
DCDownloadThread {
|
2017-05-28 09:23:03 +00:00
|
|
|
id: downloadThread
|
2017-05-26 14:40:50 +00:00
|
|
|
deviceData.vendor : comboVendor.currentText
|
|
|
|
deviceData.product : comboProduct.currentText
|
2017-07-17 04:50:28 +00:00
|
|
|
deviceData.devName : comboConnection.currentText
|
2017-05-26 14:40:50 +00:00
|
|
|
|
|
|
|
//TODO: Make this the default on the C++
|
2017-07-17 19:09:11 +00:00
|
|
|
deviceData.bluetoothMode : true
|
2017-05-26 14:40:50 +00:00
|
|
|
deviceData.forceDownload : false
|
|
|
|
deviceData.createNewTrip : false
|
|
|
|
deviceData.deviceId : 0
|
|
|
|
deviceData.diveId : 0
|
|
|
|
deviceData.saveDump : false
|
|
|
|
deviceData.saveLog : false
|
2017-05-26 15:53:25 +00:00
|
|
|
|
|
|
|
onFinished : {
|
|
|
|
importModel.repopulate()
|
2017-07-09 23:07:03 +00:00
|
|
|
progressBar.visible = false
|
|
|
|
if (dcImportModel.rowCount() > 0) {
|
|
|
|
console.log(dcImportModel.rowCount() + " dive downloaded")
|
|
|
|
divesDownloaded = true
|
|
|
|
} else {
|
|
|
|
console.log("no new dives downloaded")
|
|
|
|
divesDownloaded = false
|
|
|
|
}
|
2017-05-28 09:44:24 +00:00
|
|
|
manager.appendTextToLog("DCDownloadThread finished")
|
2017-05-26 15:53:25 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
DCImportModel {
|
|
|
|
id: importModel
|
2017-05-26 14:40:50 +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
|
|
|
|
Layout.fillWidth: true
|
2017-05-12 15:55:19 +00:00
|
|
|
GridLayout {
|
|
|
|
columns: 2
|
2017-05-12 16:17:23 +00:00
|
|
|
Kirigami.Label { text: qsTr(" Vendor name: ") }
|
2017-08-26 19:27:12 +00:00
|
|
|
property var vendoridx: downloadThread.data().getDetectedVendorIndex()
|
2017-05-12 16:17:23 +00:00
|
|
|
ComboBox {
|
2017-05-12 16:29:45 +00:00
|
|
|
id: comboVendor
|
2017-05-12 16:17:23 +00:00
|
|
|
Layout.fillWidth: true
|
|
|
|
model: vendorList
|
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
|
|
|
currentIndex: parent.vendoridx
|
2017-07-17 19:07:19 +00:00
|
|
|
delegate: ItemDelegate {
|
|
|
|
width: comboVendor.width
|
|
|
|
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: {
|
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
|
|
|
comboProduct.model = downloadThread.data().getProductListFromVendor(currentText)
|
2017-08-26 19:27:12 +00:00
|
|
|
if (currentIndex == downloadThread.data().getDetectedVendorIndex())
|
|
|
|
comboProduct.currentIndex = downloadThread.data().getDetectedProductIndex(currentText)
|
2017-06-05 16:18:17 +00:00
|
|
|
}
|
2017-05-12 16:17:23 +00:00
|
|
|
}
|
2017-05-12 16:29:45 +00:00
|
|
|
Kirigami.Label { text: qsTr(" Dive Computer:") }
|
|
|
|
ComboBox {
|
|
|
|
id: comboProduct
|
2017-08-26 19:27:12 +00:00
|
|
|
property var productidx: downloadThread.data().getDetectedProductIndex(comboVendor.currentText)
|
2017-05-12 16:29:45 +00:00
|
|
|
Layout.fillWidth: true
|
2017-06-05 16:18:17 +00:00
|
|
|
model: null
|
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
|
|
|
currentIndex: productidx
|
2017-07-17 19:07:19 +00:00
|
|
|
delegate: ItemDelegate {
|
|
|
|
width: comboProduct.width
|
|
|
|
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: {
|
2017-07-17 13:06:22 +00:00
|
|
|
var newIdx = downloadThread.data().getMatchingAddress(comboVendor.currentText, currentText)
|
|
|
|
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: {
|
|
|
|
currentIndex = productidx
|
|
|
|
}
|
2017-05-29 22:11:11 +00:00
|
|
|
}
|
2017-07-17 04:50:28 +00:00
|
|
|
Kirigami.Label { text: qsTr(" Connection:") }
|
|
|
|
ComboBox {
|
|
|
|
id: comboConnection
|
|
|
|
Layout.fillWidth: true
|
|
|
|
model: connectionListModel
|
|
|
|
currentIndex: -1
|
2017-07-17 19:07:19 +00:00
|
|
|
delegate: ItemDelegate {
|
|
|
|
width: comboConnection.width
|
|
|
|
contentItem: Text {
|
|
|
|
text: modelData
|
|
|
|
// color: "#21be2b"
|
|
|
|
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: {
|
|
|
|
// pattern that matches BT addresses
|
|
|
|
var btAddr = /[0-9A-Fa-f][0-9A-Fa-f]:[0-9A-Fa-f][0-9A-Fa-f]:[0-9A-Fa-f][0-9A-Fa-f]:[0-9A-Fa-f][0-9A-Fa-f]:[0-9A-Fa-f][0-9A-Fa-f]:[0-9A-Fa-f][0-9A-Fa-f]/ ;
|
|
|
|
if (btAddr.test(currentText))
|
2017-07-17 19:09:11 +00:00
|
|
|
downloadThread.deviceData.bluetoothMode = true
|
2017-07-17 13:36:44 +00:00
|
|
|
else
|
2017-07-17 19:09:11 +00:00
|
|
|
downloadThread.deviceData.bluetoothMode = false
|
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
|
|
|
|
|
|
|
ProgressBar {
|
2017-07-09 23:07:03 +00:00
|
|
|
id: progressBar
|
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-07-24 00:45:55 +00:00
|
|
|
anchors.left: parent.left
|
|
|
|
anchors.right: parent.right
|
|
|
|
anchors.margins: Kirigami.Units.smallSpacing
|
|
|
|
spacing: Kirigami.Units.smallSpacing
|
2017-07-25 15:19:53 +00:00
|
|
|
SsrfButton {
|
2017-07-08 13:16:42 +00:00
|
|
|
id: download
|
2016-05-03 19:24:00 +00:00
|
|
|
text: qsTr("Download")
|
2016-02-02 19:48:43 +00:00
|
|
|
onClicked: {
|
2017-06-13 07:54:21 +00:00
|
|
|
text = qsTr("Retry")
|
2017-07-17 14:43:31 +00:00
|
|
|
// strip any BT Name from the address
|
|
|
|
var devName = downloadThread.deviceData.devName
|
|
|
|
downloadThread.deviceData.devName = devName.replace(/ (.*)$/, "")
|
|
|
|
manager.appendTextToLog("DCDownloadThread started for " + downloadThread.deviceData.product + " on "+ downloadThread.deviceData.devName)
|
2017-07-09 23:07:03 +00:00
|
|
|
progressBar.visible = true
|
2017-05-28 09:23:03 +00:00
|
|
|
downloadThread.start()
|
2016-02-02 19:48:43 +00:00
|
|
|
}
|
|
|
|
}
|
2017-07-25 15:19:53 +00:00
|
|
|
SsrfButton {
|
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()
|
|
|
|
if (!progressBar.visible)
|
|
|
|
stackView.pop();
|
2017-05-28 09:44:24 +00:00
|
|
|
manager.appendTextToLog("exit DCDownload screen")
|
2016-02-02 19:48:43 +00:00
|
|
|
}
|
|
|
|
}
|
2017-07-24 00:45:55 +00:00
|
|
|
Kirigami.Label {
|
|
|
|
Layout.maximumWidth: parent.width - download.width - quitbutton.width
|
|
|
|
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
|
|
|
|
2017-05-29 17:55:36 +00:00
|
|
|
ListView {
|
|
|
|
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 : {
|
|
|
|
console.log("Selecting index" + index);
|
|
|
|
importModel.selectRow(index)
|
|
|
|
}
|
2016-02-02 19:48:43 +00:00
|
|
|
}
|
2017-05-12 15:55:19 +00:00
|
|
|
}
|
2017-05-29 17:55:36 +00:00
|
|
|
|
2016-02-02 19:48:43 +00:00
|
|
|
RowLayout {
|
|
|
|
Layout.fillWidth: true
|
2017-06-25 23:12:45 +00:00
|
|
|
Kirigami.Label {
|
|
|
|
text: "" // Spacer on the left for hamburger menu
|
|
|
|
Layout.fillWidth: true
|
|
|
|
}
|
2017-07-25 15:19:53 +00:00
|
|
|
SsrfButton {
|
2017-05-28 10:22:46 +00:00
|
|
|
id: acceptButton
|
2017-07-09 23:07:03 +00:00
|
|
|
enabled: divesDownloaded
|
2016-05-03 19:24:00 +00:00
|
|
|
text: qsTr("Accept")
|
2016-02-02 19:48:43 +00:00
|
|
|
onClicked: {
|
2017-05-28 18:48:30 +00:00
|
|
|
manager.appendTextToLog("Save downloaded dives that were selected")
|
|
|
|
importModel.recordDives()
|
|
|
|
manager.saveChangesLocal()
|
|
|
|
diveModel.clear()
|
|
|
|
diveModel.addAllDives()
|
2016-02-02 19:48:43 +00:00
|
|
|
stackView.pop();
|
2015-07-23 11:46:02 +00:00
|
|
|
}
|
|
|
|
}
|
2017-03-31 14:15:14 +00:00
|
|
|
Kirigami.Label {
|
2016-02-02 19:48:43 +00:00
|
|
|
text: "" // Spacer between 2 button groups
|
|
|
|
Layout.fillWidth: true
|
|
|
|
}
|
2017-07-25 15:19:53 +00:00
|
|
|
SsrfButton {
|
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")
|
2017-05-29 18:36:00 +00:00
|
|
|
onClicked : {
|
|
|
|
importModel.selectAll()
|
|
|
|
}
|
2016-02-02 19:48:43 +00:00
|
|
|
}
|
2017-07-25 15:19:53 +00:00
|
|
|
SsrfButton {
|
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")
|
2017-05-29 18:36:00 +00:00
|
|
|
onClicked : {
|
|
|
|
importModel.selectNone()
|
|
|
|
}
|
2016-02-02 19:48:43 +00:00
|
|
|
}
|
|
|
|
}
|
2015-07-23 11:46:02 +00:00
|
|
|
}
|
|
|
|
}
|