diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2016-01-27 07:05:31 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2016-01-27 10:16:25 -0800 |
| commit | 140624918c7328f46e9d3cddd9aa3c749f28bf34 (patch) | |
| tree | c3499b9d5974ef9f67c394b9428c2dd120dc928b /qt-mobile/qml/DiveDetailsView.qml | |
| parent | 35e60a7355e23b50fc7f48f48efe68a26b445454 (diff) | |
| download | subsurface-140624918c7328f46e9d3cddd9aa3c749f28bf34.tar.gz | |
QML UI: revert dive detail view layout changes
Now the layout flows again and shouldn't cause clipping on the right
(unless the user has excessively long, unbreakable words it seems.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-mobile/qml/DiveDetailsView.qml')
| -rw-r--r-- | qt-mobile/qml/DiveDetailsView.qml | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/qt-mobile/qml/DiveDetailsView.qml b/qt-mobile/qml/DiveDetailsView.qml index df1d255a2..7479ccb7a 100644 --- a/qt-mobile/qml/DiveDetailsView.qml +++ b/qt-mobile/qml/DiveDetailsView.qml @@ -67,16 +67,14 @@ Item { } */ MobileComponents.Label { - Layout.alignment: Qt.AlignLeft + Layout.alignment: Qt.AlignRight id: dateLabel text: "Date: " opacity: 0.6 } MobileComponents.Label { - Layout.alignment: Qt.AlignLeft text: dive.date + " " + dive.time Layout.columnSpan: 2 - Layout.fillWidth: true } MobileComponents.Label { id: numberText @@ -86,13 +84,12 @@ Item { } MobileComponents.Label { - Layout.alignment: Qt.AlignLeft + Layout.alignment: Qt.AlignRight id: depthLabel text: "Depth: " opacity: 0.6 } MobileComponents.Label { - Layout.alignment: Qt.AlignLeft text: dive.depth } MobileComponents.Label { @@ -102,7 +99,6 @@ Item { } MobileComponents.Label { text: dive.duration - Layout.alignment: Qt.AlignRight } QMLProfile { @@ -130,7 +126,7 @@ Item { } MobileComponents.Label { - Layout.alignment: Qt.AlignLeft + Layout.alignment: Qt.AlignRight text: "Air Temp:" opacity: 0.6 } @@ -142,25 +138,26 @@ Item { } MobileComponents.Label { - Layout.alignment: Qt.AlignLeft + Layout.alignment: Qt.AlignRight text: "Water Temp:" opacity: 0.6 } MobileComponents.Label { id: txtWaterTemp text: dive.waterTemp + Layout.fillWidth: true wrapMode: TextEdit.WrapAtWordBoundaryOrAnywhere - Layout.alignment: Qt.AlignRight } MobileComponents.Label { - Layout.alignment: Qt.AlignLeft + Layout.alignment: Qt.AlignRight text: "Suit:" opacity: 0.6 } MobileComponents.Label { id: txtSuit text: dive.suit + Layout.fillWidth: true wrapMode: TextEdit.WrapAtWordBoundaryOrAnywhere } @@ -172,36 +169,36 @@ Item { MobileComponents.Label { id: txtWeight text: weight + Layout.fillWidth: true wrapMode: TextEdit.WrapAtWordBoundaryOrAnywhere - Layout.alignment: Qt.AlignRight } MobileComponents.Label { - Layout.alignment: Qt.AlignLeft text: "Cylinder:" + Layout.alignment: Qt.AlignRight opacity: 0.6 } MobileComponents.Label { id: txtCylinder text: cylinder Layout.fillWidth: true - wrapMode: TextEdit.WordWrap + wrapMode: TextEdit.WrapAtWordBoundaryOrAnywhere } MobileComponents.Label { - Layout.alignment: Qt.AlignLeft + Layout.alignment: Qt.AlignRight text: "Dive Master:" opacity: 0.6 } MobileComponents.Label { id: txtDiveMaster text: dive.divemaster + Layout.fillWidth: true wrapMode: TextEdit.WrapAtWordBoundaryOrAnywhere - Layout.alignment: Qt.AlignRight } MobileComponents.Label { - Layout.alignment: Qt.AlignLeft + Layout.alignment: Qt.AlignRight text: "Buddy:" opacity: 0.6 } @@ -209,8 +206,8 @@ Item { id: txtBuddy text: dive.buddy Layout.fillWidth: true - wrapMode: TextEdit.WordWrap Layout.columnSpan: 3 + wrapMode: TextEdit.WrapAtWordBoundaryOrAnywhere } MobileComponents.Heading { |