| -rw-r--r-- | bin/kdepim/WhatsNew.txt | 6 | ||||
| -rw-r--r-- | kabc/addresseedialog.cpp | 9 |
2 files changed, 8 insertions, 7 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt index e0bd3f3..eaf4b56 100644 --- a/bin/kdepim/WhatsNew.txt +++ b/bin/kdepim/WhatsNew.txt @@ -1,17 +1,23 @@ Info about the changes in new versions of KDE-Pim/Pi ********** VERSION 2.1.8 ************ +KO/Pi: +Added info about the completion sate of a todo in the ListView/Searchdialog. +If in TodoView is selected "do not show compledted todos" then completed todos are not shown in the ListView as well. + +KA/Pi: +In the addressee selection dialog now the formatted name is shown, if not empty. ********** VERSION 2.1.7 ************ KO/Pi: Fixed several problems in the new Resource handling. Added more options to the search dialog. Fixed a problem in the Month view. Added more options to the dialog when setting a todo to stopped. Fixed two small problems in KO/PiAlarm applet. ********** VERSION 2.1.6 ************ diff --git a/kabc/addresseedialog.cpp b/kabc/addresseedialog.cpp index 19b52bb..e89584d 100644 --- a/kabc/addresseedialog.cpp +++ b/kabc/addresseedialog.cpp @@ -33,28 +33,25 @@ #include "stdaddressbook.h" #include "addresseedialog.h" #include "KDGanttMinimizeSplitter.h" //#include "addresseedialog.moc" using namespace KABC; AddresseeItem::AddresseeItem( QListView *parent, const Addressee &addressee ) : QListViewItem( parent ), mAddressee( addressee ) { - QString name = addressee.familyName()+", "+ addressee.givenName(); - if ( name.length() == 2 ) - name = addressee.organization(); - setText( Name,name); + setText( Name,addressee.realName()); setText( Email, addressee.preferredEmail() ); } QString AddresseeItem::key( int column, bool ) const { if (column == Email) { QString value = text(Email); int val = value.findRev("@"); return value.mid( val) + value.left( val ); } return text(column).lower(); @@ -156,27 +153,25 @@ void AddresseeDialog::loadAddressBook() return; } //mAddresseeEdit->completionObject()->clear(); QRegExp re; re.setWildcard(true); // most people understand these better. re.setCaseSensitive(false); re.setPattern( "*"+ mAddresseeEdit->text() + "*"); AddressBook::Iterator it; for( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) { if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") ) continue; - QString name = (*it).familyName()+", "+ (*it).givenName(); - if ( name.length() == 2 ) - name = (*it).realName(); + QString name = (*it).realName(); name += (*it).preferredEmail(); #if QT_VERSION >= 0x030000 if (re.search(name) != -1) #else if (re.match(name) != -1) #endif AddresseeItem *item = new AddresseeItem( mAddresseeList, (*it) ); } } void AddresseeDialog::addCompletionItem( const QString &str, QListViewItem *item ) { |