diff options
| author |  Jan Mulder <jlmulder@xs4all.nl> | 2017-10-19 15:41:05 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2017-10-19 14:55:30 -0400 |
| commit | a9b692f0c30fecf950c52099d7c0f336f88c901f (patch) | |
| tree | 20baf808d76b5507aa258b3cfe1d450adcb1ddb5 | |
| parent | 53ed1c7326a6633b15e24f1f8f486a3db0f444ea (diff) | |
| download | subsurface-a9b692f0c30fecf950c52099d7c0f336f88c901f.tar.gz | |
QML-UI: Download screen fixup
Again, mostly related to label change. First, the top button was "glued"
to the top of the screen, so added a little margin there. It
appeared that all the other items on the screen (progressbar,
2 button rows, and the downloaded dive list) where not moving down
due to the add of that little top margin. This was solved by
anchor-ing the items together. Finally, the text of a downloaded
dive was on the top of the delegate lines. Not sure where that came
from, but easily solved by centering it explicitly.
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
| -rw-r--r-- | mobile-widgets/qml/DownloadFromDiveComputer.qml | 24 | ||||
| -rw-r--r-- | mobile-widgets/qml/DownloadedDiveDelegate.qml | 2 |
2 files changed, 23 insertions, 3 deletions
diff --git a/mobile-widgets/qml/DownloadFromDiveComputer.qml b/mobile-widgets/qml/DownloadFromDiveComputer.qml index 6b04cfc1b..9d11167d9 100644 --- a/mobile-widgets/qml/DownloadFromDiveComputer.qml +++ b/mobile-widgets/qml/DownloadFromDiveComputer.qml @@ -59,6 +59,11 @@ Kirigami.Page { width: parent.width Layout.fillWidth: true GridLayout { + id: buttonGrid + anchors { + top: parent.top + topMargin: Kirigami.Units.smallSpacing * 4 + } columns: 2 Controls.Label { text: qsTr(" Vendor name: ") } property var vendoridx: downloadThread.data().getDetectedVendorIndex() @@ -163,6 +168,10 @@ Kirigami.Page { } Controls.ProgressBar { + anchors { + top: buttonGrid.bottom + topMargin: Kirigami.Units.smallSpacing * 4 + } id: progressBar Layout.fillWidth: true indeterminate: true @@ -170,9 +179,13 @@ Kirigami.Page { } RowLayout { - anchors.left: parent.left - anchors.right: parent.right - anchors.margins: Kirigami.Units.smallSpacing + id: buttonBar + anchors { + left: parent.left + right: parent.right + top: progressBar.bottom + topMargin: Kirigami.Units.smallSpacing * 2 + } spacing: Kirigami.Units.smallSpacing SsrfButton { id: download @@ -206,6 +219,11 @@ Kirigami.Page { } ListView { + id: dlList + anchors { + top: buttonBar.bottom + topMargin: Kirigami.Units.smallSpacing * 4 + } Layout.fillWidth: true Layout.fillHeight: true diff --git a/mobile-widgets/qml/DownloadedDiveDelegate.qml b/mobile-widgets/qml/DownloadedDiveDelegate.qml index be9e2aaf5..b88561b17 100644 --- a/mobile-widgets/qml/DownloadedDiveDelegate.qml +++ b/mobile-widgets/qml/DownloadedDiveDelegate.qml @@ -48,12 +48,14 @@ Kirigami.AbstractListItem { Controls.Label { id: dateLabel text: innerListItem.datetime + anchors.verticalCenter: parent.verticalCenter width: Math.round(parent.width * 0.35) font.pointSize: subsurfaceTheme.smallPointSize color: textColor } Controls.Label { text: innerListItem.depth + ' / ' + innerListItem.duration + anchors.verticalCenter: parent.verticalCenter width: Math.round(parent.width * 0.35) font.pointSize: subsurfaceTheme.smallPointSize color: textColor |