mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-01 01:23:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

QML UI: revert dive detail view layout changes

Browse source 
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>
This commit is contained in:
Dirk Hohndel 2016-01-27 07:05:31 -08:00
parent 35e60a7355
commit 140624918c
1 changed files with 14 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
qt-mobile/qml/DiveDetailsView.qml
View file

@ -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 {