diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2016-03-31 21:57:12 -0500 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2016-03-31 22:36:15 -0500 |
| commit | 2efa047999c5e82bb05215648bbe8248fd0b03e6 (patch) | |
| tree | f231e16e7d770805af58359f5476064a72ec034a /qt-mobile/qml/StartPage.qml | |
| parent | 2069526e74505e873140f7be35871db7acbc084d (diff) | |
| parent | 2480f21e5b2463bd5ac82980f44386277f24c51f (diff) | |
| download | subsurface-2efa047999c5e82bb05215648bbe8248fd0b03e6.tar.gz | |
Merge branch 'kirigamiPort' of https://github.com/sebasje/subsurface into mergeKirigamiPort
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>
Diffstat (limited to 'qt-mobile/qml/StartPage.qml')
| -rw-r--r-- | qt-mobile/qml/StartPage.qml | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/qt-mobile/qml/StartPage.qml b/qt-mobile/qml/StartPage.qml index a9e23ed7b..2d70cfcb3 100644 --- a/qt-mobile/qml/StartPage.qml +++ b/qt-mobile/qml/StartPage.qml @@ -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 } |