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

Merge branch 'kirigamiPort' of https://github.com/sebasje/subsurface into mergeKirigamiPort

Browse source 
This merge was a bit more challenging given how far things had diverged,
but I hope I got it mostly right.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2016-03-31 21:57:12 -05:00
commit 2efa047999
17 changed files with 436 additions and 423 deletions
Download patch file Download diff file Expand all files Collapse all files

16
qt-mobile/qml/StartPage.qml
View file

@ -2,7 +2,7 @@ import QtQuick 2.5
import QtQuick.Controls 1.2
import QtQuick.Controls.Styles 1.2
import QtQuick.Layouts 1.1
import org.kde.plasma.mobilecomponents 0.2 as MobileComponents
import org.kde.kirigami 1.0 as Kirigami
import org.subsurfacedivelog.mobile 1.0
ColumnLayout {
@ -11,23 +11,23 @@ ColumnLayout {
function saveCredentials() { cloudCredentials.saveCredentials() }
MobileComponents.Heading {
Layout.margins: MobileComponents.Units.gridUnit
Kirigami.Heading {
Layout.margins: Kirigami.Units.gridUnit
text: "Subsurface-mobile"
}
MobileComponents.Label {
Kirigami.Label {
id: explanationText
Layout.fillWidth: true
Layout.margins: MobileComponents.Units.gridUnit
Layout.margins: Kirigami.Units.gridUnit
Layout.topMargin: 0
text: "In order to use Subsurface-mobile you need to have a Subsurface cloud storage account " +
"(which can be created with the Subsurface desktop application)."
wrapMode: Text.WordWrap
}
MobileComponents.Label {
Kirigami.Label {
id: messageArea
Layout.fillWidth: true
Layout.margins: MobileComponents.Units.gridUnit
Layout.margins: Kirigami.Units.gridUnit
Layout.topMargin: 0
text: manager.startPageText
wrapMode: Text.WordWrap
@ -35,7 +35,7 @@ ColumnLayout {
CloudCredentials {
id: cloudCredentials
Layout.fillWidth: true
Layout.margins: MobileComponents.Units.gridUnit
Layout.margins: Kirigami.Units.gridUnit
Layout.topMargin: 0
property int headingLevel: 3
}