mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

QML UIL: fix more problems with members moving from manager to prefs

Browse source 
That change clearly would have benefited from better code review.
This is a superset of a change proposed by Jan Iversen.

Closes #1406

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2018-06-18 17:53:08 +09:00
parent e0f7a2ca37
commit e6835d76cc
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mobile-widgets/qml/CloudCredentials.qml
View file

@ -117,7 +117,7 @@ Item {
id: cancelpin id: cancelpin
text: qsTr("Cancel") text: qsTr("Cancel")
onClicked: { onClicked: {
manager.cancelCredentialsPinSetup() prefs.cancelCredentialsPinSetup()
rootItem.returnTopPage() rootItem.returnTopPage()
} }
} }

2
mobile-widgets/qml/Settings.qml
View file

@ -52,7 +52,7 @@ Kirigami.ScrollablePage {
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
text: qsTr("Change") text: qsTr("Change")
onClicked: { onClicked: {
manager.cancelCredentialsPinSetup() prefs.cancelCredentialsPinSetup()
rootItem.returnTopPage() rootItem.returnTopPage()
} }
} }

2
mobile-widgets/qml/StartPage.qml
View file

@ -52,7 +52,7 @@ Kirigami.ScrollablePage {
"If you do not receive an email from us within 15 minutes, please check " + "If you do not receive an email from us within 15 minutes, please check " +
"the correct spelling of your email address and your spam box first.<br/><br/>" + "the correct spelling of your email address and your spam box first.<br/><br/>" +
"In case of any problems regarding cloud account setup, please contact us " + "In case of any problems regarding cloud account setup, please contact us " +
"at our user forum \(https://subsurface-divelog.org/user-forum/\).<br/><br/>").arg(manager.cloudUserName) "at our user forum \(https://subsurface-divelog.org/user-forum/\).<br/><br/>").arg(prefs.cloudUserName)
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
} }
Item { width: Kirigami.Units.gridUnit; height: 3 * Kirigami.Units.gridUnit} Item { width: Kirigami.Units.gridUnit; height: 3 * Kirigami.Units.gridUnit}