author | ulf69 <ulf69> | 2004-07-20 21:28:10 (UTC) |
---|---|---|
committer | ulf69 <ulf69> | 2004-07-20 21:28:10 (UTC) |
commit | 6f2ccd235ef49d5606ecf4e540e8884f7a9b7ec4 (patch) (unidiff) | |
tree | 8ce4d24be2dfd04c386665723530435b66701286 | |
parent | fba0c028ac0ce15d0f7473439e025c56f108145e (diff) | |
download | kdepimpi-6f2ccd235ef49d5606ecf4e540e8884f7a9b7ec4.zip kdepimpi-6f2ccd235ef49d5606ecf4e540e8884f7a9b7ec4.tar.gz kdepimpi-6f2ccd235ef49d5606ecf4e540e8884f7a9b7ec4.tar.bz2 |
remove the export was successfull dialog if the user canceled the operation
-rw-r--r-- | kaddressbook/xxport/csv_xxport.cpp | 6 | ||||
-rw-r--r-- | kaddressbook/xxport/opie/opie_xxport.cpp | 54 | ||||
-rw-r--r-- | kaddressbook/xxport/vcard_xxport.cpp | 30 |
3 files changed, 45 insertions, 45 deletions
diff --git a/kaddressbook/xxport/csv_xxport.cpp b/kaddressbook/xxport/csv_xxport.cpp index caee66d..d4d5475 100644 --- a/kaddressbook/xxport/csv_xxport.cpp +++ b/kaddressbook/xxport/csv_xxport.cpp | |||
@@ -113,15 +113,15 @@ bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const QString& | |||
113 | file.close(); | 113 | file.close(); |
114 | 114 | ||
115 | return true; | 115 | return true; |
116 | } | 116 | } |
117 | 117 | ||
118 | #else //KAB_EMBEDDED | 118 | #else //KAB_EMBEDDED |
119 | 119 | ||
120 | QString fileName = KFileDialog::getSaveFileName( "addressbook.csv", i18n("Save file"), parentWidget() ); | 120 | QString fileName = KFileDialog::getSaveFileName( "addressbook.csv", i18n("Save file"), parentWidget() ); |
121 | 121 | ||
122 | if ( fileName.isEmpty() ) | 122 | if ( fileName.isEmpty() ) |
123 | return true; | 123 | return false; |
124 | 124 | ||
125 | QFile file( fileName ); | 125 | QFile file( fileName ); |
126 | if ( !file.open( IO_WriteOnly ) ) { | 126 | if ( !file.open( IO_WriteOnly ) ) { |
127 | QString txt = i18n( "<qt>Unable to open file <b>%1</b>.</qt>" ); | 127 | QString txt = i18n( "<qt>Unable to open file <b>%1</b>.</qt>" ); |
@@ -135,9 +135,9 @@ bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const QString& | |||
135 | return true; | 135 | return true; |
136 | 136 | ||
137 | 137 | ||
138 | #endif //KAB_EMBEDDED | 138 | #endif //KAB_EMBEDDED |
139 | 139 | ||
140 | } | 140 | } |
141 | 141 | ||
142 | KABC::AddresseeList CSVXXPort::importContacts( const QString& ) const | 142 | KABC::AddresseeList CSVXXPort::importContacts( const QString& ) const |
143 | { | 143 | { |
diff --git a/kaddressbook/xxport/opie/opie_xxport.cpp b/kaddressbook/xxport/opie/opie_xxport.cpp index db30d34..c9b0163 100644 --- a/kaddressbook/xxport/opie/opie_xxport.cpp +++ b/kaddressbook/xxport/opie/opie_xxport.cpp | |||
@@ -87,39 +87,39 @@ OpieXXPort::OpieXXPort( KABC::AddressBook *ab, QWidget *parent, const char *name | |||
87 | 87 | ||
88 | bool OpieXXPort::exportContacts( const KABC::AddresseeList &list, const QString &data ) | 88 | bool OpieXXPort::exportContacts( const KABC::AddresseeList &list, const QString &data ) |
89 | { | 89 | { |
90 | QString name = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml"; | 90 | QString name = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml"; |
91 | 91 | ||
92 | #ifndef KAB_EMBEDDED | 92 | #ifndef KAB_EMBEDDED |
93 | QString fileName = KFileDialog::getSaveFileName( name ); | 93 | QString fileName = KFileDialog::getSaveFileName( name ); |
94 | #else //KAB_EMBEDDED | 94 | #else //KAB_EMBEDDED |
95 | QString fileName = KFileDialog::getSaveFileName( name, i18n("Save file"), parentWidget() ); | 95 | QString fileName = KFileDialog::getSaveFileName( name, i18n("Save file"), parentWidget() ); |
96 | #endif //KAB_EMBEDDED | 96 | #endif //KAB_EMBEDDED |
97 | 97 | ||
98 | if ( fileName.isEmpty() ) | 98 | if ( fileName.isEmpty() ) |
99 | return true; | 99 | return false; |
100 | 100 | ||
101 | OContactAccessBackend_XML* backend = new OContactAccessBackend_XML( "KA/Pi", fileName ); | 101 | OContactAccessBackend_XML* backend = new OContactAccessBackend_XML( "KA/Pi", fileName ); |
102 | OContactAccess* access = new OContactAccess("KA/Pi", 0l, backend, false); | 102 | OContactAccess* access = new OContactAccess("KA/Pi", 0l, backend, false); |
103 | 103 | ||
104 | if ( !access ) { | 104 | if ( !access ) { |
105 | qDebug("Unable to access file() %s", fileName.latin1()); | 105 | qDebug("Unable to access file() %s", fileName.latin1()); |
106 | addressBook()->error( i18n( "Unable to access file '%1'." ).arg( fileName ) ); | 106 | addressBook()->error( i18n( "Unable to access file '%1'." ).arg( fileName ) ); |
107 | return false; | 107 | return false; |
108 | } | 108 | } |
109 | 109 | ||
110 | KABC::OpieConverter mConverter; | 110 | KABC::OpieConverter mConverter; |
111 | 111 | ||
112 | bool res = mConverter.init(); | 112 | bool res = mConverter.init(); |
113 | if (!res) | 113 | if (!res) |
114 | { | 114 | { |
115 | QString text( i18n( "Unable to initialize opie converter.<br>Most likely a problem with the category file." ) ); | 115 | QString text( i18n( "Unable to initialize opie converter.<br>Most likely a problem with the category file." ) ); |
116 | qDebug(text); | 116 | qDebug(text); |
117 | KMessageBox::error( parentWidget(), text ); | 117 | KMessageBox::error( parentWidget(), text ); |
118 | delete access; | 118 | delete access; |
119 | return false; | 119 | return false; |
120 | } | 120 | } |
121 | 121 | ||
122 | //Now check if the file has already entries, and ask the user if he wants to delete them first. | 122 | //Now check if the file has already entries, and ask the user if he wants to delete them first. |
123 | OContactAccess::List contactList = access->allRecords(); | 123 | OContactAccess::List contactList = access->allRecords(); |
124 | if (contactList.count() > 0) | 124 | if (contactList.count() > 0) |
125 | { | 125 | { |
@@ -128,15 +128,15 @@ bool OpieXXPort::exportContacts( const KABC::AddresseeList &list, const QString | |||
128 | // Clean the database.. | 128 | // Clean the database.. |
129 | access->clear(); | 129 | access->clear(); |
130 | } | 130 | } |
131 | } | 131 | } |
132 | 132 | ||
133 | 133 | ||
134 | KABC::Addressee::List::ConstIterator it; | 134 | KABC::Addressee::List::ConstIterator it; |
135 | for ( it = list.begin(); it != list.end(); ++it ) { | 135 | for ( it = list.begin(); it != list.end(); ++it ) { |
136 | OContact c; | 136 | OContact c; |
137 | KABC::Addressee addressee = (*it); | 137 | KABC::Addressee addressee = (*it); |
138 | 138 | ||
139 | res = mConverter.addresseeToOpie( *it, c ); | 139 | res = mConverter.addresseeToOpie( *it, c ); |
140 | if (res == true) | 140 | if (res == true) |
141 | { | 141 | { |
142 | res = access->add(c); | 142 | res = access->add(c); |
@@ -147,43 +147,43 @@ bool OpieXXPort::exportContacts( const KABC::AddresseeList &list, const QString | |||
147 | { | 147 | { |
148 | qDebug("Unable to convert Addressee %s", addressee.formattedName().latin1()); | 148 | qDebug("Unable to convert Addressee %s", addressee.formattedName().latin1()); |
149 | } | 149 | } |
150 | } | 150 | } |
151 | 151 | ||
152 | access->save(); | 152 | access->save(); |
153 | 153 | ||
154 | delete access; | 154 | delete access; |
155 | //US the deletion of the access object deletes the backend object as well. | 155 | //US the deletion of the access object deletes the backend object as well. |
156 | 156 | ||
157 | return true; | 157 | return true; |
158 | } | 158 | } |
159 | 159 | ||
160 | KABC::AddresseeList OpieXXPort::importContacts( const QString& ) const | 160 | KABC::AddresseeList OpieXXPort::importContacts( const QString& ) const |
161 | { | 161 | { |
162 | KABC::AddresseeList adrlst; | 162 | KABC::AddresseeList adrlst; |
163 | 163 | ||
164 | QString name = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml"; | 164 | QString name = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml"; |
165 | 165 | ||
166 | #ifndef KAB_EMBEDDED | 166 | #ifndef KAB_EMBEDDED |
167 | QString fileName = KFileDialog::getOpenFileName( name ); | 167 | QString fileName = KFileDialog::getOpenFileName( name ); |
168 | #else //KAB_EMBEDDED | 168 | #else //KAB_EMBEDDED |
169 | QString fileName = KFileDialog::getOpenFileName( name, i18n("Load file"), parentWidget() ); | 169 | QString fileName = KFileDialog::getOpenFileName( name, i18n("Load file"), parentWidget() ); |
170 | #endif //KAB_EMBEDDED | 170 | #endif //KAB_EMBEDDED |
171 | 171 | ||
172 | if ( fileName.isEmpty() ) | 172 | if ( fileName.isEmpty() ) |
173 | return KABC::AddresseeList(); | 173 | return KABC::AddresseeList(); |
174 | 174 | ||
175 | OContactAccessBackend_XML* backend = new OContactAccessBackend_XML( "KA/Pi", fileName ); | 175 | OContactAccessBackend_XML* backend = new OContactAccessBackend_XML( "KA/Pi", fileName ); |
176 | OContactAccess* access = new OContactAccess("KA/Pi", 0l, backend, false); | 176 | OContactAccess* access = new OContactAccess("KA/Pi", 0l, backend, false); |
177 | 177 | ||
178 | if ( !access ) { | 178 | if ( !access ) { |
179 | qDebug("Unable to access file() %s", fileName.latin1()); | 179 | qDebug("Unable to access file() %s", fileName.latin1()); |
180 | addressBook()->error( i18n( "Unable to access file '%1'." ).arg( fileName ) ); | 180 | addressBook()->error( i18n( "Unable to access file '%1'." ).arg( fileName ) ); |
181 | return KABC::AddresseeList(); | 181 | return KABC::AddresseeList(); |
182 | } | 182 | } |
183 | 183 | ||
184 | access -> setReadAhead( 32 ); // Use ReadAhead-Cache if available | 184 | access -> setReadAhead( 32 ); // Use ReadAhead-Cache if available |
185 | 185 | ||
186 | KABC::OpieConverter mConverter; | 186 | KABC::OpieConverter mConverter; |
187 | 187 | ||
188 | bool res = mConverter.init(); | 188 | bool res = mConverter.init(); |
189 | if (!res) | 189 | if (!res) |
@@ -193,29 +193,29 @@ KABC::AddresseeList OpieXXPort::importContacts( const QString& ) const | |||
193 | KMessageBox::error( parentWidget(), text ); | 193 | KMessageBox::error( parentWidget(), text ); |
194 | delete access; | 194 | delete access; |
195 | return KABC::AddresseeList(); | 195 | return KABC::AddresseeList(); |
196 | } | 196 | } |
197 | 197 | ||
198 | 198 | ||
199 | OContactAccess::List::Iterator it; | 199 | OContactAccess::List::Iterator it; |
200 | OContactAccess::List allList = access->allRecords(); | 200 | OContactAccess::List allList = access->allRecords(); |
201 | for ( it = allList.begin(); it != allList.end(); ++it ) | 201 | for ( it = allList.begin(); it != allList.end(); ++it ) |
202 | { | 202 | { |
203 | OContact c = (*it); | 203 | OContact c = (*it); |
204 | 204 | ||
205 | KABC::Addressee addressee; | 205 | KABC::Addressee addressee; |
206 | 206 | ||
207 | res = mConverter.opieToAddressee( c, addressee ); | 207 | res = mConverter.opieToAddressee( c, addressee ); |
208 | 208 | ||
209 | if ( !addressee.isEmpty() && res ) { | 209 | if ( !addressee.isEmpty() && res ) { |
210 | adrlst.append( addressee ); | 210 | adrlst.append( addressee ); |
211 | } | 211 | } |
212 | 212 | ||
213 | // qDebug("found %s", c.fullName().latin1()); | 213 | // qDebug("found %s", c.fullName().latin1()); |
214 | } | 214 | } |
215 | 215 | ||
216 | delete access; | 216 | delete access; |
217 | //US the deletion of the access object deletes the backend object as well. | 217 | //US the deletion of the access object deletes the backend object as well. |
218 | 218 | ||
219 | return adrlst; | 219 | return adrlst; |
220 | 220 | ||
221 | } | 221 | } |
diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp index adf47cd..4819341 100644 --- a/kaddressbook/xxport/vcard_xxport.cpp +++ b/kaddressbook/xxport/vcard_xxport.cpp | |||
@@ -89,17 +89,17 @@ bool VCardXXPort::exportContacts( const KABC::AddresseeList &list, const QString | |||
89 | if ( list.count() == 1 ) | 89 | if ( list.count() == 1 ) |
90 | name = list[ 0 ].givenName() + "_" + list[ 0 ].familyName() + ".vcf"; | 90 | name = list[ 0 ].givenName() + "_" + list[ 0 ].familyName() + ".vcf"; |
91 | else | 91 | else |
92 | name = "addressbook.vcf"; | 92 | name = "addressbook.vcf"; |
93 | 93 | ||
94 | #ifndef KAB_EMBEDDED | 94 | #ifndef KAB_EMBEDDED |
95 | QString fileName = KFileDialog::getSaveFileName( name ); | 95 | QString fileName = KFileDialog::getSaveFileName( name ); |
96 | #else //KAB_EMBEDDED | 96 | #else //KAB_EMBEDDED |
97 | QString fileName = KFileDialog::getSaveFileName( name, i18n("Save file"), parentWidget() ); | 97 | QString fileName = KFileDialog::getSaveFileName( name, i18n("Save file"), parentWidget() ); |
98 | #endif //KAB_EMBEDDED | 98 | #endif //KAB_EMBEDDED |
99 | 99 | ||
100 | if ( fileName.isEmpty() ) | 100 | if ( fileName.isEmpty() ) |
101 | return true; | 101 | return false; |
102 | 102 | ||
103 | QFile outFile( fileName ); | 103 | QFile outFile( fileName ); |
104 | if ( !outFile.open( IO_WriteOnly ) ) { | 104 | if ( !outFile.open( IO_WriteOnly ) ) { |
105 | QString text = i18n( "<qt>Unable to open file <b>%1</b> for export.</qt>" ); | 105 | QString text = i18n( "<qt>Unable to open file <b>%1</b> for export.</qt>" ); |
@@ -167,53 +167,53 @@ KABC::AddresseeList VCardXXPort::importContacts( const QString& ) const | |||
167 | } else { | 167 | } else { |
168 | QString text = i18n( "<qt>Unable to access <b>%1</b>.</qt>" ); | 168 | QString text = i18n( "<qt>Unable to access <b>%1</b>.</qt>" ); |
169 | KMessageBox::error( parentWidget(), text.arg( url.url() ), caption ); | 169 | KMessageBox::error( parentWidget(), text.arg( url.url() ), caption ); |
170 | } | 170 | } |
171 | 171 | ||
172 | } | 172 | } |
173 | 173 | ||
174 | 174 | ||
175 | #else //KAB_EMBEDDED | 175 | #else //KAB_EMBEDDED |
176 | 176 | ||
177 | 177 | ||
178 | if ( !XXPortManager::importData.isEmpty() ) | 178 | if ( !XXPortManager::importData.isEmpty() ) |
179 | addrList = parseVCard( XXPortManager::importData ); | 179 | addrList = parseVCard( XXPortManager::importData ); |
180 | else { | 180 | else { |
181 | if ( XXPortManager::importURL.isEmpty() ) | 181 | if ( XXPortManager::importURL.isEmpty() ) |
182 | { | 182 | { |
183 | fileName = KFileDialog::getOpenFileName( QString::null, i18n("Select vCard to Import"), parentWidget() ); | 183 | fileName = KFileDialog::getOpenFileName( QString::null, i18n("Select vCard to Import"), parentWidget() ); |
184 | if ( fileName.isEmpty() ) | 184 | if ( fileName.isEmpty() ) |
185 | return addrList; | 185 | return addrList; |
186 | 186 | ||
187 | } | 187 | } |
188 | else | 188 | else |
189 | { | 189 | { |
190 | //US url = XXPortManager::importURL; | 190 | //US url = XXPortManager::importURL; |
191 | qDebug("VCardXXPort::importContacts Urls at the moment not supported"); | 191 | qDebug("VCardXXPort::importContacts Urls at the moment not supported"); |
192 | if ( url.isEmpty() ) | 192 | if ( url.isEmpty() ) |
193 | return addrList; | 193 | return addrList; |
194 | 194 | ||
195 | } | 195 | } |
196 | 196 | ||
197 | 197 | ||
198 | QFile file( fileName ); | 198 | QFile file( fileName ); |
199 | 199 | ||
200 | file.open( IO_ReadOnly ); | 200 | file.open( IO_ReadOnly ); |
201 | QByteArray rawData = file.readAll(); | 201 | QByteArray rawData = file.readAll(); |
202 | file.close(); | 202 | file.close(); |
203 | 203 | ||
204 | QString data = QString::fromUtf8( rawData.data(), rawData.size() + 1 ); | 204 | QString data = QString::fromUtf8( rawData.data(), rawData.size() + 1 ); |
205 | addrList = parseVCard( data ); | 205 | addrList = parseVCard( data ); |
206 | 206 | ||
207 | } | 207 | } |
208 | #endif //KAB_EMBEDDED | 208 | #endif //KAB_EMBEDDED |
209 | 209 | ||
210 | return addrList; | 210 | return addrList; |
211 | } | 211 | } |
212 | 212 | ||
213 | KABC::AddresseeList VCardXXPort::parseVCard( const QString &data ) const | 213 | KABC::AddresseeList VCardXXPort::parseVCard( const QString &data ) const |
214 | { | 214 | { |
215 | 215 | ||
216 | KABC::VCardTool tool; | 216 | KABC::VCardTool tool; |
217 | KABC::AddresseeList addrList; | 217 | KABC::AddresseeList addrList; |
218 | addrList = tool.parseVCards( data ); | 218 | addrList = tool.parseVCards( data ); |
219 | // LR : I switched to the code, which is in current cvs HEAD | 219 | // LR : I switched to the code, which is in current cvs HEAD |