mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

mobile UI: move code to open download page on device plug-in

Browse source 
This makes the code easier to reuse and uses the helper we just added.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2020-03-09 10:46:17 -07:00
parent 93080f129d
commit 174bb91326
2 changed files with 29 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
mobile-widgets/qml/DiveList.qml
View file

@ -508,20 +508,6 @@ Kirigami.ScrollablePage {
} }
} }
function showDownloadPage(vendor, product, connection) {
downloadFromDc.dcImportModel.clearTable()
pageStack.push(downloadFromDc)
if (vendor !== undefined && product !== undefined && connection !== undefined) {
/* set up the correct values on the download page */
if (vendor !== -1)
downloadFromDc.vendor = vendor
if (product !== -1)
downloadFromDc.product = product
if (connection !== -1)
downloadFromDc.connection = connection
}
}
property QtObject downloadFromDCAction: Kirigami.Action { property QtObject downloadFromDCAction: Kirigami.Action {
icon { icon {
name: ":/icons/downloadDC" name: ":/icons/downloadDC"
@ -529,7 +515,7 @@ Kirigami.ScrollablePage {
} }
text: qsTr("Download dives") text: qsTr("Download dives")
onTriggered: { onTriggered: {
showDownloadPage() rootItem.showDownloadPage()
} }
} }

36
mobile-widgets/qml/main.qml
View file

@ -802,19 +802,39 @@ if you have network connectivity and want to sync your data to cloud storage."),
visible: false visible: false
} }
function showDownloadPage(vendor, product, connection) {
manager.appendTextToLog("show download page for " + vendor + " / " + product + " / " + connection)
downloadFromDc.dcImportModel.clearTable()
if (vendor !== undefined && product !== undefined && connection !== undefined) {
/* set up the correct values on the download page */
if (vendor !== -1)
downloadFromDc.vendor = vendor
if (product !== -1)
downloadFromDc.product = product
if (connection !== -1)
downloadFromDc.connection = connection
}
showPage(downloadFromDc)
}
function showDownloadForPluggedInDevice() {
manager.appendTextToLog("plugged in device name changed to " + pluggedInDeviceName)
/* if we recognized the device, we'll pass in a triple of ComboBox indeces as "vendor;product;connection" */
var vendorProductConnection = pluggedInDeviceName.split(';')
if (vendorProductConnection.length === 3)
showDownloadPage(vendorProductConnection[0], vendorProductConnection[1], vendorProductConnection[2])
else
showDownloadPage()
manager.appendTextToLog("done showing download page")
}
onPluggedInDeviceNameChanged: { onPluggedInDeviceNameChanged: {
if (detailsWindow.state === 'edit' || detailsWindow.state === 'add') { if (detailsWindow.state === 'edit' || detailsWindow.state === 'add') {
/* we're in the middle of editing / adding a dive */ /* we're in the middle of editing / adding a dive */
manager.appendTextToLog("Download page requested by Android Intent, but adding/editing dive; no action taken") manager.appendTextToLog("Download page requested by Android Intent, but adding/editing dive; no action taken")
} else { } else {
manager.appendTextToLog("Show download page for device " + pluggedInDeviceName) // we want to show the downloads page
/* if we recognized the device, we'll pass in a triple of ComboBox indeces as "vendor;product;connection" */ showDownloadForPluggedInDevice()
var vendorProductConnection = pluggedInDeviceName.split(';')
if (vendorProductConnection.length === 3)
diveList.showDownloadPage(vendorProductConnection[0], vendorProductConnection[1], vendorProductConnection[2])
else
diveList.showDownloadPage()
manager.appendTextToLog("done showing download page")
} }
} }