summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-06-18 09:37:58 (UTC)
committer zautrix <zautrix>2005-06-18 09:37:58 (UTC)
commit2cbe93f970eddb6b61d3fc42ccff1a500e806723 (patch) (unidiff)
treec4a76544776f9d046e9560fb6d0eb9eb3cc050a1
parent252c62bffc34f2c71002c71abea480807fa1455a (diff)
downloadkdepimpi-2cbe93f970eddb6b61d3fc42ccff1a500e806723.zip
kdepimpi-2cbe93f970eddb6b61d3fc42ccff1a500e806723.tar.gz
kdepimpi-2cbe93f970eddb6b61d3fc42ccff1a500e806723.tar.bz2
fixx
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/WhatsNew.txt6
-rw-r--r--kabc/addresseedialog.cpp9
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
@@ -4,4 +4,10 @@ Info about the changes in new versions of KDE-Pim/Pi
4********** VERSION 2.1.8 ************ 4********** VERSION 2.1.8 ************
5 5
6KO/Pi:
7Added info about the completion sate of a todo in the ListView/Searchdialog.
8If in TodoView is selected "do not show compledted todos" then completed todos are not shown in the ListView as well.
9
10KA/Pi:
11In the addressee selection dialog now the formatted name is shown, if not empty.
6 12
7********** VERSION 2.1.7 ************ 13********** VERSION 2.1.7 ************
diff --git a/kabc/addresseedialog.cpp b/kabc/addresseedialog.cpp
index 19b52bb..e89584d 100644
--- a/kabc/addresseedialog.cpp
+++ b/kabc/addresseedialog.cpp
@@ -43,8 +43,5 @@ AddresseeItem::AddresseeItem( QListView *parent, const Addressee &addressee ) :
43 mAddressee( addressee ) 43 mAddressee( addressee )
44{ 44{
45 QString name = addressee.familyName()+", "+ addressee.givenName(); 45 setText( Name,addressee.realName());
46 if ( name.length() == 2 )
47 name = addressee.organization();
48 setText( Name,name);
49 setText( Email, addressee.preferredEmail() ); 46 setText( Email, addressee.preferredEmail() );
50} 47}
@@ -166,7 +163,5 @@ void AddresseeDialog::loadAddressBook()
166 if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") ) 163 if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") )
167 continue; 164 continue;
168 QString name = (*it).familyName()+", "+ (*it).givenName(); 165 QString name = (*it).realName();
169 if ( name.length() == 2 )
170 name = (*it).realName();
171 name += (*it).preferredEmail(); 166 name += (*it).preferredEmail();
172#if QT_VERSION >= 0x030000 167#if QT_VERSION >= 0x030000