From kde-commits  Tue Dec 28 14:55:49 2010
From: Tobias Koenig <tokoe () kde ! org>
Date: Tue, 28 Dec 2010 14:55:49 +0000
To: kde-commits
Subject: KDE/kdepimlibs/akonadi
Message-Id: <20101228145549.4E6B4AC8AD () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=129354819907106

SVN commit 1209914 by tokoe:

Filter out hidden folders and folders with wrong content types


 M  +14 -6     subscriptiondialog.cpp  


--- trunk/KDE/kdepimlibs/akonadi/subscriptiondialog.cpp #1209913:1209914
@@ -19,9 +19,10 @@
 
 #include "subscriptiondialog_p.h"
 
+#include "control.h"
+#include "recursivecollectionfilterproxymodel.h"
+#include "subscriptionjob_p.h"
 #include "subscriptionmodel_p.h"
-#include "subscriptionjob_p.h"
-#include "control.h"
 
 #include <kdebug.h>
 
@@ -30,16 +31,15 @@
 #include <klocale.h>
 
 #ifndef KDEPIM_MOBILE_UI
+#include <klineedit.h>
 #include <krecursivefilterproxymodel.h>
-#include <recursivecollectionfilterproxymodel.h>
 #include <QtGui/QHeaderView>
 #include <QtGui/QLabel>
 #include <QtGui/QTreeView>
-#include <klineedit.h>
 #else
+#include "kdescendantsproxymodel_p.h"
 #include <QtGui/QListView>
 #include <QtGui/QSortFilterProxyModel>
-#include "kdescendantsproxymodel_p.h"
 
 class CheckableFilterProxyModel : public QSortFilterProxyModel
 {
@@ -154,10 +154,18 @@
   d->collectionView->setModel( filterRecursiveCollectionFilter );
   mainLayout->addWidget( d->collectionView );
 #else
+
+  RecursiveCollectionFilterProxyModel *filterRecursiveCollectionFilter
+      = new Akonadi::RecursiveCollectionFilterProxyModel( this );
+  if ( !mimetype.isEmpty() )
+    filterRecursiveCollectionFilter->addContentMimeTypeInclusionFilter( mimetype );
+
+  filterRecursiveCollectionFilter->setSourceModel( d->model );
+
   KDescendantsProxyModel *flatModel = new KDescendantsProxyModel( this );
   flatModel->setDisplayAncestorData( true );
   flatModel->setAncestorSeparator( QLatin1String( "/" ) );
-  flatModel->setSourceModel( d->model );
+  flatModel->setSourceModel( filterRecursiveCollectionFilter );
 
   CheckableFilterProxyModel *checkableModel = new CheckableFilterProxyModel( this );
   checkableModel->setSourceModel( flatModel );