diff options
| -rw-r--r-- | qt-mobile/qml/DiveDetails.qml | 2 | ||||
| -rw-r--r-- | qt-mobile/qml/DiveDetailsView.qml | 11 |
2 files changed, 2 insertions, 11 deletions
diff --git a/qt-mobile/qml/DiveDetails.qml b/qt-mobile/qml/DiveDetails.qml index 1dba8365b..0ac9dc68f 100644 --- a/qt-mobile/qml/DiveDetails.qml +++ b/qt-mobile/qml/DiveDetails.qml @@ -24,7 +24,7 @@ MobileComponents.Page { diveListView.currentIndex = diveListView.indexAt(diveListView.contentX+1, 1); detailsEdit.dive_id = diveListView.currentItem.modelData.dive.id 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.durationText = diveListView.currentItem.modelData.dive.duration detailsEdit.depthText = diveListView.currentItem.modelData.dive.depth diff --git a/qt-mobile/qml/DiveDetailsView.qml b/qt-mobile/qml/DiveDetailsView.qml index a4a66ec41..3023330d9 100644 --- a/qt-mobile/qml/DiveDetailsView.qml +++ b/qt-mobile/qml/DiveDetailsView.qml @@ -37,14 +37,6 @@ Item { rowSpacing: MobileComponents.Units.smallSpacing * 2 columnSpacing: MobileComponents.Units.smallSpacing - /*Connections { - target: diveDetailsWindow - onDive_idChanged: { - qmlProfile.diveId = diveDetailsWindow.dive_id - qmlProfile.update() - } - }*/ - MobileComponents.Heading { id: detailsViewHeading Layout.fillWidth: true @@ -79,7 +71,7 @@ Item { opacity: 0.6 } MobileComponents.Label { - text: dive.date + text: dive.date + " " + dive.time Layout.columnSpan: 2 } MobileComponents.Label { @@ -123,7 +115,6 @@ Item { 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 { |