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

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

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