mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-01 02:23:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Mobile: Fix location combobox

Browse source 
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>
This commit is contained in:
Joakim Bygdell 2018-03-09 14:49:15 +01:00 • committed by Dirk Hohndel
parent 93ba8f1a05
commit 07fb1db3ad
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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

3
mobile-widgets/qml/DiveDetailsEdit.qml
View file

@ -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: {