[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepim/korganizer
From:       Thomas Thrainer <tom_t () gmx ! at>
Date:       2008-04-29 17:29:13
Message-ID: 1209490153.636545.19905.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 802514 by thrainer:

Make the "filter by category" combobox in the todo view work.



 M  +1 -0      CMakeLists.txt  
 M  +3 -5      views/todoview/kcheckcombobox.cpp  
 M  +4 -2      views/todoview/kotodoview.cpp  
 A             views/todoview/kotodoviewsortfilterproxymodel.cpp   [License: GPL (v2+) (+Qt exception)]
 A             views/todoview/kotodoviewsortfilterproxymodel.h   [License: GPL (v2+) (+Qt exception)]


--- trunk/KDE/kdepim/korganizer/CMakeLists.txt #802513:802514
@@ -148,6 +148,7 @@
    views/monthview/monthscene.cpp
    views/todoview/kotodomodel.cpp
    views/todoview/kotododelegates.cpp
+   views/todoview/kotodoviewsortfilterproxymodel.cpp
    views/todoview/kotodoview.cpp
    views/todoview/kotodoviewquicksearch.cpp
    views/todoview/kcheckcombobox.cpp
--- trunk/KDE/kdepim/korganizer/views/todoview/kcheckcombobox.cpp #802513:802514
@@ -90,7 +90,7 @@
   for ( int r = 0; r < model()->rowCount( rootModelIndex() ); ++r ) {
     QModelIndex indx = model()->index( r, modelColumn(), rootModelIndex() );
     QString text = indx.data().toString();
-    bool found = items.indexOf( text ) == -1 ? false : true;
+    bool found = items.contains( text );
     model()->setData( indx, found ? Qt::Checked : Qt::Unchecked, Qt::CheckStateRole );
   }
   updateCheckedItems();
@@ -166,10 +166,8 @@
     text = items.join( mSeparator );
   }
 
-  if ( text != lineEdit()->text() ) {
-    setEditText( text );
-    emit checkedItemsChanged( items );
-  }
+  setEditText( text );
+  emit checkedItemsChanged( items );
 }
 
 void KCheckComboBox::toggleCheckState( int index )
--- trunk/KDE/kdepim/korganizer/views/todoview/kotodoview.cpp #802513:802514
@@ -28,6 +28,7 @@
 #include "kotodoview.h"
 #include "kotodoviewquicksearch.h"
 #include "kotodomodel.h"
+#include "kotodoviewsortfilterproxymodel.h"
 #include "kotododelegates.h"
 #include "koprefs.h"
 #include "koglobals.h"
@@ -46,7 +47,6 @@
 #include <QTreeView>
 #include <QModelIndex>
 #include <QHeaderView>
-#include <QSortFilterProxyModel>
 
 using namespace KCal;
 using namespace KOrg;
@@ -58,7 +58,7 @@
   mQuickSearch = new KOTodoViewQuickSearch( calendar(), this );
 
   mModel = new KOTodoModel( calendar(), this );
-  mProxyModel = new QSortFilterProxyModel( this );
+  mProxyModel = new KOTodoViewSortFilterProxyModel( this );
   mProxyModel->setSourceModel( mModel );
   mProxyModel->setDynamicSortFilter( true );
   mProxyModel->setFilterKeyColumn( KOTodoModel::SummaryColumn );
@@ -66,6 +66,8 @@
 
   connect( mQuickSearch, SIGNAL(searchTextChanged(const QString &)),
            mProxyModel, SLOT(setFilterRegExp(const QString &)) );
+  connect( mQuickSearch, SIGNAL(searchCategoryChanged(const QStringList &)),
+           mProxyModel, SLOT(setCategoryFilter(const QStringList &)) );
 
   mView = new QTreeView( this );
   mView->setModel( mProxyModel );
[prev in list] [next in list] [prev in thread] [next in thread]