-rw-r--r-- | kabc/plugins/qtopia/resourceqtopia.cpp | 2 | ||||
-rw-r--r-- | kaddressbook/xxport/qtopia_xxport.cpp | 16 | ||||
-rw-r--r-- | kaddressbook/xxportobject.cpp | 9 |
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() | |||
165 | file.close(); | 165 | file.close(); |
166 | return false; | 166 | return true; |
167 | } | 167 | } |
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$ | |||
35 | #include "qtopia_xxport.h" | 35 | #include "qtopia_xxport.h" |
36 | #include <kfiledialog.h> | ||
36 | 37 | ||
@@ -64,4 +65,4 @@ QtopiaXXPort::QtopiaXXPort( KABC::AddressBook *ab, QWidget *parent, const char * | |||
64 | { | 65 | { |
65 | createImportAction( i18n( "Import Qtopia..." ) ); | 66 | createImportAction( i18n( "Import xml (Qtopia)..." ) ); |
66 | createExportAction( i18n( "Export Qtopia..." ) ); | 67 | createExportAction( i18n( "Export xml (Qtopia)..." ) ); |
67 | } | 68 | } |
@@ -71,3 +72,7 @@ bool QtopiaXXPort::exportContacts( const KABC::AddresseeList &list, const QStrin | |||
71 | { | 72 | { |
72 | return _exportContacts( list, identifier, defaultFileName ); | 73 | QString fn =KFileDialog::getSaveFileName( defaultFileName, i18n("Import xml file"), 0 ); |
74 | if ( fn == "" ) | ||
75 | return false; | ||
76 | |||
77 | return _exportContacts( list, identifier, fn ); | ||
73 | } | 78 | } |
@@ -76,3 +81,6 @@ KABC::AddresseeList QtopiaXXPort::importContacts( const QString &identifier ) co | |||
76 | { | 81 | { |
77 | return _importContacts( identifier, defaultFileName ); | 82 | QString fn =KFileDialog::getOpenFileName( defaultFileName, i18n("Import xml file"), 0 ); |
83 | if ( fn == "" ) | ||
84 | return KABC::AddresseeList() ; | ||
85 | return _importContacts( identifier, fn ); | ||
78 | } | 86 | } |
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$ | |||
31 | #include <qmap.h> | 31 | #include <qmap.h> |
32 | #include <qfile.h> | ||
32 | #include <qsignalmapper.h> | 33 | #include <qsignalmapper.h> |
@@ -183,4 +184,6 @@ bool XXPortResourceObject::_exportContacts( const KABC::AddresseeList &list, con | |||
183 | 184 | ||
184 | if (fileName != QString::null) | 185 | if (fileName != QString::null) { |
185 | mResource->setFileName( fileName ); | 186 | mResource->setFileName( fileName ); |
187 | } else | ||
188 | return false; | ||
186 | 189 | ||
@@ -195,3 +198,3 @@ bool XXPortResourceObject::_exportContacts( const KABC::AddresseeList &list, con | |||
195 | } | 198 | } |
196 | 199 | if ( QFile::exists ( fileName ) ) { | |
197 | res = tmpAB.load(); | 200 | res = tmpAB.load(); |
@@ -214,3 +217,3 @@ bool XXPortResourceObject::_exportContacts( const KABC::AddresseeList &list, con | |||
214 | } | 217 | } |
215 | 218 | } | |
216 | 219 | ||