diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2016-02-08 12:41:29 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2016-02-08 12:43:28 -0800 |
| commit | c6a844fbad02680fd37bd6b5dbece95dd89f007a (patch) | |
| tree | 1fb1a3b0947297f8e2e9243ba86f00ada947057b /qt-mobile | |
| parent | 10ca6674030bb19502a4c55133ae45dc873cb10c (diff) | |
| download | subsurface-c6a844fbad02680fd37bd6b5dbece95dd89f007a.tar.gz | |
QML UI: DiveDetailsView - reorder the grid
Let's put the three likely rather narrow items above each other in the
right column and the others (especially the three that could run long:
suit, buddy, dive master) in the left one.
Also, make the individual entries more consistent in which attributes are
set in which order - easier to read.
Finally, make sure that all grid elements enable wrapping.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-mobile')
| -rw-r--r-- | qt-mobile/qml/DiveDetailsView.qml | 65 |
1 files changed, 36 insertions, 29 deletions
diff --git a/qt-mobile/qml/DiveDetailsView.qml b/qt-mobile/qml/DiveDetailsView.qml index e8e2f0f07..606bc2973 100644 --- a/qt-mobile/qml/DiveDetailsView.qml +++ b/qt-mobile/qml/DiveDetailsView.qml @@ -65,10 +65,10 @@ Item { } */ MobileComponents.Label { - Layout.alignment: Qt.AlignRight id: dateLabel text: "Date: " opacity: 0.6 + Layout.alignment: Qt.AlignRight } MobileComponents.Label { text: dive.date + " " + dive.time @@ -83,10 +83,10 @@ Item { } MobileComponents.Label { - Layout.alignment: Qt.AlignRight id: depthLabel text: "Depth: " opacity: 0.6 + Layout.alignment: Qt.AlignRight } MobileComponents.Label { text: dive.depth @@ -94,9 +94,9 @@ Item { wrapMode: TextEdit.WrapAtWordBoundaryOrAnywhere } MobileComponents.Label { - Layout.alignment: Qt.AlignRight text: "Duration: " opacity: 0.6 + Layout.alignment: Qt.AlignRight } MobileComponents.Label { text: dive.duration @@ -140,76 +140,82 @@ Item { } MobileComponents.Label { - Layout.alignment: Qt.AlignRight - text: "Air Temp:" + text: "Suit:" + wrapMode: Text.WrapAtWordBoundaryOrAnywhere opacity: 0.6 + Layout.alignment: Qt.AlignRight } MobileComponents.Label { - id: txtAirTemp - text: dive.airTemp - Layout.fillWidth: true + id: txtSuit + text: dive.suit wrapMode: TextEdit.WrapAtWordBoundaryOrAnywhere } MobileComponents.Label { - Layout.alignment: Qt.AlignRight - text: "Water Temp:" + text: "Air Temp:" + wrapMode: Text.WrapAtWordBoundaryOrAnywhere opacity: 0.6 + Layout.alignment: Qt.AlignRight } MobileComponents.Label { - id: txtWaterTemp - text: dive.waterTemp + id: txtAirTemp + text: dive.airTemp wrapMode: TextEdit.WrapAtWordBoundaryOrAnywhere } MobileComponents.Label { - Layout.alignment: Qt.AlignRight - text: "Suit:" + text: "Cylinder:" + wrapMode: Text.WrapAtWordBoundaryOrAnywhere opacity: 0.6 + Layout.alignment: Qt.AlignRight } MobileComponents.Label { - id: txtSuit - text: dive.suit + id: txtCylinder + text: dive.getCylinder wrapMode: TextEdit.WrapAtWordBoundaryOrAnywhere } MobileComponents.Label { - Layout.alignment: Qt.AlignRight - text: "Weight:" + text: "Water Temp:" + wrapMode: Text.WrapAtWordBoundaryOrAnywhere opacity: 0.6 + Layout.alignment: Qt.AlignRight } MobileComponents.Label { - id: txtWeight - text: dive.sumWeight + id: txtWaterTemp + text: dive.waterTemp wrapMode: TextEdit.WrapAtWordBoundaryOrAnywhere } MobileComponents.Label { - text: "Cylinder:" - Layout.alignment: Qt.AlignRight + text: "Dive Master:" + wrapMode: Text.WrapAtWordBoundaryOrAnywhere opacity: 0.6 + Layout.alignment: Qt.AlignRight } MobileComponents.Label { - id: txtCylinder - text: dive.getCylinder + id: txtDiveMaster + text: dive.divemaster wrapMode: TextEdit.WrapAtWordBoundaryOrAnywhere } MobileComponents.Label { - Layout.alignment: Qt.AlignRight - text: "Dive Master:" + text: "Weight:" + wrapMode: Text.WrapAtWordBoundaryOrAnywhere opacity: 0.6 + Layout.alignment: Qt.AlignRight } MobileComponents.Label { - id: txtDiveMaster - text: dive.divemaster + id: txtWeight + text: dive.sumWeight wrapMode: TextEdit.WrapAtWordBoundaryOrAnywhere } MobileComponents.Label { - Layout.alignment: Qt.AlignRight text: "Buddy:" + wrapMode: Text.WrapAtWordBoundaryOrAnywhere opacity: 0.6 + Layout.alignment: Qt.AlignRight } MobileComponents.Label { id: txtBuddy @@ -222,6 +228,7 @@ Item { Layout.fillWidth: true level: 3 text: "Notes" + wrapMode: Text.WrapAtWordBoundaryOrAnywhere Layout.columnSpan: 4 } |