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

QML UI: DiveList: make download from DC main action

Browse source 
Now that we support this for many dive computers, that seem reasonable.
I'm not happy with the icon, but couldn't figure out a better one in the
breeze icon set.

See #426

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2017-06-27 21:45:17 -07:00
parent 344b9e3234
commit b459ccbff7
3 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -274,11 +274,11 @@ Kirigami.ScrollablePage {
page.actions.right = page.offlineAction page.actions.right = page.offlineAction
title = qsTr("Cloud credentials") title = qsTr("Cloud credentials")
} else if(manager.credentialStatus === QMLManager.VALID || manager.credentialStatus === QMLManager.VALID_EMAIL || manager.credentialStatus === QMLManager.NOCLOUD) { } else if(manager.credentialStatus === QMLManager.VALID || manager.credentialStatus === QMLManager.VALID_EMAIL || manager.credentialStatus === QMLManager.NOCLOUD) {
page.actions.main = page.addDiveAction page.actions.main = page.downloadFromDCAction
page.actions.right = null page.actions.right = page.addDiveAction
title = qsTr("Dive list") title = qsTr("Dive list")
if (diveListView.count === 0) if (diveListView.count === 0)
showPassiveNotification(qsTr("Please tap the '+' button to add a dive"), 3000) showPassiveNotification(qsTr("Please tap the '+' button to add a dive (or download dives from a supported dive computer)"), 3000)
} else { } else {
page.actions.main = null page.actions.main = null
page.actions.right = null page.actions.right = null
@ -327,6 +327,14 @@ Kirigami.ScrollablePage {
} }
} }
property QtObject downloadFromDCAction: Kirigami.Action {
iconName: "document-import"
onTriggered: {
downloadFromDc.dcImportModel.clearTable()
stackView.push(downloadFromDc)
}
}
property QtObject addDiveAction: Kirigami.Action { property QtObject addDiveAction: Kirigami.Action {
iconName: "list-add" iconName: "list-add"
onTriggered: { onTriggered: {

1
mobile-widgets/qml/mobile-resources.qrc
View file

@ -31,6 +31,7 @@
<file alias="icons/handle-left.svg">kirigami/icons/handle-left.svg</file> <file alias="icons/handle-left.svg">kirigami/icons/handle-left.svg</file>
<file alias="icons/distribute-horizontal-x.svg">kirigami/icons/distribute-horizontal-x.svg</file> <file alias="icons/distribute-horizontal-x.svg">kirigami/icons/distribute-horizontal-x.svg</file>
<file alias="icons/document-edit.svg">kirigami/icons/document-edit.svg</file> <file alias="icons/document-edit.svg">kirigami/icons/document-edit.svg</file>
<file alias="icons/document-import.svg">kirigami/icons/document-import.svg</file>
<file alias="icons/document-save.svg">kirigami/icons/document-save.svg</file> <file alias="icons/document-save.svg">kirigami/icons/document-save.svg</file>
<file alias="icons/view-readermode.svg">kirigami/icons/view-readermode.svg</file> <file alias="icons/view-readermode.svg">kirigami/icons/view-readermode.svg</file>
<file alias="icons/dialog-cancel.svg">kirigami/icons/dialog-cancel.svg</file> <file alias="icons/dialog-cancel.svg">kirigami/icons/dialog-cancel.svg</file>

1
scripts/mobilecomponents.sh
View file

@ -57,6 +57,7 @@ cp -R $PMMC/* $MC/
cp $BREEZE/icons/actions/24/dialog-cancel.svg $MC/icons cp $BREEZE/icons/actions/24/dialog-cancel.svg $MC/icons
cp $BREEZE/icons/actions/24/distribute-horizontal-x.svg $MC/icons cp $BREEZE/icons/actions/24/distribute-horizontal-x.svg $MC/icons
cp $BREEZE/icons/actions/24/document-edit.svg $MC/icons cp $BREEZE/icons/actions/24/document-edit.svg $MC/icons
cp $BREEZE/icons/actions/24/document-import.svg $MC/icons
cp $BREEZE/icons/actions/24/document-save.svg $MC/icons cp $BREEZE/icons/actions/24/document-save.svg $MC/icons
cp $BREEZE/icons/actions/24/go-next.svg $MC/icons cp $BREEZE/icons/actions/24/go-next.svg $MC/icons
cp $BREEZE/icons/actions/24/go-previous.svg $MC/icons cp $BREEZE/icons/actions/24/go-previous.svg $MC/icons