From c111c4bb022229e66fb15cf8a7967bf79180a441 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Fri, 15 Apr 2016 05:17:39 -0700 Subject: QML UI: add elements to allow editing the GPS coordinates This isn't hooked up, yet, but provides the UI Signed-off-by: Dirk Hohndel --- mobile-widgets/qml/DiveDetails.qml | 4 ++++ mobile-widgets/qml/DiveDetailsEdit.qml | 16 +++++++++++----- mobile-widgets/qml/main.qml | 2 ++ 3 files changed, 17 insertions(+), 5 deletions(-) (limited to 'mobile-widgets') diff --git a/mobile-widgets/qml/DiveDetails.qml b/mobile-widgets/qml/DiveDetails.qml index c9d123d07..31fe8ce8d 100644 --- a/mobile-widgets/qml/DiveDetails.qml +++ b/mobile-widgets/qml/DiveDetails.qml @@ -20,12 +20,14 @@ Kirigami.Page { property alias depth: detailsEdit.depthText property alias duration: detailsEdit.durationText property alias location: detailsEdit.locationText + property alias gps: detailsEdit.gpsText property alias notes: detailsEdit.notesText property alias suit: detailsEdit.suitText property alias weight: detailsEdit.weightText property alias startpressure: detailsEdit.startpressureText property alias endpressure: detailsEdit.endpressureText property alias gasmix: detailsEdit.gasmixText + property alias gpsCheckbox: detailsEdit.gpsCheckbox property int updateCurrentIdx: manager.updateSelectedDive property bool contentItem: true // HACK to work around Kirigami issue - remove once that's addressed upstream @@ -144,6 +146,8 @@ Kirigami.Page { number = diveDetailsListView.currentItem.modelData.dive.number date = diveDetailsListView.currentItem.modelData.dive.date + " " + diveDetailsListView.currentItem.modelData.dive.time location = diveDetailsListView.currentItem.modelData.dive.location + gps = diveDetailsListView.currentItem.modelData.dive.gps + gpsCheckbox = false duration = diveDetailsListView.currentItem.modelData.dive.duration depth = diveDetailsListView.currentItem.modelData.dive.depth airtemp = diveDetailsListView.currentItem.modelData.dive.airTemp diff --git a/mobile-widgets/qml/DiveDetailsEdit.qml b/mobile-widgets/qml/DiveDetailsEdit.qml index 5672cdae6..3e32a2ac9 100644 --- a/mobile-widgets/qml/DiveDetailsEdit.qml +++ b/mobile-widgets/qml/DiveDetailsEdit.qml @@ -12,7 +12,7 @@ Item { property int number property alias dateText: txtDate.text property alias locationText: txtLocation.text - property string gpsText + property alias gpsText: txtGps.text property alias airtempText: txtAirTemp.text property alias watertempText: txtWaterTemp.text property alias suitText: txtSuit.text @@ -25,6 +25,7 @@ Item { property alias startpressureText: txtStartPressure.text property alias endpressureText: txtEndPressure.text property alias gasmixText: txtGasMix.text + property alias gpsCheckbox: checkboxGPS.checked function saveData() { // apply the changes to the dive_table @@ -89,10 +90,15 @@ Item { Layout.fillWidth: true } - // we should add a checkbox here that allows the user - // to add the current location as the dive location - // (think of someone adding a dive while on the boat or - // at the dive site) + Kirigami.Label { + Layout.alignment: Qt.AlignRight + text: "Coordinates:" + } + StyledTextField { + id: txtGps + Layout.fillWidth: true + } + Kirigami.Label { Layout.alignment: Qt.AlignRight text: "Use current\nGPS location:" diff --git a/mobile-widgets/qml/main.qml b/mobile-widgets/qml/main.qml index 4f75f2d7f..c950fd316 100644 --- a/mobile-widgets/qml/main.qml +++ b/mobile-widgets/qml/main.qml @@ -69,12 +69,14 @@ Kirigami.ApplicationWindow { detailsWindow.divemaster = "" detailsWindow.notes = "" detailsWindow.location = "" + detailsWindow.gps = "" detailsWindow.duration = "" detailsWindow.suit = "" detailsWindow.weight = "" detailsWindow.gasmix = "" detailsWindow.startpressure = "" detailsWindow.endpressure = "" + detailsWindow.gpsCheckbox = false stackView.push(detailsWindow) } -- cgit v1.2.3-70-g09d2