diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2019-12-05 22:36:09 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2020-03-10 09:25:57 -0700 |
| commit | 0fc82e33987ec982d6a49440dcc28e17782d6ed7 (patch) | |
| tree | d7d441a69ac35617d174a64bdda5d5043bfb4c40 | |
| parent | b6f821886b2ed29230d08357df5c09ee66f7cc8d (diff) | |
| download | subsurface-0fc82e33987ec982d6a49440dcc28e17782d6ed7.tar.gz | |
mobile/divelist: switch to the correct model
This obviously breaks everything, but now we can start fixing
things.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | mobile-widgets/qml/DiveList.qml | 2 | ||||
| -rw-r--r-- | subsurface-helper.cpp | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/mobile-widgets/qml/DiveList.qml b/mobile-widgets/qml/DiveList.qml index db78f1de6..0aa3772e7 100644 --- a/mobile-widgets/qml/DiveList.qml +++ b/mobile-widgets/qml/DiveList.qml @@ -13,7 +13,7 @@ Kirigami.ScrollablePage { title: qsTr("Dive list") verticalScrollBarPolicy: Qt.ScrollBarAlwaysOff property int horizontalPadding: Kirigami.Units.gridUnit / 2 - Kirigami.Units.smallSpacing + 1 - property QtObject diveListModel: mobileListModel + property QtObject diveListModel: diveModel supportsRefreshing: true onRefreshingChanged: { diff --git a/subsurface-helper.cpp b/subsurface-helper.cpp index fb997290b..d230eacb8 100644 --- a/subsurface-helper.cpp +++ b/subsurface-helper.cpp @@ -103,9 +103,8 @@ void run_ui() gpsSortModel->setSortRole(GpsListModel::GpsWhenRole); gpsSortModel->sort(0, Qt::DescendingOrder); QQmlContext *ctxt = engine.rootContext(); - ctxt->setContextProperty("diveModel", DiveListSortModel::instance()); MobileListModel *mlm(MobileListModel::instance()); - ctxt->setContextProperty("mobileListModel", mlm); + ctxt->setContextProperty("diveModel", mlm); ctxt->setContextProperty("gpsModel", gpsSortModel); ctxt->setContextProperty("vendorList", vendorList); set_non_bt_addresses(); |