diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2016-02-10 15:49:28 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2016-02-10 20:57:11 -0800 |
| commit | 82a982b90370cf09c8ac43d68ade30d010fcfd12 (patch) | |
| tree | 3584448a8d519d702d67aa22ad0c5cda283d4d86 /qt-mobile/qml | |
| parent | ffd449cf217a45e939620abf65a49fa54cfd727c (diff) | |
| download | subsurface-82a982b90370cf09c8ac43d68ade30d010fcfd12.tar.gz | |
QML UI: redo the start page
It now explains the relationship between Subsurface-mobile and the desktop
application and allows the user to enter the cloud credentials right
there.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-mobile/qml')
| -rw-r--r-- | qt-mobile/qml/StartPage.qml | 53 | ||||
| -rw-r--r-- | qt-mobile/qml/main.qml | 5 |
2 files changed, 17 insertions, 41 deletions
diff --git a/qt-mobile/qml/StartPage.qml b/qt-mobile/qml/StartPage.qml index 173ed1265..eccdd2224 100644 --- a/qt-mobile/qml/StartPage.qml +++ b/qt-mobile/qml/StartPage.qml @@ -8,6 +8,7 @@ import org.subsurfacedivelog.mobile 1.0 Item { ColumnLayout { id: startpage + width: subsurfaceTheme.columnWidth anchors.fill: parent anchors.margins: MobileComponents.Units.gridUnit / 2 @@ -15,51 +16,31 @@ Item { MobileComponents.Heading { Layout.bottomMargin: MobileComponents.Units.largeSpacing - text: "Subsurface Divelog" + text: "Subsurface-mobile" } - MobileComponents.Label { - id: welcomeText + id: explanationText Layout.fillWidth: true Layout.bottomMargin: MobileComponents.Units.largeSpacing - text: manager.startPageText + 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 - Layout.columnSpan: 2 - } - SubsurfaceButton { - id: cloudstorageButton - Layout.bottomMargin: MobileComponents.Units.largeSpacing - Layout.preferredWidth: startpage.buttonWidth - anchors.horizontalCenter: parent.horizontalCenter - text: "Connect to CloudStorage..." - onClicked: { - stackView.push(cloudCredWindow) - } } - /* - SubsurfaceButton { - id: computerButton - Layout.preferredWidth: startpage.buttonWidth - Layout.bottomMargin: MobileComponents.Units.largeSpacing - anchors.horizontalCenter: parent.horizontalCenter - text: "Transfer from dive computer..." - onClicked: { - stackView.push(downloadDivesWindow) - } + MobileComponents.Label { + id: messageArea + Layout.fillWidth: true + text: manager.startPageText + wrapMode: Text.WordWrap } - */ - SubsurfaceButton { - id: manualButton - Layout.preferredWidth: startpage.buttonWidth - Layout.bottomMargin: MobileComponents.Units.largeSpacing - anchors.horizontalCenter: parent.horizontalCenter - text: "Add dive manually..." - onClicked: { - manager.addDive(); - stackView.push(detailsWindow) - } + CloudCredentials { + Layout.fillWidth: true + Layout.margins: MobileComponents.Units.gridUnit + Layout.topMargin: MobileComponents.Units.gridUnit * 2 + visible: true + property int headingLevel: 3 } Item { + id: spacer width: parent.width Layout.fillHeight: true } diff --git a/qt-mobile/qml/main.qml b/qt-mobile/qml/main.qml index 087de2621..1f1a65475 100644 --- a/qt-mobile/qml/main.qml +++ b/qt-mobile/qml/main.qml @@ -251,11 +251,6 @@ MobileComponents.ApplicationWindow { visible: false } - CloudCredentials { - id: cloudCredWindow - visible: false - } - DiveDetails { id: detailsWindow visible: false |