| -rw-r--r-- | kaddressbook/kabcore.cpp | 2 | ||||
| -rw-r--r-- | kaddressbook/kaimportoldialog.cpp | 60 |
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 @@ -1706,17 +1706,17 @@ void KABCore::initActions() 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(), diff --git a/kaddressbook/kaimportoldialog.cpp b/kaddressbook/kaimportoldialog.cpp index ef949e7..10e3c76 100644 --- a/kaddressbook/kaimportoldialog.cpp +++ b/kaddressbook/kaimportoldialog.cpp @@ -263,17 +263,17 @@ void KAImportOLdialog::ol2kapiContact( _ContactItem * aItem ) //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()); @@ -598,17 +598,73 @@ void KAImportOLdialog::ol2kapiContact( _ContactItem * aItem ) 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 )) |