From 6e92f5deb39aed43d72d8a64733f5b11e1650d5d Mon Sep 17 00:00:00 2001 From: Arno Date: Sat, 1 Jun 2013 13:11:56 +0200 Subject: Make filter work in new ArchiveView Filter by QRegExp, but only on the first level according to the sort order. All items are expanded when filtered. Also, remember the filter and the sort order when exiting. --- archiveview.h | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'archiveview.h') diff --git a/archiveview.h b/archiveview.h index d97ca7f..b76e487 100644 --- a/archiveview.h +++ b/archiveview.h @@ -9,6 +9,8 @@ #define ARCHIVEVIEW_H #include +#include +#include #include "archivemodel.h" #include "smtreeview.h" @@ -19,11 +21,18 @@ class QLineEdit; class ArchiveTree; class ArchiveFiles; +class ArchiveProxy; class ArchiveView : public QWidget { Q_OBJECT public: explicit ArchiveView(QWidget *parent = 0); + int currentSortOrder() const; + void writeSettings(); + + private slots: + void setFilter(); + void clearFilter(); private: QComboBox *mSortOrder; @@ -31,6 +40,7 @@ class ArchiveView : public QWidget { ArchiveTree *mTree; ArchiveFiles *mFiles; ArchiveModel *mArchiveModel; + ArchiveProxy *mProxy; }; class ArchiveTree : public SmTreeView { @@ -47,4 +57,20 @@ class ArchiveFiles : public SmTreeView { explicit ArchiveFiles(QWidget *parent = 0); }; +class ArchiveProxy : public QSortFilterProxyModel { + Q_OBJECT + public: + ArchiveProxy(QObject *parent = 0); + + public slots: + void setFilter(const QString &filter, int sortOrder); + + protected: + bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const; + + private: + QRegExp mFilter; + int mSortOrder; +}; + #endif // ARCHIVEVIEW_H -- cgit v1.2.3-70-g09d2