export kapi fix

3 files changed, 14 insertions, 0 deletions

diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 3532084..93edc59 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -1,21 +1,25 @@
 Info about the changes in new versions of KDE-Pim/Pi
 
 ********** VERSION 2.1.5 ************
 
 This is the new stable version.
 Bugfix:
 Fixed a problem with agenda popup on the desktop in KO/Pi.
 Fixed a crash when reloading file, e.g. after a passive pi-sync synchronization.
 Added config option to not display completed todos in agenda view.
+Addressee view is now using the formatted name, if defined.
+That makes it possible to display "lastname, firstname" in that view now.
+To set the formatted name for all contacts, please use menu:
+Edit->Change->Set formatted name.
 
 ********** VERSION 2.1.4 ************
 
 Fixed two more bugs in the KA/Pi CSV import dialog:
 Made it possible to read multi-line fields and import it to the "Note" field.
 Fixed a problem in mapping custom fields, whatever a custem field is...
 
 ********** VERSION 2.1.3 ************
 
 Changed the menu structure of the alarm applet:
 Moved "Simulate" to " Play Beeps" submenu and re-added "Todo List".
 
diff --git a/kabc/addresseeview.cpp b/kabc/addresseeview.cpp
index 9118c3d..667a5e2 100644
--- a/kabc/addresseeview.cpp
+++ b/kabc/addresseeview.cpp
@@ -34,24 +34,25 @@
 #include <qlabel.h>
 #include <qwidget.h>
 #include <qlayout.h>
 #include <qapplication.h>
 #include <qpushbutton.h>
 #ifdef DESKTOP_VERSION 
 #include <qpaintdevicemetrics.h>
 #include <qprinter.h>
 #include <qpainter.h>
 #endif
 
 
+#include <qstylesheet.h> 
 #include "externalapphandler.h"
 #include <kabc/addresseeview.h>
 
 
 //US #ifndef DESKTOP_VERSION
 //US #include <qtopia/qcopenvelope_qws.h>
 //US #include <qpe/qpeapplication.h>
 //US #endif
 
 //US static int kphoneInstalled = 0;
 
 using namespace KABC;
@@ -61,24 +62,25 @@ AddresseeView::AddresseeView( QWidget *parent, const char *name )
 
 
 {
 //US  setWrapPolicy( QTextEdit::AtWordBoundary );
   setLinkUnderline( false );
   // setVScrollBarMode( QScrollView::AlwaysOff );
   //setHScrollBarMode( QScrollView::AlwaysOff );
 
 //US  QStyleSheet *sheet = styleSheet();
 //US  QStyleSheetItem *link = sheet->item( "a" );
 //US  link->setColor( KGlobalSettings::linkColor() );
 
+
 }
 void AddresseeView::printMe()
 {
 #ifdef DESKTOP_VERSION 
     QPrinter printer;
     if (!printer.setup() )
         return;
     QPainter p;
     p.begin ( &printer  );
     QPaintDeviceMetrics m = QPaintDeviceMetrics ( &printer );
     float dx, dy;
     int wid = (m.width() * 9)/10;
@@ -116,26 +118,30 @@ void AddresseeView::setSource(const QString& n)
 }
 void AddresseeView::setAddressee( const KABC::Addressee& mAddressee )
 {
   bool kemailAvail = ExternalAppHandler::instance()->isEmailAppAvailable();
   // mAddressee = addr;
   // clear view
   //setText( QString::null );
 
   if ( mAddressee.isEmpty() ) {
       setText( QString::null);
       return;
   }
+#if 0
   QString name = ( mAddressee.assembledName().isEmpty() ?
                    mAddressee.formattedName() : mAddressee.assembledName() );
+#endif
+
+  QString name =  mAddressee.realName();
 
   QString dynamicPart;
 
   dynamicPart += getPhoneNumbers( mAddressee.phoneNumbers(),true );
   QStringList emails = mAddressee.emails();
   QStringList::ConstIterator emailIt;
   QString type = i18n( "Email" );
   emailIt = emails.begin();
   if ( emailIt != emails.end() ) {
     if ( kemailAvail ) {
       dynamicPart += QString(
             "<tr><td align=\"right\"><b>%1</b></td>"
diff --git a/kaddressbook/xxportselectdialog.cpp b/kaddressbook/xxportselectdialog.cpp
index e134f97..278cab0 100644
--- a/kaddressbook/xxportselectdialog.cpp
+++ b/kaddressbook/xxportselectdialog.cpp
@@ -150,54 +150,58 @@ void XXPortSelectDialog::tagSelected()
   }
 }
 KABC::AddresseeList XXPortSelectDialog::contacts()
 {
 
   KABC::AddresseeList list;
   if ( mUseSelection->isChecked() ) {
     QStringList::Iterator it;
     QStringList selection = mCore->selectedUIDs();
     for ( it = selection.begin(); it != selection.end(); ++it ) {
       KABC::Addressee addr = mCore->addressBook()->findByUid( *it );
       if ( !addr.isEmpty() )
+          if ( addr.uid().left( 19 ) != QString("last-syncAddressee-") )
         list.append( addr );
     }
   } else if ( mUseFilters->isChecked() ) {
     // find contacts that can pass selected filter
     Filter::List::Iterator filterIt;
     for ( filterIt = mFilters.begin(); filterIt != mFilters.end(); ++filterIt )
       if ( (*filterIt).name() == mFiltersCombo->currentText() )
         break;
 
     KABC::AddressBook::Iterator it;
     for ( it = mCore->addressBook()->begin(); it != mCore->addressBook()->end(); ++it ) {
       if ( (*filterIt).filterAddressee( *it ) )
+          if ((*it).uid().left( 19 ) != QString("last-syncAddressee-") )
         list.append( *it );
     }
   } else if ( mUseCategories->isChecked() ) {
     QStringList categorieList = categories();
     KABC::AddressBook::Iterator it;
     for ( it = mCore->addressBook()->begin(); it != mCore->addressBook()->end(); ++it ) {
       QStringList tmp( (*it).categories() );
       QStringList::Iterator tmpIt;
       for ( tmpIt = tmp.begin(); tmpIt != tmp.end(); ++tmpIt )
         if ( categorieList.contains( *tmpIt ) ) {
+          if ((*it).uid().left( 19 ) != QString("last-syncAddressee-") )
           list.append( *it );
           break;
         }
     }
   } else {
     // create a string list of all entries:
     KABC::AddressBook::Iterator it;
     for ( it = mCore->addressBook()->begin(); it != mCore->addressBook()->end(); ++it )
+          if ((*it).uid().left( 19 ) != QString("last-syncAddressee-") )
       list.append( *it );
   }
 
   if ( mUseSorting ) {
     list.setReverseSorting( mSortTypeCombo->currentItem() == 1 );
     uint pos = mFieldCombo->currentItem();
     if ( pos < mFields.count() )
       list.sortByField( mFields[ pos ] );
   }
 
   return list;
 }