-rw-r--r-- | kabc/plugins/qtopia/resourceqtopia.cpp | 2 | ||||
-rw-r--r-- | kaddressbook/xxport/qtopia_xxport.cpp | 16 | ||||
-rw-r--r-- | kaddressbook/xxportobject.cpp | 85 |
3 files changed, 57 insertions, 46 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() | |||
163 | QDomDocument doc("mydocument" ); | 163 | QDomDocument doc("mydocument" ); |
164 | if ( !doc.setContent( &file ) ) { | 164 | if ( !doc.setContent( &file ) ) { |
165 | file.close(); | 165 | file.close(); |
166 | return false; | 166 | return true; |
167 | } | 167 | } |
168 | bool res; | 168 | bool res; |
169 | QDomElement docElem = doc.documentElement( ); | 169 | 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$ | |||
33 | #include "addressee.h" | 33 | #include "addressee.h" |
34 | #include "xxportmanager.h" | 34 | #include "xxportmanager.h" |
35 | #include "qtopia_xxport.h" | 35 | #include "qtopia_xxport.h" |
36 | #include <kfiledialog.h> | ||
36 | 37 | ||
37 | /*US | 38 | /*US |
38 | class QtopiaXXPortFactory : public XXPortFactory | 39 | class QtopiaXXPortFactory : public XXPortFactory |
@@ -62,17 +63,24 @@ QtopiaXXPort::QtopiaXXPort( KABC::AddressBook *ab, QWidget *parent, const char * | |||
62 | 63 | ||
63 | if ( mFactory && !mFactory->typeName( "qtopia" ).isEmpty() ) | 64 | if ( mFactory && !mFactory->typeName( "qtopia" ).isEmpty() ) |
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 | } |
68 | } | 69 | } |
69 | 70 | ||
70 | bool QtopiaXXPort::exportContacts( const KABC::AddresseeList &list, const QString &identifier ) | 71 | bool QtopiaXXPort::exportContacts( const KABC::AddresseeList &list, const QString &identifier ) |
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 | } |
74 | 79 | ||
75 | KABC::AddresseeList QtopiaXXPort::importContacts( const QString &identifier ) const | 80 | KABC::AddresseeList QtopiaXXPort::importContacts( const QString &identifier ) const |
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 | |||
@@ -29,6 +29,7 @@ $Id$ | |||
29 | */ | 29 | */ |
30 | 30 | ||
31 | #include <qmap.h> | 31 | #include <qmap.h> |
32 | #include <qfile.h> | ||
32 | #include <qsignalmapper.h> | 33 | #include <qsignalmapper.h> |
33 | 34 | ||
34 | #include <kaction.h> | 35 | #include <kaction.h> |
@@ -176,50 +177,52 @@ bool XXPortResourceObject::isAvailable() | |||
176 | bool XXPortResourceObject::_exportContacts( const KABC::AddresseeList &list, const QString& identifier, const QString& fileName ) | 177 | bool XXPortResourceObject::_exportContacts( const KABC::AddresseeList &list, const QString& identifier, const QString& fileName ) |
177 | { | 178 | { |
178 | //create new resource | 179 | //create new resource |
179 | KABC::Resource* mResource = (KABC::Resource*)(mFactory->resource( this->identifier(), 0 )); | 180 | KABC::Resource* mResource = (KABC::Resource*)(mFactory->resource( this->identifier(), 0 )); |
180 | 181 | ||
181 | if (mResource == 0) | 182 | if (mResource == 0) |
182 | return false; | 183 | return false; |
183 | 184 | ||
184 | if (fileName != QString::null) | 185 | if (fileName != QString::null) { |
185 | mResource->setFileName( fileName ); | 186 | mResource->setFileName( fileName ); |
186 | 187 | } else | |
187 | 188 | return false; | |
188 | KABC::TmpAddressBook tmpAB; | 189 | |
189 | 190 | ||
190 | bool res = tmpAB.addResource( mResource ); | 191 | KABC::TmpAddressBook tmpAB; |
191 | if (res == false) | 192 | |
192 | { | 193 | bool res = tmpAB.addResource( mResource ); |
193 | delete mResource; | 194 | if (res == false) |
194 | return false; | 195 | { |
195 | } | 196 | delete mResource; |
196 | 197 | return false; | |
197 | res = tmpAB.load(); | 198 | } |
198 | if (res == false) | 199 | if ( QFile::exists ( fileName ) ) { |
199 | { | 200 | res = tmpAB.load(); |
200 | //removeResource deletes also the resource object, if the linkcount is 0 | 201 | if (res == false) |
201 | tmpAB.removeResource( mResource ); | 202 | { |
202 | return false; | 203 | //removeResource deletes also the resource object, if the linkcount is 0 |
203 | } | 204 | tmpAB.removeResource( mResource ); |
204 | 205 | return false; | |
205 | 206 | } | |
206 | //Now check if the file has already entries, and ask the user if he wants to delete them first. | 207 | |
207 | if (tmpAB.begin() != tmpAB.end()) | 208 | |
208 | { | 209 | //Now check if the file has already entries, and ask the user if he wants to delete them first. |
209 | QString text( i18n( "Do you want to remove<br>all existing entries from<br>%1<br>before exporting.?" ) ); | 210 | if (tmpAB.begin() != tmpAB.end()) |
210 | if ( KMessageBox::questionYesNo( parentWidget(), text.arg( fileName ) ) == KMessageBox::Yes ) { | 211 | { |
211 | // Clean the database.. | 212 | QString text( i18n( "Do you want to remove<br>all existing entries from<br>%1<br>before exporting.?" ) ); |
212 | tmpAB.clear(); | 213 | if ( KMessageBox::questionYesNo( parentWidget(), text.arg( fileName ) ) == KMessageBox::Yes ) { |
214 | // Clean the database.. | ||
215 | tmpAB.clear(); | ||
216 | } | ||
217 | } | ||
213 | } | 218 | } |
214 | } | ||
215 | 219 | ||
220 | KABC::Addressee::List::ConstIterator it; | ||
221 | for ( it = list.begin(); it != list.end(); ++it ) { | ||
222 | tmpAB.insertAddressee(*it); | ||
223 | } | ||
216 | 224 | ||
217 | KABC::Addressee::List::ConstIterator it; | 225 | KABC::Ticket * ticket = tmpAB.requestSaveTicket(mResource); |
218 | for ( it = list.begin(); it != list.end(); ++it ) { | ||
219 | tmpAB.insertAddressee(*it); | ||
220 | } | ||
221 | |||
222 | KABC::Ticket * ticket = tmpAB.requestSaveTicket(mResource); | ||
223 | 226 | ||
224 | res = false; | 227 | res = false; |
225 | if (ticket != 0) | 228 | if (ticket != 0) |