diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2019-10-20 07:37:51 -0400 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2019-10-20 16:08:55 -0400 |
| commit | 158a2ec1591598973dbde0cedd80a4494f34045a (patch) | |
| tree | 80a3a2cc527dff4d3323d6fe58eae2638fc1118c /mobile-widgets/qml | |
| parent | 32ae3810ce3844bd517002477e41afb78e493f2f (diff) | |
| download | subsurface-158a2ec1591598973dbde0cedd80a4494f34045a.tar.gz | |
Mobile: remove remaining accesses to DiveObjectHelper from QML
Add a couple more roles and remove the dive role that allows accesss to
the DiveObjectHelper in the first place.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'mobile-widgets/qml')
| -rw-r--r-- | mobile-widgets/qml/DiveDetails.qml | 20 | ||||
| -rw-r--r-- | mobile-widgets/qml/DiveDetailsEdit.qml | 10 |
2 files changed, 15 insertions, 15 deletions
diff --git a/mobile-widgets/qml/DiveDetails.qml b/mobile-widgets/qml/DiveDetails.qml index 4d9f7fc63..e84cf843e 100644 --- a/mobile-widgets/qml/DiveDetails.qml +++ b/mobile-widgets/qml/DiveDetails.qml @@ -216,7 +216,7 @@ Kirigami.Page { onCurrentItemChanged: { // why do we do this? What consumes this? - manager.selectedDiveTimestamp = currentItem.modelData.dive.timestamp + manager.selectedDiveTimestamp = currentItem.modelData.date // make sure the core data structures reflect that this dive is selected manager.selectDive(currentItem.modelData.id) // update the map to show the highlighted flag and center on it @@ -284,15 +284,15 @@ Kirigami.Page { // careful when translating, this text is "magic" in DiveDetailsEdit.qml weight = "cannot edit multiple weight systems" } - startpressure = dive.startPressure - endpressure = dive.endPressure - usedGas = dive.firstGas - usedCyl = dive.getCylinder - cylinderIndex0 = dive.cylinderList.indexOf(usedCyl[0]) - cylinderIndex1 = dive.cylinderList.indexOf(usedCyl[1]) - cylinderIndex2 = dive.cylinderList.indexOf(usedCyl[2]) - cylinderIndex3 = dive.cylinderList.indexOf(usedCyl[3]) - cylinderIndex4 = dive.cylinderList.indexOf(usedCyl[4]) + startpressure = modelData.startPressure + endpressure = modelData.endPressure + usedGas = modelData.firstGas + usedCyl = modelData.getCylinder + cylinderIndex0 = modelData.cylinderList.indexOf(usedCyl[0]) + cylinderIndex1 = modelData.cylinderList.indexOf(usedCyl[1]) + cylinderIndex2 = modelData.cylinderList.indexOf(usedCyl[2]) + cylinderIndex3 = modelData.cylinderList.indexOf(usedCyl[3]) + cylinderIndex4 = modelData.cylinderList.indexOf(usedCyl[4]) rating = modelData.rating visibility = modelData.viz diff --git a/mobile-widgets/qml/DiveDetailsEdit.qml b/mobile-widgets/qml/DiveDetailsEdit.qml index 266f275a4..7e0e7f766 100644 --- a/mobile-widgets/qml/DiveDetailsEdit.qml +++ b/mobile-widgets/qml/DiveDetailsEdit.qml @@ -363,7 +363,7 @@ Item { id: cylinderBox0 flat: true model: diveDetailsListView.currentItem && diveDetailsListView.currentItem.modelData !== null ? - diveDetailsListView.currentItem.modelData.dive.cylinderList : null + diveDetailsListView.currentItem.modelData.cylinderList : null inputMethodHints: Qt.ImhNoPredictiveText Layout.fillWidth: true } @@ -420,7 +420,7 @@ Item { id: cylinderBox1 flat: true model: diveDetailsListView.currentItem && diveDetailsListView.currentItem.modelData !== null ? - diveDetailsListView.currentItem.modelData.dive.cylinderList : null + diveDetailsListView.currentItem.modelData.cylinderList : null inputMethodHints: Qt.ImhNoPredictiveText Layout.fillWidth: true } @@ -484,7 +484,7 @@ Item { currentIndex: find(usedCyl[2]) flat: true model: diveDetailsListView.currentItem && diveDetailsListView.currentItem.modelData !== null ? - diveDetailsListView.currentItem.modelData.dive.cylinderList : null + diveDetailsListView.currentItem.modelData.cylinderList : null inputMethodHints: Qt.ImhNoPredictiveText Layout.fillWidth: true } @@ -547,7 +547,7 @@ Item { currentIndex: find(usedCyl[3]) flat: true model: diveDetailsListView.currentItem && diveDetailsListView.currentItem.modelData !== null ? - diveDetailsListView.currentItem.modelData.dive.cylinderList : null + diveDetailsListView.currentItem.modelData.cylinderList : null inputMethodHints: Qt.ImhNoPredictiveText Layout.fillWidth: true } @@ -611,7 +611,7 @@ Item { currentIndex: find(usedCyl[4]) flat: true model: diveDetailsListView.currentItem && diveDetailsListView.currentItem.modelData !== null ? - diveDetailsListView.currentItem.modelData.dive.cylinderList : null + diveDetailsListView.currentItem.modelData.cylinderList : null inputMethodHints: Qt.ImhNoPredictiveText Layout.fillWidth: true } |