author | zautrix <zautrix> | 2005-01-27 14:46:38 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-01-27 14:46:38 (UTC) |
commit | 3a6e3862e0b813965f633a51e9a116e5f8f26b23 (patch) (unidiff) | |
tree | ea53a2b248257a2a50aee4f6df98749b13401df1 /kaddressbook/views/kaddressbookcardview.cpp | |
parent | cd1b9287f2bcd59652ef66186d00dcf5ff8a2a46 (diff) | |
download | kdepimpi-3a6e3862e0b813965f633a51e9a116e5f8f26b23.zip kdepimpi-3a6e3862e0b813965f633a51e9a116e5f8f26b23.tar.gz kdepimpi-3a6e3862e0b813965f633a51e9a116e5f8f26b23.tar.bz2 |
fix
Diffstat (limited to 'kaddressbook/views/kaddressbookcardview.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | kaddressbook/views/kaddressbookcardview.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/kaddressbook/views/kaddressbookcardview.cpp b/kaddressbook/views/kaddressbookcardview.cpp index 9d8c5ce..2b40909 100644 --- a/kaddressbook/views/kaddressbookcardview.cpp +++ b/kaddressbook/views/kaddressbookcardview.cpp | |||
@@ -279,53 +279,49 @@ void KAddressBookCardView::readConfig(KConfig *config) | |||
279 | if (KABPrefs::instance()->mHonorSingleClick) | 279 | if (KABPrefs::instance()->mHonorSingleClick) |
280 | connect(mCardView, SIGNAL(executed(CardViewItem *)), | 280 | connect(mCardView, SIGNAL(executed(CardViewItem *)), |
281 | this, SLOT(addresseeExecuted(CardViewItem *))); | 281 | this, SLOT(addresseeExecuted(CardViewItem *))); |
282 | else | 282 | else |
283 | connect(mCardView, SIGNAL(doubleClicked(CardViewItem *)), | 283 | connect(mCardView, SIGNAL(doubleClicked(CardViewItem *)), |
284 | this, SLOT(addresseeExecuted(CardViewItem *))); | 284 | this, SLOT(addresseeExecuted(CardViewItem *))); |
285 | #endif | 285 | #endif |
286 | 286 | ||
287 | connect(mCardView, SIGNAL(doubleClicked(CardViewItem *)), | 287 | connect(mCardView, SIGNAL(doubleClicked(CardViewItem *)), |
288 | this, SLOT(addresseeExecuted(CardViewItem *))); | 288 | this, SLOT(addresseeExecuted(CardViewItem *))); |
289 | } | 289 | } |
290 | 290 | ||
291 | void KAddressBookCardView::writeConfig( KConfig *config ) | 291 | void KAddressBookCardView::writeConfig( KConfig *config ) |
292 | { | 292 | { |
293 | config->writeEntry( "ItemWidth", mCardView->itemWidth() ); | 293 | config->writeEntry( "ItemWidth", mCardView->itemWidth() ); |
294 | KAddressBookView::writeConfig( config ); | 294 | KAddressBookView::writeConfig( config ); |
295 | } | 295 | } |
296 | void KAddressBookCardView::doSearch( const QString& s,KABC::Field *field ) | 296 | void KAddressBookCardView::doSearch( const QString& s,KABC::Field *field ) |
297 | { | 297 | { |
298 | mCardView->clear(); | 298 | mCardView->clear(); |
299 | if ( s.isEmpty() || s == "*" ) { | 299 | if ( s.isEmpty() || s == "*" ) { |
300 | refresh(); | 300 | refresh(); |
301 | return; | 301 | return; |
302 | } | 302 | } |
303 | QString pattern = s.lower()+"*"; | 303 | QRegExp re = getRegExp( s ); |
304 | QRegExp re; | ||
305 | re.setWildcard(true); // most people understand these better. | ||
306 | re.setCaseSensitive(false); | ||
307 | re.setPattern( pattern ); | ||
308 | if (!re.isValid()) | 304 | if (!re.isValid()) |
309 | return; | 305 | return; |
310 | mCardView->viewport()->setUpdatesEnabled( false ); | 306 | mCardView->viewport()->setUpdatesEnabled( false ); |
311 | KABC::Addressee::List addresseeList = addressees(); | 307 | KABC::Addressee::List addresseeList = addressees(); |
312 | KABC::Addressee::List::Iterator it; | 308 | KABC::Addressee::List::Iterator it; |
313 | if ( field ) { | 309 | if ( field ) { |
314 | for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) { | 310 | for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) { |
315 | if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") ) | 311 | if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") ) |
316 | continue; | 312 | continue; |
317 | #if QT_VERSION >= 0x030000 | 313 | #if QT_VERSION >= 0x030000 |
318 | if (re.search(field->value( *it ).lower()) != -1) | 314 | if (re.search(field->value( *it ).lower()) != -1) |
319 | #else | 315 | #else |
320 | if (re.match(field->value( *it ).lower()) != -1) | 316 | if (re.match(field->value( *it ).lower()) != -1) |
321 | #endif | 317 | #endif |
322 | new AddresseeCardViewItem(fields(), mShowEmptyFields, | 318 | new AddresseeCardViewItem(fields(), mShowEmptyFields, |
323 | addressBook(), *it, mCardView); | 319 | addressBook(), *it, mCardView); |
324 | 320 | ||
325 | } | 321 | } |
326 | } else { | 322 | } else { |
327 | KABC::Field::List fieldList = allFields(); | 323 | KABC::Field::List fieldList = allFields(); |
328 | KABC::Field::List::ConstIterator fieldIt; | 324 | KABC::Field::List::ConstIterator fieldIt; |
329 | for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) { | 325 | for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) { |
330 | if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") ) | 326 | if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") ) |
331 | continue; | 327 | continue; |