Filtering documents

resources/forms/documents.ui

@@ -102,22 +102,6 @@
               </item>
              </widget>
             </item>
-            <item>
-             <spacer name="horizontalSpacer">
-              <property name="orientation">
-               <enum>Qt::Horizontal</enum>
-              </property>
-              <property name="sizeType">
-               <enum>QSizePolicy::Fixed</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>10</width>
-                <height>20</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
             <item>
              <widget class="QToolButton" name="sortOrder">
               <property name="sizePolicy">
@@ -146,17 +130,14 @@
              </widget>
             </item>
             <item>
-             <spacer name="horizontalSpacer_2">
-              <property name="orientation">
-               <enum>Qt::Horizontal</enum>
+             <widget class="QLineEdit" name="filterText">
+              <property name="placeholderText">
+               <string>filter the documents</string>
               </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>40</width>
-                <height>20</height>
-               </size>
+              <property name="clearButtonEnabled">
+               <bool>true</bool>
               </property>
-             </spacer>
+             </widget>
             </item>
            </layout>
           </item>

src/document/UBDocumentController.cpp

@@ -2316,6 +2316,7 @@ void UBDocumentController::setupViews()
 
         connect(mDocumentUI->sortKind, SIGNAL(activated(int)), this, SLOT(onSortKindChanged(int)));
         connect(mDocumentUI->sortOrder, SIGNAL(toggled(bool)), this, SLOT(onSortOrderChanged(bool)));
+        connect(mDocumentUI->filterText, &QLineEdit::textChanged, this, &UBDocumentController::onFilterTextChanged);
 
         connect(mDocumentUI->splitter, SIGNAL(splitterMoved(int,int)), this, SLOT(onSplitterMoved(int, int)));
 
@@ -2416,6 +2417,12 @@ void UBDocumentController::onSortKindChanged(int index)
     UBSettings::settings()->documentSortKind->setInt(index);
 }
 
+void UBDocumentController::onFilterTextChanged(const QString& filter)
+{
+    mSortFilterProxyModel->setFilterCaseSensitivity(Qt::CaseSensitivity::CaseInsensitive);
+    mSortFilterProxyModel->setFilterRegularExpression(filter);
+}
+
 void UBDocumentController::onSplitterMoved(int size, int index)
 {
     Q_UNUSED(index);
@@ -2461,6 +2468,8 @@ void UBDocumentController::show()
 
     if(!mToolsPalette)
         setupPalettes();
+
+    mDocumentUI->filterText->clear();
 }
 
 

src/document/UBDocumentController.h

@@ -508,6 +508,7 @@ class UBDocumentController : public UBDocumentContainer
         //N/C - NNE - 20140403
         void onSortKindChanged(int index);
         void onSortOrderChanged(bool order);
+        void onFilterTextChanged(const QString& filter);
         void onSplitterMoved(int size, int index);
         void collapseAll();
         void expandAll();

src/document/UBSortFilterProxyModel.cpp

@@ -23,3 +23,24 @@ bool UBSortFilterProxyModel::lessThan(const QModelIndex &left, const QModelIndex
 
     return QSortFilterProxyModel::lessThan(left, right);
 }
+
+bool UBSortFilterProxyModel::filterAcceptsRow(int sourceRow,
+                                              const QModelIndex &sourceParent) const
+{
+    UBDocumentTreeModel *model = dynamic_cast<UBDocumentTreeModel*>(sourceModel());
+    if(model == nullptr)
+    {
+        return false;
+    }
+
+    if(model->isCatalog(model->index(sourceRow, 0, sourceParent)))
+    {
+        // Always show the catalog folders
+        return true;
+    }
+    else
+    {
+        // Filter the documents
+        return QSortFilterProxyModel::filterAcceptsRow(sourceRow, sourceParent);
+    }
+}

src/document/UBSortFilterProxyModel.h

@@ -2,14 +2,14 @@
 #define UBSORTFILTERPROXYMODEL_H
 
 #include <QSortFilterProxyModel>
-#include "core/UBPersistenceManager.h"
 
 class UBSortFilterProxyModel : public QSortFilterProxyModel
 {
 public:
     UBSortFilterProxyModel();
 
-    bool lessThan(const QModelIndex &left, const QModelIndex &right) const;
+protected:
+    bool lessThan(const QModelIndex &left, const QModelIndex &right) const override;
+    bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
 };
-
 #endif // UBSORTFILTERPROXYMODEL_H

src/gui/UBDocumentThumbnailsView.h

@@ -37,7 +37,7 @@
 
 #include "core/UBApplication.h"
 #include "board/UBBoardController.h"
-#include "frameworks/UBCoreGraphicsScene.h"
+#include "domain/UBGraphicsScene.h"
 #include "core/UBSettings.h"
 #include "domain/UBItem.h"
 #include "gui/UBThumbnailView.h"

src/gui/UBFeaturesWidget.cpp

@@ -35,6 +35,7 @@
 #include "frameworks/UBFileSystemUtils.h"
 #include "core/UBApplication.h"
 #include "core/UBDownloadManager.h"
+#include "core/UBPersistenceManager.h"
 #include "globals/UBGlobals.h"
 #include "board/UBBoardController.h"
 #include "document/UBDocumentController.h"