diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2019-11-26 00:08:35 +0100 |
|---|---|---|
| committer |  bstoeger <32835590+bstoeger@users.noreply.github.com> | 2019-12-04 13:00:23 +0100 |
| commit | a431840075fbba6f882627496f18a0fb80630e4f (patch) | |
| tree | 3c7fb27b2ef10e8ab0f08039188a08ec4213166f /desktop-widgets | |
| parent | 755f185cfcbd3d61457df6fdff32bcf2118f0ab5 (diff) | |
| download | subsurface-a431840075fbba6f882627496f18a0fb80630e4f.tar.gz | |
Selection: move initialization of selection from view to model
The goal here is to unify desktop and mobile by moving
selection code from the desktop-only view.
Currently, initialization of the selection still has to be
called from the view after connecting the appropriate signals.
This is due to the weird way in which create completely new
models when resetting them.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'desktop-widgets')
| -rw-r--r-- | desktop-widgets/divelistview.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/desktop-widgets/divelistview.cpp b/desktop-widgets/divelistview.cpp index 4354fdb26..b81b16557 100644 --- a/desktop-widgets/divelistview.cpp +++ b/desktop-widgets/divelistview.cpp @@ -86,8 +86,11 @@ void DiveListView::resetModel() MultiFilterSortModel::instance()->resetModel(currentLayout); // If the model was reset, we have to reconnect the signals and tell // the filter model to update its source model. - connect(DiveTripModelBase::instance(), &DiveTripModelBase::selectionChanged, this, &DiveListView::diveSelectionChanged); - connect(DiveTripModelBase::instance(), &DiveTripModelBase::currentDiveChanged, this, &DiveListView::currentDiveChanged); + DiveTripModelBase *m = DiveTripModelBase::instance(); + connect(m, &DiveTripModelBase::selectionChanged, this, &DiveListView::diveSelectionChanged); + connect(m, &DiveTripModelBase::currentDiveChanged, this, &DiveListView::currentDiveChanged); + // Get the initial selection + m->initSelection(); } void DiveListView::calculateInitialColumnWidth(int col) @@ -519,10 +522,6 @@ void DiveListView::reload() { resetModel(); - if (amount_selected && current_dive != NULL) - selectDive(get_divenr(current_dive), true); - else - select_newest_visible_dive(); if (selectedIndexes().count()) { QModelIndex curr = selectedIndexes().first(); curr = curr.parent().isValid() ? curr.parent() : curr; |