summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-09-15 15:06:44 (UTC)
committer zautrix <zautrix>2004-09-15 15:06:44 (UTC)
commitd37aeeb9aa023d52b364c971fa4aabd0c8f339b9 (patch) (side-by-side diff)
tree6d818d2c6dae0921b793f09e2ed569cbe7dd7d09
parent12091abdaa7e60e408fc248e286f37e12cb10a23 (diff)
downloadkdepimpi-d37aeeb9aa023d52b364c971fa4aabd0c8f339b9.zip
kdepimpi-d37aeeb9aa023d52b364c971fa4aabd0c8f339b9.tar.gz
kdepimpi-d37aeeb9aa023d52b364c971fa4aabd0c8f339b9.tar.bz2
KAPi OLE import changes
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--kaddressbook/kabcore.cpp2
-rw-r--r--kaddressbook/kaimportoldialog.cpp60
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
@@ -1711,7 +1711,7 @@ void KABCore::initActions()
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
diff --git a/kaddressbook/kaimportoldialog.cpp b/kaddressbook/kaimportoldialog.cpp
index ef949e7..10e3c76 100644
--- a/kaddressbook/kaimportoldialog.cpp
+++ b/kaddressbook/kaimportoldialog.cpp
@@ -268,7 +268,7 @@ void KAImportOLdialog::ol2kapiContact( _ContactItem * aItem )
//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 );
@@ -603,7 +603,63 @@ void KAImportOLdialog::ol2kapiContact( _ContactItem * aItem )
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