added filedialog to xml im/export

3 files changed, 19 insertions, 8 deletions

diff --git a/kabc/plugins/qtopia/resourceqtopia.cpp b/kabc/plugins/qtopia/resourceqtopia.cpp
index d6df981..cf6b11a 100644
--- a/kabc/plugins/qtopia/resourceqtopia.cpp
+++ b/kabc/plugins/qtopia/resourceqtopia.cpp
@@ -163,7 +163,7 @@ bool ResourceQtopia::load()
   QDomDocument doc("mydocument" );
   if ( !doc.setContent( &file ) ) {
     file.close();
-    return false;
+    return true;
   }
   bool res;
   QDomElement docElem = doc.documentElement( );
diff --git a/kaddressbook/xxport/qtopia_xxport.cpp b/kaddressbook/xxport/qtopia_xxport.cpp
index 0cf6546..fc4abbb 100644
--- a/kaddressbook/xxport/qtopia_xxport.cpp
+++ b/kaddressbook/xxport/qtopia_xxport.cpp
@@ -33,6 +33,7 @@ $Id$
 #include "addressee.h"
 #include "xxportmanager.h"
 #include "qtopia_xxport.h"
+#include <kfiledialog.h>
 
 /*US
 class QtopiaXXPortFactory : public XXPortFactory
@@ -62,17 +63,24 @@ QtopiaXXPort::QtopiaXXPort( KABC::AddressBook *ab, QWidget *parent, const char *
 
   if ( mFactory && !mFactory->typeName( "qtopia" ).isEmpty() )
   {
-    createImportAction( i18n( "Import Qtopia..." ) );
-    createExportAction( i18n( "Export Qtopia..." ) );
+    createImportAction( i18n( "Import xml (Qtopia)..." ) );
+    createExportAction( i18n( "Export xml (Qtopia)..." ) );
   }
 }
 
 bool QtopiaXXPort::exportContacts( const KABC::AddresseeList &list, const QString &identifier )
 {
-  return _exportContacts( list, identifier, defaultFileName );
+    QString fn =KFileDialog::getSaveFileName( defaultFileName, i18n("Import xml file"), 0 );
+    if ( fn == "" )
+        return false;
+
+  return _exportContacts( list, identifier, fn );
 }
 
 KABC::AddresseeList QtopiaXXPort::importContacts( const QString &identifier ) const
 {
-  return _importContacts( identifier, defaultFileName );
+    QString fn =KFileDialog::getOpenFileName( defaultFileName, i18n("Import xml file"), 0 );
+    if ( fn == "" )
+        return KABC::AddresseeList() ;
+  return _importContacts( identifier, fn );
 }
diff --git a/kaddressbook/xxportobject.cpp b/kaddressbook/xxportobject.cpp
index 67e8406..bd9d986 100644
--- a/kaddressbook/xxportobject.cpp
+++ b/kaddressbook/xxportobject.cpp
@@ -29,6 +29,7 @@ $Id$
 */
 
 #include <qmap.h>
+#include <qfile.h>
 #include <qsignalmapper.h>
 
 #include <kaction.h>
@@ -181,8 +182,10 @@ bool XXPortResourceObject::_exportContacts( const KABC::AddresseeList &list, con
   if (mResource == 0)
     return false;
 
-  if (fileName != QString::null)
+    if (fileName != QString::null) {
           mResource->setFileName( fileName );
+    } else 
+        return false;
 
 
   KABC::TmpAddressBook tmpAB;
@@ -193,7 +196,7 @@ bool XXPortResourceObject::_exportContacts( const KABC::AddresseeList &list, con
         delete mResource;
         return false;
   }
-
+    if ( QFile::exists ( fileName ) ) {
   res = tmpAB.load();
   if (res == false)
   {
@@ -212,7 +215,7 @@ bool XXPortResourceObject::_exportContacts( const KABC::AddresseeList &list, con
       tmpAB.clear();
     }
   }
-
+    }
 
   KABC::Addressee::List::ConstIterator it;
   for ( it = list.begin(); it != list.end(); ++it ) {