diff options
| author |  Jocke <j.bygdell@gmail.com> | 2018-07-28 15:43:05 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-08-11 11:19:07 -0700 |
| commit | bd8eec5c8e97050b130bb2d9f02162fe189edbda (patch) | |
| tree | b68c5e85136f85e27c56920b0ee2ecaeaa5d5fea /mobile-widgets | |
| parent | a026d8d889a58be3c0f012e13057d1ce2fe1aba0 (diff) | |
| download | subsurface-bd8eec5c8e97050b130bb2d9f02162fe189edbda.tar.gz | |
Mobile: fix adding new dive
All the changes to multi cylinder editing broke the option to add a new dive.
Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
Diffstat (limited to 'mobile-widgets')
| -rw-r--r-- | mobile-widgets/qml/DiveDetails.qml | 6 | ||||
| -rw-r--r-- | mobile-widgets/qml/DiveDetailsEdit.qml | 6 | ||||
| -rw-r--r-- | mobile-widgets/qml/main.qml | 16 |
3 files changed, 20 insertions, 8 deletions
diff --git a/mobile-widgets/qml/DiveDetails.qml b/mobile-widgets/qml/DiveDetails.qml index 74b1557a1..5fca950bc 100644 --- a/mobile-widgets/qml/DiveDetails.qml +++ b/mobile-widgets/qml/DiveDetails.qml @@ -46,7 +46,11 @@ Kirigami.Page { property alias rating: detailsEdit.rating property alias visibility: detailsEdit.visibility property alias usedCyl: detailsEdit.usedCyl - property alias cylinderModel: detailsEdit.cylinderModel + property alias cylinderModel0: detailsEdit.cylinderModel0 + property alias cylinderModel1: detailsEdit.cylinderModel1 + property alias cylinderModel2: detailsEdit.cylinderModel2 + property alias cylinderModel3: detailsEdit.cylinderModel3 + property alias cylinderModel4: detailsEdit.cylinderModel4 title: currentItem && currentItem.modelData ? currentItem.modelData.dive.location : qsTr("Dive details") state: "view" diff --git a/mobile-widgets/qml/DiveDetailsEdit.qml b/mobile-widgets/qml/DiveDetailsEdit.qml index 2f2f681e1..91d7a9e23 100644 --- a/mobile-widgets/qml/DiveDetailsEdit.qml +++ b/mobile-widgets/qml/DiveDetailsEdit.qml @@ -38,7 +38,11 @@ Item { property alias suitModel: suitBox.model property alias divemasterModel: divemasterBox.model property alias buddyModel: buddyBox.model - property alias cylinderModel: cylinderBox0.model + property alias cylinderModel0: cylinderBox0.model + property alias cylinderModel1: cylinderBox1.model + property alias cylinderModel2: cylinderBox2.model + property alias cylinderModel3: cylinderBox3.model + property alias cylinderModel4: cylinderBox4.model property alias locationModel: locationBox.model property int rating property int visibility diff --git a/mobile-widgets/qml/main.qml b/mobile-widgets/qml/main.qml index d8e11809c..6e9b98ce7 100644 --- a/mobile-widgets/qml/main.qml +++ b/mobile-widgets/qml/main.qml @@ -96,13 +96,17 @@ Kirigami.ApplicationWindow { detailsWindow.suitModel = manager.suitList detailsWindow.suitIndex = -1 detailsWindow.suitText = "" - detailsWindow.cylinderModel = manager.cylinderInit - detailsWindow.cylinderIndex = -1 - detailsWindow.cylinderText = "" + detailsWindow.cylinderModel0 = manager.cylinderInit + detailsWindow.cylinderModel1 = manager.cylinderInit + detailsWindow.cylinderModel2 = manager.cylinderInit + detailsWindow.cylinderModel3 = manager.cylinderInit + detailsWindow.cylinderModel4 = manager.cylinderInit + detailsWindow.cylinderIndex0 = -1 + detailsWindow.usedCyl = ["",] detailsWindow.weight = "" - detailsWindow.gasmix = "" - detailsWindow.startpressure = "" - detailsWindow.endpressure = "" + detailsWindow.usedGas = [] + detailsWindow.startpressure = [] + detailsWindow.endpressure = [] detailsWindow.gpsCheckbox = false stackView.push(detailsWindow) } |