2 files changed, 59 insertions, 3 deletions

diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 013e243..f21507a 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -1330,762 +1330,762 @@ void KABCore::print()
 
 void KABCore::addGUIClient( KXMLGUIClient *client )
 {
   if ( mGUIClient )
     mGUIClient->insertChildClient( client );
   else
     KMessageBox::error( this, "no KXMLGUICLient");
 }
 
 
 void KABCore::configurationChanged()
 {
   mExtensionManager->reconfigure();
 }
 
 void KABCore::addressBookChanged()
 {
 /*US
   QDictIterator<AddresseeEditorDialog> it( mEditorDict );
   while ( it.current() ) {
     if ( it.current()->dirty() ) {
       QString text = i18n( "Data has been changed externally. Unsaved "
                            "changes will be lost." );
       KMessageBox::information( this, text );
     }
     it.current()->setAddressee( mAddressBook->findByUid( it.currentKey() ) );
     ++it;
   }
 */
   if (mEditorDialog)
   {
     if (mEditorDialog->dirty())
     {
       QString text = i18n( "Data has been changed externally. Unsaved "
                            "changes will be lost." );
       KMessageBox::information( this, text );
     }
     QString currentuid = mEditorDialog->addressee().uid();
     mEditorDialog->setAddressee( mAddressBook->findByUid( currentuid ) );
   }
   mViewManager->refreshView();
 //  mDetails->refreshView();
 
 
 }
 
 AddresseeEditorDialog *KABCore::createAddresseeEditorDialog( QWidget *parent,
                                                              const char *name )
 {
 
     if ( mEditorDialog == 0 ) {
   mEditorDialog = new AddresseeEditorDialog( this, parent,
                                                  name ? name : "editorDialog" );
 
 
   connect( mEditorDialog, SIGNAL( contactModified( const KABC::Addressee& ) ),
            SLOT( contactModified( const KABC::Addressee& ) ) );
   //connect( mEditorDialog, SIGNAL( editorDestroyed( const QString& ) ),
   //       SLOT( slotEditorDestroyed( const QString& ) ) ;
     }
 
   return mEditorDialog;
 }
 
 void KABCore::slotEditorDestroyed( const QString &uid )
 {
     //mEditorDict.remove( uid );
 }
 
 void KABCore::initGUI()
 {
 #ifndef KAB_EMBEDDED
   QHBoxLayout *topLayout = new QHBoxLayout( this );
   topLayout->setSpacing( KDialogBase::spacingHint() );
 
   mExtensionBarSplitter = new QSplitter( this );
   mExtensionBarSplitter->setOrientation( Qt::Vertical );
 
   mDetailsSplitter = new QSplitter( mExtensionBarSplitter );
 
   QVBox *viewSpace = new QVBox( mDetailsSplitter );
   mIncSearchWidget = new IncSearchWidget( viewSpace );
   connect( mIncSearchWidget, SIGNAL( doSearch( const QString& ) ),
            SLOT( incrementalSearch( const QString& ) ) );
 
   mViewManager = new ViewManager( this, viewSpace );
   viewSpace->setStretchFactor( mViewManager, 1 );
 
   mDetails = new ViewContainer( mDetailsSplitter );
 
   mJumpButtonBar = new JumpButtonBar( this, this );
 
   mExtensionManager = new ExtensionManager( this, mExtensionBarSplitter );
 
   topLayout->addWidget( mExtensionBarSplitter );
   topLayout->setStretchFactor( mExtensionBarSplitter, 100 );
   topLayout->addWidget( mJumpButtonBar );
   topLayout->setStretchFactor( mJumpButtonBar, 1 );
 
   mXXPortManager = new XXPortManager( this, this );
 
 #else //KAB_EMBEDDED
   //US initialize viewMenu before settingup viewmanager.
   //  Viewmanager needs this menu to plugin submenues.
   viewMenu = new QPopupMenu( this );
   settingsMenu = new QPopupMenu( this );
   //filterMenu = new QPopupMenu( this );
   ImportMenu = new QPopupMenu( this );
   ExportMenu = new QPopupMenu( this );
 
   changeMenu= new QPopupMenu( this );
 
 //US since we have no splitter for the embedded system, setup
 // a layout with two frames. One left and one right.
 
   QBoxLayout *topLayout;
 
   // = new QHBoxLayout( this );
 //  QBoxLayout *topLayout = (QBoxLayout*)layout();
 
 //  QWidget *mainBox = new QWidget( this );
 //  QBoxLayout * mainBoxLayout  = new QHBoxLayout(mainBox);
 
 #ifdef DESKTOP_VERSION
   topLayout = new QHBoxLayout( this );
 
 
   mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Horizontal, this);
   mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right );
 
   topLayout->addWidget(mMiniSplitter );
 
   mExtensionBarSplitter = new KDGanttMinimizeSplitter( Qt::Vertical,mMiniSplitter );
   mExtensionBarSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Down );
   mViewManager = new ViewManager( this, mExtensionBarSplitter  );
   mDetails = new ViewContainer( mMiniSplitter );
   mExtensionManager = new ExtensionManager( this, mExtensionBarSplitter );
 #else
   if ( QApplication::desktop()->width() > 480 ) {
       topLayout = new QHBoxLayout( this );
       mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Horizontal, this);
       mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right );
   } else {
 
       topLayout = new QHBoxLayout( this );
       mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Vertical, this);
       mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Down );
   }
 
   topLayout->addWidget(mMiniSplitter );
   mViewManager = new ViewManager( this,  mMiniSplitter );
   mDetails = new ViewContainer( mMiniSplitter );
 
 
    mExtensionManager = new ExtensionManager( this, mMiniSplitter );
 #endif
    //eh->hide();
   // topLayout->addWidget(mExtensionManager );
 
 
 /*US
 #ifndef KAB_NOSPLITTER
   QHBoxLayout *topLayout = new QHBoxLayout( this );
 //US  topLayout->setSpacing( KDialogBase::spacingHint() );
   topLayout->setSpacing( 10 );
 
   mDetailsSplitter = new QSplitter( this );
 
   QVBox *viewSpace = new QVBox( mDetailsSplitter );
 
   mViewManager = new ViewManager( this, viewSpace );
   viewSpace->setStretchFactor( mViewManager, 1 );
 
   mDetails = new ViewContainer( mDetailsSplitter );
 
   topLayout->addWidget( mDetailsSplitter );
   topLayout->setStretchFactor( mDetailsSplitter, 100 );
 #else //KAB_NOSPLITTER
   QHBoxLayout *topLayout = new QHBoxLayout( this );
 //US  topLayout->setSpacing( KDialogBase::spacingHint() );
   topLayout->setSpacing( 10 );
 
 //  mDetailsSplitter = new QSplitter( this );
 
   QVBox *viewSpace = new QVBox( this );
 
   mViewManager = new ViewManager( this, viewSpace );
   viewSpace->setStretchFactor( mViewManager, 1 );
 
   mDetails = new ViewContainer( this );
 
   topLayout->addWidget( viewSpace );
 //  topLayout->setStretchFactor( mDetailsSplitter, 100 );
   topLayout->addWidget( mDetails );
 #endif //KAB_NOSPLITTER
 */
 
 
 #endif //KAB_EMBEDDED
   initActions();
 
 #ifdef KAB_EMBEDDED
   addActionsManually();
   //US make sure the export and import menues are initialized before creating the xxPortManager.
   mXXPortManager = new XXPortManager( this, this );
 
   // LR mIncSearchWidget = new IncSearchWidget( mMainWindow->getIconToolBar() );
   //mMainWindow->toolBar()->insertWidget(-1, 4, mIncSearchWidget);
   // mActionQuit->plug ( mMainWindow->toolBar());
   //mIncSearchWidget = new IncSearchWidget( mMainWindow->toolBar() );
   //mMainWindow->toolBar()->insertWidget(-1, 0, mIncSearchWidget);
   // mIncSearchWidget->hide();
   connect( mIncSearchWidget, SIGNAL( doSearch( const QString& ) ),
            SLOT( incrementalSearch( const QString& ) ) );
 
 
   mJumpButtonBar = new JumpButtonBar( this, this );
 
   topLayout->addWidget( mJumpButtonBar );
 //US  topLayout->setStretchFactor( mJumpButtonBar, 10 );
 
 // mMainWindow->getIconToolBar()->raise();
 
 #endif //KAB_EMBEDDED
 
 }
 void KABCore::initActions()
 {
 //US  qDebug("KABCore::initActions(): mIsPart %i", mIsPart);
 
 #ifndef KAB_EMBEDDED
   connect( QApplication::clipboard(), SIGNAL( dataChanged() ),
            SLOT( clipboardDataChanged() ) );
 #endif //KAB_EMBEDDED
 
   // file menu
   if ( mIsPart ) {
     mActionMail = new KAction( i18n( "&Mail" ), "mail_generic", 0, this,
                                SLOT( sendMail() ), actionCollection(),
                                "kaddressbook_mail" );
     mActionPrint = new KAction( i18n( "&Print" ), "fileprint", CTRL + Key_P, this,
                  SLOT( print() ), actionCollection(), "kaddressbook_print" );
 
   } else {
     mActionMail = KStdAction::mail( this, SLOT( sendMail() ), actionCollection() );
     mActionPrint = KStdAction::print( this, SLOT( print() ), actionCollection() );
   }
 
 
   mActionSave = new KAction( i18n( "&Save" ), "filesave", CTRL+Key_S, this,
                              SLOT( save() ), actionCollection(), "file_sync" );
 
   mActionNewContact = new KAction( i18n( "&New Contact..." ), "filenew", CTRL+Key_N, this,
                              SLOT( newContact() ), actionCollection(), "file_new_contact" );
 
   mActionMailVCard = new KAction(i18n("Mail &vCard..."), "mail_post_to", 0,
                                  this, SLOT( mailVCard() ),
                                  actionCollection(), "file_mail_vcard");
 
   mActionBeamVCard = 0;
  mActionBeam = 0;
 
 #ifndef DESKTOP_VERSION
   if ( Ir::supported() ) {
     mActionBeamVCard = new KAction( i18n( "Beam selected v&Card(s)" ), "beam", 0, this,
                                SLOT( beamVCard() ), actionCollection(),
                                "kaddressbook_beam_vcard" );
 
     mActionBeam = new KAction( i18n( "&Beam personal vCard" ), "beam", 0, this,
                                SLOT( beamMySelf() ), actionCollection(),
                                "kaddressbook_beam_myself" );
   }
 #endif
 
   mActionEditAddressee = new KAction( i18n( "&Edit Contact..." ), "edit", 0,
                                       this, SLOT( editContact2() ),
                                       actionCollection(), "file_properties" );
 
 #ifdef KAB_EMBEDDED
   // mActionQuit = KStdAction::quit( mMainWindow, SLOT( exit() ), actionCollection() );
   mActionQuit = new KAction( i18n( "&Exit" ), "exit", 0,
                                       mMainWindow, SLOT( exit() ),
                                       actionCollection(), "quit" );
 #endif //KAB_EMBEDDED
 
   // edit menu
   if ( mIsPart ) {
     mActionCopy = new KAction( i18n( "&Copy" ), "editcopy", CTRL + Key_C, this,
                                SLOT( copyContacts() ), actionCollection(),
                                "kaddressbook_copy" );
     mActionCut = new KAction( i18n( "Cu&t" ), "editcut", CTRL + Key_X, this,
                               SLOT( cutContacts() ), actionCollection(),
                               "kaddressbook_cut" );
     mActionPaste = new KAction( i18n( "&Paste" ), "editpaste", CTRL + Key_V, this,
                                 SLOT( pasteContacts() ), actionCollection(),
                                 "kaddressbook_paste" );
     mActionSelectAll = new KAction( i18n( "Select &All" ), CTRL + Key_A, this,
                   SLOT( selectAllContacts() ), actionCollection(),
                  "kaddressbook_select_all" );
     mActionUndo = new KAction( i18n( "&Undo" ), "undo", CTRL + Key_Z, this,
                                SLOT( undo() ), actionCollection(),
                                "kaddressbook_undo" );
     mActionRedo = new KAction( i18n( "Re&do" ), "redo", CTRL + SHIFT + Key_Z,
                                this, SLOT( redo() ), actionCollection(),
                                "kaddressbook_redo" );
   } else {
     mActionCopy = KStdAction::copy( this, SLOT( copyContacts() ), actionCollection() );
     mActionCut = KStdAction::cut( this, SLOT( cutContacts() ), actionCollection() );
     mActionPaste = KStdAction::paste( this, SLOT( pasteContacts() ), actionCollection() );
     mActionSelectAll = KStdAction::selectAll( this, SLOT( selectAllContacts() ), actionCollection() );
     mActionUndo = KStdAction::undo( this, SLOT( undo() ), actionCollection() );
     mActionRedo = KStdAction::redo( this, SLOT( redo() ), actionCollection() );
   }
 
   mActionDelete = new KAction( i18n( "&Delete Contact" ), "editdelete",
                                Key_Delete, this, SLOT( deleteContacts() ),
                                actionCollection(), "edit_delete" );
 
   mActionUndo->setEnabled( false );
   mActionRedo->setEnabled( false );
 
   // settings menu
 #ifdef KAB_EMBEDDED
 //US special menuentry to configure the addressbook resources. On KDE
 // you do that through the control center !!!
   mActionConfigResources = new KAction( i18n( "Configure &Resources..." ), "configure_resources", 0, this,
                SLOT( configureResources() ), actionCollection(),
                "kaddressbook_configure_resources" );
 #endif //KAB_EMBEDDED
 
   if ( mIsPart ) {
     mActionConfigKAddressbook = new KAction( i18n( "&Configure KAddressBook..." ), "configure", 0, this,
                  SLOT( openConfigDialog() ), actionCollection(),
                  "kaddressbook_configure" );
 
     mActionConfigShortcuts = new KAction( i18n( "Configure S&hortcuts..." ), "configure_shortcuts", 0,
                  this, SLOT( configureKeyBindings() ), actionCollection(),
                  "kaddressbook_configure_shortcuts" );
 #ifdef KAB_EMBEDDED
   mActionConfigureToolbars = KStdAction::configureToolbars( this, SLOT( mMainWindow->configureToolbars() ), actionCollection() );
   mActionConfigureToolbars->setEnabled( false );
 #endif //KAB_EMBEDDED
 
   } else {
     mActionConfigKAddressbook = KStdAction::preferences( this, SLOT( openConfigDialog() ), actionCollection() );
 
     mActionKeyBindings = KStdAction::keyBindings( this, SLOT( configureKeyBindings() ), actionCollection() );
   }
 
   mActionJumpBar = new KToggleAction( i18n( "Show Jump Bar" ), 0, 0,
                                       actionCollection(), "options_show_jump_bar" );
   connect( mActionJumpBar, SIGNAL( toggled( bool ) ), SLOT( setJumpButtonBarVisible( bool ) ) );
 
   mActionDetails = new KToggleAction( i18n( "Show Details" ), "listview", 0,
                                       actionCollection(), "options_show_details" );
   connect( mActionDetails, SIGNAL( toggled( bool ) ), SLOT( setDetailsVisible( bool ) ) );
 
   // misc
   // only enable LDAP lookup if we can handle the protocol
 #ifndef KAB_EMBEDDED
   if ( KProtocolInfo::isKnownProtocol( KURL( "ldap://localhost" ) ) ) {
     new KAction( i18n( "&Lookup Addresses in Directory" ), "find", 0,
                  this, SLOT( openLDAPDialog() ), actionCollection(),
                  "ldap_lookup" );
   }
 #else //KAB_EMBEDDED
   //qDebug("KABCore::initActions() LDAP has to be implemented");
 #endif //KAB_EMBEDDED
 
 
   mActionWhoAmI = new KAction( i18n( "Set Who Am I" ), "personal", 0, this,
                                SLOT( setWhoAmI() ), actionCollection(),
                                "set_personal" );
 
 
 
 
   mActionCategories = new KAction( i18n( "Set Categories" ), 0, this,
                                    SLOT( setCategories() ), actionCollection(),
                                    "edit_set_categories" );
 
   mActionRemoveVoice = new KAction( i18n( "Remove \"voice\"..." ), 0, this,
                                     SLOT( removeVoice() ), actionCollection(),
                                    "remove_voice" );
-  mActionImportOL = new KAction( i18n( "Import from OL..." ), 0, this,
+  mActionImportOL = new KAction( i18n( "Import from Outlook..." ), 0, this,
                                     SLOT( importFromOL() ), actionCollection(),
                                    "import_OL" );
 #ifdef KAB_EMBEDDED
  mActionLicence = new KAction( i18n( "Licence" ), 0,
                  this, SLOT( showLicence() ), actionCollection(),
                  "licence_about_data" );
  mActionFaq = new KAction( i18n( "Faq" ), 0,
                  this, SLOT( faq() ), actionCollection(),
                  "faq_about_data" );
 
   mActionAboutKAddressbook = new KAction( i18n( "&About KAddressBook" ), "kaddressbook2", 0,
                  this, SLOT( createAboutData() ), actionCollection(),
                  "kaddressbook_about_data" );
 #endif //KAB_EMBEDDED
 
   clipboardDataChanged();
   connect( UndoStack::instance(), SIGNAL( changed() ), SLOT( updateActionMenu() ) );
   connect( RedoStack::instance(), SIGNAL( changed() ), SLOT( updateActionMenu() ) );
 }
 
 //US we need this function, to plug all actions into the correct menues.
 // KDE uses a XML format to plug the actions, but we work her without this overhead.
 void KABCore::addActionsManually()
 {
 //US  qDebug("KABCore::initActions(): mIsPart %i", mIsPart);
 
 #ifdef KAB_EMBEDDED
   QPopupMenu *fileMenu = new QPopupMenu( this );
   QPopupMenu *editMenu = new QPopupMenu( this );
   QPopupMenu *helpMenu = new QPopupMenu( this );
 
   KToolBar* tb =  mMainWindow->toolBar();
 
 #ifdef DESKTOP_VERSION
   QMenuBar* mb = mMainWindow->menuBar();
 
   //US setup menubar.
   //Disable the following block if you do not want to have a menubar.
   mb->insertItem( "&File", fileMenu );
   mb->insertItem( "&Edit", editMenu );
   mb->insertItem( "&View", viewMenu );
   mb->insertItem( "&Settings", settingsMenu );
   mb->insertItem( "&Change selected", changeMenu );
   mb->insertItem( "&Help", helpMenu );
   mIncSearchWidget = new IncSearchWidget( tb );
   // tb->insertWidget(-1, 0, mIncSearchWidget);
 
 #else
   //US setup toolbar
   QPEMenuBar   *menuBarTB = new QPEMenuBar( tb );
   QPopupMenu *popupBarTB = new QPopupMenu( this );
   menuBarTB->insertItem( "ME", popupBarTB);
   tb->insertWidget(-1, 0, menuBarTB);
   mIncSearchWidget = new IncSearchWidget( tb );
 
   tb->enableMoving(false);
   popupBarTB->insertItem( "&File", fileMenu );
   popupBarTB->insertItem( "&Edit", editMenu );
   popupBarTB->insertItem( "&View", viewMenu );
   popupBarTB->insertItem( "&Settings", settingsMenu );
   mViewManager->getFilterAction()->plug ( popupBarTB);
   popupBarTB->insertItem( "&Change selected", changeMenu );
   popupBarTB->insertItem( "&Help", helpMenu );
   if (QApplication::desktop()->width() > 320 ) {
       // mViewManager->getFilterAction()->plug ( tb);
   }
 #endif
   // mActionQuit->plug ( mMainWindow->toolBar());
 
 
 
   //US Now connect the actions with the menue entries.
   mActionPrint->plug( fileMenu );
   mActionMail->plug( fileMenu );
   fileMenu->insertSeparator();
 
   mActionNewContact->plug( fileMenu );
   mActionNewContact->plug( tb );
 
   mActionEditAddressee->plug( fileMenu );
   if ((KGlobal::getDesktopSize() > KGlobal::Small ) ||
       (!KABPrefs::instance()->mMultipleViewsAtOnce ))
     mActionEditAddressee->plug( tb );
 
   fileMenu->insertSeparator();
   mActionSave->plug( fileMenu );
   fileMenu->insertItem( "&Import", ImportMenu );
   fileMenu->insertItem( "&Export", ExportMenu );
   fileMenu->insertSeparator();
   mActionMailVCard->plug( fileMenu );
 #ifndef DESKTOP_VERSION
   if ( Ir::supported() ) mActionBeamVCard->plug( fileMenu );
   if ( Ir::supported() ) mActionBeam->plug(fileMenu );
 #endif
   fileMenu->insertSeparator();
   mActionQuit->plug( fileMenu );
 #ifdef _WIN32_
   mActionImportOL->plug( ImportMenu  );
 #endif
   // edit menu
   mActionUndo->plug( editMenu );
   mActionRedo->plug( editMenu );
   editMenu->insertSeparator();
   mActionCut->plug( editMenu );
   mActionCopy->plug( editMenu );
   mActionPaste->plug( editMenu );
   mActionDelete->plug( editMenu );
   editMenu->insertSeparator();
   mActionSelectAll->plug( editMenu );
 
   mActionRemoveVoice->plug( changeMenu );
   // settings menu
 //US special menuentry to configure the addressbook resources. On KDE
 // you do that through the control center !!!
   mActionConfigResources->plug( settingsMenu );
   settingsMenu->insertSeparator();
 
   mActionConfigKAddressbook->plug( settingsMenu );
 
   if ( mIsPart ) {
     mActionConfigShortcuts->plug( settingsMenu );
     mActionConfigureToolbars->plug( settingsMenu );
 
   } else {
     mActionKeyBindings->plug( settingsMenu );
   }
 
   settingsMenu->insertSeparator();
 
   mActionJumpBar->plug( settingsMenu );
   mActionDetails->plug( settingsMenu );
   if (!KABPrefs::instance()->mMultipleViewsAtOnce || KGlobal::getDesktopSize() == KGlobal::Desktop  )
     mActionDetails->plug( tb );
   settingsMenu->insertSeparator();
 
   mActionWhoAmI->plug( settingsMenu );
   mActionCategories->plug( settingsMenu );
 
   mActionLicence->plug( helpMenu );
   mActionFaq->plug( helpMenu );
   mActionAboutKAddressbook->plug( helpMenu );
 
   if (KGlobal::getDesktopSize() > KGlobal::Small ) {
 
       mActionSave->plug( tb );
       mViewManager->getFilterAction()->plug ( tb);
       if (KGlobal::getDesktopSize() == KGlobal::Desktop ) {
         mActionUndo->plug( tb );
         mActionDelete->plug( tb );
         mActionRedo->plug( tb );
       }
   }
   //mActionQuit->plug ( tb );
   // tb->insertWidget(-1, 0, mIncSearchWidget, 6);
 
   //US link the searchwidget first to this.
   // The real linkage to the toolbar happens later.
 //US  mIncSearchWidget->reparent(tb, 0, QPoint(50,0), TRUE);
 //US  tb->insertItem( mIncSearchWidget );
 /*US
   mIncSearchWidget = new IncSearchWidget( tb );
   connect( mIncSearchWidget, SIGNAL( doSearch( const QString& ) ),
            SLOT( incrementalSearch( const QString& ) ) );
 
   mJumpButtonBar = new JumpButtonBar( this, this );
 
 //US topLayout->addWidget( mJumpButtonBar );
  this->layout()->add( mJumpButtonBar );
 */
 
 #endif //KAB_EMBEDDED
 }
 void KABCore::showLicence()
 {
     KApplication::showLicence();
 }
 void KABCore::removeVoice()
 {
     if ( KMessageBox::questionYesNo( this, i18n("After importing, phone numbers\nmay have two or more types.\n(E.g. work+voice)\nThese numbers are shown as \"other\".\nClick Yes to remove the voice type\nfrom numbers with more than one type.\n\nRemove voice type?") ) == KMessageBox::No )
         return;
     KABC::Addressee::List list = mViewManager->selectedAddressees();
     KABC::Addressee::List::Iterator it;
     for ( it = list.begin(); it != list.end(); ++it ) {
         PhoneNumber::List phoneNumbers = (*it).phoneNumbers();
         PhoneNumber::List::Iterator phoneIt;
         bool found = false;
         for ( phoneIt = phoneNumbers.begin(); phoneIt != phoneNumbers.end(); ++phoneIt ) {
             if ( (*phoneIt).type() & PhoneNumber::Voice) { // voice found
                 if ((*phoneIt).type() - PhoneNumber::Voice ) {
                     (*phoneIt).setType((*phoneIt).type() - PhoneNumber::Voice );
                     (*it).insertPhoneNumber( (*phoneIt) );
                     found = true;
                 }
             }
 
         }
         if ( found )
             contactModified((*it) );
     }
 }
 
 
 
 void KABCore::clipboardDataChanged()
 {
 
   if ( mReadWrite )
     mActionPaste->setEnabled( !QApplication::clipboard()->text().isEmpty() );
 
 }
 
 void KABCore::updateActionMenu()
 {
   UndoStack *undo = UndoStack::instance();
   RedoStack *redo = RedoStack::instance();
 
   if ( undo->isEmpty() )
     mActionUndo->setText( i18n( "Undo" ) );
   else
     mActionUndo->setText( i18n( "Undo %1" ).arg( undo->top()->name() ) );
 
   mActionUndo->setEnabled( !undo->isEmpty() );
 
   if ( !redo->top() )
     mActionRedo->setText( i18n( "Redo" ) );
   else
     mActionRedo->setText( i18n( "Redo %1" ).arg( redo->top()->name() ) );
 
   mActionRedo->setEnabled( !redo->isEmpty() );
 }
 
 void KABCore::configureKeyBindings()
 {
 #ifndef KAB_EMBEDDED
   KKeyDialog::configure( actionCollection(), true );
 #else //KAB_EMBEDDED
   qDebug("KABCore::configureKeyBindings() not implemented");
 #endif //KAB_EMBEDDED
 }
 
 #ifdef KAB_EMBEDDED
 void KABCore::configureResources()
 {
   KRES::KCMKResources dlg( this, "" , 0 );
 
   if ( !dlg.exec() )
     return;
   KMessageBox::information( this,  i18n("Please restart to get the \nchanged resources (re)loaded!\n") );
 }
 #endif //KAB_EMBEDDED
 
 
 /* this method will be called through the QCop interface from Ko/Pi to select addresses
  * for the attendees list of an event.
  */
 void KABCore::requestForNameEmailUidList(const QString& sourceChannel, const QString& uid)
 {
   QStringList nameList;
   QStringList emailList;
   QStringList uidList;
 
   KABC::Addressee::List list = KABC::AddresseeDialog::getAddressees(this);
   uint i=0;
   for (i=0; i < list.count(); i++)
   {
         nameList.append(list[i].realName());
         emailList.append(list[i].preferredEmail());
         uidList.append(list[i].uid());
   }
 
   bool res = ExternalAppHandler::instance()->returnNameEmailUidListFromKAPI(sourceChannel, uid, nameList, emailList, uidList);
 
 }
 
 /* this method will be called through the QCop interface from other apps to show details of a contact.
  */
 void KABCore::requestForDetails(const QString& sourceChannel, const QString& sessionuid, const QString& name, const QString& email, const QString& uid)
 {
     qDebug("KABCore::requestForDetails %s %s %s %s %s", sourceChannel.latin1(), sessionuid.latin1(), name.latin1(), email.latin1(), uid.latin1());
 
     QString foundUid = QString::null;
     if ( ! uid.isEmpty() ) {
         Addressee adrr = mAddressBook->findByUid( uid );
         if (  !adrr.isEmpty() ) {
             foundUid = uid;
         }
             if ( email == "sendbacklist" ) {
                 //qDebug("ssssssssssssssssssssssend ");
                 QStringList nameList;
                 QStringList emailList;
                 QStringList uidList;
                 nameList.append(adrr.realName());
                 emailList = adrr.emails();
                 uidList.append( adrr.preferredEmail());
                 bool res = ExternalAppHandler::instance()->returnNameEmailUidListFromKAPI("QPE/Application/ompi", uid, nameList, emailList, uidList);
                 return;
             }
         
     }
   
   if ( email == "sendbacklist" ) 
       return;
   if (foundUid.isEmpty())
   {
     //find the uid of the person first
     Addressee::List namelist;
     Addressee::List emaillist;
 
     if (!name.isEmpty())
       namelist = mAddressBook->findByName( name );
 
     if (!email.isEmpty())
       emaillist = mAddressBook->findByEmail( email );
     qDebug("count %d %d ",  namelist.count(),emaillist.count() );
     //check if we have a match in Namelist and Emaillist
     if ((namelist.count() == 0) && (emaillist.count() > 0)) {
       foundUid = emaillist[0].uid();
     }
     else if ((namelist.count() > 0) && (emaillist.count() == 0))
       foundUid = namelist[0].uid();
     else
     {
       for (int i = 0; i < namelist.count(); i++)
       {
         for (int j = 0; j < emaillist.count(); j++)
         {
           if (namelist[i] == emaillist[j])
           {
             foundUid = namelist[i].uid();
           }
         }
       }
     }
   }
   else
   {
     foundUid = uid;
   }
 
   if (!foundUid.isEmpty())
   {
    
     // raise Ka/Pi if it is in the background
 #ifndef DESKTOP_VERSION
 #ifndef KORG_NODCOP
       //QCopEnvelope e("QPE/Application/kapi", "raise()");
 #endif
 #endif
     
     mMainWindow->showMaximized();
     mMainWindow-> raise();
 
     mViewManager->setSelected( "", false);
     mViewManager->refreshView( "" );
     mViewManager->setSelected( foundUid, true );
     mViewManager->refreshView( foundUid );
 
     if ( !mMultipleViewsAtOnce )
     {
       setDetailsVisible( true );
       mActionDetails->setChecked(true);
     }
   }
 }
 
 
 void  KABCore::faq()
 {
   KApplication::showFile( "KA/Pi FAQ", "kdepim/kaddressbook/kapiFAQ.txt" );
 }
 
 
 
 
 #ifndef KAB_EMBEDDED
 #include "kabcore.moc"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/kaimportoldialog.cpp b/kaddressbook/kaimportoldialog.cpp
index ef949e7..10e3c76 100644
--- a/kaddressbook/kaimportoldialog.cpp
+++ b/kaddressbook/kaimportoldialog.cpp
@@ -1,639 +1,695 @@
 /*
     This file is part of KAddressbook/Pi.
     Copyright (c) 2004 Lutz Rogowski <rogowski@kde.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #include <qtooltip.h>
 #include <qframe.h>
 #include <qpixmap.h>
 #include <qlayout.h>
 #include <qprogressbar.h>
 #include <qwidgetstack.h>
 #include <qdatetime.h>
 #include <qdir.h>
 #include <qapplication.h>
 #include <qhbox.h>
 #include <qheader.h>
 #include <qdatetime.h>
 #include <qlistview.h>
 
 #include <kdebug.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
 #include <kfiledialog.h>
 
 #include <libkdepim/categoryselectdialog.h>
 #include <libkdepim/kinputdialog.h>
 
 #include <libkcal/calendarlocal.h>
 #include <libkcal/icalformat.h>
 
 #include <kabc/addresseelist.h>
 #include <kabc/phonenumber.h>
 
 #include "kaimportoldialog.h"
 
 #include "../outport/msoutl9.h"
 #include <ole2.h>
 #include <comutil.h>
 _Application gOlAppAB;
 
 QDateTime mDdate2Qdtr( DATE dt)
 {
     COleDateTime odt;
     SYSTEMTIME st;
     odt = dt;
     if ( odt.GetStatus() != 0 )
       return QDateTime();
     odt.GetAsSystemTime(st);
     if ( st.wYear > 4000  ) // this program as a year 4000 bug!
       return QDateTime();
     // it seems so, that 1.1.4501 indicates: DATE invalid
     QDateTime qdt (QDate(st.wYear, st.wMonth,st.wDay ),QTime( st.wHour, st.wMinute,st.wSecond ) );
     return qdt;
 }
 
 class OLEListViewItem : public QCheckListItem
 {
   public:
     OLEListViewItem( QListView *parent, QString text ) :
       QCheckListItem( parent, text, QCheckListItem::CheckBox ) { ; };
     OLEListViewItem(  QListViewItem *after, QString text ) :
       QCheckListItem( after, text, QCheckListItem::CheckBox ) { ; };
     ~OLEListViewItem() {};
   void setData( DWORD data ) {mData= data; };
   DWORD data() { return mData ;};
   private:
      DWORD  mData;
 }; 
 
 KAImportOLdialog::KAImportOLdialog( const QString &caption, 
                                       KABC::AddressBook * aBook, QWidget *parent ) :
     KDialogBase( Plain, caption, User1 | Close, Ok,
                parent, caption, true, false, i18n("Import!") )
 {
   QHBox * mw = new  QHBox( this );
   setMainWidget( mw );
   mListView = new QListView( mw );
   mListView->addColumn(i18n("Select Folder to import"));
   mListView->addColumn(i18n("Content Type"));
   mABook = aBook;
   connect( this, SIGNAL( user1Clicked() ),SLOT ( slotApply()));
   setupFolderView();
   resize( sizeHint().width()+50,  sizeHint().height()+50 );
 }
 
 KAImportOLdialog::~KAImportOLdialog()
 {
    
 }
 
 KABC::Addressee::List KAImportOLdialog::getAddressList()
 {
   return mAList;
 }
 void KAImportOLdialog::setupFolderView()
 {
   SCODE sc = ::OleInitialize(NULL);
   if ( FAILED ( sc ) ) {
     KMessageBox::information(this,"OLE initialisation failed");
     return;
   }
   
   if(!gOlAppAB.CreateDispatch(_T("Outlook.Application"),NULL)){
     KMessageBox::information(this,"Sorry, cannot access Outlook");
     return ;
   }
   MAPIFolder mfInbox;
   MAPIFolder mfRoot;
   CString szName;
   _NameSpace olNS; 
   olNS = gOlAppAB.GetNamespace(_T("MAPI"));
   mfInbox = olNS.GetDefaultFolder(6);
   mfRoot = mfInbox.GetParent();
   szName = mfRoot.GetName();
   long iType = mfRoot.GetDefaultItemType();
   QString mes;
   mes = QString::fromUcs2( szName.GetBuffer() );
   OLEListViewItem * root = new OLEListViewItem( mListView, mes );
   mfRoot.m_lpDispatch->AddRef();
   addFolder( root, mfRoot.m_lpDispatch );
   root->setOpen( true );
   mListView->setSortColumn( 0 );
   mListView->sort( );
 }
 
 
 void KAImportOLdialog::addFolder(OLEListViewItem* iParent, LPDISPATCH dispParent)
 {
   MAPIFolder mfParent(dispParent), mfChild;
   _Folders folders;
   _variant_t fndx((long)0);
   CString szName;
   long iType;
   OLEListViewItem* hChild;
 
     folders = mfParent.GetFolders();    
     for(int i=1; i <= folders.GetCount(); ++i)
     {
       fndx = (long)i;
       mfChild = folders.Item(fndx.Detach());
       mfChild.m_lpDispatch->AddRef();
       szName = mfChild.GetName();
       iType = mfChild.GetDefaultItemType();
       hChild = new OLEListViewItem( iParent , QString::fromUcs2( szName.GetBuffer() ) );
       if ( iType != 2)
         hChild->setEnabled( false );
       QString ts; 
       switch( iType ) {
       case 0:
         ts = i18n("Mail");
         break;
       case 1:
         ts = i18n("Calendar");
         break;
       case 2:
         ts = i18n("Contacts");
         break;
       case 3:
         ts = i18n("Todos");
         break;
       case 4:
         ts = i18n("Journals");
         break;
       case 5:
         ts = i18n("Notes");
         break;
       default:
         ts = i18n("Unknown");
       }
       hChild->setText( 1,ts);
       hChild->setData( (DWORD) mfChild.m_lpDispatch );
       mfChild.m_lpDispatch->AddRef();
       addFolder(hChild, mfChild.m_lpDispatch);
     }
 }
 
 void KAImportOLdialog::slotApply()
 {
   importedItems = 0;
   OLEListViewItem* child = (OLEListViewItem*) mListView->firstChild();
   while ( child ) {
     if ( child->isOn() )
       readContactData( child->data() );
     child = (OLEListViewItem*) child->itemBelow();
   }
   QString mes = i18n("Importing complete.\n\n%1 items imported.").arg( importedItems);
   KMessageBox::information(this,mes);
 }
 void KAImportOLdialog::readContactData( DWORD folder )
 {
 
   LPDISPATCH dispItem = (LPDISPATCH)folder;
   dispItem->AddRef();
   MAPIFolder mf(dispItem);
   mf.m_lpDispatch->AddRef();
   _Items folderItems;
   _variant_t indx((long)0);
   LPDISPATCH itm;
   int i;
   folderItems = mf.GetItems(); 
   QProgressBar bar( folderItems.GetCount(),0 );
   bar.setCaption (i18n("Importing - close to abort!") );
   int h = bar.sizeHint().height() ;
   int w = 300;
   int dw = QApplication::desktop()->width();
   int dh = QApplication::desktop()->height();
   bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
   bar.show();
   for(i=1; i <= folderItems.GetCount(); ++i)
     {
       qApp->processEvents();
       if ( ! bar.isVisible() )
             return ;
       bar.setProgress( i );
       indx = (long)i;
       itm = folderItems.Item(indx.Detach());
       _ContactItem * pItem = (_ContactItem *)&itm;
       ol2kapiContact( pItem );
       itm->Release();
     }
 }
 void KAImportOLdialog::slotOk()
 {
    QDialog::accept();
 }
 
 void KAImportOLdialog::ol2kapiContact( _ContactItem * aItem )
 {
   KABC::Addressee  addressee;
   
   addressee.setUid( QString::fromUcs2(aItem->GetEntryID().GetBuffer()));
   //GetLastModificationTime()
   //addressee.setName( const QString &name );
   //addressee.setFormattedName( const QString &formattedName );
   addressee.setFamilyName( QString::fromUcs2(aItem->GetLastName().GetBuffer()) );
   addressee.setGivenName( QString::fromUcs2(aItem->GetFirstName().GetBuffer()) );
   addressee.setAdditionalName( QString::fromUcs2(aItem->GetMiddleName().GetBuffer()) );
   addressee.setPrefix(QString::fromUcs2(aItem->GetTitle().GetBuffer()) );
   addressee.setSuffix( QString::fromUcs2(aItem->GetSuffix().GetBuffer()) );
   addressee.setNickName( QString::fromUcs2(aItem->GetNickName().GetBuffer()) );
   QDateTime dtb = mDdate2Qdtr(aItem->GetBirthday());
   if ( dtb.isValid() )
     addressee.setBirthday( mDdate2Qdtr(aItem->GetBirthday()));
 
   //QString::fromUcs2(aItem->.GetBuffer())
   //addressee.setMailer( const QString &mailer );
   //addressee.setTimeZone( const TimeZone &timeZone );
   //addressee.setGeo( const Geo &geo );
   //addressee.setTitle( QString::fromUcs2(aItem->GetJobTitle().GetBuffer()) );// titel is the prefix
   addressee.setRole( QString::fromUcs2(aItem->GetJobTitle().GetBuffer()) );
   addressee.setOrganization( QString::fromUcs2(aItem->GetCompanyName().GetBuffer()) );
-  addressee.setNote( QString::fromUcs2(aItem->GetBody().GetBuffer()) );
+  QString notesStr = QString::fromUcs2(aItem->GetBody().GetBuffer());
    
   addressee.setProductId( QString::fromUcs2(aItem->GetCustomerID().GetBuffer()) );
   //addressee.setRevision( const QDateTime &revision );
   // addressee.setSortString( const QString &sortString );
   addressee.setUrl( QString::fromUcs2(aItem->GetWebPage().GetBuffer()) );
 
   QString tempS;
   tempS = QString::fromUcs2(aItem->GetNetMeetingAlias().GetBuffer())+" AT SERVER: " +QString::fromUcs2(aItem->GetNetMeetingServer().GetBuffer());
   if ( tempS.length() > 12 )
     addressee.insertCustom( "KADDRESSBOOK", "X-IMAddress", tempS );
   tempS = QString::fromUcs2(aItem->GetSpouse().GetBuffer());
   if ( !tempS.isEmpty() )
     addressee.insertCustom( "KADDRESSBOOK", "X-SpousesName", tempS );
   tempS = QString::fromUcs2(aItem->GetManagerName().GetBuffer());
   if ( !tempS.isEmpty() )
     addressee.insertCustom( "KADDRESSBOOK", "X-ManagersName", tempS );
   tempS = QString::fromUcs2(aItem->GetAssistantName().GetBuffer());
   if ( !tempS.isEmpty() )
     addressee.insertCustom( "KADDRESSBOOK", "X-AssistantsName", tempS );
   tempS = QString::fromUcs2(aItem->GetDepartment().GetBuffer());
   if ( !tempS.isEmpty() )
     addressee.insertCustom( "KADDRESSBOOK", "X-Department", tempS );
   tempS = QString::fromUcs2(aItem->GetOfficeLocation().GetBuffer());
   if ( !tempS.isEmpty() )
     addressee.insertCustom( "KADDRESSBOOK", "X-Office",tempS );
   tempS = QString::fromUcs2(aItem->GetProfession().GetBuffer());
   if ( !tempS.isEmpty() )
     addressee.insertCustom( "KADDRESSBOOK", "X-Profession", tempS );
   dtb =  mDdate2Qdtr(aItem->GetAnniversary());
   if (dtb.isValid() ) {
     QString dt = KGlobal::locale()->formatDate( dtb.date() , true, KLocale::ISODate);
     addressee.insertCustom( "KADDRESSBOOK", "X-Anniversary", dt);
   }
   int sec =   aItem->GetSensitivity() ;
   if ( sec > 1 )// mapping pers -> private
     --sec;
   addressee.setSecrecy( sec );
   //addressee.setLogo( const Picture &logo );
   //addressee.setPhoto( const Picture &photo );
   //addressee.setSound( const Sound &sound );
   //addressee.setAgent( const Agent &agent );
   QString cat = QString::fromUcs2( aItem->GetCategories().GetBuffer());
   addressee.setCategories( QStringList::split( ";", cat ));
   
   QString phoneS;
 
   phoneS = QString::fromUcs2( aItem->GetAssistantTelephoneNumber().GetBuffer());
   if ( ! phoneS.isEmpty()) 
     addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Work + KABC::PhoneNumber::Voice ) );
   phoneS = QString::fromUcs2( aItem->GetBusinessTelephoneNumber().GetBuffer());
   if ( ! phoneS.isEmpty()) 
     addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Work ) );
   phoneS = QString::fromUcs2( aItem->GetBusiness2TelephoneNumber().GetBuffer());
   if ( ! phoneS.isEmpty()) 
     addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Work ) );
   phoneS = QString::fromUcs2( aItem->GetBusinessFaxNumber().GetBuffer());
   if ( ! phoneS.isEmpty()) 
     addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Work + KABC::PhoneNumber::Fax ) );
   phoneS = QString::fromUcs2( aItem->GetCarTelephoneNumber().GetBuffer());
   if ( ! phoneS.isEmpty()) 
     addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Car ) );
   phoneS = QString::fromUcs2( aItem->GetHomeTelephoneNumber().GetBuffer());
   if ( ! phoneS.isEmpty()) 
     addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Home  ) );
   phoneS = QString::fromUcs2( aItem->GetHome2TelephoneNumber().GetBuffer());
   if ( ! phoneS.isEmpty()) 
     addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Home ) );
   phoneS = QString::fromUcs2( aItem->GetHomeFaxNumber().GetBuffer());
   if ( ! phoneS.isEmpty()) 
     addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Home + KABC::PhoneNumber::Fax ) );
   phoneS = QString::fromUcs2( aItem->GetISDNNumber().GetBuffer());
   if ( ! phoneS.isEmpty()) 
     addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Isdn ) );
   phoneS = QString::fromUcs2( aItem->GetMobileTelephoneNumber().GetBuffer());
   if ( ! phoneS.isEmpty()) 
     addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Cell ) );
   phoneS = QString::fromUcs2( aItem->GetOtherFaxNumber().GetBuffer());
   if ( ! phoneS.isEmpty()) 
     addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Fax ) );
   phoneS = QString::fromUcs2( aItem->GetOtherTelephoneNumber().GetBuffer());
   if ( ! phoneS.isEmpty()) 
     addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Voice ) );
   phoneS = QString::fromUcs2( aItem->GetPagerNumber().GetBuffer());
   if ( ! phoneS.isEmpty()) 
     addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Pager ) );
   phoneS = QString::fromUcs2( aItem->GetPrimaryTelephoneNumber().GetBuffer());
   if ( ! phoneS.isEmpty()) 
     addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Pref ) );
   phoneS = QString::fromUcs2( aItem->GetTTYTDDTelephoneNumber().GetBuffer());
   if ( ! phoneS.isEmpty()) 
     addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Modem ) );
   phoneS = QString::fromUcs2( aItem->GetTelexNumber().GetBuffer());
   if ( ! phoneS.isEmpty()) 
     addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Fax + KABC::PhoneNumber::Bbs ) );
   phoneS = QString::fromUcs2( aItem->GetCompanyMainTelephoneNumber().GetBuffer());
   if ( ! phoneS.isEmpty()) 
     addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Work + KABC::PhoneNumber::Pref ) );
   phoneS = QString::fromUcs2( aItem->GetRadioTelephoneNumber().GetBuffer());
   if ( ! phoneS.isEmpty()) 
     addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Video  ) );
   phoneS = QString::fromUcs2( aItem->GetCallbackTelephoneNumber().GetBuffer());
   if ( ! phoneS.isEmpty()) 
     addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Voice + KABC::PhoneNumber::Pref ) );
  
   bool preferred = true;
   phoneS = QString::fromUcs2( aItem->GetEmail1Address().GetBuffer());
   if ( ! phoneS.isEmpty()) {
     addressee.insertEmail(phoneS  , preferred );
     preferred = false;
   }
   phoneS = QString::fromUcs2( aItem->GetEmail2Address().GetBuffer());
   if ( ! phoneS.isEmpty()) {
     addressee.insertEmail(phoneS  , preferred );
     preferred = false;
   }
   phoneS = QString::fromUcs2( aItem->GetEmail3Address().GetBuffer());
   if ( ! phoneS.isEmpty()) {
     addressee.insertEmail(phoneS  , preferred );
     preferred = false;
   }
   // is this the number of the preferred email?
           //long GetSelectedMailingAddress();???
  
   KABC::Address addressHome;
   KABC::Address* addressAdd = &addressHome;
   bool insert = false;
   phoneS = QString::fromUcs2( aItem->GetHomeAddressCountry().GetBuffer());
   if ( ! phoneS.isEmpty()) {
     addressAdd->setCountry(phoneS  );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetHomeAddressState().GetBuffer());
   if ( ! phoneS.isEmpty()) {
     addressAdd->setRegion(phoneS   );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetHomeAddressCity().GetBuffer());
   if ( ! phoneS.isEmpty()) {
     addressAdd->setLocality(phoneS  );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetHomeAddressPostalCode().GetBuffer());
   if ( ! phoneS.isEmpty()) {
     addressAdd->setPostalCode(phoneS  );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetHomeAddressPostOfficeBox().GetBuffer());
   if ( ! phoneS.isEmpty()) {
     addressAdd->setPostOfficeBox(phoneS  );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetHomeAddressStreet().GetBuffer());
   if ( ! phoneS.isEmpty()) {
     addressAdd->setStreet(phoneS  );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetHomeAddress().GetBuffer());
   if ( ! phoneS.isEmpty()) {
     // redundant !addressAdd->setExtended(phoneS  );
     // insert = true;
   }
   addressAdd->setType( KABC::Address::Home );
   if ( insert )
     addressee.insertAddress( *addressAdd );
   // ++++++++++++++++++++++ end of address
 
   KABC::Address addressWork;
   addressAdd = &addressWork;
   insert = false;
   phoneS = QString::fromUcs2( aItem->GetBusinessAddressCountry().GetBuffer());
   if ( ! phoneS.isEmpty()) {
     addressAdd->setCountry(phoneS  );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetBusinessAddressState().GetBuffer());
   if ( ! phoneS.isEmpty()) {
     addressAdd->setRegion(phoneS   );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetBusinessAddressCity().GetBuffer());
   if ( ! phoneS.isEmpty()) {
     addressAdd->setLocality(phoneS  );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetBusinessAddressPostalCode().GetBuffer());
   if ( ! phoneS.isEmpty()) {
     addressAdd->setPostalCode(phoneS  );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetBusinessAddressPostOfficeBox().GetBuffer());
   if ( ! phoneS.isEmpty()) {
     addressAdd->setPostOfficeBox(phoneS  );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetBusinessAddressStreet().GetBuffer());
   if ( ! phoneS.isEmpty()) {
     addressAdd->setStreet(phoneS  );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetBusinessAddress().GetBuffer());
   if ( ! phoneS.isEmpty()) {
     // redundant !addressAdd->setExtended(phoneS  );
     // insert = true;
   }
   addressAdd->setType( KABC::Address::Work );
   if ( insert )
     addressee.insertAddress( *addressAdd );
   // ++++++++++++++++++++++ end of address
 
  KABC::Address addressOther;
   addressAdd = &addressOther;
   insert = false;
   phoneS = QString::fromUcs2( aItem->GetOtherAddressCountry().GetBuffer());
   if ( ! phoneS.isEmpty()) {
     addressAdd->setCountry(phoneS  );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetOtherAddressState().GetBuffer());
   if ( ! phoneS.isEmpty()) {
     addressAdd->setRegion(phoneS   );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetOtherAddressCity().GetBuffer());
   if ( ! phoneS.isEmpty()) {
     addressAdd->setLocality(phoneS  );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetOtherAddressPostalCode().GetBuffer());
   if ( ! phoneS.isEmpty()) {
     addressAdd->setPostalCode(phoneS  );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetOtherAddressPostOfficeBox().GetBuffer());
   if ( ! phoneS.isEmpty()) {
     addressAdd->setPostOfficeBox(phoneS  );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetOtherAddressStreet().GetBuffer());
   if ( ! phoneS.isEmpty()) {
     addressAdd->setStreet(phoneS  );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetOtherAddress().GetBuffer());
   if ( ! phoneS.isEmpty()) {
     // redundant !addressAdd->setExtended(phoneS  );
     //insert = true;
   }
   //addressAdd->setId(  );
   if ( insert )
     addressee.insertAddress( *addressAdd );
   // ++++++++++++++++++++++ end of address
  KABC::Address addressMail;
   addressAdd = &addressMail;
   insert = false;
   phoneS = QString::fromUcs2( aItem->GetMailingAddressCountry().GetBuffer());
   if ( ! phoneS.isEmpty()) {
     addressAdd->setCountry(phoneS  );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetMailingAddressState().GetBuffer());
   if ( ! phoneS.isEmpty()) {
     addressAdd->setRegion(phoneS   );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetMailingAddressCity().GetBuffer());
   if ( ! phoneS.isEmpty()) {
     addressAdd->setLocality(phoneS  );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetMailingAddressPostalCode().GetBuffer());
   if ( ! phoneS.isEmpty()) {
     addressAdd->setPostalCode(phoneS  );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetMailingAddressPostOfficeBox().GetBuffer());
   if ( ! phoneS.isEmpty()) {
     addressAdd->setPostOfficeBox(phoneS  );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetMailingAddressStreet().GetBuffer());
   if ( ! phoneS.isEmpty()) {
     addressAdd->setStreet(phoneS  );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetMailingAddress().GetBuffer());
   if ( ! phoneS.isEmpty()) {
     // redundant ! addressAdd->setExtended(phoneS  );
     // insert = true;
   }
   addressAdd->setType( KABC::Address::Postal ); 
   if ( insert ) {
     addressee.insertAddress( *addressAdd );
   }
   // the following code is disabled
   // it does not seem to be useful
 #if 0
   if ( insert ) {
     addressAdd->setType( KABC::Address::Home );
     if ( addressMail == addressHome ) {
       addressHome.setType( KABC::Address::Postal+ KABC::Address::Home );
       addressee.insertAddress( addressHome );
     } else { 
       addressAdd->setType( KABC::Address::Work );
       if ( addressMail == addressWork ){
         addressWork.setType( KABC::Address::Postal+ KABC::Address::Work );
         addressee.insertAddress( addressWork );
 
       } else {
         addressAdd->setType( 0 );
         if ( addressOther == addressMail ){
           addressOther.setType( KABC::Address::Postal );
           addressee.insertAddress( addressOther );
         } else {
           addressee.insertAddress( *addressAdd );
         }
       }
     }
   }
 #endif
   // ++++++++++++++++++++++ end of ALL addresses
   //GetUserProperties();
   tempS = QString::fromUcs2(aItem->GetInternetFreeBusyAddress().GetBuffer());
   if ( !tempS.isEmpty() )
     addressee.insertCustom( "KADDRESSBOOK", "X-FreeBusyUrl", tempS );
   tempS = QString::fromUcs2(aItem->GetChildren().GetBuffer());
   if ( !tempS.isEmpty() )
     addressee.insertCustom( "KADDRESSBOOK", "X-Children", tempS );
   int gen  = aItem->GetGender();
   if ( gen != 0  ) { // 0 undef - 1 female - 2 male 
     if ( gen == 1 )
       addressee.insertCustom( "KADDRESSBOOK", "X-Gender", "female" );
     else
       addressee.insertCustom( "KADDRESSBOOK", "X-Gender", "male" );
   }
-
+  QString additionalInfo;
+  QString tempAdd;
+  tempAdd = QString::fromUcs2(aItem->GetLanguage().GetBuffer());
+  if ( ! tempAdd.isEmpty() ) {
+    additionalInfo += i18n("\nLanguage: ");
+    additionalInfo += tempAdd;
+  }
+  tempAdd = QString::fromUcs2(aItem->GetHobby().GetBuffer()); 
+  if ( ! tempAdd.isEmpty() ) {
+    additionalInfo += i18n("\nHobby: ");
+    additionalInfo += tempAdd;;
+  }
+  tempAdd =QString::fromUcs2(aItem->GetPersonalHomePage().GetBuffer());
+  if ( ! tempAdd.isEmpty() ) {
+    additionalInfo += i18n("\nHomepage: ");
+    additionalInfo += tempAdd;;
+  }
+  tempAdd = QString::fromUcs2(aItem->GetBillingInformation().GetBuffer());
+  if ( ! tempAdd.isEmpty() ) {
+    additionalInfo += i18n("\nBilling information: ");
+    additionalInfo += tempAdd;;
+  }
+  tempAdd = QString::fromUcs2(aItem->GetCustomerID().GetBuffer());
+  if ( ! tempAdd.isEmpty() ) {
+    additionalInfo += i18n("\nCustomer ID: ");
+    additionalInfo += tempAdd;;
+  }
+  tempAdd = QString::fromUcs2(aItem->GetUser1().GetBuffer());
+  if ( ! tempAdd.isEmpty() ) {
+    additionalInfo += i18n("\nUser1: ");
+    additionalInfo += tempAdd;;
+  }
+  tempAdd = QString::fromUcs2(aItem->GetUser2().GetBuffer());
+  if ( ! tempAdd.isEmpty() ) {
+    additionalInfo += i18n("\nUser2: ");
+    additionalInfo += tempAdd;;
+  }
+  tempAdd = QString::fromUcs2(aItem->GetUser3().GetBuffer());
+  if ( ! tempAdd.isEmpty() ) {
+    additionalInfo += i18n("\nUser3: ");
+    additionalInfo += tempAdd;;
+  }
+  tempAdd = QString::fromUcs2(aItem->GetUser4().GetBuffer()); 
+  if ( ! tempAdd.isEmpty() ) {
+    additionalInfo += i18n("\nUser4: ");
+    additionalInfo += tempAdd;;
+  }
+  if (!additionalInfo.isEmpty() ) {
+    tempAdd = notesStr;
+    notesStr = "+++++++++++++++++++++++++++\n";
+    notesStr += i18n("Additonal fields created\nby KA/Pi Outlook import:");
+    notesStr += additionalInfo;
+    notesStr += i18n("\nEnd additonal fields created\nby KA/Pi Outlook import!\n");
+    notesStr += "+++++++++++++++++++++++++++\n";
+    notesStr += tempAdd;
+  }
+  addressee.setNote( notesStr );
 #if 0  
   // pending
   - IM address: no clue where to get info about the helper ID
     -custom fields: difficult to implement - not implemented
     -keys: makes no sense
 #endif
    
   if ( addAddressee( addressee ))
     ++importedItems;
 }
 void KAImportOLdialog::slotCancel()
 {
   reject();
 }
 
 bool KAImportOLdialog::addAddressee( KABC::Addressee a )
 {
   bool add = true;
   KABC::Addressee::List::Iterator it;
     for ( it = mAList.begin(); it != mAList.end(); ++it ) {
       if ( (*it).uid() == a.uid() ) {
         add = false;
         break;
       }
     }
     if ( add ) {
       if ( mABook->findByUid(a.uid() ).isEmpty())
         mAList.append ( a );
       else 
         add = false;
     }
     return add;
 }