mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
mobile: newer Kirigami SHA
This commit consists of the following 3 parts: 1. There are 2 source files added, adapt our build process accordingly. 2. Due to a change in icon and kirigami QML prefixes, we need to adapt for this as well. Changed mobile-resources.qrc for that. When this would not be changed, the icons will not be found. 3. To further prepare for the future, abandon the iconName property in favour of the new icon grouped property, which can have more attributes than only the name. But currently it is only a syntactic change. Tested on Android device, and no visible changes. Signedoff-by: Jan Mulder <jlmulder@xs4all.nl
This commit is contained in:
parent
7a48149868
commit
a5b44362c6
7 changed files with 86 additions and 28 deletions
|
@ -332,7 +332,9 @@ Kirigami.ScrollablePage {
|
|||
}
|
||||
|
||||
property QtObject downloadFromDCAction: Kirigami.Action {
|
||||
iconName: "downloadDC"
|
||||
icon {
|
||||
name: "downloadDC"
|
||||
}
|
||||
onTriggered: {
|
||||
downloadFromDc.dcImportModel.clearTable()
|
||||
stackView.push(downloadFromDc)
|
||||
|
@ -340,14 +342,18 @@ Kirigami.ScrollablePage {
|
|||
}
|
||||
|
||||
property QtObject addDiveAction: Kirigami.Action {
|
||||
iconName: "list-add"
|
||||
icon {
|
||||
name: "list-add"
|
||||
}
|
||||
onTriggered: {
|
||||
startAddDive()
|
||||
}
|
||||
}
|
||||
|
||||
property QtObject saveAction: Kirigami.Action {
|
||||
iconName: "document-save"
|
||||
icon {
|
||||
name: "document-save"
|
||||
}
|
||||
onTriggered: {
|
||||
Qt.inputMethod.hide()
|
||||
startPage.saveCredentials();
|
||||
|
@ -355,7 +361,9 @@ Kirigami.ScrollablePage {
|
|||
}
|
||||
|
||||
property QtObject offlineAction: Kirigami.Action {
|
||||
iconName: "qrc:/qml/nocloud.svg"
|
||||
icon {
|
||||
name: "qrc:/qml/nocloud.svg"
|
||||
}
|
||||
onTriggered: {
|
||||
manager.syncToCloud = false
|
||||
manager.credentialStatus = QMLManager.CS_NOCLOUD
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue