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 UI: cleanup some whitespace and string formatting

Browse source 
This addresses some review comment on whitespace and translated
string formatting.

In the string formatting, a tiny additional change is made.
I wanted the email address in the explanation text in a bold
font. Using the HTML <b> for this, removed the /n newline
characters in the output. Apparantly, mixing these two
formatting styles does not work. No problem, replaced the
/n to HTML style too.

Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
This commit is contained in:
Jan Mulder 2017-09-29 09:15:43 +02:00 • committed by Dirk Hohndel
parent dbed88bd81
commit e2aaa43d8c
4 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -103,7 +103,7 @@ Item {
spacing: Kirigami.Units.smallSpacing
visible: rootItem.showPin
SsrfButton {
id:registerpin
id: registerpin
text: qsTr("Register")
onClicked: {
saveCredentials()
@ -131,7 +131,7 @@ Item {
visible: !rootItem.showPin
SsrfButton {
id:signin_register_normal
id: signin_register_normal
text: qsTr("Sign-in or Register")
onClicked: {
saveCredentials()

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

@ -274,7 +274,7 @@ Kirigami.ScrollablePage {
page.actions.main = null
page.actions.right = null
page.title = qsTr("Cloud credentials")
} else if(manager.credentialStatus === QMLManager.CS_VERIFIED || manager.credentialStatus === QMLManager.CS_NOCLOUD) {
} else if (manager.credentialStatus === QMLManager.CS_VERIFIED || manager.credentialStatus === QMLManager.CS_NOCLOUD) {
page.actions.main = page.downloadFromDCAction
page.actions.right = page.addDiveAction
page.title = qsTr("Dive list")

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

@ -37,17 +37,17 @@ Kirigami.ScrollablePage {
Kirigami.Label {
text: qsTr("Email")
Layout.alignment: Qt.AlignRight
Layout.preferredWidth:gridWidth * 0.15
Layout.preferredWidth: gridWidth * 0.15
Layout.preferredHeight: Kirigami.Units.gridUnit * 2
}
Kirigami.Label {
text: manager.credentialStatus === QMLManager.CS_NOCLOUD?qsTr("Not applicable"):manager.cloudUserName
text: manager.credentialStatus === QMLManager.CS_NOCLOUD ? qsTr("Not applicable") : manager.cloudUserName
Layout.alignment: Qt.AlignRight
Layout.preferredWidth:gridWidth * 0.60
Layout.preferredWidth: gridWidth * 0.60
Layout.preferredHeight: Kirigami.Units.gridUnit * 2
}
SsrfButton {
id:changeCloudSettings
id: changeCloudSettings
Layout.alignment: Qt.AlignRight
text: qsTr("Change")
onClicked: {
@ -58,13 +58,13 @@ Kirigami.ScrollablePage {
Kirigami.Label {
text: qsTr("Status")
Layout.alignment: Qt.AlignRight
Layout.preferredWidth:gridWidth * 0.15
Layout.preferredWidth: gridWidth * 0.15
Layout.preferredHeight: Kirigami.Units.gridUnit * 2
}
Kirigami.Label {
text: describe[manager.credentialStatus]
Layout.alignment: Qt.AlignRight
Layout.preferredWidth:gridWidth * 0.60
Layout.preferredWidth: gridWidth * 0.60
Layout.preferredHeight: Kirigami.Units.gridUnit * 2
}
}
@ -269,7 +269,7 @@ Kirigami.ScrollablePage {
Kirigami.Label {
text: qsTr("Distance threshold (meters)")
Layout.alignment: Qt.AlignRight
Layout.preferredWidth:gridWidth * 0.75
Layout.preferredWidth: gridWidth * 0.75
}
TextField {

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

@ -32,10 +32,10 @@ Kirigami.ScrollablePage {
Layout.fillWidth: true
Layout.margins: Kirigami.Units.gridUnit
Layout.topMargin: Kirigami.Units.gridUnit * 3
text: qsTr("To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.\n\n") +
qsTr("If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) " +
"and a password of your choice (letters and numbers).\n\n") +
qsTr("To use Subsurface-mobile only with local data on this device, select " +
text: qsTr("To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.<br/><br/>" +
"If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) " +
"and a password of your choice (letters and numbers).<br/><br/>" +
"To use Subsurface-mobile only with local data on this device, select " +
"the no cloud buttton above.")
wrapMode: Text.WordWrap
}
@ -45,12 +45,12 @@ Kirigami.ScrollablePage {
Layout.fillWidth: true
Layout.margins: Kirigami.Units.gridUnit
Layout.topMargin: Kirigami.Units.gridUnit * 3
text: qsTr("Thank you for registering with Subsurface. We sent ") + manager.cloudUserName +
qsTr(" a PIN code to complete the registration. ") +
qsTr("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.\n\n" +
"In case of any problems regarding cloud account setup, please contact us " +
"at our user forum \(https://subsurface-divelog.org/user-forum/\).\n\n")
text: qsTr("Thank you for registering with Subsurface. We sent <b>%1</b>" +
" a PIN code to complete the registration. " +
"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/>" +
"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)
wrapMode: Text.WordWrap
}
Item { width: Kirigami.Units.gridUnit; height: 3 * Kirigami.Units.gridUnit}