author | eilers <eilers> | 2005-03-19 16:23:16 (UTC) |
---|---|---|
committer | eilers <eilers> | 2005-03-19 16:23:16 (UTC) |
commit | ea15abad0554edab0746f342fafddd461a0fb0eb (patch) (unidiff) | |
tree | d645b3d8655bab11f9685f1989a854b21468e1d5 /libopie2 | |
parent | 34e42590a8ef21c1377f89c7b82f25bcf0aec3cb (diff) | |
download | opie-ea15abad0554edab0746f342fafddd461a0fb0eb.zip opie-ea15abad0554edab0746f342fafddd461a0fb0eb.tar.gz opie-ea15abad0554edab0746f342fafddd461a0fb0eb.tar.bz2 |
Minor update for generic sorted(): It will now ignory any categories if filter "DoNotShowCategories" is used..
-rw-r--r-- | libopie2/opiepim/ChangeLog | 2 | ||||
-rw-r--r-- | libopie2/opiepim/backend/ocontactaccessbackend.cpp | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/libopie2/opiepim/ChangeLog b/libopie2/opiepim/ChangeLog index 52b3f6b..a1b4db0 100644 --- a/libopie2/opiepim/ChangeLog +++ b/libopie2/opiepim/ChangeLog | |||
@@ -1,12 +1,14 @@ | |||
1 | 2005-03.19 Stefan Eilers <stefan@eilers-online.net> | ||
2 | * Minor update for sorted(). Now ignoring any category search if "DoNotShowWithCategory" filter is activated. | ||
1 | 2005-03-18 Stefan Eilers <stefan@eilers-online.net> | 3 | 2005-03-18 Stefan Eilers <stefan@eilers-online.net> |
2 | * Rewrote generic sorted filter and added filter for "DoNotShowWithCategory", needed by addressbook (other filters need to be added!) | 4 | * Rewrote generic sorted filter and added filter for "DoNotShowWithCategory", needed by addressbook (other filters need to be added!) |
3 | 2005-01-16 Stefan Eilers <stefan@eilers-online.net> | 5 | 2005-01-16 Stefan Eilers <stefan@eilers-online.net> |
4 | * Added new OPimEventSortVector class, improved OPimSortVector | 6 | * Added new OPimEventSortVector class, improved OPimSortVector |
5 | * OPimAccessBackend now supports generic sorting. | 7 | * OPimAccessBackend now supports generic sorting. |
6 | 2005-01-03 Stefan Eilers <stefan@eilers-online.net> | 8 | 2005-01-03 Stefan Eilers <stefan@eilers-online.net> |
7 | * Fixing bug in API documentation | 9 | * Fixing bug in API documentation |
8 | * Moving hasQuerySettings() and querySettings() to OPimAccessTemplate to be available for all frontends | 10 | * Moving hasQuerySettings() and querySettings() to OPimAccessTemplate to be available for all frontends |
9 | 2004-12-28 Stefan Eilers <stefan@eilers-online.net> | 11 | 2004-12-28 Stefan Eilers <stefan@eilers-online.net> |
10 | * Make improved query by example accessable via frontend | 12 | * Make improved query by example accessable via frontend |
11 | * Some API documentation improvement | 13 | * Some API documentation improvement |
12 | * Cleanup of backend api.. | 14 | * Cleanup of backend api.. |
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend.cpp b/libopie2/opiepim/backend/ocontactaccessbackend.cpp index 6ac9934..e942905 100644 --- a/libopie2/opiepim/backend/ocontactaccessbackend.cpp +++ b/libopie2/opiepim/backend/ocontactaccessbackend.cpp | |||
@@ -247,49 +247,48 @@ UIDArray OPimContactAccessBackend::sorted( const UIDArray& ar, bool asc, int sor | |||
247 | uint cat_count = categories.count(); | 247 | uint cat_count = categories.count(); |
248 | uint eve_count = ar.count(); | 248 | uint eve_count = ar.count(); |
249 | bool contactPassed = false; | 249 | bool contactPassed = false; |
250 | int cat; | 250 | int cat; |
251 | 251 | ||
252 | for ( uint i = 0; i < eve_count; ++i ) { | 252 | for ( uint i = 0; i < eve_count; ++i ) { |
253 | OPimContact contact = find( ar[i], ar, i, Frontend::Forward ); | 253 | OPimContact contact = find( ar[i], ar, i, Frontend::Forward ); |
254 | if ( contact.isEmpty() ) | 254 | if ( contact.isEmpty() ) |
255 | continue; | 255 | continue; |
256 | 256 | ||
257 | contactPassed = true; | 257 | contactPassed = true; |
258 | 258 | ||
259 | // Filter all Contacts which have any category | ||
260 | if ( (filter & OPimContactAccess::DoNotShowWithCategory) ? true : false ){ | 259 | if ( (filter & OPimContactAccess::DoNotShowWithCategory) ? true : false ){ |
261 | if ( !contact.categories().isEmpty() ) | 260 | if ( !contact.categories().isEmpty() ) |
262 | continue; | 261 | continue; |
263 | } | 262 | } else { |
264 | 263 | ||
264 | if ( (filter & OPimContactAccess::FilterCategory) ? true : false ){ | ||
265 | /* show category */ | 265 | /* show category */ |
266 | /* -1 == unfiled */ | 266 | /* -1 == unfiled */ |
267 | for ( uint cat_nu = 0; cat_nu < cat_count; ++cat_nu ) { | 267 | for ( uint cat_nu = 0; cat_nu < cat_count; ++cat_nu ) { |
268 | cat = categories[cat_nu]; | 268 | cat = categories[cat_nu]; |
269 | 269 | ||
270 | if ( (filter & OPimContactAccess::FilterCategory) ? true : false ){ | ||
271 | if ( cat == -1 ) { | 270 | if ( cat == -1 ) { |
272 | // We should search unfiled contacts. | 271 | // We should search unfiled contacts. |
273 | // Unfiled categories have no category set, thus continue if | 272 | // Unfiled categories have no category set, thus continue if |
274 | // this contact has no empty category. | 273 | // this contact has no empty category. |
275 | if( !contact.categories().isEmpty() ) | 274 | if( !contact.categories().isEmpty() ) |
276 | contactPassed = false; | 275 | contactPassed = false; |
277 | } else if ( cat != 0 ) | 276 | } else if ( cat != 0 ) |
278 | if ( !contact.categories().contains( cat ) ) | 277 | if ( !contact.categories().contains( cat ) ) |
279 | contactPassed = false; | 278 | contactPassed = false; |
280 | } | 279 | } |
281 | 280 | ||
282 | } | 281 | } |
283 | 282 | } | |
284 | /* | 283 | /* |
285 | * If none of the Categories matched | 284 | * If none of the Categories matched |
286 | * continue | 285 | * continue |
287 | */ | 286 | */ |
288 | if ( !contactPassed ) | 287 | if ( !contactPassed ) |
289 | continue; | 288 | continue; |
290 | 289 | ||
291 | vector.insert(item++, contact ); | 290 | vector.insert(item++, contact ); |
292 | } | 291 | } |
293 | 292 | ||
294 | vector.resize( item ); | 293 | vector.resize( item ); |
295 | /* sort it now */ | 294 | /* sort it now */ |