mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

list models: include current dive in selection signal

Browse source 
After sending a selection-change signal, there follows a current
dive changed signal. Combine these two into a single signal, since
usually the current dive is changed when the selection is changed.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2022-08-21 11:22:34 +02:00 • committed by bstoeger
parent 832398180c
commit 9ccb940a1b
8 changed files with 23 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

8
desktop-widgets/divelistview.cpp
View file

@ -40,7 +40,6 @@ DiveListView::DiveListView(QWidget *parent) : QTreeView(parent),
MultiFilterSortModel *m = MultiFilterSortModel::instance();
setModel(m);
connect(m, &MultiFilterSortModel::selectionChanged, this, &DiveListView::diveSelectionChanged);
connect(m, &MultiFilterSortModel::currentDiveChanged, this, &DiveListView::currentDiveChanged);
connect(&diveListNotifier, &DiveListNotifier::settingsChanged, this, &DiveListView::settingsChanged);
setSortingEnabled(true);
@ -227,7 +226,7 @@ void DiveListView::reset()
}
// If items were selected, inform the selection model
void DiveListView::diveSelectionChanged(const QVector<QModelIndex> &indices)
void DiveListView::diveSelectionChanged(const QVector<QModelIndex> &indices, QModelIndex currentDive)
{
// This is the entry point for programmatical selection changes.
// Set a flag so that selection changes are not further processed,
@ -262,16 +261,13 @@ void DiveListView::diveSelectionChanged(const QVector<QModelIndex> &indices)
selectionChangeDone();
programmaticalSelectionChange = false;
}
void DiveListView::currentDiveChanged(QModelIndex index)
{
// Set the currently activated row.
// Note, we have to use the QItemSelectionModel::Current mode to avoid
// changing our selection (in contrast to Qt's documentation, which
// instructs to use QItemSelectionModel::NoUpdate, which results in
// funny side-effects).
selectionModel()->setCurrentIndex(index, QItemSelectionModel::Current);
selectionModel()->setCurrentIndex(currentDive, QItemSelectionModel::Current);
}
// If rows are added, check which of these rows is a trip and expand the first column

3
desktop-widgets/divelistview.h
View file

@ -51,8 +51,7 @@ slots:
void renumberDives();
void addDivesToTrip();
void shiftTimes();
void diveSelectionChanged(const QVector<QModelIndex> &indices);
void currentDiveChanged(QModelIndex index);
void diveSelectionChanged(const QVector<QModelIndex> &indices, QModelIndex currentDive);
void tripChanged(dive_trip *trip, TripField);
private:
void rowsInserted(const QModelIndex &parent, int start, int end) override;