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

List:       kde-commits
Subject:    KDE/kdepim/akregator/src
From:       Christophe Giboudeaux <cgiboudeaux () gmail ! com>
Date:       2010-09-21 23:18:33
Message-ID: 20100921231833.A3148AC88E () svn ! kde ! org
[Download RAW message or body]

SVN commit 1178003 by cgiboudeaux:

Let the search filter look for authors.
BUG: 242712
FIXED-IN: 4.6


 M  +7 -0      articlematcher.cpp  
 M  +1 -1      articlematcher.h  
 M  +2 -0      searchbar.cpp  


--- trunk/KDE/kdepim/akregator/src/articlematcher.cpp #1178002:1178003
@@ -59,6 +59,8 @@
             return QString::fromLatin1("Status");
         case KeepFlag:
             return QString::fromLatin1("KeepFlag");
+        case Author:
+            return QString::fromLatin1("Author");
         default: // should never happen (TM)
             return QString::fromLatin1("Description");
     }
@@ -76,6 +78,8 @@
         return Status;
     else if (subjStr == QString::fromLatin1("KeepFlag"))
         return KeepFlag;
+    else if (subjStr == QString::fromLatin1("Author"))
+        return Author;
 
     // hopefully never reached
     return Description;
@@ -168,6 +172,9 @@
             break;
         case KeepFlag:
             concreteSubject = QVariant(article.keep());   
+            break;
+        case Author:
+            concreteSubject = QVariant(article.authorName());
         default:
             break;
     }
--- trunk/KDE/kdepim/akregator/src/articlematcher.h #1178002:1178003
@@ -112,7 +112,7 @@
     public:
 
         enum Subject {
-            Title, Description, Link, Status, KeepFlag
+            Title, Description, Link, Status, KeepFlag, Author
         };
 
         static QString subjectToString(Subject subj);
--- trunk/KDE/kdepim/akregator/src/searchbar.cpp #1178002:1178003
@@ -185,6 +185,8 @@
         textCriteria << subjCrit;
         Criterion crit1( Criterion::Description, Criterion::Contains, d->searchText);
         textCriteria << crit1;
+        Criterion authCrit( Criterion::Author, Criterion::Contains, d->searchText);
+        textCriteria << authCrit;
     }
 
     if (d->searchCombo->currentIndex())
[prev in list] [next in list] [prev in thread] [next in thread]