mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
3b5375d553
When first tested this commit, especially the dive list was looking terrible. However, after including newer SHA's from libkirigami, and correcting lots of spacing/margin issue, a retest of this commit shows no strange artifact any more, and the amount of warnings in the log output is reduced significantly. So now, it appears save to upgrade. Notice that main.qml still uses Kirigami 2.0. and is not updated in this commit. With version 2.2, there is a new way of theming, that is not (yet) compatible with our current code. Blindly upgrading to 2.2 leads to a almost black dive list, wrong button colors, and runtime errors in the log, due to the fact the direct setting from QML Kirigami's Theme colors is not allowed any more. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
59 lines
2.1 KiB
QML
59 lines
2.1 KiB
QML
// SPDX-License-Identifier: GPL-2.0
|
|
import QtQuick 2.5
|
|
import QtQuick.Layouts 1.1
|
|
import QtQuick.Controls 2.0 as Controls
|
|
import org.kde.kirigami 2.2 as Kirigami
|
|
import org.subsurfacedivelog.mobile 1.0
|
|
|
|
|
|
Kirigami.ScrollablePage {
|
|
id: startpage
|
|
|
|
function saveCredentials() { cloudCredentials.saveCredentials() }
|
|
|
|
ColumnLayout {
|
|
CloudCredentials {
|
|
id: cloudCredentials
|
|
Layout.fillWidth: true
|
|
Layout.margins: Kirigami.Units.gridUnit
|
|
Layout.topMargin: 0
|
|
property int headingLevel: 3
|
|
}
|
|
Controls.Label {
|
|
id: messageArea
|
|
Layout.fillWidth: true
|
|
Layout.margins: Kirigami.Units.gridUnit
|
|
Layout.topMargin: 0
|
|
text: manager.startPageText
|
|
wrapMode: Text.WordWrap
|
|
}
|
|
Controls.Label {
|
|
id: explanationTextBasic
|
|
visible: !showPin
|
|
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.<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
|
|
}
|
|
Controls.Label {
|
|
id: explanationTextPin
|
|
visible: showPin
|
|
Layout.fillWidth: true
|
|
Layout.margins: Kirigami.Units.gridUnit
|
|
Layout.topMargin: Kirigami.Units.gridUnit * 3
|
|
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}
|
|
}
|
|
}
|