1 files changed, 7 insertions, 1 deletions

diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp
index 91df96d..9a8fa68 100644
--- a/kaddressbook/xxport/vcard_xxport.cpp
+++ b/kaddressbook/xxport/vcard_xxport.cpp
@@ -118,149 +118,155 @@ bool VCardXXPort::exportContacts( const KABC::AddresseeList &list, const QString
 
         KABC::VCardConverter::Version version;
         if ( data == "v21" )
             version = KABC::VCardConverter::v2_1;
         else
             version = KABC::VCardConverter::v3_0;
 
         converter.addresseeToVCard( *it, vcard, version );
         t << vcard << "\r\n\r\n";
     }
 
     outFile.close();
 
     return true;
 }
 
 KABC::AddresseeList VCardXXPort::importContacts( const QString& ) const
 {
     QString fileName;
     KABC::AddresseeList addrList;
     KURL url;
 
 #ifndef KAB_EMBEDDED
     if ( !XXPortManager::importData.isEmpty() )
         addrList = parseVCard( XXPortManager::importData );
     else {
         if ( XXPortManager::importURL.isEmpty() )
             {
                 url = KFileDialog::getLoadFileName( QString::null, i18n("Select vCard to Import"), parentWidget() );
             }
         else
             url = XXPortManager::importURL;
         if ( url.isEmpty() )
             return addrList;
         QString caption( i18n( "vCard Import Failed" ) );
         if ( KIO::NetAccess::download( url, fileName ) ) {
             QFile file( fileName );
 
             file.open( IO_ReadOnly );
             QByteArray rawData = file.readAll();
             file.close();
 
             QString data = QString::fromUtf8( rawData.data(), rawData.size() + 1 );
             addrList = parseVCard( data );
 
             if ( !url.isLocalFile() )
                 KIO::NetAccess::removeTempFile( fileName );
 
         } else {
             QString text = i18n( "<qt>Unable to access <b>%1</b>.</qt>" );
             KMessageBox::error( parentWidget(), text.arg( url.url() ), caption );
         }
 
     }
 
 
 #else //KAB_EMBEDDED
 
 
     if ( !XXPortManager::importData.isEmpty() )
         addrList = parseVCard( XXPortManager::importData );
     else {
         if ( XXPortManager::importURL.isEmpty() )
             {
                 fileName = KFileDialog::getOpenFileName( QString::null, i18n("Select vCard to Import"), parentWidget() );
 
                 if ( fileName.isEmpty() )
                     return addrList;
                 QFileInfo fi ( fileName );
                 if ( !fi.isFile() )
                     return addrList;
             }
         else
             {
                 //US      url = XXPortManager::importURL;
                 qDebug("VCardXXPort::importContacts  Urls at the moment not supported");
                 if ( url.isEmpty() )
                     return addrList;
 
             }
         QFile file( fileName );
         if ( file.open( IO_ReadOnly ) ) {
             QCString rawData ( file.readAll().data(),file.size()+1);
             file.close();
             int start = 0;
 #ifndef DESKTOP_VERSION            
             while ( start < rawData.size()-2 ) {
                 if ( rawData.at( start ) == '\r' ) 
                     if ( rawData.at( start+1 ) == '\n' )
                         if ( rawData.at( start+2 ) == ' ' ) {
                             rawData.remove(start,3);
                             --start;
                         }
                 ++start;
             }
 #endif
-            addrList = parseVCard( QString::fromUtf8( rawData.data() ) );
+            int ret = KMessageBox::warningYesNoCancel( 0, i18n("Select import format!\nDefault and standard is Utf8.\nLatin1 may be the right\nfor some West Europian languages."), i18n("Import Format"), i18n("Utf8"), i18n("Latin1") );
+            if (  ret == KMessageBox::Cancel )
+                return addrList;
+            if ( ret == KMessageBox::Yes )
+                addrList = parseVCard( QString::fromUtf8( rawData.data() ) );
+            else
+                addrList = parseVCard( QString::fromLatin1( rawData.data() ) );
         }
 
     }
 #endif //KAB_EMBEDDED
 
     return addrList;
 }
 
 KABC::AddresseeList VCardXXPort::parseVCard( const QString &data ) const
 {
 
     KABC::VCardTool tool;
     KABC::AddresseeList addrList;
     addrList = tool.parseVCards( data );
     // LR : I switched to the code, which is in current cvs HEAD
     /*
       uint numVCards = data.contains( "BEGIN:VCARD", false );
       QStringList dataList = QStringList::split( "\r\n\r\n", data );
 
       for ( uint i = 0; i < numVCards && i < dataList.count(); ++i ) {
       KABC::Addressee addr;
       bool ok = false;
 
       if ( dataList[ i ].contains( "VERSION:3.0" ) )
       ok = converter.vCardToAddressee( dataList[ i ], addr, KABC::VCardConverter::v3_0 );
       else if ( dataList[ i ].contains( "VERSION:2.1" ) )
       ok = converter.vCardToAddressee( dataList[ i ], addr, KABC::VCardConverter::v2_1 );
       else {
       KMessageBox::sorry( parentWidget(), i18n( "Not supported vCard version." ) );
       continue;
       }
 
       if ( !addr.isEmpty() && ok )
       addrList.append( addr );
       else {
       QString text = i18n( "The selected file does not include a valid vCard. "
       "Please check the file and try again." );
       KMessageBox::sorry( parentWidget(), text );
       }
       }
     */
     if ( addrList.isEmpty()  ) {
         QString text = i18n( "The selected file does not\ninclude a valid vCard.\nPlease check the file and try again.\n" );
         KMessageBox::sorry( parentWidget(), text );
     }
     return addrList;
 }
 
 
 #ifndef KAB_EMBEDDED
 #include "vcard_xxport.moc"
 #endif //KAB_EMBEDDED