KAPi OLE import changes

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
@@ -1712,5 +1712,5 @@ void KABCore::initActions()
                                     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" );
diff --git a/kaddressbook/kaimportoldialog.cpp b/kaddressbook/kaimportoldialog.cpp
index ef949e7..10e3c76 100644
--- a/kaddressbook/kaimportoldialog.cpp
+++ b/kaddressbook/kaimportoldialog.cpp
@@ -269,5 +269,5 @@ void KAImportOLdialog::ol2kapiContact( _ContactItem * aItem )
   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()) );
@@ -604,5 +604,61 @@ void KAImportOLdialog::ol2kapiContact( _ContactItem * aItem )
       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