summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--kabc/plugins/qtopia/resourceqtopia.cpp2
-rw-r--r--kaddressbook/xxport/qtopia_xxport.cpp16
-rw-r--r--kaddressbook/xxportobject.cpp9
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
@@ -165,3 +165,3 @@ bool ResourceQtopia::load()
file.close();
- return false;
+ return true;
}
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
@@ -35,2 +35,3 @@ $Id$
#include "qtopia_xxport.h"
+#include <kfiledialog.h>
@@ -64,4 +65,4 @@ QtopiaXXPort::QtopiaXXPort( KABC::AddressBook *ab, QWidget *parent, const char *
{
- createImportAction( i18n( "Import Qtopia..." ) );
- createExportAction( i18n( "Export Qtopia..." ) );
+ createImportAction( i18n( "Import xml (Qtopia)..." ) );
+ createExportAction( i18n( "Export xml (Qtopia)..." ) );
}
@@ -71,3 +72,7 @@ bool QtopiaXXPort::exportContacts( const KABC::AddresseeList &list, const QStrin
{
- return _exportContacts( list, identifier, defaultFileName );
+ QString fn =KFileDialog::getSaveFileName( defaultFileName, i18n("Import xml file"), 0 );
+ if ( fn == "" )
+ return false;
+
+ return _exportContacts( list, identifier, fn );
}
@@ -76,3 +81,6 @@ KABC::AddresseeList QtopiaXXPort::importContacts( const QString &identifier ) co
{
- 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
@@ -31,2 +31,3 @@ $Id$
#include <qmap.h>
+#include <qfile.h>
#include <qsignalmapper.h>
@@ -183,4 +184,6 @@ bool XXPortResourceObject::_exportContacts( const KABC::AddresseeList &list, con
- if (fileName != QString::null)
+ if (fileName != QString::null) {
mResource->setFileName( fileName );
+ } else
+ return false;
@@ -195,3 +198,3 @@ bool XXPortResourceObject::_exportContacts( const KABC::AddresseeList &list, con
}
-
+ if ( QFile::exists ( fileName ) ) {
res = tmpAB.load();
@@ -214,3 +217,3 @@ bool XXPortResourceObject::_exportContacts( const KABC::AddresseeList &list, con
}
-
+ }