From 56b3ecb3f66a700d4b54269d7140d44a9cccd947 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sun, 10 Jan 2016 22:06:25 -0800 Subject: QML UI: show dive time again In commit 25aa80846b ("Move Dive class from qthelper.h/cpp to it's own file") the meaning of getting the "date" of a dive was changed to just be the date and not the date and time. That's not what the QML code expected. Signed-off-by: Dirk Hohndel --- qt-mobile/qml/DiveList.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'qt-mobile/qml/DiveList.qml') diff --git a/qt-mobile/qml/DiveList.qml b/qt-mobile/qml/DiveList.qml index 53d71d0c3..06da8dee1 100644 --- a/qt-mobile/qml/DiveList.qml +++ b/qt-mobile/qml/DiveList.qml @@ -40,7 +40,7 @@ MobileComponents.Page { detailsWindow.divemaster = dive.divemaster detailsWindow.notes = dive.notes detailsWindow.number = dive.number - detailsWindow.date = dive.date + detailsWindow.date = dive.date + " " + dive.time // detailsWindow.weight = dive.weights stackView.push(detailsWindow) } @@ -64,7 +64,7 @@ MobileComponents.Page { } MobileComponents.Label { id: dateLabel - text: dive.date + text: dive.date + " " + dive.time opacity: 0.6 font.pointSize: subsurfaceTheme.smallPointSize anchors { -- cgit v1.2.3-70-g09d2