added import vcard menu entry

3 files changed, 323 insertions, 303 deletions

diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp
index 8229212..86d1760 100644
--- a/core/pim/addressbook/addressbook.cpp
+++ b/core/pim/addressbook/addressbook.cpp
@@ -17,24 +17,27 @@
 ** not clear to you.
 **
 **********************************************************************/
 
 #define QTOPIA_INTERNAL_FD
 
 #include "contacteditor.h"
 #include "ablabel.h"
 #include "abtable.h"
 #include "addresssettings.h"
 #include "addressbook.h"
 
+
+#include <opie/ofileselector.h>
+#include <opie/ofiledialog.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/config.h>
 #include <qpe/contact.h>
 
 #ifndef MAKE_FOR_SHARP_ROM
 #include <qpe/finddialog.h>
 #endif
 
 #include <qpe/global.h>
 #include <qpe/resource.h>
 #include <qpe/ir.h>
 #include <qpe/qpemessagebox.h>
@@ -64,38 +67,38 @@
 #include <qdatetime.h>
 
 #include "picker.h"
 static QString addressbookOldXMLFilename()
 {
     QString filename = QPEApplication::documentDir() + "addressbook.xml";
     return filename;
 }
 
 static QString addressbookXMLFilename()
 {
     QString filename = Global::applicationFileName("addressbook",
-						   "addressbook.xml");
+               "addressbook.xml");
     return filename;
 }
 
 static QString addressbookPersonalVCardName()
 {
     QString filename = Global::applicationFileName("addressbook",
-						   "businesscard.vcf");
+               "businesscard.vcf");
     return filename;
 }
 
 
 AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
-				      WFlags f )
+              WFlags f )
     : QMainWindow( parent, name, f ),
       abEditor(0),
       bAbEditFirstTime(TRUE),
       syncing(FALSE)
 {
     initFields();
 
     setCaption( tr("Contacts") );
     setIcon( Resource::loadPixmap( "AddressBook" ) );
 
     setToolBarsMovable( FALSE );
 
@@ -105,39 +108,39 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
     bar->setHorizontalStretchable( TRUE );
 
     QPEMenuBar *mbList = new QPEMenuBar( bar );
     mbList->setMargin( 0 );
 
     QPopupMenu *edit = new QPopupMenu( this );
     mbList->insertItem( tr( "Contact" ), edit );
 
     listTools = new QPEToolBar( this, "list operations" );
 
 
     QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ), QString::null,
-			      0, this, 0 );
+            0, this, 0 );
     actionNew = a;
     connect( a, SIGNAL( activated() ), this, SLOT( slotListNew() ) );
     a->addTo( edit );
     a->addTo( listTools );
 
     a = new QAction( tr( "Edit" ), Resource::loadPixmap( "edit" ), QString::null,
-				  0, this, 0 );
+          0, this, 0 );
     actionEdit = a;
     connect( a, SIGNAL( activated() ), this, SLOT( slotViewEdit() ) );
     a->addTo( edit );
     a->addTo( listTools );
 
     a = new QAction( tr( "Delete" ), Resource::loadPixmap( "trash" ), QString::null,
-		     0, this, 0 );
+         0, this, 0 );
     actionTrash = a;
     connect( a, SIGNAL( activated() ), this, SLOT( slotListDelete() ) );
     a->addTo( edit );
     a->addTo( listTools );
 
 #ifndef MAKE_FOR_SHARP_ROM
     a = new QAction( tr( "Find" ), Resource::loadPixmap( "mag" ),
                      QString::null, 0, this, 0 );
     actionFind = a;
     connect( a, SIGNAL(activated()), this, SLOT(slotFind()) );
     a->addTo( edit );
     a->addTo( listTools );
@@ -146,78 +149,86 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
 
     a = new QAction( tr( "Write Mail To" ), Resource::loadPixmap( "qtmail/reply" ),
                      QString::null, 0, this, 0 );
     //a->setEnabled( FALSE ); we got support for it now :) zecke
     actionMail = a;
     connect( a, SIGNAL( activated() ), this, SLOT( writeMail() ) );
     a->addTo( edit );
     a->addTo( listTools );
 
 
 
     if ( Ir::supported() ) {
-	a = new QAction( tr ("Beam Entry" ), Resource::loadPixmap( "beam" ), QString::null,
-				  0, this, 0 );
-	actionBeam = a;
-	connect( a, SIGNAL( activated() ), this, SLOT( slotBeam() ) );
-	a->addTo( edit );
-	a->addTo( listTools );
+  a = new QAction( tr ("Beam Entry" ), Resource::loadPixmap( "beam" ), QString::null,
+          0, this, 0 );
+  actionBeam = a;
+  connect( a, SIGNAL( activated() ), this, SLOT( slotBeam() ) );
+  a->addTo( edit );
+  a->addTo( listTools );
     }
 
     edit->insertSeparator();
 
+    a = new QAction( tr("Import vCard"), QString::null, 0, 0, 0, TRUE );
+    actionPersonal = a;
+    connect( a, SIGNAL( activated() ), this, SLOT( importvCard() ) );
+    a->addTo( edit );
+
+
+    edit->insertSeparator();
+
     a = new QAction( tr("My Personal Details"), QString::null, 0, 0, 0, TRUE );
     actionPersonal = a;
     connect( a, SIGNAL( activated() ), this, SLOT( slotPersonalView() ) );
     a->addTo( edit );
 
 
     a = new QAction( tr( "Arrange Edit Fields"), QString::null, 0, 0 );
     connect( a, SIGNAL( activated() ), this, SLOT( slotSettings() ) );
     a->addTo( edit );
 
     // Create Views
 
     // This is safe to call without checking to see if it exists...
     // not to mention it also does the necessary stuff for the
     // journaling...
     QString str = addressbookXMLFilename();
     if ( str.isNull() ) {
-	QMessageBox::warning( this, tr("Out of Space"),
-			      tr("There is not enough space to create\n"
-				 "neccessary startup files.\n"
-				 "\nFree up some space before\nentering data!")
-			      );
+  QMessageBox::warning( this, tr("Out of Space"),
+            tr("There is not enough space to create\n"
+         "neccessary startup files.\n"
+         "\nFree up some space before\nentering data!")
+            );
     }
 
     listContainer = new QWidget( this );
 
     QVBoxLayout *vb = new QVBoxLayout( listContainer );
 
     abList = new AbTable( &orderedFields, listContainer, "table" );
     vb->addWidget(abList);
     abList->setHScrollBarMode( QScrollView::AlwaysOff );
     connect( abList, SIGNAL( empty( bool ) ),
-	     this, SLOT( listIsEmpty( bool ) ) );
+       this, SLOT( listIsEmpty( bool ) ) );
     connect( abList, SIGNAL( details() ),
-	     this, SLOT( slotListView() ) );
+       this, SLOT( slotListView() ) );
     connect( abList, SIGNAL(currentChanged(int,int)),
-	     this, SLOT(slotUpdateToolbar()) );
+       this, SLOT(slotUpdateToolbar()) );
 
     mView = 0;
 
     abList->load( addressbookXMLFilename() );
     if ( QFile::exists(addressbookOldXMLFilename()) ) {
-	abList->load( addressbookOldXMLFilename() );
-	QFile::remove(addressbookOldXMLFilename());
+  abList->load( addressbookOldXMLFilename() );
+  QFile::remove(addressbookOldXMLFilename());
     }
 
     pLabel = new LetterPicker( listContainer );
     connect(pLabel, SIGNAL(letterClicked(char)), this, SLOT(slotSetLetter(char)));
     vb->addWidget(pLabel);
     catMenu = new QPopupMenu( this );
     catMenu->setCheckable( TRUE );
     connect( catMenu, SIGNAL(activated(int)), this, SLOT(slotSetCategory(int)) );
     populateCategories();
 
     mbList->insertItem( tr("View"), catMenu );
     setCentralWidget( listContainer );
@@ -232,290 +243,298 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
 
     defaultFont = new QFont( abList->font() );
 
     slotSetFont(startFontSize);
 
     mbList->insertItem( tr("Font"), fontMenu);
     setCentralWidget(listContainer);
 
     //    qDebug("adressbook contrsuction: t=%d", t.elapsed() );
 }
 void AddressbookWindow::slotSetFont( int size ) {
 
-	if (size > 2 || size < 0)
-		size = 1;
-
-	startFontSize = size;
-
-	QFont *currentFont;
-
-	switch (size) {
-		case 0:
-			fontMenu->setItemChecked(0, true);
-			fontMenu->setItemChecked(1, false);
-			fontMenu->setItemChecked(2, false);
-			abList->setFont( QFont( defaultFont->family(), defaultFont->pointSize() - 2 ) );
-			currentFont = new QFont (abList->font());
-			abList->resizeRows(currentFont->pixelSize() + 7);
-			break;
-		case 1:
-			fontMenu->setItemChecked(0, false);
-			fontMenu->setItemChecked(1, true);
-			fontMenu->setItemChecked(2, false);
-			abList->setFont( *defaultFont );
-			currentFont = new QFont (abList->font());
-			abList->resizeRows(currentFont->pixelSize() + 7);
-			break;
-		case 2:
-			fontMenu->setItemChecked(0, false);
-			fontMenu->setItemChecked(1, false);
-			fontMenu->setItemChecked(2, true);
-			abList->setFont( QFont( defaultFont->family(), defaultFont->pointSize() + 2 ) );
-			currentFont = new QFont (abList->font());
-			abList->resizeRows(currentFont->pixelSize() + 7);
-			break;
-	}
+  if (size > 2 || size < 0)
+    size = 1;
+
+  startFontSize = size;
+
+  QFont *currentFont;
+
+  switch (size) {
+    case 0:
+      fontMenu->setItemChecked(0, true);
+      fontMenu->setItemChecked(1, false);
+      fontMenu->setItemChecked(2, false);
+      abList->setFont( QFont( defaultFont->family(), defaultFont->pointSize() - 2 ) );
+      currentFont = new QFont (abList->font());
+      abList->resizeRows(currentFont->pixelSize() + 7);
+      break;
+    case 1:
+      fontMenu->setItemChecked(0, false);
+      fontMenu->setItemChecked(1, true);
+      fontMenu->setItemChecked(2, false);
+      abList->setFont( *defaultFont );
+      currentFont = new QFont (abList->font());
+      abList->resizeRows(currentFont->pixelSize() + 7);
+      break;
+    case 2:
+      fontMenu->setItemChecked(0, false);
+      fontMenu->setItemChecked(1, false);
+      fontMenu->setItemChecked(2, true);
+      abList->setFont( QFont( defaultFont->family(), defaultFont->pointSize() + 2 ) );
+      currentFont = new QFont (abList->font());
+      abList->resizeRows(currentFont->pixelSize() + 7);
+      break;
+  }
+}
+
+
+
+void AddressbookWindow::importvCard() {
+        QString str = OFileDialog::getOpenFileName( 1,"/");//,"", "*", this );
+        if(!str.isEmpty() )
+            setDocument((const QString&) str );
+    
 }
 
-
 void AddressbookWindow::setDocument( const QString &filename )
 {
     if ( filename.find(".vcf") != int(filename.length()) - 4 ) return;
 
     QValueList<Contact> cl = Contact::readVCard( filename );
     for( QValueList<Contact>::Iterator it = cl.begin(); it != cl.end(); ++it ) {
-// 	QString msg = tr("You received a vCard for\n%1.\nDo You want to add it to your\naddressbook?")
-// 		      .arg( (*it).fullName() );
-// 	if ( QMessageBox::information( this, tr("received contact"), msg, QMessageBox::Ok, QMessageBox::Cancel ) ==
-// 	     QMessageBox::Ok ) {
-	    abList->addEntry( *it );
-// 	}
+//  QString msg = tr("You received a vCard for\n%1.\nDo You want to add it to your\naddressbook?")
+//          .arg( (*it).fullName() );
+//  if ( QMessageBox::information( this, tr("received contact"), msg, QMessageBox::Ok, QMessageBox::Cancel ) ==
+//       QMessageBox::Ok ) {
+      abList->addEntry( *it );
+//  }
     }
 
 }
 
 void AddressbookWindow::resizeEvent( QResizeEvent *e )
 {
   QMainWindow::resizeEvent( e );
 
   if ( centralWidget() == listContainer  )
       showList();
   else if ( centralWidget() == mView )
       showView();
 }
 
 AddressbookWindow::~AddressbookWindow()
 {
-	Config cfg("AddressBook");
-	cfg.setGroup("Font");
-	cfg.writeEntry("fontSize", startFontSize);
+  Config cfg("AddressBook");
+  cfg.setGroup("Font");
+  cfg.writeEntry("fontSize", startFontSize);
 }
 
 void AddressbookWindow::slotUpdateToolbar()
 {
     Contact ce = abList->currentEntry();
     actionMail->setEnabled( !ce.defaultEmail().isEmpty() );
 }
 
 void AddressbookWindow::showList()
 {
     if ( mView ) mView->hide();
     setCentralWidget( listContainer );
     listContainer->show();
     // update our focues... (or use a stack widget!);
     abList->setFocus();
 }
 
 void AddressbookWindow::showView()
 {
     if ( abList->numRows() > 0 ) {
-	listContainer->hide();
-	setCentralWidget( abView() );
-	mView->show();
-	mView->setFocus();
+  listContainer->hide();
+  setCentralWidget( abView() );
+  mView->show();
+  mView->setFocus();
     }
 }
 
 void AddressbookWindow::slotListNew()
 {
     Contact cnt;
     if( !syncing ) {
-	if ( abEditor )
-	    abEditor->setEntry( cnt );
-	abView()->init( cnt );
-	editEntry( NewEntry );
+  if ( abEditor )
+      abEditor->setEntry( cnt );
+  abView()->init( cnt );
+  editEntry( NewEntry );
     } else {
-	QMessageBox::warning(this, tr("Contacts"),
-			     tr("Can not edit data, currently syncing"));
+  QMessageBox::warning(this, tr("Contacts"),
+           tr("Can not edit data, currently syncing"));
     }
 }
 
 void AddressbookWindow::slotListView()
 {
     abView()->init( abList->currentEntry() );
     mView->sync();
     showView();
 }
 
 void AddressbookWindow::slotListDelete()
 {
     if(!syncing) {
-	Contact tmpEntry = abList->currentEntry();
-
-	// get a name, do the best we can...
-	QString strName = tmpEntry.fullName();
-	if ( strName.isEmpty() ) {
-	    strName = tmpEntry.company();
-	    if ( strName.isEmpty() )
-		strName = "No Name";
-	}
-
-
-	if ( QPEMessageBox::confirmDelete( this, tr( "Contacts" ),
-					   strName ) ) {
-		abList->deleteCurrentEntry();
-		showList();
-	}
+  Contact tmpEntry = abList->currentEntry();
+
+  // get a name, do the best we can...
+  QString strName = tmpEntry.fullName();
+  if ( strName.isEmpty() ) {
+      strName = tmpEntry.company();
+      if ( strName.isEmpty() )
+    strName = "No Name";
+  }
+
+
+  if ( QPEMessageBox::confirmDelete( this, tr( "Contacts" ),
+             strName ) ) {
+    abList->deleteCurrentEntry();
+    showList();
+  }
     } else {
-	QMessageBox::warning( this, tr("Contacts"),
-			      tr("Can not edit data, currently syncing") );
+  QMessageBox::warning( this, tr("Contacts"),
+            tr("Can not edit data, currently syncing") );
     }
 }
 
 void AddressbookWindow::slotViewBack()
 {
     showList();
 }
 
 void AddressbookWindow::slotViewEdit()
 {
     if(!syncing) {
-	if (actionPersonal->isOn()) {
-	    editPersonal();
-	} else {
-	    if ( !bAbEditFirstTime )
-		abEditor->setEntry( abList->currentEntry() );
-	    editEntry( EditEntry );
-	}
+  if (actionPersonal->isOn()) {
+      editPersonal();
+  } else {
+      if ( !bAbEditFirstTime )
+    abEditor->setEntry( abList->currentEntry() );
+      editEntry( EditEntry );
+  }
     } else {
-	QMessageBox::warning( this, tr("Contacts"),
-			      tr("Can not edit data, currently syncing") );
+  QMessageBox::warning( this, tr("Contacts"),
+            tr("Can not edit data, currently syncing") );
     }
 }
 
 
 
 void AddressbookWindow::writeMail()
 {
     Contact c = abList->currentEntry();
     QString name = c.fileAs();
     QString email = c.defaultEmail();
     QCopEnvelope e("QPE/Application/qtmail", "writeMail(QString,QString)");
     e << name << email;
 }
 
 
 
 
 static const char * beamfile = "/tmp/obex/contact.vcf";
 
 void AddressbookWindow::slotBeam()
 {
     QString filename;
     Contact c;
     if ( actionPersonal->isOn() ) {
-	filename = addressbookPersonalVCardName();
-	if (!QFile::exists(filename))
-	    return; // can't beam a non-existent file
-	c = Contact::readVCard( filename )[0];
+  filename = addressbookPersonalVCardName();
+  if (!QFile::exists(filename))
+      return; // can't beam a non-existent file
+  c = Contact::readVCard( filename )[0];
     } else {
-	unlink( beamfile ); // delete if exists
-	c = abList->currentEntry();
-	mkdir("/tmp/obex/", 0755);
-	Contact::writeVCard( beamfile, c );
-	filename = beamfile;
+  unlink( beamfile ); // delete if exists
+  c = abList->currentEntry();
+  mkdir("/tmp/obex/", 0755);
+  Contact::writeVCard( beamfile, c );
+  filename = beamfile;
     }
     Ir *ir = new Ir( this );
     connect( ir, SIGNAL( done( Ir * ) ), this, SLOT( beamDone( Ir * ) ) );
     QString description = c.fullName();
     ir->send( filename, description, "text/x-vCard" );
 }
 
 void AddressbookWindow::beamDone( Ir *ir )
 {
     delete ir;
     unlink( beamfile );
 }
 
 
 static void parseName( const QString& name, QString *first, QString *middle,
-		       QString * last )
+           QString * last )
 {
 
     int comma = name.find ( "," );
     QString rest;
     if ( comma > 0 ) {
-	*last = name.left( comma );
-	comma++;
-	while ( comma < int(name.length()) && name[comma] == ' ' )
-	    comma++;
-	rest = name.mid( comma );
+  *last = name.left( comma );
+  comma++;
+  while ( comma < int(name.length()) && name[comma] == ' ' )
+      comma++;
+  rest = name.mid( comma );
     } else {
-	int space = name.findRev( ' ' );
-	*last = name.mid( space+1 );
-	rest = name.left( space );
+  int space = name.findRev( ' ' );
+  *last = name.mid( space+1 );
+  rest = name.left( space );
     }
     int space = rest.find( ' ' );
     if ( space <= 0 ) {
-	*first = rest;
+  *first = rest;
     } else {
-	*first = rest.left( space );
-	*middle = rest.mid( space+1 );
+  *first = rest.left( space );
+  *middle = rest.mid( space+1 );
     }
 
 }
 
 
 void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
 {
     if (msg == "editPersonal()") {
-	editPersonal();
+  editPersonal();
     } else if (msg == "editPersonalAndClose()") {
-	editPersonal();
-	close();
+  editPersonal();
+  close();
     } else if ( msg == "addContact(QString,QString)" ) {
         QDataStream stream(data,IO_ReadOnly);
         QString name, email;
         stream >> name >> email;
 
-	Contact cnt;
-	QString fn, mn, ln;
-	parseName( name, &fn, &mn, &ln );
-	//	qDebug( " %s - %s - %s", fn.latin1(), mn.latin1(), ln.latin1() );
-	cnt.setFirstName( fn );
-	cnt.setMiddleName( mn );
-	cnt.setLastName( ln );
-	cnt.setEmails( email );
-	cnt.setDefaultEmail( email );
-	cnt.setFileAs();
-
-	if ( bAbEditFirstTime ) {
-	    abEditor = new ContactEditor( cnt, &orderedFields, &slOrderedFields,
-				     this, "editor" );
-	    bAbEditFirstTime = FALSE;
-	} else {
-	    abEditor->setEntry( cnt );
-	}
-	abView()->init( cnt );
-	editEntry( NewEntry );
+  Contact cnt;
+  QString fn, mn, ln;
+  parseName( name, &fn, &mn, &ln );
+  //  qDebug( " %s - %s - %s", fn.latin1(), mn.latin1(), ln.latin1() );
+  cnt.setFirstName( fn );
+  cnt.setMiddleName( mn );
+  cnt.setLastName( ln );
+  cnt.setEmails( email );
+  cnt.setDefaultEmail( email );
+  cnt.setFileAs();
+
+  if ( bAbEditFirstTime ) {
+      abEditor = new ContactEditor( cnt, &orderedFields, &slOrderedFields,
+             this, "editor" );
+      bAbEditFirstTime = FALSE;
+  } else {
+      abEditor->setEntry( cnt );
+  }
+  abView()->init( cnt );
+  editEntry( NewEntry );
 
 
 
     }
 #if 0
     else if (msg == "pickAddresses(QCString,QCString,QStringList,...)" ) {
         QDataStream stream(data,IO_ReadOnly);
         QCString ch,m;
         QStringList types;
         stream >> ch >> m >> types;
         AddressPicker picker(abList,this,0,TRUE);
         picker.showMaximized();
@@ -539,309 +558,309 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
             e << sel;
         }
     }
 #endif
 
 }
 
 void AddressbookWindow::editPersonal()
 {
     QString filename = addressbookPersonalVCardName();
     Contact me;
     if (QFile::exists(filename))
-	me = Contact::readVCard( filename )[0];
+  me = Contact::readVCard( filename )[0];
     if (bAbEditFirstTime) {
-	abEditor = new ContactEditor( me, &orderedFields, &slOrderedFields,
-		this, "editor" );
-	// don't create a new editor every time
-	bAbEditFirstTime = FALSE;
+  abEditor = new ContactEditor( me, &orderedFields, &slOrderedFields,
+    this, "editor" );
+  // don't create a new editor every time
+  bAbEditFirstTime = FALSE;
     } else
-	abEditor->setEntry( me );
+  abEditor->setEntry( me );
 
     abEditor->setCaption(tr("Edit My Personal Details"));
     abEditor->showMaximized();
 
     // fix the foxus...
     abEditor->setNameFocus();
     if ( abEditor->exec() ) {
-	setFocus();
-	Contact new_personal = abEditor->entry();
-	QString fname = addressbookPersonalVCardName();
-	Contact::writeVCard( fname, new_personal );
-	abView()->init(new_personal);
-	abView()->sync();
+  setFocus();
+  Contact new_personal = abEditor->entry();
+  QString fname = addressbookPersonalVCardName();
+  Contact::writeVCard( fname, new_personal );
+  abView()->init(new_personal);
+  abView()->sync();
     }
     abEditor->setCaption( tr("Edit Address") );
 }
 
 void AddressbookWindow::slotPersonalView()
 {
     if (!actionPersonal->isOn()) {
-	// we just turned it off
-	setCaption( tr("Contacts") );
-	actionNew->setEnabled(TRUE);
-	actionTrash->setEnabled(TRUE);
+  // we just turned it off
+  setCaption( tr("Contacts") );
+  actionNew->setEnabled(TRUE);
+  actionTrash->setEnabled(TRUE);
 #ifndef MAKE_FOR_SHARP_ROM
-	actionFind->setEnabled(TRUE);
+  actionFind->setEnabled(TRUE);
 #endif
-	slotUpdateToolbar(); // maybe some of the above could be moved there
-	showList();
-	return;
+  slotUpdateToolbar(); // maybe some of the above could be moved there
+  showList();
+  return;
     }
 
     // XXX need to disable some QActions.
     actionNew->setEnabled(FALSE);
     actionTrash->setEnabled(FALSE);
 #ifndef MAKE_FOR_SHARP_ROM
     actionFind->setEnabled(FALSE);
 #endif
     actionMail->setEnabled(FALSE);
 
     setCaption( tr("Contacts - My Personal Details") );
     QString filename = addressbookPersonalVCardName();
     Contact me;
     if (QFile::exists(filename))
-	me = Contact::readVCard( filename )[0];
+  me = Contact::readVCard( filename )[0];
 
     abView()->init( me );
     abView()->sync();
     listContainer->hide();
     setCentralWidget( abView() );
     mView->show();
     mView->setFocus();
 }
 
 void AddressbookWindow::editEntry( EntryMode entryMode )
 {
     Contact entry;
     if ( bAbEditFirstTime ) {
-	abEditor = new ContactEditor( entry, &orderedFields, &slOrderedFields,
-				 this, "editor" );
-	bAbEditFirstTime = FALSE;
-	if ( entryMode == EditEntry )
-	    abEditor->setEntry( abList->currentEntry() );
+  abEditor = new ContactEditor( entry, &orderedFields, &slOrderedFields,
+         this, "editor" );
+  bAbEditFirstTime = FALSE;
+  if ( entryMode == EditEntry )
+      abEditor->setEntry( abList->currentEntry() );
     }
     // other things may chane the caption.
     abEditor->setCaption( tr("Edit Address") );
 
 #if defined(Q_WS_QWS) || defined(_WS_QWS_)
     abEditor->showMaximized();
 #endif
     // fix the foxus...
     abEditor->setNameFocus();
     if ( abEditor->exec() ) {
-	setFocus();
-	if ( entryMode == NewEntry ) {
-	    Contact insertEntry = abEditor->entry();
-	    insertEntry.assignUid();
-	    abList->addEntry( insertEntry );
-	} else {
-	    Contact replaceEntry = abEditor->entry();
-	    if ( !replaceEntry.isValidUid() )
-		replaceEntry.assignUid();
-	    abList->replaceCurrentEntry( replaceEntry );
-	}
+  setFocus();
+  if ( entryMode == NewEntry ) {
+      Contact insertEntry = abEditor->entry();
+      insertEntry.assignUid();
+      abList->addEntry( insertEntry );
+  } else {
+      Contact replaceEntry = abEditor->entry();
+      if ( !replaceEntry.isValidUid() )
+    replaceEntry.assignUid();
+      abList->replaceCurrentEntry( replaceEntry );
+  }
     }
     populateCategories();
     showList();
 }
 
 void AddressbookWindow::listIsEmpty( bool empty )
 {
     if ( !empty ) {
-	deleteButton->setEnabled( TRUE );
+  deleteButton->setEnabled( TRUE );
     }
 }
 
 void AddressbookWindow::reload()
 {
     syncing = FALSE;
     abList->clear();
     abList->load( addressbookXMLFilename() );
 }
 
 void AddressbookWindow::flush()
 {
     syncing = TRUE;
     abList->save( addressbookXMLFilename() );
 }
 
 
 void AddressbookWindow::closeEvent( QCloseEvent *e )
 {
     if ( centralWidget() == mView ) {
-	if (actionPersonal->isOn()) {
-	    // pretend we clicked it off
-	    actionPersonal->setOn(FALSE);
-	    slotPersonalView();
-	} else {
-	    showList();
-	}
-	e->ignore();
-	return;
+  if (actionPersonal->isOn()) {
+      // pretend we clicked it off
+      actionPersonal->setOn(FALSE);
+      slotPersonalView();
+  } else {
+      showList();
+  }
+  e->ignore();
+  return;
     }
 
     if(syncing) {
-	/* shouldn't we save, I hear you say? well its already been set
-	   so that an edit can not occur during a sync, and we flushed
-	   at the start of the sync, so there is no need to save
-	   Saving however itself would cause problems. */
-	e->accept();
-	return;
+  /* shouldn't we save, I hear you say? well its already been set
+     so that an edit can not occur during a sync, and we flushed
+     at the start of the sync, so there is no need to save
+     Saving however itself would cause problems. */
+  e->accept();
+  return;
     }
 //################## shouldn't always save
     if ( save() )
-	e->accept();
+  e->accept();
     else
-	e->ignore();
+  e->ignore();
 }
 
 /*
   Returns TRUE if it is OK to exit
  */
 
 bool AddressbookWindow::save()
 {
     QString str = addressbookXMLFilename();
     if ( str.isNull() ) {
-	if ( QMessageBox::critical( 0, tr("Out of space"),
-		    tr("Unable to save information.\n"
-			"Free up some space\n"
-			"and try again.\n"
-			"\nQuit anyway?"),
-		    QMessageBox::Yes|QMessageBox::Escape,
-		    QMessageBox::No|QMessageBox::Default )
-		!= QMessageBox::No )
-	    return TRUE;
-	else
-	    return FALSE;
+  if ( QMessageBox::critical( 0, tr("Out of space"),
+        tr("Unable to save information.\n"
+      "Free up some space\n"
+      "and try again.\n"
+      "\nQuit anyway?"),
+        QMessageBox::Yes|QMessageBox::Escape,
+        QMessageBox::No|QMessageBox::Default )
+    != QMessageBox::No )
+      return TRUE;
+  else
+      return FALSE;
     } else {
-	if ( !abList->save( str ) ) {
-	    if ( QMessageBox::critical( 0, tr( "Out of space" ),
-			tr("Unable to save information.\n"
-			    "Free up some space\n"
-			    "and try again.\n"
-			    "\nQuit anyway?"),
-			QMessageBox::Yes|QMessageBox::Escape,
-			QMessageBox::No|QMessageBox::Default )
-		    != QMessageBox::No )
-		return TRUE;
-	    else
-		return FALSE;
-	}
+  if ( !abList->save( str ) ) {
+      if ( QMessageBox::critical( 0, tr( "Out of space" ),
+      tr("Unable to save information.\n"
+          "Free up some space\n"
+          "and try again.\n"
+          "\nQuit anyway?"),
+      QMessageBox::Yes|QMessageBox::Escape,
+      QMessageBox::No|QMessageBox::Default )
+        != QMessageBox::No )
+    return TRUE;
+      else
+    return FALSE;
+  }
     }
     return TRUE;
 }
 
 void AddressbookWindow::slotSettings()
 {
     AddressSettings frmSettings( this );
 #if defined(Q_WS_QWS) || defined(_WS_QWS_)
     frmSettings.showMaximized();
 #endif
 
     if ( frmSettings.exec() ) {
-	allFields.clear();
-	orderedFields.clear();
-	slOrderedFields.clear();
-	initFields();
- 	if ( abEditor )
- 	    abEditor->loadFields();
- 	abList->refresh();
+  allFields.clear();
+  orderedFields.clear();
+  slOrderedFields.clear();
+  initFields();
+  if ( abEditor )
+      abEditor->loadFields();
+  abList->refresh();
     }
 }
 
 
 void AddressbookWindow::initFields()
 {
     // we really don't need the things from the configuration, anymore
     // only thing that is important are the important categories.  So,
     // Call the contact functions that correspond to these old functions...
 
     QStringList xmlFields = Contact::fields();
     QStringList visibleFields = Contact::trfields();
     xmlFields.remove( "Title" );
     visibleFields.remove( tr("Name Title") );
     visibleFields.remove( tr("Notes") );
 
     int i,
-	version;
+  version;
     Config cfg( "AddressBook" );
     QString zn;
 
     // ### Write a function to keep this from happening again...
     QStringList::ConstIterator it;
     for ( i = 0, it = xmlFields.begin(); it != xmlFields.end(); ++it, i++ ) {
-	allFields.append( i + 3 );
+  allFields.append( i + 3 );
     }
 
     cfg.setGroup( "Version" );
     version = cfg.readNumEntry( "version" );
     i = 0;
     startFontSize = 1;
 
     if ( version >= ADDRESSVERSION ) {
 
-	cfg.setGroup( "ImportantCategory" );
+  cfg.setGroup( "ImportantCategory" );
 
-	zn = cfg.readEntry( "Category" + QString::number(i), QString::null );
-	while ( !zn.isNull() ) {
-	    if ( zn.contains( tr("Work") ) || zn.contains( tr("Mb") ) ) {
-		slOrderedFields.clear();
-		break;
-	    }
-	    slOrderedFields.append( zn );
-	    zn = cfg.readEntry( "Category" + QString::number(++i), QString::null );
-	}
-	cfg.setGroup( "Font" );
-	startFontSize = cfg.readNumEntry( "fontSize", 1 );
+  zn = cfg.readEntry( "Category" + QString::number(i), QString::null );
+  while ( !zn.isNull() ) {
+      if ( zn.contains( tr("Work") ) || zn.contains( tr("Mb") ) ) {
+    slOrderedFields.clear();
+    break;
+      }
+      slOrderedFields.append( zn );
+      zn = cfg.readEntry( "Category" + QString::number(++i), QString::null );
+  }
+  cfg.setGroup( "Font" );
+  startFontSize = cfg.readNumEntry( "fontSize", 1 );
 
 
     } else {
-	QString str;
-	str = getenv("HOME");
-	str += "/Settings/AddressBook.conf";
-	QFile::remove( str );
+  QString str;
+  str = getenv("HOME");
+  str += "/Settings/AddressBook.conf";
+  QFile::remove( str );
     }
     if ( slOrderedFields.count() > 0 ) {
-	for( QStringList::ConstIterator it = slOrderedFields.begin();
-	     it != slOrderedFields.end(); ++it ) {
-	    QValueList<int>::ConstIterator itVl;
-	    QStringList::ConstIterator itVis;
-	    itVl = allFields.begin();
-	    for ( itVis = visibleFields.begin();
-		  itVis != visibleFields.end() && itVl != allFields.end();
-		  ++itVis, ++itVl ) {
-		if ( *it == *itVis && itVl != allFields.end() ) {
-		    orderedFields.append( *itVl );
-		}
-	    }
-	}
+  for( QStringList::ConstIterator it = slOrderedFields.begin();
+       it != slOrderedFields.end(); ++it ) {
+      QValueList<int>::ConstIterator itVl;
+      QStringList::ConstIterator itVis;
+      itVl = allFields.begin();
+      for ( itVis = visibleFields.begin();
+      itVis != visibleFields.end() && itVl != allFields.end();
+      ++itVis, ++itVl ) {
+    if ( *it == *itVis && itVl != allFields.end() ) {
+        orderedFields.append( *itVl );
+    }
+      }
+  }
     } else {
-	QValueList<int>::ConstIterator it;
-	for ( it = allFields.begin(); it != allFields.end(); ++it )
-	    orderedFields.append( *it );
-
-	slOrderedFields = visibleFields;
-	orderedFields.remove( Qtopia::AddressUid );
-	orderedFields.remove( Qtopia::Title );
-	orderedFields.remove( Qtopia::Groups );
-	orderedFields.remove( Qtopia::AddressCategory );
-	orderedFields.remove( Qtopia::FirstName );
-	orderedFields.remove( Qtopia::LastName );
-	orderedFields.remove( Qtopia::DefaultEmail );
-	orderedFields.remove( Qtopia::FileAs );
-	orderedFields.remove( Qtopia::Notes );
-	orderedFields.remove( Qtopia::Gender );
-	slOrderedFields.remove( tr("Name Title") );
+  QValueList<int>::ConstIterator it;
+  for ( it = allFields.begin(); it != allFields.end(); ++it )
+      orderedFields.append( *it );
+
+  slOrderedFields = visibleFields;
+  orderedFields.remove( Qtopia::AddressUid );
+  orderedFields.remove( Qtopia::Title );
+  orderedFields.remove( Qtopia::Groups );
+  orderedFields.remove( Qtopia::AddressCategory );
+  orderedFields.remove( Qtopia::FirstName );
+  orderedFields.remove( Qtopia::LastName );
+  orderedFields.remove( Qtopia::DefaultEmail );
+  orderedFields.remove( Qtopia::FileAs );
+  orderedFields.remove( Qtopia::Notes );
+  orderedFields.remove( Qtopia::Gender );
+  slOrderedFields.remove( tr("Name Title") );
         slOrderedFields.remove( tr("First Name") );
         slOrderedFields.remove( tr("Last Name") );
         slOrderedFields.remove( tr("File As") );
         slOrderedFields.remove( tr("Default Email") );
         slOrderedFields.remove( tr("Notes") );
         slOrderedFields.remove( tr("Gender") );
 
     }
 }
 
 
 AbLabel *AddressbookWindow::abView()
@@ -849,76 +868,76 @@ AbLabel *AddressbookWindow::abView()
     if ( !mView ) {
       mView = new AbLabel( this, "viewer" );
       mView->init( Contact()  );
       connect( mView, SIGNAL( okPressed() ), this, SLOT( slotListView() ) );
     }
     return mView;
 }
 
 void AddressbookWindow::slotFind()
 {
 #ifndef MAKE_FOR_SHARP_ROM
     if ( centralWidget() == abView() )
-	showList();
+  showList();
 
     FindDialog frmFind( "Contacts", this );
     QObject::connect( &frmFind, SIGNAL(signalFindClicked(const QString &, bool, bool, int)), abList, SLOT(slotDoFind( const QString&,bool,bool,int)));
     QObject::connect( abList, SIGNAL(signalNotFound()), &frmFind, SLOT(slotNotFound()) );
     QObject::connect( abList, SIGNAL(signalWrapAround()), &frmFind, SLOT(slotWrapAround()) );
 
     frmFind.exec();
 
     if ( abList->numSelections() )
-	abList->clearSelection();
+  abList->clearSelection();
 
     abList->clearFindRow();
 #endif
 }
 
 void AddressbookWindow::slotSetCategory( int c )
 {
     if ( c <= 0 )
-	return;
+  return;
     for ( unsigned int i = 1; i < catMenu->count(); i++ )
-	catMenu->setItemChecked( i, c == (int)i );
+  catMenu->setItemChecked( i, c == (int)i );
     if ( c == 1 ) {
-	abList->setShowCategory( QString::null );
-	setCaption( tr("Contacts") + " - " + tr ( "All" ) );
+  abList->setShowCategory( QString::null );
+  setCaption( tr("Contacts") + " - " + tr ( "All" ) );
     } else if ( c == (int)catMenu->count() ) {
-	abList->setShowCategory( tr( "Unfiled" ) );
-	setCaption( tr("Contacts") + " - " + tr( "Unfiled" ) );
+  abList->setShowCategory( tr( "Unfiled" ) );
+  setCaption( tr("Contacts") + " - " + tr( "Unfiled" ) );
     } else {
-	QString cat = abList->categories()[c - 2];
-	abList->setShowCategory( cat );
-	setCaption( tr("Contacts") + " - " + cat );
+  QString cat = abList->categories()[c - 2];
+  abList->setShowCategory( cat );
+  setCaption( tr("Contacts") + " - " + cat );
     }
 }
 
 void AddressbookWindow::slotSetLetter( char c ) {
 
-	abList->setShowByLetter( c );
+  abList->setShowByLetter( c );
 
 }
 
 void AddressbookWindow::populateCategories()
 {
     catMenu->clear();
 
     int id,
-	rememberId;
+  rememberId;
     id = 1;
     rememberId = 0;
     catMenu->insertItem( tr( "All" ), id++ );
     QStringList categories = abList->categories();
     categories.append( tr( "Unfiled" ) );
     for ( QStringList::Iterator it = categories.begin();
-	  it != categories.end(); ++it ) {
-	catMenu->insertItem( *it, id );
- 	if ( *it == abList->showCategory() )
- 	    rememberId = id;
-	++id;
+    it != categories.end(); ++it ) {
+  catMenu->insertItem( *it, id );
+  if ( *it == abList->showCategory() )
+      rememberId = id;
+  ++id;
     }
     if ( abList->showCategory().isEmpty() )
-	slotSetCategory( 1 );
+  slotSetCategory( 1 );
     else
-	slotSetCategory( rememberId );
+  slotSetCategory( rememberId );
 }
diff --git a/core/pim/addressbook/addressbook.h b/core/pim/addressbook/addressbook.h
index 476c971..da43731 100644
--- a/core/pim/addressbook/addressbook.h
+++ b/core/pim/addressbook/addressbook.h
@@ -50,58 +50,59 @@ protected:
     void editPersonal();
     void editEntry( EntryMode );
     void closeEvent( QCloseEvent *e );
     bool save();
 
 public slots:
     void flush();
     void reload();
     void appMessage(const QCString &, const QByteArray &);
     void setDocument( const QString & );
 
 private slots:
+    void importvCard();   
     void slotListNew();
     void slotListView();
     void slotListDelete();
     void slotViewBack();
     void slotViewEdit();
     void slotPersonalView();
     void listIsEmpty( bool );
     void slotSettings();
     void writeMail();
     void slotBeam();
     void beamDone( Ir * );
     void slotFind();
     void slotSetCategory( int );
     void slotSetLetter( char );
     void slotUpdateToolbar();
     void slotSetFont(int);
 private:
-    void initFields();	// inititialize our fields...
+    void initFields();  // inititialize our fields...
     AbLabel *abView();
     void populateCategories();
 
     QPopupMenu *catMenu, *fontMenu;
     QPEToolBar *listTools;
     QToolButton *deleteButton;
     QValueList<int> allFields,
-	            orderedFields;
+              orderedFields;
     QStringList slOrderedFields;
     enum Panes { paneList=0, paneView, paneEdit };
     ContactEditor *abEditor;
     AbLabel *mView;
     LetterPicker *pLabel;
     AbTable *abList;
     QWidget *listContainer;
 
     QAction *actionNew, *actionEdit, *actionTrash, *actionFind, *actionBeam, 
-	*actionPersonal, *actionMail;
+  *actionPersonal, *actionMail;
 
     bool bAbEditFirstTime;
     int viewMargin;
 
     bool syncing;
     QFont *defaultFont;
     int startFontSize;
 };
 
 #endif
diff --git a/core/pim/addressbook/addressbook.pro b/core/pim/addressbook/addressbook.pro
index 0d65c74..428af2b 100644
--- a/core/pim/addressbook/addressbook.pro
+++ b/core/pim/addressbook/addressbook.pro
@@ -10,25 +10,25 @@ HEADERS	= addressbook.h \
 SOURCES	= main.cpp \
 		  addressbook.cpp \
 		  contacteditor.cpp \
 		  ablabel.cpp \
 		  abtable.cpp \
 		  addresssettings.cpp \
 		  picker.cpp
 INTERFACES	= addresssettingsbase.ui
 
 TARGET		= addressbook
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH	+= $(OPIEDIR)/include
-LIBS            += -lqpe
+LIBS            += -lqpe -lopie
 
 TRANSLATIONS    = ../../i18n/pt_BR/addressbook.ts
 TRANSLATIONS   += ../../i18n/de/addressbook.ts
 TRANSLATIONS   += ../../i18n/en/addressbook.ts
 TRANSLATIONS   += ../../i18n/hu/addressbook.ts
 TRANSLATIONS   += ../../i18n/sl/addressbook.ts
 TRANSLATIONS   += ../../i18n/ja/addressbook.ts
 TRANSLATIONS   += ../../i18n/ko/addressbook.ts
 TRANSLATIONS   += ../../i18n/pl/addressbook.ts
 TRANSLATIONS   += ../../i18n/no/addressbook.ts
 TRANSLATIONS   += ../../i18n/zh_CN/addressbook.ts
 TRANSLATIONS   += ../../i18n/zh_TW/addressbook.ts