← Back to branch summary

~ubuntu-branches/ubuntu/quantal/kdepimlibs/quantal-proposed

« back to all changes in this revision

Viewing changes to akonadi/subscriptiondialog.cpp

  • Committer: Package Import Robot
  • Author(s): Philip Muškovac
  • Date: 2011-07-08 00:32:40 UTC
  • mfrom: (1.1.63 upstream)
  • Revision ID: package-import@ubuntu.com-20110708003240-0gzufcu25rui82r1
Tags: 4:4.6.90-0ubuntu1
* New upstream release candidate
  - Bump build-dep on libakonadi-dev
  - update install files with new library versions
  - update libkcal4.install
  - refresh libakonadi-kde4.symbols, libkcalcore4.symbols,
    libkholidays4.symbols and libkimap4.symbols
  - exclude kde-runtime not kdebase-runtime in rules.
  - Update Vcs links for new location

Show diffs side-by-side

added added

removed removed

Lines of Context:
akonadi/subscriptiondialog.cpp
19
19
 
20
20
#include "subscriptiondialog_p.h"
21
21
 
 
22
#include "control.h"
 
23
#include "recursivecollectionfilterproxymodel.h"
 
24
#include "subscriptionjob_p.h"
22
25
#include "subscriptionmodel_p.h"
23
 
#include "subscriptionjob_p.h"
24
 
#include "control.h"
25
26
 
26
27
#include <kdebug.h>
27
28
 
30
31
#include <klocale.h>
31
32
 
32
33
#ifndef KDEPIM_MOBILE_UI
 
34
#include <klineedit.h>
33
35
#include <krecursivefilterproxymodel.h>
34
 
#include <recursivecollectionfilterproxymodel.h>
35
36
#include <QtGui/QHeaderView>
36
37
#include <QtGui/QLabel>
37
38
#include <QtGui/QTreeView>
38
 
#include <klineedit.h>
39
39
#else
 
40
#include <kdescendantsproxymodel.h>
40
41
#include <QtGui/QListView>
41
42
#include <QtGui/QSortFilterProxyModel>
42
 
#include "kdescendantsproxymodel_p.h"
43
43
 
44
44
class CheckableFilterProxyModel : public QSortFilterProxyModel
45
45
{
105
105
    KDialog( parent ),
106
106
    d( new Private( this ) )
107
107
{
108
 
  init();
 
108
  init( QStringList() );
109
109
}
110
110
 
111
 
SubscriptionDialog::SubscriptionDialog(const QString& mimetype, QWidget * parent) :
 
111
SubscriptionDialog::SubscriptionDialog(const QStringList& mimetypes, QWidget * parent) :
112
112
    KDialog( parent ),
113
113
    d( new Private( this ) )
114
114
{
115
 
  init( mimetype );
 
115
  init( mimetypes );
116
116
}
117
117
 
118
 
void SubscriptionDialog::init( const QString& mimetype )
 
118
void SubscriptionDialog::init( const QStringList &mimetypes )
119
119
{
120
120
  enableButtonOk( false );
121
121
  setCaption( i18n( "Local Subscriptions" ) );
134
134
 
135
135
  RecursiveCollectionFilterProxyModel *filterRecursiveCollectionFilter
136
136
      = new Akonadi::RecursiveCollectionFilterProxyModel( this );
137
 
  if ( !mimetype.isEmpty() )
138
 
    filterRecursiveCollectionFilter->addContentMimeTypeInclusionFilter( mimetype );
 
137
  if ( !mimetypes.isEmpty() )
 
138
    filterRecursiveCollectionFilter->addContentMimeTypeInclusionFilters( mimetypes );
139
139
 
140
140
  filterRecursiveCollectionFilter->setSourceModel( filterTreeViewModel );
141
141
 
154
154
  d->collectionView->setModel( filterRecursiveCollectionFilter );
155
155
  mainLayout->addWidget( d->collectionView );
156
156
#else
 
157
 
 
158
  RecursiveCollectionFilterProxyModel *filterRecursiveCollectionFilter
 
159
      = new Akonadi::RecursiveCollectionFilterProxyModel( this );
 
160
  if ( !mimetypes.isEmpty() )
 
161
    filterRecursiveCollectionFilter->addContentMimeTypeInclusionFilters( mimetypes );
 
162
 
 
163
  filterRecursiveCollectionFilter->setSourceModel( d->model );
 
164
 
157
165
  KDescendantsProxyModel *flatModel = new KDescendantsProxyModel( this );
158
166
  flatModel->setDisplayAncestorData( true );
159
167
  flatModel->setAncestorSeparator( QLatin1String( "/" ) );
160
 
  flatModel->setSourceModel( d->model );
 
168
  flatModel->setSourceModel( filterRecursiveCollectionFilter );
161
169
 
162
170
  CheckableFilterProxyModel *checkableModel = new CheckableFilterProxyModel( this );
163
171
  checkableModel->setSourceModel( flatModel );