diff options
| author |  Joakim Bygdell <j.bygdell@gmail.com> | 2018-03-09 14:49:15 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-03-19 12:01:14 -0700 |
| commit | 07fb1db3ad5652b7df74f790d1c547a4d9bc3803 (patch) | |
| tree | 8ae418749a0686291dead3146d68b9137dac3b12 /mobile-widgets | |
| parent | 93ba8f1a050b2700613bfe0c9f106ee4bff7e5bf (diff) | |
| download | subsurface-07fb1db3ad5652b7df74f790d1c547a4d9bc3803.tar.gz | |
Mobile: Fix location combobox
In the initial move to comboboxes the correct location model
was not used. This uses the correct model and makes it behave
like the other comboboxes.
Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
Diffstat (limited to 'mobile-widgets')
| -rw-r--r-- | mobile-widgets/qml/DiveDetails.qml | 2 | ||||
| -rw-r--r-- | mobile-widgets/qml/DiveDetailsEdit.qml | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/mobile-widgets/qml/DiveDetails.qml b/mobile-widgets/qml/DiveDetails.qml index 9cfbbe437..f82c069bb 100644 --- a/mobile-widgets/qml/DiveDetails.qml +++ b/mobile-widgets/qml/DiveDetails.qml @@ -26,6 +26,7 @@ Kirigami.Page { property alias duration: detailsEdit.durationText property alias location: detailsEdit.locationText property alias locationModel: detailsEdit.locationModel + property alias locationIndex: detailsEdit.locationIndex property alias gps: detailsEdit.gpsText property alias notes: detailsEdit.notesText property alias suitIndex: detailsEdit.suitIndex @@ -234,6 +235,7 @@ Kirigami.Page { number = currentItem.modelData.dive.number date = currentItem.modelData.dive.date + " " + currentItem.modelData.dive.time location = currentItem.modelData.dive.location + locationIndex = manager.locationList.indexOf(currentItem.modelData.dive.location) gps = currentItem.modelData.dive.gps gpsCheckbox = false duration = currentItem.modelData.dive.duration diff --git a/mobile-widgets/qml/DiveDetailsEdit.qml b/mobile-widgets/qml/DiveDetailsEdit.qml index 4e3b956f0..d91dfbef8 100644 --- a/mobile-widgets/qml/DiveDetailsEdit.qml +++ b/mobile-widgets/qml/DiveDetailsEdit.qml @@ -12,6 +12,7 @@ Item { property int number property alias dateText: txtDate.text property alias locationText: txtLocation.editText + property alias locationIndex: txtLocation.currentIndex property alias gpsText: txtGps.text property alias airtempText: txtAirTemp.text property alias watertempText: txtWaterTemp.text @@ -136,7 +137,7 @@ Item { editable: true flat: true model: diveDetailsListView.currentItem && diveDetailsListView.currentItem.modelData !== null ? - diveDetailsListView.currentItem.modelData.dive.locationList : null + manager.locationList : null inputMethodHints: Qt.ImhNoPredictiveText Layout.fillWidth: true onAccepted: { |