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

mobile: remove collapsed model that we no longer use

Browse source 
The dive list now uses the mobile list model.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2019-11-15 21:31:52 -08:00
parent b382445e59
commit edeaf7fa57
3 changed files with 2 additions and 209 deletions
Download patch file Download diff file Expand all files Collapse all files

31
qt-models/divelistmodel.h
View file

@ -8,36 +8,6 @@
#include "core/divefilter.h"
#include "core/subsurface-qt/diveobjecthelper.h"
class CollapsedDiveListSortModel : public QSortFilterProxyModel
{
Q_OBJECT
public:
static CollapsedDiveListSortModel *instance();
void setSourceModel(QAbstractItemModel *sourceModel);
Q_INVOKABLE QString tripTitle(const QString &trip);
Q_INVOKABLE QString tripShortDate(const QString &trip);
Q_INVOKABLE void setActiveTrip(const QString &trip);
Q_INVOKABLE QString activeTrip() const;
// super subtle optimization alert - in order to reduce the number of model accesses from QML,
// the two states where we show the dive in question have odd numbers
enum CollapsedState {
DontShow = 0,
ShowDive = 1,
ShowTrip = 2,
ShowDiveAndTrip = 3
};
void updateFilterState();
void updateSelectionState();
protected:
bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const;
private:
CollapsedDiveListSortModel();
bool isExpanded(struct dive_trip *dt) const;
QString m_activeTrip;
};
class DiveListSortModel : public QSortFilterProxyModel
{
Q_OBJECT
@ -106,7 +76,6 @@ public:
StartPressureRole,
EndPressureRole,
FirstGasRole,
CollapsedRole,
SelectedRole,
};