diff options
| author |  Jan Mulder <jlmulder@xs4all.nl> | 2018-01-28 10:26:45 +0100 |
|---|---|---|
| committer | Jan Mulder <jlmulder@xs4all.nl> | 2018-01-31 14:48:14 +0100 |
| commit | 572fc470718e4a11d5df60b37e7a2a91639285c7 (patch) | |
| tree | 012052da9ce773463550741c33e33a00626c3434 /mobile-widgets/qml | |
| parent | fed2c5b6a1c71649bcb310c0bd118cb1abcf9ea0 (diff) | |
| download | subsurface-572fc470718e4a11d5df60b37e7a2a91639285c7.tar.gz | |
mobile cleanup: unduplicate code and do not loop over dives (2)
See e6e1473e6. Exact same commit but here for the
list of buddies.
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
Diffstat (limited to 'mobile-widgets/qml')
| -rw-r--r-- | mobile-widgets/qml/DiveDetails.qml | 3 | ||||
| -rw-r--r-- | mobile-widgets/qml/DiveDetailsEdit.qml | 3 | ||||
| -rw-r--r-- | mobile-widgets/qml/main.qml | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/mobile-widgets/qml/DiveDetails.qml b/mobile-widgets/qml/DiveDetails.qml index a285e62e4..787c826db 100644 --- a/mobile-widgets/qml/DiveDetails.qml +++ b/mobile-widgets/qml/DiveDetails.qml @@ -18,7 +18,6 @@ Kirigami.Page { property alias watertemp: detailsEdit.watertempText property alias buddyIndex: detailsEdit.buddyIndex property alias buddyText: detailsEdit.buddyText - property alias buddyModel: detailsEdit.buddyModel property alias divemasterIndex: detailsEdit.divemasterIndex property alias divemasterText: detailsEdit.divemasterText property alias divemasterModel: detailsEdit.divemasterModel @@ -240,7 +239,7 @@ Kirigami.Page { if (currentItem.modelData.dive.buddy.indexOf(",") > 0) { buddyText = currentItem.modelData.dive.buddy; } else { - buddyIndex = currentItem.modelData.dive.buddyList.indexOf(currentItem.modelData.dive.buddy) + buddyIndex = manager.buddyList.indexOf(currentItem.modelData.dive.buddy) } divemasterIndex = currentItem.modelData.dive.divemasterList.indexOf(currentItem.modelData.dive.divemaster) notes = currentItem.modelData.dive.notes diff --git a/mobile-widgets/qml/DiveDetailsEdit.qml b/mobile-widgets/qml/DiveDetailsEdit.qml index 5808f78a7..8373ba5b7 100644 --- a/mobile-widgets/qml/DiveDetailsEdit.qml +++ b/mobile-widgets/qml/DiveDetailsEdit.qml @@ -236,8 +236,7 @@ Item { } HintsTextEdit { id: buddyBox - model: diveDetailsListView.currentItem && diveDetailsListView.currentItem.modelData !== null ? - diveDetailsListView.currentItem.modelData.dive.buddyList : null + model: manager.buddyList inputMethodHints: Qt.ImhNoPredictiveText Layout.fillWidth: true } diff --git a/mobile-widgets/qml/main.qml b/mobile-widgets/qml/main.qml index 2df8d9f67..ad073a08b 100644 --- a/mobile-widgets/qml/main.qml +++ b/mobile-widgets/qml/main.qml @@ -81,7 +81,7 @@ Kirigami.ApplicationWindow { detailsWindow.date = manager.getDate(detailsWindow.dive_id) detailsWindow.airtemp = "" detailsWindow.watertemp = "" - detailsWindow.buddyModel = manager.buddyInit + detailsWindow.buddyModel = manager.buddyList detailsWindow.buddyIndex = -1 detailsWindow.buddyText = "" detailsWindow.depth = "" |