mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

QML UI: show date and time for dive

Browse source 
We keep losing the time when people move code around. date really is just the
date and doesn't include the time component.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2016-01-20 13:58:04 -08:00
parent 60e0a6e833
commit 3116bc06fb
2 changed files with 2 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
qt-mobile/qml/DiveDetails.qml
View file

@ -24,7 +24,7 @@ MobileComponents.Page {
diveListView.currentIndex = diveListView.indexAt(diveListView.contentX+1, 1); diveListView.currentIndex = diveListView.indexAt(diveListView.contentX+1, 1);
detailsEdit.dive_id = diveListView.currentItem.modelData.dive.id detailsEdit.dive_id = diveListView.currentItem.modelData.dive.id
detailsEdit.number = diveListView.currentItem.modelData.dive.number detailsEdit.number = diveListView.currentItem.modelData.dive.number
detailsEdit.dateText = diveListView.currentItem.modelData.dive.date detailsEdit.dateText = diveListView.currentItem.modelData.dive.date + " " + diveListView.currentItem.modelData.dive.time
detailsEdit.locationText = diveListView.currentItem.modelData.dive.location detailsEdit.locationText = diveListView.currentItem.modelData.dive.location
detailsEdit.durationText = diveListView.currentItem.modelData.dive.duration detailsEdit.durationText = diveListView.currentItem.modelData.dive.duration
detailsEdit.depthText = diveListView.currentItem.modelData.dive.depth detailsEdit.depthText = diveListView.currentItem.modelData.dive.depth

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

@ -37,14 +37,6 @@ Item {
rowSpacing: MobileComponents.Units.smallSpacing * 2 rowSpacing: MobileComponents.Units.smallSpacing * 2
columnSpacing: MobileComponents.Units.smallSpacing columnSpacing: MobileComponents.Units.smallSpacing
/*Connections {
target: diveDetailsWindow
onDive_idChanged: {
qmlProfile.diveId = diveDetailsWindow.dive_id
qmlProfile.update()
}
}*/
MobileComponents.Heading { MobileComponents.Heading {
id: detailsViewHeading id: detailsViewHeading
Layout.fillWidth: true Layout.fillWidth: true
@ -79,7 +71,7 @@ Item {
opacity: 0.6 opacity: 0.6
} }
MobileComponents.Label { MobileComponents.Label {
text: dive.date text: dive.date + " " + dive.time
Layout.columnSpan: 2 Layout.columnSpan: 2
} }
MobileComponents.Label { MobileComponents.Label {
@ -123,7 +115,6 @@ Item {
anchors.fill: parent anchors.fill: parent
} }
//Rectangle { color: "green"; opacity: 0.4; anchors.fill: parent } // used for debugging the dive profile sizing, will be removed later
} }
MobileComponents.Heading { MobileComponents.Heading {