diff options
| author |  Jan Mulder <jlmulder@xs4all.nl> | 2018-01-28 11:28:01 +0100 |
|---|---|---|
| committer | Jan Mulder <jlmulder@xs4all.nl> | 2018-01-31 14:48:14 +0100 |
| commit | 83259008e763d3cc120c826f58f91a0ff62b6b92 (patch) | |
| tree | c78b2d3cd2e390858a38787c97a130d55f5c9458 /mobile-widgets/qml | |
| parent | 572fc470718e4a11d5df60b37e7a2a91639285c7 (diff) | |
| download | subsurface-83259008e763d3cc120c826f58f91a0ff62b6b92.tar.gz | |
mobile cleanup: unduplicate code and do not loop over dives (3)
See e6e1473e6. Exact same commit but here for the
list of divemaster. The careful reader will spot a
small addition to the clearDetailsEdit() QML function.
Two more field are cleared.
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
Diffstat (limited to 'mobile-widgets/qml')
| -rw-r--r-- | mobile-widgets/qml/DiveDetails.qml | 2 | ||||
| -rw-r--r-- | mobile-widgets/qml/DiveDetailsEdit.qml | 5 | ||||
| -rw-r--r-- | mobile-widgets/qml/main.qml | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/mobile-widgets/qml/DiveDetails.qml b/mobile-widgets/qml/DiveDetails.qml index 787c826db..2335efb23 100644 --- a/mobile-widgets/qml/DiveDetails.qml +++ b/mobile-widgets/qml/DiveDetails.qml @@ -241,7 +241,7 @@ Kirigami.Page { } else { buddyIndex = manager.buddyList.indexOf(currentItem.modelData.dive.buddy) } - divemasterIndex = currentItem.modelData.dive.divemasterList.indexOf(currentItem.modelData.dive.divemaster) + divemasterIndex = manager.divemasterList.indexOf(currentItem.modelData.dive.divemaster) notes = currentItem.modelData.dive.notes if (currentItem.modelData.dive.singleWeight) { // we have only one weight, go ahead, have fun and edit it diff --git a/mobile-widgets/qml/DiveDetailsEdit.qml b/mobile-widgets/qml/DiveDetailsEdit.qml index 8373ba5b7..c623a856f 100644 --- a/mobile-widgets/qml/DiveDetailsEdit.qml +++ b/mobile-widgets/qml/DiveDetailsEdit.qml @@ -48,6 +48,8 @@ Item { detailsEdit.depthText = "" detailsEdit.airtempText = "" detailsEdit.watertempText = "" + detailsEdit.divemasterText = "" + detailsEdit.buddyText = "" suitBox.currentIndex = -1 buddyBox.currentIndex = -1 divemasterBox.currentIndex = -1 @@ -248,8 +250,7 @@ Item { } HintsTextEdit { id: divemasterBox - model: diveDetailsListView.currentItem && diveDetailsListView.currentItem.modelData !== null ? - diveDetailsListView.currentItem.modelData.dive.divemasterList : null + model: manager.divemasterList inputMethodHints: Qt.ImhNoPredictiveText Layout.fillWidth: true } diff --git a/mobile-widgets/qml/main.qml b/mobile-widgets/qml/main.qml index ad073a08b..08b5f329f 100644 --- a/mobile-widgets/qml/main.qml +++ b/mobile-widgets/qml/main.qml @@ -85,7 +85,7 @@ Kirigami.ApplicationWindow { detailsWindow.buddyIndex = -1 detailsWindow.buddyText = "" detailsWindow.depth = "" - detailsWindow.divemasterModel = manager.divemasterInit + detailsWindow.divemasterModel = manager.divemasterList detailsWindow.divemasterIndex = -1 detailsWindow.divemasterText = "" detailsWindow.notes = "" |