-rw-r--r-- | kabc/plugins/file/resourcefile.cpp | 1 | ||||
-rw-r--r-- | kabc/plugins/sharpdtm/sharpdtmconverter.cpp | 6 | ||||
-rw-r--r-- | kaddressbook/kabcore.cpp | 6 |
3 files changed, 6 insertions, 7 deletions
diff --git a/kabc/plugins/file/resourcefile.cpp b/kabc/plugins/file/resourcefile.cpp index 6cd63fd..163f2b4 100644 --- a/kabc/plugins/file/resourcefile.cpp +++ b/kabc/plugins/file/resourcefile.cpp | |||
@@ -1,409 +1,408 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of libkabc. | 2 | This file is part of libkabc. |
3 | Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org> | 3 | Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org> |
4 | 4 | ||
5 | This library is free software; you can redistribute it and/or | 5 | This library is free software; you can redistribute it and/or |
6 | modify it under the terms of the GNU Library General Public | 6 | modify it under the terms of the GNU Library General Public |
7 | License as published by the Free Software Foundation; either | 7 | License as published by the Free Software Foundation; either |
8 | version 2 of the License, or (at your option) any later version. | 8 | version 2 of the License, or (at your option) any later version. |
9 | 9 | ||
10 | This library is distributed in the hope that it will be useful, | 10 | This library is distributed in the hope that it will be useful, |
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
13 | Library General Public License for more details. | 13 | Library General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU Library General Public License | 15 | You should have received a copy of the GNU Library General Public License |
16 | along with this library; see the file COPYING.LIB. If not, write to | 16 | along with this library; see the file COPYING.LIB. If not, write to |
17 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 17 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
18 | Boston, MA 02111-1307, USA. | 18 | Boston, MA 02111-1307, USA. |
19 | */ | 19 | */ |
20 | 20 | ||
21 | /* | 21 | /* |
22 | Enhanced Version of the file for platform independent KDE tools. | 22 | Enhanced Version of the file for platform independent KDE tools. |
23 | Copyright (c) 2004 Ulf Schenk | 23 | Copyright (c) 2004 Ulf Schenk |
24 | 24 | ||
25 | $Id$ | 25 | $Id$ |
26 | */ | 26 | */ |
27 | 27 | ||
28 | #include <sys/types.h> | 28 | #include <sys/types.h> |
29 | #include <sys/stat.h> | 29 | #include <sys/stat.h> |
30 | #ifndef _WIN32_ | 30 | #ifndef _WIN32_ |
31 | #include <unistd.h> | 31 | #include <unistd.h> |
32 | #endif | 32 | #endif |
33 | 33 | ||
34 | #include <qfile.h> | 34 | #include <qfile.h> |
35 | #include <qfileinfo.h> | 35 | #include <qfileinfo.h> |
36 | #include <qregexp.h> | 36 | #include <qregexp.h> |
37 | #include <qtimer.h> | 37 | #include <qtimer.h> |
38 | 38 | ||
39 | #include <kapplication.h> | 39 | #include <kapplication.h> |
40 | #include <kconfig.h> | 40 | #include <kconfig.h> |
41 | #include <kdebug.h> | 41 | #include <kdebug.h> |
42 | #include <klocale.h> | 42 | #include <klocale.h> |
43 | //US #include <ksavefile.h> | 43 | //US #include <ksavefile.h> |
44 | #include <kstandarddirs.h> | 44 | #include <kstandarddirs.h> |
45 | #include <kmessagebox.h> | 45 | #include <kmessagebox.h> |
46 | 46 | ||
47 | #include "formatfactory.h" | 47 | #include "formatfactory.h" |
48 | 48 | ||
49 | #include "resource.h" | 49 | #include "resource.h" |
50 | #include "resourcefileconfig.h" | 50 | #include "resourcefileconfig.h" |
51 | #include "stdaddressbook.h" | 51 | #include "stdaddressbook.h" |
52 | #define NO_DIRWATCH | 52 | #define NO_DIRWATCH |
53 | #include "resourcefile.h" | 53 | #include "resourcefile.h" |
54 | #include "syncprefwidget.h" | 54 | #include "syncprefwidget.h" |
55 | 55 | ||
56 | //#define ALLOW_LOCKING | 56 | //#define ALLOW_LOCKING |
57 | 57 | ||
58 | 58 | ||
59 | 59 | ||
60 | using namespace KABC; | 60 | using namespace KABC; |
61 | 61 | ||
62 | extern "C" | 62 | extern "C" |
63 | #ifdef _WIN32_ | 63 | #ifdef _WIN32_ |
64 | __declspec(dllexport) | 64 | __declspec(dllexport) |
65 | #else | 65 | #else |
66 | { | 66 | { |
67 | #endif | 67 | #endif |
68 | 68 | ||
69 | //US void *init_kabc_file() | 69 | //US void *init_kabc_file() |
70 | void *init_microkabc_file() | 70 | void *init_microkabc_file() |
71 | { | 71 | { |
72 | return new KRES::PluginFactory<ResourceFile,ResourceFileConfig, SyncPrefWidgetContainer>(); | 72 | return new KRES::PluginFactory<ResourceFile,ResourceFileConfig, SyncPrefWidgetContainer>(); |
73 | } | 73 | } |
74 | #ifndef _WIN32_ | 74 | #ifndef _WIN32_ |
75 | } | 75 | } |
76 | #endif | 76 | #endif |
77 | 77 | ||
78 | ResourceFile::ResourceFile( const KConfig *config, bool syncable ) | 78 | ResourceFile::ResourceFile( const KConfig *config, bool syncable ) |
79 | : Resource( config, syncable ) , mFormat( 0 ) | 79 | : Resource( config, syncable ) , mFormat( 0 ) |
80 | { | 80 | { |
81 | QString fileName, formatName, default_fileName; | 81 | QString fileName, formatName, default_fileName; |
82 | 82 | ||
83 | if (syncable == true) | 83 | if (syncable == true) |
84 | default_fileName = "/home/polo/kdepim/apps/kabc/localfile.vcf"; | 84 | default_fileName = "/home/polo/kdepim/apps/kabc/localfile.vcf"; |
85 | else | 85 | else |
86 | default_fileName = StdAddressBook::fileName(); | 86 | default_fileName = StdAddressBook::fileName(); |
87 | 87 | ||
88 | KConfig *cfg = (KConfig *)config; | 88 | KConfig *cfg = (KConfig *)config; |
89 | if ( cfg ) { | 89 | if ( cfg ) { |
90 | fileName = cfg->readEntry( "FileName", default_fileName ); | 90 | fileName = cfg->readEntry( "FileName", default_fileName ); |
91 | formatName = cfg->readEntry( "FileFormat", "vcard" ); | 91 | formatName = cfg->readEntry( "FileFormat", "vcard" ); |
92 | } else { | 92 | } else { |
93 | fileName = default_fileName; | 93 | fileName = default_fileName; |
94 | formatName = "vcard"; | 94 | formatName = "vcard"; |
95 | } | 95 | } |
96 | 96 | ||
97 | init( fileName, formatName ); | 97 | init( fileName, formatName ); |
98 | } | 98 | } |
99 | 99 | ||
100 | ResourceFile::ResourceFile( const QString &fileName, bool syncable , | 100 | ResourceFile::ResourceFile( const QString &fileName, bool syncable , |
101 | const QString &formatName ) | 101 | const QString &formatName ) |
102 | : Resource( 0, syncable ) | 102 | : Resource( 0, syncable ) |
103 | { | 103 | { |
104 | // qDebug("ResourceFile::ResourceFile : 3 %s, %s", fileName.latin1(), formatName.latin1()); | 104 | // qDebug("ResourceFile::ResourceFile : 3 %s, %s", fileName.latin1(), formatName.latin1()); |
105 | init( fileName, formatName ); | 105 | init( fileName, formatName ); |
106 | } | 106 | } |
107 | 107 | ||
108 | void ResourceFile::init( const QString &fileName, const QString &formatName ) | 108 | void ResourceFile::init( const QString &fileName, const QString &formatName ) |
109 | { | 109 | { |
110 | mFormatName = formatName; | 110 | mFormatName = formatName; |
111 | 111 | ||
112 | FormatFactory *factory = FormatFactory::self(); | 112 | FormatFactory *factory = FormatFactory::self(); |
113 | mFormat = factory->format( mFormatName ); | 113 | mFormat = factory->format( mFormatName ); |
114 | 114 | ||
115 | if ( !mFormat ) { | 115 | if ( !mFormat ) { |
116 | mFormatName = "vcard"; | 116 | mFormatName = "vcard"; |
117 | mFormat = factory->format( mFormatName ); | 117 | mFormat = factory->format( mFormatName ); |
118 | } | 118 | } |
119 | 119 | ||
120 | #ifndef NO_DIRWATCH | 120 | #ifndef NO_DIRWATCH |
121 | connect( &mDirWatch, SIGNAL( dirty(const QString&) ), SLOT( fileChanged() ) ); | 121 | connect( &mDirWatch, SIGNAL( dirty(const QString&) ), SLOT( fileChanged() ) ); |
122 | connect( &mDirWatch, SIGNAL( created(const QString&) ), SLOT( fileChanged() ) ); | 122 | connect( &mDirWatch, SIGNAL( created(const QString&) ), SLOT( fileChanged() ) ); |
123 | connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( fileChanged() ) ); | 123 | connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( fileChanged() ) ); |
124 | #endif | 124 | #endif |
125 | setFileName( fileName ); | 125 | setFileName( fileName ); |
126 | } | 126 | } |
127 | 127 | ||
128 | ResourceFile::~ResourceFile() | 128 | ResourceFile::~ResourceFile() |
129 | { | 129 | { |
130 | delete mFormat; | 130 | delete mFormat; |
131 | mFormat = 0; | 131 | mFormat = 0; |
132 | } | 132 | } |
133 | 133 | ||
134 | void ResourceFile::writeConfig( KConfig *config ) | 134 | void ResourceFile::writeConfig( KConfig *config ) |
135 | { | 135 | { |
136 | 136 | ||
137 | config->setGroup( "Resource_" + identifier() ); | 137 | config->setGroup( "Resource_" + identifier() ); |
138 | Resource::writeConfig( config ); | 138 | Resource::writeConfig( config ); |
139 | 139 | ||
140 | config->writeEntry( "FileName", mFileName ); | 140 | config->writeEntry( "FileName", mFileName ); |
141 | config->writeEntry( "FileFormat", mFormatName ); | 141 | config->writeEntry( "FileFormat", mFormatName ); |
142 | 142 | ||
143 | // qDebug("ResourceFile::writeConfig format %s, %s", mFileName.latin1(), mFormatName.latin1()); | 143 | // qDebug("ResourceFile::writeConfig format %s, %s", mFileName.latin1(), mFormatName.latin1()); |
144 | 144 | ||
145 | } | 145 | } |
146 | 146 | ||
147 | Ticket *ResourceFile::requestSaveTicket() | 147 | Ticket *ResourceFile::requestSaveTicket() |
148 | { | 148 | { |
149 | kdDebug(5700) << "ResourceFile::requestSaveTicket()" << endl; | 149 | kdDebug(5700) << "ResourceFile::requestSaveTicket()" << endl; |
150 | 150 | ||
151 | if ( !addressBook() ) return 0; | 151 | if ( !addressBook() ) return 0; |
152 | 152 | ||
153 | #ifdef ALLOW_LOCKING | 153 | #ifdef ALLOW_LOCKING |
154 | if ( !lock( mFileName ) ) { | 154 | if ( !lock( mFileName ) ) { |
155 | qDebug("unablt to lock file "); | 155 | qDebug("unablt to lock file "); |
156 | return 0; | 156 | return 0; |
157 | } | 157 | } |
158 | #endif | 158 | #endif |
159 | return createTicket( this ); | 159 | return createTicket( this ); |
160 | } | 160 | } |
161 | 161 | ||
162 | 162 | ||
163 | bool ResourceFile::doOpen() | 163 | bool ResourceFile::doOpen() |
164 | { | 164 | { |
165 | QFile file( mFileName ); | 165 | QFile file( mFileName ); |
166 | qDebug("ResourceFile::openfile %s ", mFileName.latin1()); | 166 | qDebug("ResourceFile::openfile %s ", mFileName.latin1()); |
167 | 167 | ||
168 | if ( !file.exists() ) { | 168 | if ( !file.exists() ) { |
169 | // try to create the file | 169 | // try to create the file |
170 | bool ok = file.open( IO_WriteOnly ); | 170 | bool ok = file.open( IO_WriteOnly ); |
171 | if ( ok ) | 171 | if ( ok ) |
172 | file.close(); | 172 | file.close(); |
173 | 173 | ||
174 | return ok; | 174 | return ok; |
175 | } else { | 175 | } else { |
176 | if ( !file.open( IO_ReadWrite ) ) | 176 | if ( !file.open( IO_ReadWrite ) ) |
177 | return false; | 177 | return false; |
178 | 178 | ||
179 | if ( file.size() == 0 ) { | 179 | if ( file.size() == 0 ) { |
180 | file.close(); | 180 | file.close(); |
181 | return true; | 181 | return true; |
182 | } | 182 | } |
183 | 183 | ||
184 | bool ok = mFormat->checkFormat( &file ); | 184 | bool ok = mFormat->checkFormat( &file ); |
185 | file.close(); | 185 | file.close(); |
186 | 186 | ||
187 | return ok; | 187 | return ok; |
188 | } | 188 | } |
189 | } | 189 | } |
190 | 190 | ||
191 | void ResourceFile::doClose() | 191 | void ResourceFile::doClose() |
192 | { | 192 | { |
193 | } | 193 | } |
194 | 194 | ||
195 | bool ResourceFile::load() | 195 | bool ResourceFile::load() |
196 | { | 196 | { |
197 | 197 | ||
198 | qDebug("ResourceFile::loadfile %s ", mFileName.latin1()); | ||
199 | QFile file( mFileName ); | 198 | QFile file( mFileName ); |
200 | if ( !file.open( IO_ReadOnly ) ) { | 199 | if ( !file.open( IO_ReadOnly ) ) { |
201 | addressBook()->error( i18n( "Unable to open file '%1'." ).arg( mFileName ) ); | 200 | addressBook()->error( i18n( "Unable to open file '%1'." ).arg( mFileName ) ); |
202 | return false; | 201 | return false; |
203 | } | 202 | } |
204 | 203 | ||
205 | // qDebug("ResourceFile::load format %s, %s", mFileName.latin1(), mFormatName.latin1()); | 204 | // qDebug("ResourceFile::load format %s, %s", mFileName.latin1(), mFormatName.latin1()); |
206 | 205 | ||
207 | return mFormat->loadAll( addressBook(), this, &file ); | 206 | return mFormat->loadAll( addressBook(), this, &file ); |
208 | } | 207 | } |
209 | 208 | ||
210 | bool ResourceFile::save( Ticket *ticket ) | 209 | bool ResourceFile::save( Ticket *ticket ) |
211 | { | 210 | { |
212 | // qDebug("ResourceFile::save format %s, %s", mFileName.latin1(), mFormatName.latin1()); | 211 | // qDebug("ResourceFile::save format %s, %s", mFileName.latin1(), mFormatName.latin1()); |
213 | 212 | ||
214 | 213 | ||
215 | // create backup file | 214 | // create backup file |
216 | QString extension = "_" + QString::number( QDate::currentDate().dayOfWeek() ); | 215 | QString extension = "_" + QString::number( QDate::currentDate().dayOfWeek() ); |
217 | 216 | ||
218 | /*US we use a simpler method to create a backupfile | 217 | /*US we use a simpler method to create a backupfile |
219 | 218 | ||
220 | (void) KSaveFile::backupFile( mFileName, QString::null | 219 | (void) KSaveFile::backupFile( mFileName, QString::null |
221 | ,extension ); | 220 | ,extension ); |
222 | 221 | ||
223 | KSaveFile saveFile( mFileName ); | 222 | KSaveFile saveFile( mFileName ); |
224 | bool ok = false; | 223 | bool ok = false; |
225 | if ( saveFile.status() == 0 && saveFile.file() ) | 224 | if ( saveFile.status() == 0 && saveFile.file() ) |
226 | { | 225 | { |
227 | mFormat->saveAll( addressBook(), this, saveFile.file() ); | 226 | mFormat->saveAll( addressBook(), this, saveFile.file() ); |
228 | ok = saveFile.close(); | 227 | ok = saveFile.close(); |
229 | } | 228 | } |
230 | */ | 229 | */ |
231 | 230 | ||
232 | //US ToDo: write backupfile | 231 | //US ToDo: write backupfile |
233 | #ifndef NO_DIRWATCH | 232 | #ifndef NO_DIRWATCH |
234 | mDirWatch.stopScan(); | 233 | mDirWatch.stopScan(); |
235 | #endif | 234 | #endif |
236 | QFile info; | 235 | QFile info; |
237 | info.setName( mFileName ); | 236 | info.setName( mFileName ); |
238 | bool ok = info.open( IO_WriteOnly ); | 237 | bool ok = info.open( IO_WriteOnly ); |
239 | if ( ok ) { | 238 | if ( ok ) { |
240 | mFormat->saveAll( addressBook(), this, &info ); | 239 | mFormat->saveAll( addressBook(), this, &info ); |
241 | 240 | ||
242 | info.close(); | 241 | info.close(); |
243 | ok = true; | 242 | ok = true; |
244 | } | 243 | } |
245 | else { | 244 | else { |
246 | 245 | ||
247 | } | 246 | } |
248 | 247 | ||
249 | if ( !ok ) | 248 | if ( !ok ) |
250 | addressBook()->error( i18n( "Unable to save file '%1'." ).arg( mFileName ) ); | 249 | addressBook()->error( i18n( "Unable to save file '%1'." ).arg( mFileName ) ); |
251 | #ifndef NO_DIRWATCH | 250 | #ifndef NO_DIRWATCH |
252 | mDirWatch.startScan(); | 251 | mDirWatch.startScan(); |
253 | #endif | 252 | #endif |
254 | delete ticket; | 253 | delete ticket; |
255 | #ifdef ALLOW_LOCKING | 254 | #ifdef ALLOW_LOCKING |
256 | unlock( mFileName ); | 255 | unlock( mFileName ); |
257 | #endif | 256 | #endif |
258 | 257 | ||
259 | return ok; | 258 | return ok; |
260 | } | 259 | } |
261 | 260 | ||
262 | bool ResourceFile::lock( const QString &fileName ) | 261 | bool ResourceFile::lock( const QString &fileName ) |
263 | { | 262 | { |
264 | #ifdef ALLOW_LOCKING | 263 | #ifdef ALLOW_LOCKING |
265 | 264 | ||
266 | 265 | ||
267 | QString fn = fileName; | 266 | QString fn = fileName; |
268 | 267 | ||
269 | //US change the implementation how the lockfilename is getting created | 268 | //US change the implementation how the lockfilename is getting created |
270 | //US fn.replace( QRegExp("/"), "_" ); | 269 | //US fn.replace( QRegExp("/"), "_" ); |
271 | //US QString lockName = locateLocal( "data", "kabc/lock/" + fn + ".lock" ); | 270 | //US QString lockName = locateLocal( "data", "kabc/lock/" + fn + ".lock" ); |
272 | 271 | ||
273 | KURL url(fn); | 272 | KURL url(fn); |
274 | QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" ); | 273 | QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" ); |
275 | 274 | ||
276 | 275 | ||
277 | 276 | ||
278 | if (QFile::exists( lockName )) return false; | 277 | if (QFile::exists( lockName )) return false; |
279 | 278 | ||
280 | QString lockUniqueName; | 279 | QString lockUniqueName; |
281 | lockUniqueName = fn + KApplication::randomString( 8 ); | 280 | lockUniqueName = fn + KApplication::randomString( 8 ); |
282 | 281 | ||
283 | url = lockUniqueName; | 282 | url = lockUniqueName; |
284 | //US mLockUniqueName = locateLocal( "data", "kabc/lock/" + lockUniqueName ); | 283 | //US mLockUniqueName = locateLocal( "data", "kabc/lock/" + lockUniqueName ); |
285 | mLockUniqueName = locateLocal( "data", "kabc/lock/" + url.fileName() ); | 284 | mLockUniqueName = locateLocal( "data", "kabc/lock/" + url.fileName() ); |
286 | kdDebug(5700) << "-- lock unique name: " << mLockUniqueName << endl; | 285 | kdDebug(5700) << "-- lock unique name: " << mLockUniqueName << endl; |
287 | 286 | ||
288 | // Create unique file | 287 | // Create unique file |
289 | QFile file( mLockUniqueName ); | 288 | QFile file( mLockUniqueName ); |
290 | file.open( IO_WriteOnly ); | 289 | file.open( IO_WriteOnly ); |
291 | file.close(); | 290 | file.close(); |
292 | 291 | ||
293 | // Create lock file | 292 | // Create lock file |
294 | int result = 0; | 293 | int result = 0; |
295 | #ifndef _WIN32_ | 294 | #ifndef _WIN32_ |
296 | result = ::link( QFile::encodeName( mLockUniqueName ), | 295 | result = ::link( QFile::encodeName( mLockUniqueName ), |
297 | QFile::encodeName( lockName ) ); | 296 | QFile::encodeName( lockName ) ); |
298 | #endif | 297 | #endif |
299 | if ( result == 0 ) { | 298 | if ( result == 0 ) { |
300 | addressBook()->emitAddressBookLocked(); | 299 | addressBook()->emitAddressBookLocked(); |
301 | return true; | 300 | return true; |
302 | } | 301 | } |
303 | 302 | ||
304 | // TODO: check stat | 303 | // TODO: check stat |
305 | 304 | ||
306 | return false; | 305 | return false; |
307 | #else | 306 | #else |
308 | return true; | 307 | return true; |
309 | #endif | 308 | #endif |
310 | } | 309 | } |
311 | 310 | ||
312 | void ResourceFile::unlock( const QString &fileName ) | 311 | void ResourceFile::unlock( const QString &fileName ) |
313 | { | 312 | { |
314 | #ifdef ALLOW_LOCKING | 313 | #ifdef ALLOW_LOCKING |
315 | QString fn = fileName; | 314 | QString fn = fileName; |
316 | //US change the implementation how the lockfilename is getting created | 315 | //US change the implementation how the lockfilename is getting created |
317 | //US fn.replace( QRegExp( "/" ), "_" ); | 316 | //US fn.replace( QRegExp( "/" ), "_" ); |
318 | //US QString lockName = locateLocal( "data", "kabc/lock/" + fn + ".lock" ); | 317 | //US QString lockName = locateLocal( "data", "kabc/lock/" + fn + ".lock" ); |
319 | //US QString lockName = fn + ".lock"; | 318 | //US QString lockName = fn + ".lock"; |
320 | KURL url(fn); | 319 | KURL url(fn); |
321 | QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" ); | 320 | QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" ); |
322 | 321 | ||
323 | QFile::remove( lockName ); | 322 | QFile::remove( lockName ); |
324 | QFile::remove( mLockUniqueName ); | 323 | QFile::remove( mLockUniqueName ); |
325 | addressBook()->emitAddressBookUnlocked(); | 324 | addressBook()->emitAddressBookUnlocked(); |
326 | #else | 325 | #else |
327 | return; | 326 | return; |
328 | #endif | 327 | #endif |
329 | } | 328 | } |
330 | 329 | ||
331 | void ResourceFile::setFileName( const QString &fileName ) | 330 | void ResourceFile::setFileName( const QString &fileName ) |
332 | { | 331 | { |
333 | #ifndef NO_DIRWATCH | 332 | #ifndef NO_DIRWATCH |
334 | mDirWatch.stopScan(); | 333 | mDirWatch.stopScan(); |
335 | mDirWatch.removeFile( mFileName ); | 334 | mDirWatch.removeFile( mFileName ); |
336 | mFileName = fileName; | 335 | mFileName = fileName; |
337 | 336 | ||
338 | 337 | ||
339 | mDirWatch.addFile( mFileName ); | 338 | mDirWatch.addFile( mFileName ); |
340 | mDirWatch.startScan(); | 339 | mDirWatch.startScan(); |
341 | #else | 340 | #else |
342 | mFileName = fileName; | 341 | mFileName = fileName; |
343 | #endif | 342 | #endif |
344 | 343 | ||
345 | //US simulate KDirWatch event | 344 | //US simulate KDirWatch event |
346 | //US fileChanged(); | 345 | //US fileChanged(); |
347 | } | 346 | } |
348 | 347 | ||
349 | QString ResourceFile::fileName() const | 348 | QString ResourceFile::fileName() const |
350 | { | 349 | { |
351 | return mFileName; | 350 | return mFileName; |
352 | } | 351 | } |
353 | 352 | ||
354 | void ResourceFile::setFormat( const QString &format ) | 353 | void ResourceFile::setFormat( const QString &format ) |
355 | { | 354 | { |
356 | mFormatName = format; | 355 | mFormatName = format; |
357 | delete mFormat; | 356 | delete mFormat; |
358 | 357 | ||
359 | FormatFactory *factory = FormatFactory::self(); | 358 | FormatFactory *factory = FormatFactory::self(); |
360 | mFormat = factory->format( mFormatName ); | 359 | mFormat = factory->format( mFormatName ); |
361 | /*US | 360 | /*US |
362 | //qDebug("ResourceFile::setFormat initialized with format %s ", format.latin1()); | 361 | //qDebug("ResourceFile::setFormat initialized with format %s ", format.latin1()); |
363 | if (mFormatName == "vcard") { | 362 | if (mFormatName == "vcard") { |
364 | mFormat = new VCardFormatPlugin2(); | 363 | mFormat = new VCardFormatPlugin2(); |
365 | // qDebug("ResourceFile::setFormat format %s", mFormatName.latin1()); | 364 | // qDebug("ResourceFile::setFormat format %s", mFormatName.latin1()); |
366 | } | 365 | } |
367 | else if (mFormatName == "binary") { | 366 | else if (mFormatName == "binary") { |
368 | mFormat = new BinaryFormat(); | 367 | mFormat = new BinaryFormat(); |
369 | // qDebug("ResourceFile::setFormat format %s", mFormatName.latin1()); | 368 | // qDebug("ResourceFile::setFormat format %s", mFormatName.latin1()); |
370 | } | 369 | } |
371 | else | 370 | else |
372 | qDebug("ResourceFile::setFormat format unknown !!! %s ", format.latin1()); | 371 | qDebug("ResourceFile::setFormat format unknown !!! %s ", format.latin1()); |
373 | */ | 372 | */ |
374 | 373 | ||
375 | } | 374 | } |
376 | 375 | ||
377 | QString ResourceFile::format() const | 376 | QString ResourceFile::format() const |
378 | { | 377 | { |
379 | return mFormatName; | 378 | return mFormatName; |
380 | } | 379 | } |
381 | 380 | ||
382 | void ResourceFile::fileChanged() | 381 | void ResourceFile::fileChanged() |
383 | { | 382 | { |
384 | // There is a small theoretical chance that KDirWatch calls us before | 383 | // There is a small theoretical chance that KDirWatch calls us before |
385 | // we are fully constructed | 384 | // we are fully constructed |
386 | if (!addressBook()) | 385 | if (!addressBook()) |
387 | return; | 386 | return; |
388 | 387 | ||
389 | 388 | ||
390 | QString text( i18n( "File resource '%1'<br> has been changed by third party.<br>Do you want to reload?").arg( mFileName ) ); | 389 | QString text( i18n( "File resource '%1'<br> has been changed by third party.<br>Do you want to reload?").arg( mFileName ) ); |
391 | if ( readOnly() || KMessageBox::questionYesNo( 0, text ) == KMessageBox::Yes ) { | 390 | if ( readOnly() || KMessageBox::questionYesNo( 0, text ) == KMessageBox::Yes ) { |
392 | load(); | 391 | load(); |
393 | addressBook()->emitAddressBookChanged(); | 392 | addressBook()->emitAddressBookChanged(); |
394 | } | 393 | } |
395 | } | 394 | } |
396 | 395 | ||
397 | void ResourceFile::removeAddressee( const Addressee &addr ) | 396 | void ResourceFile::removeAddressee( const Addressee &addr ) |
398 | { | 397 | { |
399 | QFile::remove( QFile::encodeName( locateLocal( "data", "kabc/photos/" ) + addr.uid() ) ); | 398 | QFile::remove( QFile::encodeName( locateLocal( "data", "kabc/photos/" ) + addr.uid() ) ); |
400 | QFile::remove( QFile::encodeName( locateLocal( "data", "kabc/logos/" ) + addr.uid() ) ); | 399 | QFile::remove( QFile::encodeName( locateLocal( "data", "kabc/logos/" ) + addr.uid() ) ); |
401 | QFile::remove( QFile::encodeName( locateLocal( "data", "kabc/sounds/" ) + addr.uid() ) ); | 400 | QFile::remove( QFile::encodeName( locateLocal( "data", "kabc/sounds/" ) + addr.uid() ) ); |
402 | } | 401 | } |
403 | 402 | ||
404 | void ResourceFile::cleanUp() | 403 | void ResourceFile::cleanUp() |
405 | { | 404 | { |
406 | unlock( mFileName ); | 405 | unlock( mFileName ); |
407 | } | 406 | } |
408 | 407 | ||
409 | //US #include "resourcefile.moc" | 408 | //US #include "resourcefile.moc" |
diff --git a/kabc/plugins/sharpdtm/sharpdtmconverter.cpp b/kabc/plugins/sharpdtm/sharpdtmconverter.cpp index d36df20..6418b54 100644 --- a/kabc/plugins/sharpdtm/sharpdtmconverter.cpp +++ b/kabc/plugins/sharpdtm/sharpdtmconverter.cpp | |||
@@ -1,444 +1,444 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of libkabc. | 2 | This file is part of libkabc. |
3 | Copyright (c) 2002 Tobias Koenig <tokoe@kde.org> | 3 | Copyright (c) 2002 Tobias Koenig <tokoe@kde.org> |
4 | 4 | ||
5 | This library is free software; you can redistribute it and/or | 5 | This library is free software; you can redistribute it and/or |
6 | modify it under the terms of the GNU Library General Public | 6 | modify it under the terms of the GNU Library General Public |
7 | License as published by the Free Software Foundation; either | 7 | License as published by the Free Software Foundation; either |
8 | version 2 of the License, or (at your option) any later version. | 8 | version 2 of the License, or (at your option) any later version. |
9 | 9 | ||
10 | This library is distributed in the hope that it will be useful, | 10 | This library is distributed in the hope that it will be useful, |
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
13 | Library General Public License for more details. | 13 | Library General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU Library General Public License | 15 | You should have received a copy of the GNU Library General Public License |
16 | along with this library; see the file COPYING.LIB. If not, write to | 16 | along with this library; see the file COPYING.LIB. If not, write to |
17 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 17 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
18 | Boston, MA 02111-1307, USA. | 18 | Boston, MA 02111-1307, USA. |
19 | */ | 19 | */ |
20 | 20 | ||
21 | /* | 21 | /* |
22 | Enhanced Version of the file for platform independent KDE tools. | 22 | Enhanced Version of the file for platform independent KDE tools. |
23 | Copyright (c) 2004 Ulf Schenk | 23 | Copyright (c) 2004 Ulf Schenk |
24 | 24 | ||
25 | $Id$ | 25 | $Id$ |
26 | */ | 26 | */ |
27 | 27 | ||
28 | #include "kglobal.h" | 28 | #include "kglobal.h" |
29 | #include <qregexp.h> | 29 | #include <qregexp.h> |
30 | 30 | ||
31 | 31 | ||
32 | #include "sharpdtmconverter.h" | 32 | #include "sharpdtmconverter.h" |
33 | 33 | ||
34 | #include <sl/slcategories.h> | 34 | #include <sl/slcategories.h> |
35 | #include <libkdepim/ksyncprofile.h> | 35 | #include <libkdepim/ksyncprofile.h> |
36 | //US #include <qpe/categoryselect.h> | 36 | //US #include <qpe/categoryselect.h> |
37 | 37 | ||
38 | 38 | ||
39 | using namespace KABC; | 39 | using namespace KABC; |
40 | using namespace SlCategory; | 40 | using namespace SlCategory; |
41 | 41 | ||
42 | SharpDTMConverter::SharpDTMConverter() : catDB(0) | 42 | SharpDTMConverter::SharpDTMConverter() : catDB(0) |
43 | { | 43 | { |
44 | } | 44 | } |
45 | 45 | ||
46 | SharpDTMConverter::~SharpDTMConverter() | 46 | SharpDTMConverter::~SharpDTMConverter() |
47 | { | 47 | { |
48 | deinit(); | 48 | deinit(); |
49 | } | 49 | } |
50 | 50 | ||
51 | bool SharpDTMConverter::init() | 51 | bool SharpDTMConverter::init() |
52 | { | 52 | { |
53 | catDB = new SlCategory::SlCategories(); | 53 | catDB = new SlCategory::SlCategories(); |
54 | 54 | ||
55 | if (!catDB) | 55 | if (!catDB) |
56 | return false; | 56 | return false; |
57 | 57 | ||
58 | // catDB->load( categoryFileName() ); | 58 | // catDB->load( categoryFileName() ); |
59 | return true; | 59 | return true; |
60 | } | 60 | } |
61 | 61 | ||
62 | void SharpDTMConverter::deinit() | 62 | void SharpDTMConverter::deinit() |
63 | { | 63 | { |
64 | if (catDB) | 64 | if (catDB) |
65 | { | 65 | { |
66 | delete catDB; | 66 | delete catDB; |
67 | catDB = 0; | 67 | catDB = 0; |
68 | } | 68 | } |
69 | } | 69 | } |
70 | 70 | ||
71 | bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBase* database, Addressee &addr ) | 71 | bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBase* database, Addressee &addr ) |
72 | { | 72 | { |
73 | SlZDataBase* db = (SlZDataBase*)database; | 73 | SlZDataBase* db = (SlZDataBase*)database; |
74 | 74 | ||
75 | // for syncing: we need setting of the two fields | 75 | // for syncing: we need setting of the two fields |
76 | addr.setExternalUID( QString::number( contact ) ); | 76 | addr.setExternalUID( QString::number( contact ) ); |
77 | addr.setOriginalExternalUID( QString::number( contact ) ); | 77 | addr.setOriginalExternalUID( QString::number( contact ) ); |
78 | addr.setTempSyncStat( SYNC_TEMPSTATE_NEW_EXTERNAL ); | 78 | addr.setTempSyncStat( SYNC_TEMPSTATE_NEW_EXTERNAL ); |
79 | 79 | ||
80 | 80 | ||
81 | // name | 81 | // name |
82 | //qDebug("SharpDTMConverter::sharpToAddressee check if the fileAs transformation works!!"); | 82 | //qDebug("SharpDTMConverter::sharpToAddressee check if the fileAs transformation works!!"); |
83 | addr.setFormattedName(db->readField(ZdbAdrs::FileAs)); // needs fix | 83 | addr.setFormattedName(db->readField(ZdbAdrs::FileAs)); // needs fix |
84 | 84 | ||
85 | addr.setFamilyName( db->readField(ZdbAdrs::LastName) ); | 85 | addr.setFamilyName( db->readField(ZdbAdrs::LastName) ); |
86 | addr.setGivenName( db->readField(ZdbAdrs::FirstName) ); | 86 | addr.setGivenName( db->readField(ZdbAdrs::FirstName) ); |
87 | addr.setAdditionalName( db->readField(ZdbAdrs::MiddleName) ); | 87 | addr.setAdditionalName( db->readField(ZdbAdrs::MiddleName) ); |
88 | addr.setPrefix( db->readField(ZdbAdrs::Title) ); | 88 | addr.setPrefix( db->readField(ZdbAdrs::Title) ); |
89 | addr.setSuffix( db->readField(ZdbAdrs::Suffix) ); | 89 | addr.setSuffix( db->readField(ZdbAdrs::Suffix) ); |
90 | 90 | ||
91 | 91 | ||
92 | QString emailstr = db->readField(ZdbAdrs::Emails); | 92 | QString emailstr = db->readField(ZdbAdrs::Emails); |
93 | emailstr.replace( QRegExp(","), " " ); | 93 | emailstr.replace( QRegExp(","), " " ); |
94 | emailstr.replace( QRegExp(";"), " " ); | 94 | emailstr.replace( QRegExp(";"), " " ); |
95 | emailstr.replace( QRegExp(":"), " " ); | 95 | emailstr.replace( QRegExp(":"), " " ); |
96 | //qDebug("SharpDTMConverter::sharpToAddressee whats the character to seperate the emailadresses? %s ", emailstr.latin1()); | 96 | //qDebug("SharpDTMConverter::sharpToAddressee whats the character to seperate the emailadresses? %s ", emailstr.latin1()); |
97 | QStringList emails = QStringList::split(" ", emailstr.simplifyWhiteSpace()); | 97 | QStringList emails = QStringList::split(" ", emailstr.simplifyWhiteSpace()); |
98 | bool defE = false; | 98 | bool defE = false; |
99 | bool found = false; | 99 | bool found = false; |
100 | for ( QStringList::Iterator it = emails.begin(); it != emails.end(); ++it ) { | 100 | for ( QStringList::Iterator it = emails.begin(); it != emails.end(); ++it ) { |
101 | if (found ) | 101 | if (found ) |
102 | defE = false; | 102 | defE = false; |
103 | else | 103 | else |
104 | found = defE = ((*it).lower() == db->readField(ZdbAdrs::DefaultEmail).lower()); | 104 | found = defE = ((*it).lower() == db->readField(ZdbAdrs::DefaultEmail).lower()); |
105 | addr.insertEmail( *it, defE ); | 105 | addr.insertEmail( *it, defE ); |
106 | } | 106 | } |
107 | if ( ! found ) | 107 | if ( ! found ) |
108 | if (!db->readField(ZdbAdrs::DefaultEmail).isEmpty()) | 108 | if (!db->readField(ZdbAdrs::DefaultEmail).isEmpty()) |
109 | addr.insertEmail(db->readField(ZdbAdrs::DefaultEmail), true); | 109 | addr.insertEmail(db->readField(ZdbAdrs::DefaultEmail), true); |
110 | 110 | ||
111 | // home | 111 | // home |
112 | if ((!db->readField(ZdbAdrs::HomeStreet).isEmpty()) || | 112 | if ((!db->readField(ZdbAdrs::HomeStreet).isEmpty()) || |
113 | (!db->readField(ZdbAdrs::HomeCity).isEmpty()) || | 113 | (!db->readField(ZdbAdrs::HomeCity).isEmpty()) || |
114 | (!db->readField(ZdbAdrs::HomeState).isEmpty()) || | 114 | (!db->readField(ZdbAdrs::HomeState).isEmpty()) || |
115 | (!db->readField(ZdbAdrs::HomeZip).isEmpty()) || | 115 | (!db->readField(ZdbAdrs::HomeZip).isEmpty()) || |
116 | (!db->readField(ZdbAdrs::HomeCountry).isEmpty())) | 116 | (!db->readField(ZdbAdrs::HomeCountry).isEmpty())) |
117 | { | 117 | { |
118 | Address homeaddress; | 118 | Address homeaddress; |
119 | homeaddress.setType(Address::Home); | 119 | homeaddress.setType(Address::Home); |
120 | //US homeaddress.setPostOfficeBox( "" ); | 120 | //US homeaddress.setPostOfficeBox( "" ); |
121 | //US homeaddress.setExtended( "" ); | 121 | //US homeaddress.setExtended( "" ); |
122 | homeaddress.setStreet( db->readField(ZdbAdrs::HomeStreet) ); | 122 | homeaddress.setStreet( db->readField(ZdbAdrs::HomeStreet) ); |
123 | homeaddress.setLocality( db->readField(ZdbAdrs::HomeCity) ); | 123 | homeaddress.setLocality( db->readField(ZdbAdrs::HomeCity) ); |
124 | homeaddress.setRegion( db->readField(ZdbAdrs::HomeState) ); | 124 | homeaddress.setRegion( db->readField(ZdbAdrs::HomeState) ); |
125 | homeaddress.setPostalCode( db->readField(ZdbAdrs::HomeZip) ); | 125 | homeaddress.setPostalCode( db->readField(ZdbAdrs::HomeZip) ); |
126 | homeaddress.setCountry( db->readField(ZdbAdrs::HomeCountry) ); | 126 | homeaddress.setCountry( db->readField(ZdbAdrs::HomeCountry) ); |
127 | 127 | ||
128 | addr.insertAddress( homeaddress ); | 128 | addr.insertAddress( homeaddress ); |
129 | } | 129 | } |
130 | 130 | ||
131 | if (!db->readField(ZdbAdrs::HomePhone).isEmpty()) | 131 | if (!db->readField(ZdbAdrs::HomePhone).isEmpty()) |
132 | { | 132 | { |
133 | PhoneNumber homephone; | 133 | PhoneNumber homephone; |
134 | homephone.setType( PhoneNumber::Home ); | 134 | homephone.setType( PhoneNumber::Home ); |
135 | homephone.setNumber( db->readField(ZdbAdrs::HomePhone) ); | 135 | homephone.setNumber( db->readField(ZdbAdrs::HomePhone) ); |
136 | addr.insertPhoneNumber( homephone ); | 136 | addr.insertPhoneNumber( homephone ); |
137 | } | 137 | } |
138 | 138 | ||
139 | if (!db->readField(ZdbAdrs::HomeFax).isEmpty()) | 139 | if (!db->readField(ZdbAdrs::HomeFax).isEmpty()) |
140 | { | 140 | { |
141 | PhoneNumber homefax; | 141 | PhoneNumber homefax; |
142 | homefax.setType( PhoneNumber::Home | PhoneNumber::Fax ); | 142 | homefax.setType( PhoneNumber::Home | PhoneNumber::Fax ); |
143 | homefax.setNumber( db->readField(ZdbAdrs::HomeFax) ); | 143 | homefax.setNumber( db->readField(ZdbAdrs::HomeFax) ); |
144 | addr.insertPhoneNumber( homefax ); | 144 | addr.insertPhoneNumber( homefax ); |
145 | } | 145 | } |
146 | 146 | ||
147 | if (!db->readField(ZdbAdrs::HomeMobile).isEmpty()) | 147 | if (!db->readField(ZdbAdrs::HomeMobile).isEmpty()) |
148 | { | 148 | { |
149 | PhoneNumber homemobile; | 149 | PhoneNumber homemobile; |
150 | homemobile.setType( PhoneNumber::Home | PhoneNumber::Cell ); | 150 | homemobile.setType( PhoneNumber::Home | PhoneNumber::Cell ); |
151 | homemobile.setNumber( db->readField(ZdbAdrs::HomeMobile) ); | 151 | homemobile.setNumber( db->readField(ZdbAdrs::HomeMobile) ); |
152 | addr.insertPhoneNumber( homemobile ); | 152 | addr.insertPhoneNumber( homemobile ); |
153 | } | 153 | } |
154 | 154 | ||
155 | addr.setUrl( db->readField(ZdbAdrs::HomeWebPage) ); | 155 | addr.setUrl( db->readField(ZdbAdrs::HomeWebPage) ); |
156 | 156 | ||
157 | 157 | ||
158 | // business | 158 | // business |
159 | if ((!db->readField(ZdbAdrs::BusinessStreet).isEmpty()) || | 159 | if ((!db->readField(ZdbAdrs::BusinessStreet).isEmpty()) || |
160 | (!db->readField(ZdbAdrs::BusinessCity).isEmpty()) || | 160 | (!db->readField(ZdbAdrs::BusinessCity).isEmpty()) || |
161 | (!db->readField(ZdbAdrs::BusinessState).isEmpty()) || | 161 | (!db->readField(ZdbAdrs::BusinessState).isEmpty()) || |
162 | (!db->readField(ZdbAdrs::BusinessZip).isEmpty()) || | 162 | (!db->readField(ZdbAdrs::BusinessZip).isEmpty()) || |
163 | (!db->readField(ZdbAdrs::BusinessCountry).isEmpty())) | 163 | (!db->readField(ZdbAdrs::BusinessCountry).isEmpty())) |
164 | { | 164 | { |
165 | Address businessaddress; | 165 | Address businessaddress; |
166 | businessaddress.setType(Address::Work); | 166 | businessaddress.setType(Address::Work); |
167 | //US businessaddress.setPostOfficeBox( "" ); | 167 | //US businessaddress.setPostOfficeBox( "" ); |
168 | //US businessaddress.setExtended( "" ); | 168 | //US businessaddress.setExtended( "" ); |
169 | businessaddress.setStreet( db->readField(ZdbAdrs::BusinessStreet) ); | 169 | businessaddress.setStreet( db->readField(ZdbAdrs::BusinessStreet) ); |
170 | businessaddress.setLocality( db->readField(ZdbAdrs::BusinessCity) ); | 170 | businessaddress.setLocality( db->readField(ZdbAdrs::BusinessCity) ); |
171 | businessaddress.setRegion( db->readField(ZdbAdrs::BusinessState) ); | 171 | businessaddress.setRegion( db->readField(ZdbAdrs::BusinessState) ); |
172 | businessaddress.setPostalCode( db->readField(ZdbAdrs::BusinessZip) ); | 172 | businessaddress.setPostalCode( db->readField(ZdbAdrs::BusinessZip) ); |
173 | businessaddress.setCountry( db->readField(ZdbAdrs::BusinessCountry) ); | 173 | businessaddress.setCountry( db->readField(ZdbAdrs::BusinessCountry) ); |
174 | 174 | ||
175 | addr.insertAddress( businessaddress ); | 175 | addr.insertAddress( businessaddress ); |
176 | } | 176 | } |
177 | 177 | ||
178 | 178 | ||
179 | if (!db->readField(ZdbAdrs::BusinessPhone).isEmpty()) | 179 | if (!db->readField(ZdbAdrs::BusinessPhone).isEmpty()) |
180 | { | 180 | { |
181 | PhoneNumber businessphone; | 181 | PhoneNumber businessphone; |
182 | businessphone.setType( PhoneNumber::Work ); | 182 | businessphone.setType( PhoneNumber::Work ); |
183 | businessphone.setNumber( db->readField(ZdbAdrs::BusinessPhone) ); | 183 | businessphone.setNumber( db->readField(ZdbAdrs::BusinessPhone) ); |
184 | addr.insertPhoneNumber( businessphone ); | 184 | addr.insertPhoneNumber( businessphone ); |
185 | } | 185 | } |
186 | 186 | ||
187 | if (!db->readField(ZdbAdrs::BusinessFax).isEmpty()) | 187 | if (!db->readField(ZdbAdrs::BusinessFax).isEmpty()) |
188 | { | 188 | { |
189 | PhoneNumber businessfax; | 189 | PhoneNumber businessfax; |
190 | businessfax.setType( PhoneNumber::Work | PhoneNumber::Fax ); | 190 | businessfax.setType( PhoneNumber::Work | PhoneNumber::Fax ); |
191 | businessfax.setNumber( db->readField(ZdbAdrs::BusinessFax) ); | 191 | businessfax.setNumber( db->readField(ZdbAdrs::BusinessFax) ); |
192 | addr.insertPhoneNumber( businessfax ); | 192 | addr.insertPhoneNumber( businessfax ); |
193 | } | 193 | } |
194 | 194 | ||
195 | if (!db->readField(ZdbAdrs::BusinessMobile).isEmpty()) | 195 | if (!db->readField(ZdbAdrs::BusinessMobile).isEmpty()) |
196 | { | 196 | { |
197 | PhoneNumber businessmobile; | 197 | PhoneNumber businessmobile; |
198 | businessmobile.setType( PhoneNumber::Work | PhoneNumber::Cell ); | 198 | businessmobile.setType( PhoneNumber::Work | PhoneNumber::Cell ); |
199 | businessmobile.setNumber( db->readField(ZdbAdrs::BusinessMobile) ); | 199 | businessmobile.setNumber( db->readField(ZdbAdrs::BusinessMobile) ); |
200 | addr.insertPhoneNumber( businessmobile ); | 200 | addr.insertPhoneNumber( businessmobile ); |
201 | } | 201 | } |
202 | 202 | ||
203 | if (!db->readField(ZdbAdrs::BusinessPager).isEmpty()) | 203 | if (!db->readField(ZdbAdrs::BusinessPager).isEmpty()) |
204 | { | 204 | { |
205 | PhoneNumber businesspager; | 205 | PhoneNumber businesspager; |
206 | businesspager.setType( PhoneNumber::Work | PhoneNumber::Pager ); | 206 | businesspager.setType( PhoneNumber::Work | PhoneNumber::Pager ); |
207 | businesspager.setNumber( db->readField(ZdbAdrs::BusinessPager) ); | 207 | businesspager.setNumber( db->readField(ZdbAdrs::BusinessPager) ); |
208 | addr.insertPhoneNumber( businesspager ); | 208 | addr.insertPhoneNumber( businesspager ); |
209 | } | 209 | } |
210 | 210 | ||
211 | addr.setRole( db->readField(ZdbAdrs::JobTitle) ); | 211 | addr.setRole( db->readField(ZdbAdrs::JobTitle) ); |
212 | addr.setOrganization( db->readField(ZdbAdrs::Company) ); | 212 | addr.setOrganization( db->readField(ZdbAdrs::Company) ); |
213 | addr.insertCustom( "KADDRESSBOOK", "X-Profession", db->readField(ZdbAdrs::Profession) ); | 213 | addr.insertCustom( "KADDRESSBOOK", "X-Profession", db->readField(ZdbAdrs::Profession) ); |
214 | addr.insertCustom( "KADDRESSBOOK", "X-AssistantsName", db->readField(ZdbAdrs::Assistant) ); | 214 | addr.insertCustom( "KADDRESSBOOK", "X-AssistantsName", db->readField(ZdbAdrs::Assistant) ); |
215 | addr.insertCustom( "KADDRESSBOOK", "X-Department", db->readField(ZdbAdrs::Department) ); | 215 | addr.insertCustom( "KADDRESSBOOK", "X-Department", db->readField(ZdbAdrs::Department) ); |
216 | addr.insertCustom( "KADDRESSBOOK", "X-ManagersName", db->readField(ZdbAdrs::Manager) ); | 216 | addr.insertCustom( "KADDRESSBOOK", "X-ManagersName", db->readField(ZdbAdrs::Manager) ); |
217 | addr.insertCustom( "KADDRESSBOOK", "X-Office", db->readField(ZdbAdrs::Office) ); | 217 | addr.insertCustom( "KADDRESSBOOK", "X-Office", db->readField(ZdbAdrs::Office) ); |
218 | 218 | ||
219 | //personal | 219 | //personal |
220 | addr.insertCustom( "KADDRESSBOOK", "X-SpousesName", db->readField(ZdbAdrs::Spouse) ); | 220 | addr.insertCustom( "KADDRESSBOOK", "X-SpousesName", db->readField(ZdbAdrs::Spouse) ); |
221 | 221 | ||
222 | QString gen = db->readField(ZdbAdrs::Gender); | 222 | QString gen = db->readField(ZdbAdrs::Gender); |
223 | //qDebug("SharpDTMConverter::sharpToAddressee pleas check that gender works!! : Gender: %s", gen.latin1()); | 223 | //qDebug("SharpDTMConverter::sharpToAddressee pleas check that gender works!! : Gender: %s", gen.latin1()); |
224 | //qDebug("SharpDTMConverter::sharpToAddressee: may be int db->readUshortField(\"ZdbAdrs::Gender\") is here better suited"); | 224 | //qDebug("SharpDTMConverter::sharpToAddressee: may be int db->readUshortField(\"ZdbAdrs::Gender\") is here better suited"); |
225 | 225 | ||
226 | if (gen == "male") | 226 | if (gen == "male") |
227 | addr.insertCustom( "KADDRESSBOOK", "X-Gender", "male"); | 227 | addr.insertCustom( "KADDRESSBOOK", "X-Gender", "male"); |
228 | else if (gen == "female") | 228 | else if (gen == "female") |
229 | addr.insertCustom( "KADDRESSBOOK", "X-Gender", "female"); | 229 | addr.insertCustom( "KADDRESSBOOK", "X-Gender", "female"); |
230 | 230 | ||
231 | 231 | ||
232 | QDate ann = KGlobal::locale()->readDate( db->readField(ZdbAdrs::Anniversary) ); | 232 | QDate ann = KGlobal::locale()->readDate( db->readField(ZdbAdrs::Anniversary) ); |
233 | if (ann.isValid()) { | 233 | if (ann.isValid()) { |
234 | QString dt = KGlobal::locale()->formatDate(ann, true, KLocale::ISODate); | 234 | QString dt = KGlobal::locale()->formatDate(ann, true, KLocale::ISODate); |
235 | //qDebug("qtopiaToAddressee annyversary found:%s", dt.latin1()); | 235 | //qDebug("qtopiaToAddressee annyversary found:%s", dt.latin1()); |
236 | addr.insertCustom( "KADDRESSBOOK", "X-Anniversary", dt); | 236 | addr.insertCustom( "KADDRESSBOOK", "X-Anniversary", dt); |
237 | } | 237 | } |
238 | 238 | ||
239 | 239 | ||
240 | addr.insertCustom( "KADDRESSBOOK", "X-Children", db->readField(ZdbAdrs::Children) ); | 240 | addr.insertCustom( "KADDRESSBOOK", "X-Children", db->readField(ZdbAdrs::Children) ); |
241 | 241 | ||
242 | 242 | ||
243 | QDate birthd = KGlobal::locale()->readDate( db->readField(ZdbAdrs::Birthday) ); | 243 | QDate birthd = KGlobal::locale()->readDate( db->readField(ZdbAdrs::Birthday) ); |
244 | //qDebug("birtd %s ", birthd.toString().latin1()); | 244 | //qDebug("birtd %s ", birthd.toString().latin1()); |
245 | if (birthd.isValid()) | 245 | if (birthd.isValid()) |
246 | addr.setBirthday( birthd ); | 246 | addr.setBirthday( birthd ); |
247 | 247 | ||
248 | addr.setNickName( db->readField(ZdbAdrs::Nickname) ); | 248 | addr.setNickName( db->readField(ZdbAdrs::Nickname) ); |
249 | 249 | ||
250 | // others | 250 | // others |
251 | //US I put opies BusinessWebPage into Ka/Pi's notes block, because no other native field is available. | 251 | //US I put opies BusinessWebPage into Ka/Pi's notes block, because no other native field is available. |
252 | QString notes = db->readField(ZdbAdrs::Notes); | 252 | QString notes = db->readField(ZdbAdrs::Notes); |
253 | //notes += "\nBusinessWebPage: " + db->readField(ZdbAdrs::BusinessWebPage) + "\n"; | 253 | //notes += "\nBusinessWebPage: " + db->readField(ZdbAdrs::BusinessWebPage) + "\n"; |
254 | if ( addr.url().isEmpty() ) | 254 | if ( addr.url().isEmpty() ) |
255 | addr.setUrl( db->readField(ZdbAdrs::BusinessWebPage) ); | 255 | addr.setUrl( db->readField(ZdbAdrs::BusinessWebPage) ); |
256 | addr.setNote( db->readField(ZdbAdrs::Notes) ); | 256 | addr.setNote( db->readField(ZdbAdrs::Notes) ); |
257 | 257 | ||
258 | 258 | ||
259 | 259 | ||
260 | //US QString groups() const { return find( Qtopia::Groups ); } | 260 | //US QString groups() const { return find( Qtopia::Groups ); } |
261 | //US QStringList groupList() const; | 261 | //US QStringList groupList() const; |
262 | 262 | ||
263 | //qDebug("SharpDTMConverter::sharpToAddressee please check that the categories will be converted" ); | 263 | //qDebug("SharpDTMConverter::sharpToAddressee please check that the categories will be converted" ); |
264 | QArray<int> catArray = db->readCategories(); | 264 | QArray<int> catArray = db->readCategories(); |
265 | QString cat; | 265 | QString cat; |
266 | 266 | ||
267 | for ( unsigned int i=0; i < catArray.size(); i++ ) { | 267 | for ( unsigned int i=0; i < catArray.size(); i++ ) { |
268 | cat = catDB->label(catArray[i]); | 268 | cat = catDB->label(catArray[i]); |
269 | if ( cat.isEmpty() ) | 269 | if ( cat.isEmpty() ) |
270 | addr.insertCategory(QString::number(catArray[i])); | 270 | addr.insertCategory(QString::number(catArray[i])); |
271 | else | 271 | else |
272 | addr.insertCategory( cat ); | 272 | addr.insertCategory( cat ); |
273 | } | 273 | } |
274 | 274 | ||
275 | return true; | 275 | return true; |
276 | } | 276 | } |
277 | 277 | ||
278 | bool SharpDTMConverter::addresseeToSharp( const Addressee &addr, SlZDataBase* database , const CardId &contact ) | 278 | bool SharpDTMConverter::addresseeToSharp( const Addressee &addr, SlZDataBase* database , const CardId &contact ) |
279 | { | 279 | { |
280 | bool cellHome = false, cellWork = false; | 280 | bool cellHome = false, cellWork = false; |
281 | // name | 281 | // name |
282 | database->writeField(ZdbAdrs::LastName, addr.familyName()); | 282 | database->writeField(ZdbAdrs::LastName, addr.familyName()); |
283 | database->writeField(ZdbAdrs::FirstName, addr.givenName()); | 283 | database->writeField(ZdbAdrs::FirstName, addr.givenName()); |
284 | database->writeField(ZdbAdrs::MiddleName, addr.additionalName()); | 284 | database->writeField(ZdbAdrs::MiddleName, addr.additionalName()); |
285 | database->writeField(ZdbAdrs::Title, addr.prefix()); | 285 | database->writeField(ZdbAdrs::Title, addr.prefix()); |
286 | database->writeField(ZdbAdrs::Suffix, addr.suffix()); | 286 | database->writeField(ZdbAdrs::Suffix, addr.suffix()); |
287 | 287 | ||
288 | //qDebug("SharpDTMConverter::addresseeToSharp check if the fileAs transformation works!!\n%s",addr.formattedName().latin1() ); | 288 | //qDebug("SharpDTMConverter::addresseeToSharp check if the fileAs transformation works!!\n%s",addr.formattedName().latin1() ); |
289 | QString formattedName = addr.formattedName(); | 289 | QString formattedName = addr.formattedName(); |
290 | if ( formattedName.isEmpty() ) { | 290 | if ( formattedName.isEmpty() ) { |
291 | if ( !addr.familyName().isEmpty() ) { | 291 | if ( !addr.familyName().isEmpty() ) { |
292 | formattedName = addr.familyName(); | 292 | formattedName = addr.familyName(); |
293 | if ( !addr.givenName().isEmpty() ) { | 293 | if ( !addr.givenName().isEmpty() ) { |
294 | formattedName += ", "; | 294 | formattedName += ", "; |
295 | formattedName += addr.givenName(); | 295 | formattedName += addr.givenName(); |
296 | } | 296 | } |
297 | } else | 297 | } else |
298 | formattedName = addr.givenName(); | 298 | formattedName = addr.givenName(); |
299 | } | 299 | } |
300 | database->writeField(ZdbAdrs::FileAs, formattedName); | 300 | database->writeField(ZdbAdrs::FileAs, formattedName); |
301 | database->writeField(ZdbAdrs::FullName, formattedName); | 301 | database->writeField(ZdbAdrs::FullName, formattedName); |
302 | 302 | ||
303 | 303 | ||
304 | //qDebug("SharpDTMConverter::addresseeToSharp check which seperator we need here for the emails!!"); | 304 | //qDebug("SharpDTMConverter::addresseeToSharp check which seperator we need here for the emails!!"); |
305 | //qDebug("SharpDTMConverter::addresseeToSharp its probably the same from sharpToAddressee"); | 305 | //qDebug("SharpDTMConverter::addresseeToSharp its probably the same from sharpToAddressee"); |
306 | QString emails = addr.emails().join(" "); | 306 | QString emails = addr.emails().join(" "); |
307 | database->writeField(ZdbAdrs::Emails, emails ); | 307 | database->writeField(ZdbAdrs::Emails, emails ); |
308 | 308 | ||
309 | database->writeField(ZdbAdrs::DefaultEmail, addr.preferredEmail() ); | 309 | database->writeField(ZdbAdrs::DefaultEmail, addr.preferredEmail() ); |
310 | 310 | ||
311 | 311 | ||
312 | // home | 312 | // home |
313 | const Address homeaddress = addr.address(Address::Home); | 313 | const Address homeaddress = addr.address(Address::Home); |
314 | if (!homeaddress.isEmpty()) { | 314 | if (!homeaddress.isEmpty()) { |
315 | qDebug("write home address "); | 315 | //qDebug("write home address "); |
316 | database->writeField(ZdbAdrs::HomeStreet, homeaddress.street()); | 316 | database->writeField(ZdbAdrs::HomeStreet, homeaddress.street()); |
317 | database->writeField(ZdbAdrs::HomeCity, homeaddress.locality()); | 317 | database->writeField(ZdbAdrs::HomeCity, homeaddress.locality()); |
318 | database->writeField(ZdbAdrs::HomeState, homeaddress.region()); | 318 | database->writeField(ZdbAdrs::HomeState, homeaddress.region()); |
319 | database->writeField(ZdbAdrs::HomeZip, homeaddress.postalCode()); | 319 | database->writeField(ZdbAdrs::HomeZip, homeaddress.postalCode()); |
320 | database->writeField(ZdbAdrs::HomeCountry, homeaddress.country()); | 320 | database->writeField(ZdbAdrs::HomeCountry, homeaddress.country()); |
321 | } | 321 | } |
322 | 322 | ||
323 | PhoneNumber homephone = addr.phoneNumber( PhoneNumber::Home ); | 323 | PhoneNumber homephone = addr.phoneNumber( PhoneNumber::Home ); |
324 | if (!homephone.number().isEmpty()) | 324 | if (!homephone.number().isEmpty()) |
325 | database->writeField(ZdbAdrs::HomePhone, homephone.number()); | 325 | database->writeField(ZdbAdrs::HomePhone, homephone.number()); |
326 | 326 | ||
327 | PhoneNumber homefax = addr.phoneNumber( PhoneNumber::Home | PhoneNumber::Fax ); | 327 | PhoneNumber homefax = addr.phoneNumber( PhoneNumber::Home | PhoneNumber::Fax ); |
328 | if (!homefax.number().isEmpty()) | 328 | if (!homefax.number().isEmpty()) |
329 | database->writeField(ZdbAdrs::HomeFax, homefax.number()); | 329 | database->writeField(ZdbAdrs::HomeFax, homefax.number()); |
330 | 330 | ||
331 | PhoneNumber homemobile = addr.phoneNumber( PhoneNumber::Home | PhoneNumber::Cell ); | 331 | PhoneNumber homemobile = addr.phoneNumber( PhoneNumber::Home | PhoneNumber::Cell ); |
332 | if (!homemobile.number().isEmpty()) { | 332 | if (!homemobile.number().isEmpty()) { |
333 | database->writeField(ZdbAdrs::HomeMobile, homemobile.number()); | 333 | database->writeField(ZdbAdrs::HomeMobile, homemobile.number()); |
334 | cellHome = true; | 334 | cellHome = true; |
335 | } | 335 | } |
336 | 336 | ||
337 | database->writeField(ZdbAdrs::HomeWebPage, addr.url().url()); | 337 | database->writeField(ZdbAdrs::HomeWebPage, addr.url().url()); |
338 | 338 | ||
339 | 339 | ||
340 | // business | 340 | // business |
341 | const Address businessaddress = addr.address(Address::Work); | 341 | const Address businessaddress = addr.address(Address::Work); |
342 | if (!businessaddress.isEmpty()) { | 342 | if (!businessaddress.isEmpty()) { |
343 | qDebug("write business address "); | 343 | //qDebug("write business address "); |
344 | database->writeField(ZdbAdrs::BusinessStreet, businessaddress.street()); | 344 | database->writeField(ZdbAdrs::BusinessStreet, businessaddress.street()); |
345 | database->writeField(ZdbAdrs::BusinessCity, businessaddress.locality()); | 345 | database->writeField(ZdbAdrs::BusinessCity, businessaddress.locality()); |
346 | database->writeField(ZdbAdrs::BusinessState, businessaddress.region()); | 346 | database->writeField(ZdbAdrs::BusinessState, businessaddress.region()); |
347 | database->writeField(ZdbAdrs::BusinessZip, businessaddress.postalCode()); | 347 | database->writeField(ZdbAdrs::BusinessZip, businessaddress.postalCode()); |
348 | database->writeField(ZdbAdrs::BusinessCountry, businessaddress.country()); | 348 | database->writeField(ZdbAdrs::BusinessCountry, businessaddress.country()); |
349 | } | 349 | } |
350 | 350 | ||
351 | PhoneNumber businessphone = addr.phoneNumber( PhoneNumber::Work ); | 351 | PhoneNumber businessphone = addr.phoneNumber( PhoneNumber::Work ); |
352 | if (!businessphone.number().isEmpty()) | 352 | if (!businessphone.number().isEmpty()) |
353 | database->writeField(ZdbAdrs::BusinessPhone, businessphone.number()); | 353 | database->writeField(ZdbAdrs::BusinessPhone, businessphone.number()); |
354 | 354 | ||
355 | PhoneNumber businessfax = addr.phoneNumber( PhoneNumber::Work | PhoneNumber::Fax ); | 355 | PhoneNumber businessfax = addr.phoneNumber( PhoneNumber::Work | PhoneNumber::Fax ); |
356 | if (!businessfax.number().isEmpty()) | 356 | if (!businessfax.number().isEmpty()) |
357 | database->writeField(ZdbAdrs::BusinessFax, businessfax.number()); | 357 | database->writeField(ZdbAdrs::BusinessFax, businessfax.number()); |
358 | 358 | ||
359 | PhoneNumber businessmobile = addr.phoneNumber( PhoneNumber::Work | PhoneNumber::Cell ); | 359 | PhoneNumber businessmobile = addr.phoneNumber( PhoneNumber::Work | PhoneNumber::Cell ); |
360 | if (!businessmobile.number().isEmpty()) { | 360 | if (!businessmobile.number().isEmpty()) { |
361 | cellWork = true; | 361 | cellWork = true; |
362 | database->writeField(ZdbAdrs::BusinessMobile, businessmobile.number()); | 362 | database->writeField(ZdbAdrs::BusinessMobile, businessmobile.number()); |
363 | } | 363 | } |
364 | PhoneNumber mobile = addr.phoneNumber( PhoneNumber::Cell ); | 364 | PhoneNumber mobile = addr.phoneNumber( PhoneNumber::Cell ); |
365 | if (! mobile.number().isEmpty()) { | 365 | if (! mobile.number().isEmpty()) { |
366 | if ( ! cellHome ) | 366 | if ( ! cellHome ) |
367 | database->writeField(ZdbAdrs::HomeMobile, mobile.number()); | 367 | database->writeField(ZdbAdrs::HomeMobile, mobile.number()); |
368 | else if (! cellWork ) | 368 | else if (! cellWork ) |
369 | database->writeField(ZdbAdrs::BusinessMobile, mobile.number()); | 369 | database->writeField(ZdbAdrs::BusinessMobile, mobile.number()); |
370 | } | 370 | } |
371 | 371 | ||
372 | PhoneNumber businesspager = addr.phoneNumber( PhoneNumber::Work | PhoneNumber::Pager ); | 372 | PhoneNumber businesspager = addr.phoneNumber( PhoneNumber::Work | PhoneNumber::Pager ); |
373 | if (!businesspager.number().isEmpty()) | 373 | if (!businesspager.number().isEmpty()) |
374 | database->writeField(ZdbAdrs::BusinessPager, businesspager.number()); | 374 | database->writeField(ZdbAdrs::BusinessPager, businesspager.number()); |
375 | 375 | ||
376 | database->writeField(ZdbAdrs::JobTitle, addr.role()); | 376 | database->writeField(ZdbAdrs::JobTitle, addr.role()); |
377 | database->writeField(ZdbAdrs::Company, addr.organization()); | 377 | database->writeField(ZdbAdrs::Company, addr.organization()); |
378 | 378 | ||
379 | database->writeField(ZdbAdrs::Profession, addr.custom( "KADDRESSBOOK", "X-Profession" )); | 379 | database->writeField(ZdbAdrs::Profession, addr.custom( "KADDRESSBOOK", "X-Profession" )); |
380 | database->writeField(ZdbAdrs::Assistant, addr.custom( "KADDRESSBOOK", "X-AssistantsName" )); | 380 | database->writeField(ZdbAdrs::Assistant, addr.custom( "KADDRESSBOOK", "X-AssistantsName" )); |
381 | database->writeField(ZdbAdrs::Department, addr.custom( "KADDRESSBOOK", "X-Department" )); | 381 | database->writeField(ZdbAdrs::Department, addr.custom( "KADDRESSBOOK", "X-Department" )); |
382 | database->writeField(ZdbAdrs::Manager, addr.custom( "KADDRESSBOOK", "X-ManagersName" )); | 382 | database->writeField(ZdbAdrs::Manager, addr.custom( "KADDRESSBOOK", "X-ManagersName" )); |
383 | database->writeField(ZdbAdrs::Office, addr.custom( "KADDRESSBOOK", "X-Office" )); | 383 | database->writeField(ZdbAdrs::Office, addr.custom( "KADDRESSBOOK", "X-Office" )); |
384 | 384 | ||
385 | //personal | 385 | //personal |
386 | database->writeField(ZdbAdrs::Spouse, addr.custom( "KADDRESSBOOK", "X-Spouse" )); | 386 | database->writeField(ZdbAdrs::Spouse, addr.custom( "KADDRESSBOOK", "X-Spouse" )); |
387 | 387 | ||
388 | QString gt = addr.custom( "KADDRESSBOOK", "X-Gender" ); | 388 | QString gt = addr.custom( "KADDRESSBOOK", "X-Gender" ); |
389 | //qDebug("SharpDTMConverter::addresseeToSharp please check that gender works!! : Gender: %s", gt.latin1()); | 389 | //qDebug("SharpDTMConverter::addresseeToSharp please check that gender works!! : Gender: %s", gt.latin1()); |
390 | //qDebug("SharpDTMConverter::addresseeToSharp: may be writeField(\"ZdbAdrs::Gender\", ushort) is here better suited?"); | 390 | //qDebug("SharpDTMConverter::addresseeToSharp: may be writeField(\"ZdbAdrs::Gender\", ushort) is here better suited?"); |
391 | //qDebug("SharpDTMConverter::addresseeToSharp: check also the reverse functionality in sharpToAddressee"); | 391 | //qDebug("SharpDTMConverter::addresseeToSharp: check also the reverse functionality in sharpToAddressee"); |
392 | if (gt == "male") | 392 | if (gt == "male") |
393 | database->writeField(ZdbAdrs::Gender, "male"); | 393 | database->writeField(ZdbAdrs::Gender, "male"); |
394 | else if (gt == "female") | 394 | else if (gt == "female") |
395 | database->writeField(ZdbAdrs::Gender, "female"); | 395 | database->writeField(ZdbAdrs::Gender, "female"); |
396 | else | 396 | else |
397 | database->writeField(ZdbAdrs::Gender, ""); | 397 | database->writeField(ZdbAdrs::Gender, ""); |
398 | 398 | ||
399 | 399 | ||
400 | QDate dt = KGlobal::locale()->readDate( | 400 | QDate dt = KGlobal::locale()->readDate( |
401 | addr.custom("KADDRESSBOOK", "X-Anniversary" ), "%Y-%m-%d"); // = Qt::ISODate | 401 | addr.custom("KADDRESSBOOK", "X-Anniversary" ), "%Y-%m-%d"); // = Qt::ISODate |
402 | if ( dt.isValid() ) { | 402 | if ( dt.isValid() ) { |
403 | QString dateS = KGlobal::locale()->formatDate(dt, true ); | 403 | QString dateS = KGlobal::locale()->formatDate(dt, true ); |
404 | database->writeField(ZdbAdrs::Anniversary, dateS ); | 404 | database->writeField(ZdbAdrs::Anniversary, dateS ); |
405 | } | 405 | } |
406 | database->writeField(ZdbAdrs::Children, addr.custom( "KADDRESSBOOK", "X-Children" )); | 406 | database->writeField(ZdbAdrs::Children, addr.custom( "KADDRESSBOOK", "X-Children" )); |
407 | dt = addr.birthday().date(); | 407 | dt = addr.birthday().date(); |
408 | if ( dt.isValid() ) { | 408 | if ( dt.isValid() ) { |
409 | QString dateS = KGlobal::locale()->formatDate(dt, true ); | 409 | QString dateS = KGlobal::locale()->formatDate(dt, true ); |
410 | database->writeField(ZdbAdrs::Birthday, dateS); | 410 | database->writeField(ZdbAdrs::Birthday, dateS); |
411 | } | 411 | } |
412 | database->writeField(ZdbAdrs::Nickname, addr.nickName()); | 412 | database->writeField(ZdbAdrs::Nickname, addr.nickName()); |
413 | 413 | ||
414 | // other | 414 | // other |
415 | database->writeField(ZdbAdrs::Notes, addr.note()); | 415 | database->writeField(ZdbAdrs::Notes, addr.note()); |
416 | 416 | ||
417 | //US QString groups() const { return find( Qtopia::Groups ); } | 417 | //US QString groups() const { return find( Qtopia::Groups ); } |
418 | //US QStringList groupList() const; | 418 | //US QStringList groupList() const; |
419 | 419 | ||
420 | 420 | ||
421 | //qDebug("SharpDTMConverter::addresseeToSharp please check if category transformation works"); | 421 | //qDebug("SharpDTMConverter::addresseeToSharp please check if category transformation works"); |
422 | 422 | ||
423 | QStringList cats = addr.categories(); | 423 | QStringList cats = addr.categories(); |
424 | int ii; | 424 | int ii; |
425 | for ( ii = 0; ii < cats.count() ;++ii ) { | 425 | for ( ii = 0; ii < cats.count() ;++ii ) { |
426 | if ( !catDB->exists( cats[ii] )) | 426 | if ( !catDB->exists( cats[ii] )) |
427 | catDB->addCategory(cats[ii]); | 427 | catDB->addCategory(cats[ii]); |
428 | } | 428 | } |
429 | QArray<int> iar; | 429 | QArray<int> iar; |
430 | if ( !cats.isEmpty() ) { | 430 | if ( !cats.isEmpty() ) { |
431 | QArray<int> iar = catDB->ids(cats); | 431 | QArray<int> iar = catDB->ids(cats); |
432 | qDebug("***cat count is %d ", iar.count()); | 432 | //qDebug("***cat count is %d ", iar.count()); |
433 | database->updateCategories(contact, iar); | 433 | database->updateCategories(contact, iar); |
434 | } | 434 | } |
435 | 435 | ||
436 | return true; | 436 | return true; |
437 | } | 437 | } |
438 | 438 | ||
439 | QDate SharpDTMConverter::convertDate( QString s) | 439 | QDate SharpDTMConverter::convertDate( QString s) |
440 | { | 440 | { |
441 | QDate dt = KGlobal::locale()->readDate( s ); | 441 | QDate dt = KGlobal::locale()->readDate( s ); |
442 | return dt; | 442 | return dt; |
443 | return QDate (); | 443 | return QDate (); |
444 | } | 444 | } |
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index c2f031a..4ebd6a8 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -2174,778 +2174,778 @@ void KABCore::slotSyncMenu( int action ) | |||
2174 | if (mBlockSaveFlag) | 2174 | if (mBlockSaveFlag) |
2175 | return; | 2175 | return; |
2176 | mBlockSaveFlag = true; | 2176 | mBlockSaveFlag = true; |
2177 | mCurrentSyncProfile = action - 1000 ; | 2177 | mCurrentSyncProfile = action - 1000 ; |
2178 | mCurrentSyncDevice = KABPrefs::instance()->mSyncProfileNames[mCurrentSyncProfile] ; | 2178 | mCurrentSyncDevice = KABPrefs::instance()->mSyncProfileNames[mCurrentSyncProfile] ; |
2179 | mCurrentSyncName = KABPrefs::instance()->mLocalMachineName ; | 2179 | mCurrentSyncName = KABPrefs::instance()->mLocalMachineName ; |
2180 | KConfig config ( locateLocal( "config","ksyncprofilesrc" ) ); | 2180 | KConfig config ( locateLocal( "config","ksyncprofilesrc" ) ); |
2181 | KSyncProfile* temp = new KSyncProfile (); | 2181 | KSyncProfile* temp = new KSyncProfile (); |
2182 | temp->setName(KABPrefs::instance()->mSyncProfileNames[mCurrentSyncProfile]); | 2182 | temp->setName(KABPrefs::instance()->mSyncProfileNames[mCurrentSyncProfile]); |
2183 | temp->readConfig(&config); | 2183 | temp->readConfig(&config); |
2184 | KABPrefs::instance()->mAskForPreferences = temp->getAskForPreferences(); | 2184 | KABPrefs::instance()->mAskForPreferences = temp->getAskForPreferences(); |
2185 | KABPrefs::instance()->mSyncAlgoPrefs = temp->getSyncPrefs(); | 2185 | KABPrefs::instance()->mSyncAlgoPrefs = temp->getSyncPrefs(); |
2186 | KABPrefs::instance()->mWriteBackFile = temp->getWriteBackFile(); | 2186 | KABPrefs::instance()->mWriteBackFile = temp->getWriteBackFile(); |
2187 | KABPrefs::instance()->mWriteBackExistingOnly = temp->getWriteBackExisting(); | 2187 | KABPrefs::instance()->mWriteBackExistingOnly = temp->getWriteBackExisting(); |
2188 | KABPrefs::instance()->mWriteBackInFuture = 0; | 2188 | KABPrefs::instance()->mWriteBackInFuture = 0; |
2189 | if ( temp->getWriteBackFuture() ) | 2189 | if ( temp->getWriteBackFuture() ) |
2190 | KABPrefs::instance()->mWriteBackInFuture = temp->getWriteBackFutureWeeks( ); | 2190 | KABPrefs::instance()->mWriteBackInFuture = temp->getWriteBackFutureWeeks( ); |
2191 | KABPrefs::instance()->mShowSyncSummary = temp->getShowSummaryAfterSync(); | 2191 | KABPrefs::instance()->mShowSyncSummary = temp->getShowSummaryAfterSync(); |
2192 | if ( action == 1000 ) { | 2192 | if ( action == 1000 ) { |
2193 | syncSharp(); | 2193 | syncSharp(); |
2194 | 2194 | ||
2195 | } else if ( action == 1001 ) { | 2195 | } else if ( action == 1001 ) { |
2196 | syncLocalFile(); | 2196 | syncLocalFile(); |
2197 | 2197 | ||
2198 | } else if ( action == 1002 ) { | 2198 | } else if ( action == 1002 ) { |
2199 | quickSyncLocalFile(); | 2199 | quickSyncLocalFile(); |
2200 | 2200 | ||
2201 | } else if ( action >= 1003 ) { | 2201 | } else if ( action >= 1003 ) { |
2202 | if ( temp->getIsLocalFileSync() ) { | 2202 | if ( temp->getIsLocalFileSync() ) { |
2203 | if ( syncWithFile( temp->getRemoteFileNameAB( ), false ) ) | 2203 | if ( syncWithFile( temp->getRemoteFileNameAB( ), false ) ) |
2204 | KABPrefs::instance()->mLastSyncedLocalFile = temp->getRemoteFileNameAB(); | 2204 | KABPrefs::instance()->mLastSyncedLocalFile = temp->getRemoteFileNameAB(); |
2205 | } else { | 2205 | } else { |
2206 | if ( temp->getIsPhoneSync() ) { | 2206 | if ( temp->getIsPhoneSync() ) { |
2207 | KABPrefs::instance()->mPhoneDevice = temp->getPhoneDevice( ) ; | 2207 | KABPrefs::instance()->mPhoneDevice = temp->getPhoneDevice( ) ; |
2208 | KABPrefs::instance()->mPhoneConnection = temp->getPhoneConnection( ); | 2208 | KABPrefs::instance()->mPhoneConnection = temp->getPhoneConnection( ); |
2209 | KABPrefs::instance()->mPhoneModel = temp->getPhoneModel( ); | 2209 | KABPrefs::instance()->mPhoneModel = temp->getPhoneModel( ); |
2210 | syncPhone(); | 2210 | syncPhone(); |
2211 | } else | 2211 | } else |
2212 | syncRemote( temp ); | 2212 | syncRemote( temp ); |
2213 | 2213 | ||
2214 | } | 2214 | } |
2215 | } | 2215 | } |
2216 | delete temp; | 2216 | delete temp; |
2217 | mBlockSaveFlag = false; | 2217 | mBlockSaveFlag = false; |
2218 | } | 2218 | } |
2219 | 2219 | ||
2220 | void KABCore::syncLocalFile() | 2220 | void KABCore::syncLocalFile() |
2221 | { | 2221 | { |
2222 | 2222 | ||
2223 | QString fn =KABPrefs::instance()->mLastSyncedLocalFile; | 2223 | QString fn =KABPrefs::instance()->mLastSyncedLocalFile; |
2224 | 2224 | ||
2225 | fn =KFileDialog:: getOpenFileName( fn, i18n("Sync filename(*.ics/*.vcs)"), this ); | 2225 | fn =KFileDialog:: getOpenFileName( fn, i18n("Sync filename(*.ics/*.vcs)"), this ); |
2226 | if ( fn == "" ) | 2226 | if ( fn == "" ) |
2227 | return; | 2227 | return; |
2228 | if ( syncWithFile( fn, false ) ) { | 2228 | if ( syncWithFile( fn, false ) ) { |
2229 | qDebug("syncLocalFile() successful "); | 2229 | qDebug("syncLocalFile() successful "); |
2230 | } | 2230 | } |
2231 | 2231 | ||
2232 | } | 2232 | } |
2233 | bool KABCore::syncWithFile( QString fn , bool quick ) | 2233 | bool KABCore::syncWithFile( QString fn , bool quick ) |
2234 | { | 2234 | { |
2235 | bool ret = false; | 2235 | bool ret = false; |
2236 | QFileInfo info; | 2236 | QFileInfo info; |
2237 | info.setFile( fn ); | 2237 | info.setFile( fn ); |
2238 | QString mess; | 2238 | QString mess; |
2239 | bool loadbup = true; | 2239 | bool loadbup = true; |
2240 | if ( !info. exists() ) { | 2240 | if ( !info. exists() ) { |
2241 | mess = i18n( "Sync file \n...%1\ndoes not exist!\nNothing synced!\n").arg(fn.right( 30) ); | 2241 | mess = i18n( "Sync file \n...%1\ndoes not exist!\nNothing synced!\n").arg(fn.right( 30) ); |
2242 | int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"), | 2242 | int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"), |
2243 | mess ); | 2243 | mess ); |
2244 | return ret; | 2244 | return ret; |
2245 | } | 2245 | } |
2246 | int result = 0; | 2246 | int result = 0; |
2247 | if ( !quick ) { | 2247 | if ( !quick ) { |
2248 | mess = i18n("Sync with file \n...%1\nfrom:\n%2\n").arg(fn.right( 25)).arg(KGlobal::locale()->formatDateTime(info.lastModified (), true, false )); | 2248 | mess = i18n("Sync with file \n...%1\nfrom:\n%2\n").arg(fn.right( 25)).arg(KGlobal::locale()->formatDateTime(info.lastModified (), true, false )); |
2249 | result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"), | 2249 | result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"), |
2250 | mess, | 2250 | mess, |
2251 | i18n("Sync"), i18n("Cancel"), 0, | 2251 | i18n("Sync"), i18n("Cancel"), 0, |
2252 | 0, 1 ); | 2252 | 0, 1 ); |
2253 | if ( result ) | 2253 | if ( result ) |
2254 | return false; | 2254 | return false; |
2255 | } | 2255 | } |
2256 | if ( KABPrefs::instance()->mAskForPreferences ) | 2256 | if ( KABPrefs::instance()->mAskForPreferences ) |
2257 | edit_sync_options(); | 2257 | edit_sync_options(); |
2258 | if ( result == 0 ) { | 2258 | if ( result == 0 ) { |
2259 | //qDebug("Now sycing ... "); | 2259 | //qDebug("Now sycing ... "); |
2260 | if ( ret = syncAB( fn, KABPrefs::instance()->mSyncAlgoPrefs ) ) | 2260 | if ( ret = syncAB( fn, KABPrefs::instance()->mSyncAlgoPrefs ) ) |
2261 | setCaption( i18n("Synchronization successful") ); | 2261 | setCaption( i18n("Synchronization successful") ); |
2262 | else | 2262 | else |
2263 | setCaption( i18n("Sync cancelled or failed. Nothing synced.") ); | 2263 | setCaption( i18n("Sync cancelled or failed. Nothing synced.") ); |
2264 | if ( ! quick ) | 2264 | if ( ! quick ) |
2265 | KABPrefs::instance()->mLastSyncedLocalFile = fn; | 2265 | KABPrefs::instance()->mLastSyncedLocalFile = fn; |
2266 | setModified(); | 2266 | setModified(); |
2267 | } | 2267 | } |
2268 | return ret; | 2268 | return ret; |
2269 | } | 2269 | } |
2270 | void KABCore::quickSyncLocalFile() | 2270 | void KABCore::quickSyncLocalFile() |
2271 | { | 2271 | { |
2272 | 2272 | ||
2273 | if ( syncWithFile( KABPrefs::instance()->mLastSyncedLocalFile, false ) ) { | 2273 | if ( syncWithFile( KABPrefs::instance()->mLastSyncedLocalFile, false ) ) { |
2274 | qDebug("quick syncLocalFile() successful "); | 2274 | qDebug("quick syncLocalFile() successful "); |
2275 | 2275 | ||
2276 | } | 2276 | } |
2277 | } | 2277 | } |
2278 | void KABCore::multiSync( bool askforPrefs ) | 2278 | void KABCore::multiSync( bool askforPrefs ) |
2279 | { | 2279 | { |
2280 | if (mBlockSaveFlag) | 2280 | if (mBlockSaveFlag) |
2281 | return; | 2281 | return; |
2282 | mBlockSaveFlag = true; | 2282 | mBlockSaveFlag = true; |
2283 | QString question = i18n("Do you really want\nto multiple sync\nwith all checked profiles?\nSyncing takes some\ntime - all profiles\nare synced twice!"); | 2283 | QString question = i18n("Do you really want\nto multiple sync\nwith all checked profiles?\nSyncing takes some\ntime - all profiles\nare synced twice!"); |
2284 | if ( QMessageBox::information( this, i18n("KO/Pi Sync"), | 2284 | if ( QMessageBox::information( this, i18n("KO/Pi Sync"), |
2285 | question, | 2285 | question, |
2286 | i18n("Yes"), i18n("No"), | 2286 | i18n("Yes"), i18n("No"), |
2287 | 0, 0 ) != 0 ) { | 2287 | 0, 0 ) != 0 ) { |
2288 | mBlockSaveFlag = false; | 2288 | mBlockSaveFlag = false; |
2289 | setCaption(i18n("Aborted! Nothing synced!")); | 2289 | setCaption(i18n("Aborted! Nothing synced!")); |
2290 | return; | 2290 | return; |
2291 | } | 2291 | } |
2292 | mCurrentSyncDevice = i18n("Multiple profiles") ; | 2292 | mCurrentSyncDevice = i18n("Multiple profiles") ; |
2293 | KABPrefs::instance()->mSyncAlgoPrefs = KABPrefs::instance()->mRingSyncAlgoPrefs; | 2293 | KABPrefs::instance()->mSyncAlgoPrefs = KABPrefs::instance()->mRingSyncAlgoPrefs; |
2294 | if ( askforPrefs ) { | 2294 | if ( askforPrefs ) { |
2295 | edit_sync_options(); | 2295 | edit_sync_options(); |
2296 | KABPrefs::instance()->mRingSyncAlgoPrefs = KABPrefs::instance()->mSyncAlgoPrefs; | 2296 | KABPrefs::instance()->mRingSyncAlgoPrefs = KABPrefs::instance()->mSyncAlgoPrefs; |
2297 | } | 2297 | } |
2298 | setCaption(i18n("Multiple sync started.") ); | 2298 | setCaption(i18n("Multiple sync started.") ); |
2299 | qApp->processEvents(); | 2299 | qApp->processEvents(); |
2300 | int num = ringSync() ; | 2300 | int num = ringSync() ; |
2301 | if ( num > 1 ) | 2301 | if ( num > 1 ) |
2302 | ringSync(); | 2302 | ringSync(); |
2303 | mBlockSaveFlag = false; | 2303 | mBlockSaveFlag = false; |
2304 | if ( num ) | 2304 | if ( num ) |
2305 | save(); | 2305 | save(); |
2306 | if ( num ) | 2306 | if ( num ) |
2307 | setCaption(i18n("%1 profiles synced. Multiple sync completed!").arg(num) ); | 2307 | setCaption(i18n("%1 profiles synced. Multiple sync completed!").arg(num) ); |
2308 | else | 2308 | else |
2309 | setCaption(i18n("Nothing synced! No profiles defined for multisync!")); | 2309 | setCaption(i18n("Nothing synced! No profiles defined for multisync!")); |
2310 | return; | 2310 | return; |
2311 | } | 2311 | } |
2312 | int KABCore::ringSync() | 2312 | int KABCore::ringSync() |
2313 | { | 2313 | { |
2314 | int syncedProfiles = 0; | 2314 | int syncedProfiles = 0; |
2315 | int i; | 2315 | int i; |
2316 | QTime timer; | 2316 | QTime timer; |
2317 | KConfig config ( locateLocal( "config","ksyncprofilesrc" ) ); | 2317 | KConfig config ( locateLocal( "config","ksyncprofilesrc" ) ); |
2318 | QStringList syncProfileNames = KABPrefs::instance()->mSyncProfileNames; | 2318 | QStringList syncProfileNames = KABPrefs::instance()->mSyncProfileNames; |
2319 | KSyncProfile* temp = new KSyncProfile (); | 2319 | KSyncProfile* temp = new KSyncProfile (); |
2320 | KABPrefs::instance()->mAskForPreferences = false; | 2320 | KABPrefs::instance()->mAskForPreferences = false; |
2321 | for ( i = 0; i < syncProfileNames.count(); ++i ) { | 2321 | for ( i = 0; i < syncProfileNames.count(); ++i ) { |
2322 | mCurrentSyncProfile = i; | 2322 | mCurrentSyncProfile = i; |
2323 | temp->setName(syncProfileNames[mCurrentSyncProfile]); | 2323 | temp->setName(syncProfileNames[mCurrentSyncProfile]); |
2324 | temp->readConfig(&config); | 2324 | temp->readConfig(&config); |
2325 | if ( temp->getIncludeInRingSyncAB() && ( i < 1 || i > 2 )) { | 2325 | if ( temp->getIncludeInRingSyncAB() && ( i < 1 || i > 2 )) { |
2326 | setCaption(i18n("Profile ")+syncProfileNames[mCurrentSyncProfile]+ i18n(" is synced ... ")); | 2326 | setCaption(i18n("Profile ")+syncProfileNames[mCurrentSyncProfile]+ i18n(" is synced ... ")); |
2327 | ++syncedProfiles; | 2327 | ++syncedProfiles; |
2328 | // KABPrefs::instance()->mAskForPreferences = temp->getAskForPreferences(); | 2328 | // KABPrefs::instance()->mAskForPreferences = temp->getAskForPreferences(); |
2329 | KABPrefs::instance()->mWriteBackFile = temp->getWriteBackFile(); | 2329 | KABPrefs::instance()->mWriteBackFile = temp->getWriteBackFile(); |
2330 | KABPrefs::instance()->mWriteBackExistingOnly = temp->getWriteBackExisting(); | 2330 | KABPrefs::instance()->mWriteBackExistingOnly = temp->getWriteBackExisting(); |
2331 | KABPrefs::instance()->mWriteBackInFuture = 0; | 2331 | KABPrefs::instance()->mWriteBackInFuture = 0; |
2332 | if ( temp->getWriteBackFuture() ) | 2332 | if ( temp->getWriteBackFuture() ) |
2333 | KABPrefs::instance()->mWriteBackInFuture = temp->getWriteBackFutureWeeks( ); | 2333 | KABPrefs::instance()->mWriteBackInFuture = temp->getWriteBackFutureWeeks( ); |
2334 | KABPrefs::instance()->mShowSyncSummary = false; | 2334 | KABPrefs::instance()->mShowSyncSummary = false; |
2335 | mCurrentSyncDevice = syncProfileNames[i] ; | 2335 | mCurrentSyncDevice = syncProfileNames[i] ; |
2336 | mCurrentSyncName = KABPrefs::instance()->mLocalMachineName; | 2336 | mCurrentSyncName = KABPrefs::instance()->mLocalMachineName; |
2337 | if ( i == 0 ) { | 2337 | if ( i == 0 ) { |
2338 | syncSharp(); | 2338 | syncSharp(); |
2339 | } else { | 2339 | } else { |
2340 | if ( temp->getIsLocalFileSync() ) { | 2340 | if ( temp->getIsLocalFileSync() ) { |
2341 | if ( syncWithFile( temp->getRemoteFileNameAB( ), true ) ) | 2341 | if ( syncWithFile( temp->getRemoteFileNameAB( ), true ) ) |
2342 | KABPrefs::instance()->mLastSyncedLocalFile = temp->getRemoteFileNameAB(); | 2342 | KABPrefs::instance()->mLastSyncedLocalFile = temp->getRemoteFileNameAB(); |
2343 | } else { | 2343 | } else { |
2344 | if ( temp->getIsPhoneSync() ) { | 2344 | if ( temp->getIsPhoneSync() ) { |
2345 | KABPrefs::instance()->mPhoneDevice = temp->getPhoneDevice( ) ; | 2345 | KABPrefs::instance()->mPhoneDevice = temp->getPhoneDevice( ) ; |
2346 | KABPrefs::instance()->mPhoneConnection = temp->getPhoneConnection( ); | 2346 | KABPrefs::instance()->mPhoneConnection = temp->getPhoneConnection( ); |
2347 | KABPrefs::instance()->mPhoneModel = temp->getPhoneModel( ); | 2347 | KABPrefs::instance()->mPhoneModel = temp->getPhoneModel( ); |
2348 | syncPhone(); | 2348 | syncPhone(); |
2349 | } else | 2349 | } else |
2350 | syncRemote( temp, false ); | 2350 | syncRemote( temp, false ); |
2351 | 2351 | ||
2352 | } | 2352 | } |
2353 | } | 2353 | } |
2354 | timer.start(); | 2354 | timer.start(); |
2355 | setCaption(i18n("Multiple sync in progress ... please wait!") ); | 2355 | setCaption(i18n("Multiple sync in progress ... please wait!") ); |
2356 | while ( timer.elapsed () < 2000 ) { | 2356 | while ( timer.elapsed () < 2000 ) { |
2357 | qApp->processEvents(); | 2357 | qApp->processEvents(); |
2358 | #ifndef _WIN32_ | 2358 | #ifndef _WIN32_ |
2359 | sleep (1); | 2359 | sleep (1); |
2360 | #endif | 2360 | #endif |
2361 | } | 2361 | } |
2362 | 2362 | ||
2363 | } | 2363 | } |
2364 | 2364 | ||
2365 | } | 2365 | } |
2366 | delete temp; | 2366 | delete temp; |
2367 | return syncedProfiles; | 2367 | return syncedProfiles; |
2368 | } | 2368 | } |
2369 | 2369 | ||
2370 | void KABCore::syncRemote( KSyncProfile* prof, bool ask) | 2370 | void KABCore::syncRemote( KSyncProfile* prof, bool ask) |
2371 | { | 2371 | { |
2372 | QString question; | 2372 | QString question; |
2373 | if ( ask ) { | 2373 | if ( ask ) { |
2374 | question = i18n("Do you really want\nto remote sync\nwith profile \n")+ prof->getName()+" ?\n"; | 2374 | question = i18n("Do you really want\nto remote sync\nwith profile \n")+ prof->getName()+" ?\n"; |
2375 | if ( QMessageBox::information( this, i18n("KO/Pi Sync"), | 2375 | if ( QMessageBox::information( this, i18n("KO/Pi Sync"), |
2376 | question, | 2376 | question, |
2377 | i18n("Yes"), i18n("No"), | 2377 | i18n("Yes"), i18n("No"), |
2378 | 0, 0 ) != 0 ) | 2378 | 0, 0 ) != 0 ) |
2379 | return; | 2379 | return; |
2380 | } | 2380 | } |
2381 | QString command = prof->getPreSyncCommandAB(); | 2381 | QString command = prof->getPreSyncCommandAB(); |
2382 | int fi; | 2382 | int fi; |
2383 | if ( (fi = command.find("$PWD$")) > 0 ) { | 2383 | if ( (fi = command.find("$PWD$")) > 0 ) { |
2384 | QString pwd = getPassword(); | 2384 | QString pwd = getPassword(); |
2385 | command = command.left( fi )+ pwd + command.mid( fi+5 ); | 2385 | command = command.left( fi )+ pwd + command.mid( fi+5 ); |
2386 | 2386 | ||
2387 | } | 2387 | } |
2388 | int maxlen = 30; | 2388 | int maxlen = 30; |
2389 | if ( QApplication::desktop()->width() > 320 ) | 2389 | if ( QApplication::desktop()->width() > 320 ) |
2390 | maxlen += 25; | 2390 | maxlen += 25; |
2391 | setCaption ( i18n( "Copy remote file to local machine..." ) ); | 2391 | setCaption ( i18n( "Copy remote file to local machine..." ) ); |
2392 | int fileSize = 0; | 2392 | int fileSize = 0; |
2393 | int result = system ( command ); | 2393 | int result = system ( command ); |
2394 | // 0 : okay | 2394 | // 0 : okay |
2395 | // 256: no such file or dir | 2395 | // 256: no such file or dir |
2396 | // | 2396 | // |
2397 | qDebug("KO: Remote copy result(0 = okay): %d ",result ); | 2397 | qDebug("KO: Remote copy result(0 = okay): %d ",result ); |
2398 | if ( result != 0 ) { | 2398 | if ( result != 0 ) { |
2399 | int len = maxlen; | 2399 | int len = maxlen; |
2400 | while ( len < command.length() ) { | 2400 | while ( len < command.length() ) { |
2401 | command.insert( len , "\n" ); | 2401 | command.insert( len , "\n" ); |
2402 | len += maxlen +2; | 2402 | len += maxlen +2; |
2403 | } | 2403 | } |
2404 | question = i18n("Sorry, the copy command failed!\nCommand was:\n%1\n \nTry command on console to get more\ndetailed info about the reason.\n").arg (command) ; | 2404 | question = i18n("Sorry, the copy command failed!\nCommand was:\n%1\n \nTry command on console to get more\ndetailed info about the reason.\n").arg (command) ; |
2405 | QMessageBox::information( this, i18n("KO/Pi Sync - ERROR"), | 2405 | QMessageBox::information( this, i18n("KO/Pi Sync - ERROR"), |
2406 | question, | 2406 | question, |
2407 | i18n("Okay!")) ; | 2407 | i18n("Okay!")) ; |
2408 | setCaption ("KO/Pi"); | 2408 | setCaption ("KO/Pi"); |
2409 | return; | 2409 | return; |
2410 | } | 2410 | } |
2411 | setCaption ( i18n( "Copying succeed." ) ); | 2411 | setCaption ( i18n( "Copying succeed." ) ); |
2412 | //qDebug(" file **%s** ",prof->getLocalTempFile().latin1() ); | 2412 | //qDebug(" file **%s** ",prof->getLocalTempFile().latin1() ); |
2413 | if ( syncWithFile( prof->getLocalTempFileAB(), true ) ) { | 2413 | if ( syncWithFile( prof->getLocalTempFileAB(), true ) ) { |
2414 | // Event* e = mView->getLastSyncEvent(); | 2414 | // Event* e = mView->getLastSyncEvent(); |
2415 | // e->setReadOnly( false ); | 2415 | // e->setReadOnly( false ); |
2416 | // e->setLocation( KOPrefs::instance()->mSyncProfileNames[mCurrentSyncProfile]); | 2416 | // e->setLocation( KOPrefs::instance()->mSyncProfileNames[mCurrentSyncProfile]); |
2417 | // e->setReadOnly( true ); | 2417 | // e->setReadOnly( true ); |
2418 | if ( KABPrefs::instance()->mWriteBackFile ) { | 2418 | if ( KABPrefs::instance()->mWriteBackFile ) { |
2419 | command = prof->getPostSyncCommandAB(); | 2419 | command = prof->getPostSyncCommandAB(); |
2420 | int fi; | 2420 | int fi; |
2421 | if ( (fi = command.find("$PWD$")) > 0 ) { | 2421 | if ( (fi = command.find("$PWD$")) > 0 ) { |
2422 | QString pwd = getPassword(); | 2422 | QString pwd = getPassword(); |
2423 | command = command.left( fi )+ pwd + command.mid( fi+5 ); | 2423 | command = command.left( fi )+ pwd + command.mid( fi+5 ); |
2424 | 2424 | ||
2425 | } | 2425 | } |
2426 | setCaption ( i18n( "Writing back file ..." ) ); | 2426 | setCaption ( i18n( "Writing back file ..." ) ); |
2427 | result = system ( command ); | 2427 | result = system ( command ); |
2428 | qDebug("KO: Writing back file result: %d ", result); | 2428 | qDebug("KO: Writing back file result: %d ", result); |
2429 | if ( result != 0 ) { | 2429 | if ( result != 0 ) { |
2430 | setCaption ( i18n( "Writing back file result: " )+QString::number( result ) ); | 2430 | setCaption ( i18n( "Writing back file result: " )+QString::number( result ) ); |
2431 | return; | 2431 | return; |
2432 | } else { | 2432 | } else { |
2433 | setCaption ( i18n( "Syncronization sucessfully completed" ) ); | 2433 | setCaption ( i18n( "Syncronization sucessfully completed" ) ); |
2434 | } | 2434 | } |
2435 | } | 2435 | } |
2436 | } | 2436 | } |
2437 | return; | 2437 | return; |
2438 | } | 2438 | } |
2439 | #include <qpushbutton.h> | 2439 | #include <qpushbutton.h> |
2440 | #include <qradiobutton.h> | 2440 | #include <qradiobutton.h> |
2441 | #include <qbuttongroup.h> | 2441 | #include <qbuttongroup.h> |
2442 | void KABCore::edit_sync_options() | 2442 | void KABCore::edit_sync_options() |
2443 | { | 2443 | { |
2444 | //mDialogManager->showSyncOptions(); | 2444 | //mDialogManager->showSyncOptions(); |
2445 | //KABPrefs::instance()->mSyncAlgoPrefs | 2445 | //KABPrefs::instance()->mSyncAlgoPrefs |
2446 | QDialog dia( this, "dia", true ); | 2446 | QDialog dia( this, "dia", true ); |
2447 | dia.setCaption( i18n("Device: " ) +mCurrentSyncDevice ); | 2447 | dia.setCaption( i18n("Device: " ) +mCurrentSyncDevice ); |
2448 | QButtonGroup gr ( 1, Qt::Horizontal, i18n("Sync preferences"), &dia); | 2448 | QButtonGroup gr ( 1, Qt::Horizontal, i18n("Sync preferences"), &dia); |
2449 | QVBoxLayout lay ( &dia ); | 2449 | QVBoxLayout lay ( &dia ); |
2450 | lay.setSpacing( 2 ); | 2450 | lay.setSpacing( 2 ); |
2451 | lay.setMargin( 3 ); | 2451 | lay.setMargin( 3 ); |
2452 | lay.addWidget(&gr); | 2452 | lay.addWidget(&gr); |
2453 | QRadioButton loc ( i18n("Take local entry on conflict"), &gr ); | 2453 | QRadioButton loc ( i18n("Take local entry on conflict"), &gr ); |
2454 | QRadioButton rem ( i18n("Take remote entry on conflict"), &gr ); | 2454 | QRadioButton rem ( i18n("Take remote entry on conflict"), &gr ); |
2455 | QRadioButton newest( i18n("Take newest entry on conflict"), &gr ); | 2455 | QRadioButton newest( i18n("Take newest entry on conflict"), &gr ); |
2456 | QRadioButton ask( i18n("Ask for every entry on conflict"), &gr ); | 2456 | QRadioButton ask( i18n("Ask for every entry on conflict"), &gr ); |
2457 | QRadioButton f_loc( i18n("Force: Take local entry always"), &gr ); | 2457 | QRadioButton f_loc( i18n("Force: Take local entry always"), &gr ); |
2458 | QRadioButton f_rem( i18n("Force: Take remote entry always"), &gr ); | 2458 | QRadioButton f_rem( i18n("Force: Take remote entry always"), &gr ); |
2459 | //QRadioButton both( i18n("Take both on conflict"), &gr ); | 2459 | //QRadioButton both( i18n("Take both on conflict"), &gr ); |
2460 | QPushButton pb ( "OK", &dia); | 2460 | QPushButton pb ( "OK", &dia); |
2461 | lay.addWidget( &pb ); | 2461 | lay.addWidget( &pb ); |
2462 | connect(&pb, SIGNAL( clicked() ), &dia, SLOT ( accept() ) ); | 2462 | connect(&pb, SIGNAL( clicked() ), &dia, SLOT ( accept() ) ); |
2463 | switch ( KABPrefs::instance()->mSyncAlgoPrefs ) { | 2463 | switch ( KABPrefs::instance()->mSyncAlgoPrefs ) { |
2464 | case 0: | 2464 | case 0: |
2465 | loc.setChecked( true); | 2465 | loc.setChecked( true); |
2466 | break; | 2466 | break; |
2467 | case 1: | 2467 | case 1: |
2468 | rem.setChecked( true ); | 2468 | rem.setChecked( true ); |
2469 | break; | 2469 | break; |
2470 | case 2: | 2470 | case 2: |
2471 | newest.setChecked( true); | 2471 | newest.setChecked( true); |
2472 | break; | 2472 | break; |
2473 | case 3: | 2473 | case 3: |
2474 | ask.setChecked( true); | 2474 | ask.setChecked( true); |
2475 | break; | 2475 | break; |
2476 | case 4: | 2476 | case 4: |
2477 | f_loc.setChecked( true); | 2477 | f_loc.setChecked( true); |
2478 | break; | 2478 | break; |
2479 | case 5: | 2479 | case 5: |
2480 | f_rem.setChecked( true); | 2480 | f_rem.setChecked( true); |
2481 | break; | 2481 | break; |
2482 | case 6: | 2482 | case 6: |
2483 | // both.setChecked( true); | 2483 | // both.setChecked( true); |
2484 | break; | 2484 | break; |
2485 | default: | 2485 | default: |
2486 | break; | 2486 | break; |
2487 | } | 2487 | } |
2488 | if ( dia.exec() ) { | 2488 | if ( dia.exec() ) { |
2489 | KABPrefs::instance()->mSyncAlgoPrefs = rem.isChecked()*1+newest.isChecked()*2+ ask.isChecked()*3+ f_loc.isChecked()*4+ f_rem.isChecked()*5;//+ both.isChecked()*6 ; | 2489 | KABPrefs::instance()->mSyncAlgoPrefs = rem.isChecked()*1+newest.isChecked()*2+ ask.isChecked()*3+ f_loc.isChecked()*4+ f_rem.isChecked()*5;//+ both.isChecked()*6 ; |
2490 | } | 2490 | } |
2491 | 2491 | ||
2492 | 2492 | ||
2493 | } | 2493 | } |
2494 | QString KABCore::getPassword( ) | 2494 | QString KABCore::getPassword( ) |
2495 | { | 2495 | { |
2496 | QString retfile = ""; | 2496 | QString retfile = ""; |
2497 | QDialog dia ( this, "input-dialog", true ); | 2497 | QDialog dia ( this, "input-dialog", true ); |
2498 | QLineEdit lab ( &dia ); | 2498 | QLineEdit lab ( &dia ); |
2499 | lab.setEchoMode( QLineEdit::Password ); | 2499 | lab.setEchoMode( QLineEdit::Password ); |
2500 | QVBoxLayout lay( &dia ); | 2500 | QVBoxLayout lay( &dia ); |
2501 | lay.setMargin(7); | 2501 | lay.setMargin(7); |
2502 | lay.setSpacing(7); | 2502 | lay.setSpacing(7); |
2503 | lay.addWidget( &lab); | 2503 | lay.addWidget( &lab); |
2504 | dia.setFixedSize( 230,50 ); | 2504 | dia.setFixedSize( 230,50 ); |
2505 | dia.setCaption( i18n("Enter password") ); | 2505 | dia.setCaption( i18n("Enter password") ); |
2506 | QPushButton pb ( "OK", &dia); | 2506 | QPushButton pb ( "OK", &dia); |
2507 | lay.addWidget( &pb ); | 2507 | lay.addWidget( &pb ); |
2508 | connect(&pb, SIGNAL( clicked() ), &dia, SLOT ( accept() ) ); | 2508 | connect(&pb, SIGNAL( clicked() ), &dia, SLOT ( accept() ) ); |
2509 | dia.show(); | 2509 | dia.show(); |
2510 | int res = dia.exec(); | 2510 | int res = dia.exec(); |
2511 | if ( res ) | 2511 | if ( res ) |
2512 | retfile = lab.text(); | 2512 | retfile = lab.text(); |
2513 | dia.hide(); | 2513 | dia.hide(); |
2514 | qApp->processEvents(); | 2514 | qApp->processEvents(); |
2515 | return retfile; | 2515 | return retfile; |
2516 | 2516 | ||
2517 | } | 2517 | } |
2518 | #include <libkcal/syncdefines.h> | 2518 | #include <libkcal/syncdefines.h> |
2519 | 2519 | ||
2520 | KABC::Addressee KABCore::getLastSyncAddressee() | 2520 | KABC::Addressee KABCore::getLastSyncAddressee() |
2521 | { | 2521 | { |
2522 | Addressee lse; | 2522 | Addressee lse; |
2523 | //qDebug("CurrentSyncDevice %s ",mCurrentSyncDevice .latin1() ); | 2523 | //qDebug("CurrentSyncDevice %s ",mCurrentSyncDevice .latin1() ); |
2524 | lse = mAddressBook->findByUid( "last-syncAddressee-"+mCurrentSyncDevice ); | 2524 | lse = mAddressBook->findByUid( "last-syncAddressee-"+mCurrentSyncDevice ); |
2525 | if (lse.isEmpty()) { | 2525 | if (lse.isEmpty()) { |
2526 | qDebug("Creating new last-syncAddressee "); | 2526 | qDebug("Creating new last-syncAddressee "); |
2527 | lse.setUid( "last-syncAddressee-"+mCurrentSyncDevice ); | 2527 | lse.setUid( "last-syncAddressee-"+mCurrentSyncDevice ); |
2528 | QString sum = ""; | 2528 | QString sum = ""; |
2529 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) | 2529 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) |
2530 | sum = "E: "; | 2530 | sum = "E: "; |
2531 | lse.setFamilyName("!"+sum+mCurrentSyncDevice + i18n(" - sync event")); | 2531 | lse.setFamilyName("!"+sum+mCurrentSyncDevice + i18n(" - sync event")); |
2532 | lse.setRevision( mLastAddressbookSync ); | 2532 | lse.setRevision( mLastAddressbookSync ); |
2533 | lse.setCategories( i18n("SyncEvent") ); | 2533 | lse.setCategories( i18n("SyncEvent") ); |
2534 | mAddressBook->insertAddressee( lse ); | 2534 | mAddressBook->insertAddressee( lse ); |
2535 | } | 2535 | } |
2536 | return lse; | 2536 | return lse; |
2537 | } | 2537 | } |
2538 | int KABCore::takeAddressee( KABC::Addressee* local, KABC::Addressee* remote, int mode , bool full ) | 2538 | int KABCore::takeAddressee( KABC::Addressee* local, KABC::Addressee* remote, int mode , bool full ) |
2539 | { | 2539 | { |
2540 | 2540 | ||
2541 | //void setZaurusId(int id); | 2541 | //void setZaurusId(int id); |
2542 | // int zaurusId() const; | 2542 | // int zaurusId() const; |
2543 | // void setZaurusUid(int id); | 2543 | // void setZaurusUid(int id); |
2544 | // int zaurusUid() const; | 2544 | // int zaurusUid() const; |
2545 | // void setZaurusStat(int id); | 2545 | // void setZaurusStat(int id); |
2546 | // int zaurusStat() const; | 2546 | // int zaurusStat() const; |
2547 | // 0 equal | 2547 | // 0 equal |
2548 | // 1 take local | 2548 | // 1 take local |
2549 | // 2 take remote | 2549 | // 2 take remote |
2550 | // 3 cancel | 2550 | // 3 cancel |
2551 | QDateTime lastSync = mLastAddressbookSync; | 2551 | QDateTime lastSync = mLastAddressbookSync; |
2552 | QDateTime localMod = local->revision(); | 2552 | QDateTime localMod = local->revision(); |
2553 | QDateTime remoteMod = remote->revision(); | 2553 | QDateTime remoteMod = remote->revision(); |
2554 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { | 2554 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { |
2555 | bool remCh, locCh; | 2555 | bool remCh, locCh; |
2556 | remCh = ( remote->getCsum(mCurrentSyncDevice) != local->getCsum(mCurrentSyncDevice) ); | 2556 | remCh = ( remote->getCsum(mCurrentSyncDevice) != local->getCsum(mCurrentSyncDevice) ); |
2557 | 2557 | ||
2558 | qDebug("loc %s rem %s", local->getCsum(mCurrentSyncDevice).latin1(), remote->getCsum(mCurrentSyncDevice).latin1() ); | 2558 | //qDebug("loc %s rem %s", local->getCsum(mCurrentSyncDevice).latin1(), remote->getCsum(mCurrentSyncDevice).latin1() ); |
2559 | locCh = ( localMod > mLastAddressbookSync ); | 2559 | locCh = ( localMod > mLastAddressbookSync ); |
2560 | if ( !remCh && ! locCh ) { | 2560 | if ( !remCh && ! locCh ) { |
2561 | qDebug("both not changed "); | 2561 | //qDebug("both not changed "); |
2562 | lastSync = localMod.addDays(1); | 2562 | lastSync = localMod.addDays(1); |
2563 | if ( mode <= SYNC_PREF_ASK ) | 2563 | if ( mode <= SYNC_PREF_ASK ) |
2564 | return 0; | 2564 | return 0; |
2565 | } else { | 2565 | } else { |
2566 | if ( locCh ) { | 2566 | if ( locCh ) { |
2567 | qDebug("loc changed %s %s", localMod.toString().latin1(), mLastAddressbookSync.toString().latin1()); | 2567 | //qDebug("loc changed %s %s", localMod.toString().latin1(), mLastAddressbookSync.toString().latin1()); |
2568 | lastSync = localMod.addDays( -1 ); | 2568 | lastSync = localMod.addDays( -1 ); |
2569 | if ( !remCh ) | 2569 | if ( !remCh ) |
2570 | remoteMod =( lastSync.addDays( -1 ) ); | 2570 | remoteMod =( lastSync.addDays( -1 ) ); |
2571 | } else { | 2571 | } else { |
2572 | //qDebug(" not loc changed "); | 2572 | //qDebug(" not loc changed "); |
2573 | lastSync = localMod.addDays( 1 ); | 2573 | lastSync = localMod.addDays( 1 ); |
2574 | if ( remCh ) | 2574 | if ( remCh ) |
2575 | remoteMod =( lastSync.addDays( 1 ) ); | 2575 | remoteMod =( lastSync.addDays( 1 ) ); |
2576 | 2576 | ||
2577 | } | 2577 | } |
2578 | } | 2578 | } |
2579 | full = true; | 2579 | full = true; |
2580 | if ( mode < SYNC_PREF_ASK ) | 2580 | if ( mode < SYNC_PREF_ASK ) |
2581 | mode = SYNC_PREF_ASK; | 2581 | mode = SYNC_PREF_ASK; |
2582 | } else { | 2582 | } else { |
2583 | if ( localMod == remoteMod ) | 2583 | if ( localMod == remoteMod ) |
2584 | return 0; | 2584 | return 0; |
2585 | 2585 | ||
2586 | } | 2586 | } |
2587 | // qDebug(" %d %d conflict on %s %s ", mode, full, local->summary().latin1(), remote->summary().latin1() ); | 2587 | // qDebug(" %d %d conflict on %s %s ", mode, full, local->summary().latin1(), remote->summary().latin1() ); |
2588 | 2588 | ||
2589 | //qDebug("%s %d %s %d", local->lastModified().toString().latin1() , localMod, remote->lastModified().toString().latin1(), remoteMod); | 2589 | //qDebug("%s %d %s %d", local->lastModified().toString().latin1() , localMod, remote->lastModified().toString().latin1(), remoteMod); |
2590 | //qDebug("%d %d %d %d ", local->lastModified().time().second(), local->lastModified().time().msec(), remote->lastModified().time().second(), remote->lastModified().time().msec() ); | 2590 | //qDebug("%d %d %d %d ", local->lastModified().time().second(), local->lastModified().time().msec(), remote->lastModified().time().second(), remote->lastModified().time().msec() ); |
2591 | //full = true; //debug only | 2591 | //full = true; //debug only |
2592 | if ( full ) { | 2592 | if ( full ) { |
2593 | bool equ = ( (*local) == (*remote) ); | 2593 | bool equ = ( (*local) == (*remote) ); |
2594 | if ( equ ) { | 2594 | if ( equ ) { |
2595 | //qDebug("equal "); | 2595 | //qDebug("equal "); |
2596 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { | 2596 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { |
2597 | local->setCsum( mCurrentSyncDevice, remote->getCsum(mCurrentSyncDevice) ); | 2597 | local->setCsum( mCurrentSyncDevice, remote->getCsum(mCurrentSyncDevice) ); |
2598 | } | 2598 | } |
2599 | if ( mode < SYNC_PREF_FORCE_LOCAL ) | 2599 | if ( mode < SYNC_PREF_FORCE_LOCAL ) |
2600 | return 0; | 2600 | return 0; |
2601 | 2601 | ||
2602 | }//else //debug only | 2602 | }//else //debug only |
2603 | //qDebug("not equal %s %s ", local->summary().latin1(), remote->summary().latin1()); | 2603 | //qDebug("not equal %s %s ", local->summary().latin1(), remote->summary().latin1()); |
2604 | } | 2604 | } |
2605 | int result; | 2605 | int result; |
2606 | bool localIsNew; | 2606 | bool localIsNew; |
2607 | //qDebug("%s -- %s mLastCalendarSync %s lastsync %s --- local %s remote %s ",local->summary().latin1(), remote->summary().latin1(),mLastCalendarSync.toString().latin1() ,lastSync.toString().latin1() , local->lastModified().toString().latin1() , remote->lastModified().toString().latin1() ); | 2607 | //qDebug("%s -- %s mLastCalendarSync %s lastsync %s --- local %s remote %s ",local->summary().latin1(), remote->summary().latin1(),mLastCalendarSync.toString().latin1() ,lastSync.toString().latin1() , local->lastModified().toString().latin1() , remote->lastModified().toString().latin1() ); |
2608 | 2608 | ||
2609 | if ( full && mode < SYNC_PREF_NEWEST ) | 2609 | if ( full && mode < SYNC_PREF_NEWEST ) |
2610 | mode = SYNC_PREF_ASK; | 2610 | mode = SYNC_PREF_ASK; |
2611 | 2611 | ||
2612 | switch( mode ) { | 2612 | switch( mode ) { |
2613 | case SYNC_PREF_LOCAL: | 2613 | case SYNC_PREF_LOCAL: |
2614 | if ( lastSync > remoteMod ) | 2614 | if ( lastSync > remoteMod ) |
2615 | return 1; | 2615 | return 1; |
2616 | if ( lastSync > localMod ) | 2616 | if ( lastSync > localMod ) |
2617 | return 2; | 2617 | return 2; |
2618 | return 1; | 2618 | return 1; |
2619 | break; | 2619 | break; |
2620 | case SYNC_PREF_REMOTE: | 2620 | case SYNC_PREF_REMOTE: |
2621 | if ( lastSync > remoteMod ) | 2621 | if ( lastSync > remoteMod ) |
2622 | return 1; | 2622 | return 1; |
2623 | if ( lastSync > localMod ) | 2623 | if ( lastSync > localMod ) |
2624 | return 2; | 2624 | return 2; |
2625 | return 2; | 2625 | return 2; |
2626 | break; | 2626 | break; |
2627 | case SYNC_PREF_NEWEST: | 2627 | case SYNC_PREF_NEWEST: |
2628 | if ( localMod > remoteMod ) | 2628 | if ( localMod > remoteMod ) |
2629 | return 1; | 2629 | return 1; |
2630 | else | 2630 | else |
2631 | return 2; | 2631 | return 2; |
2632 | break; | 2632 | break; |
2633 | case SYNC_PREF_ASK: | 2633 | case SYNC_PREF_ASK: |
2634 | //qDebug("lsy %s --- lo %s --- re %s ", lastSync.toString().latin1(), localMod.toString().latin1(), remoteMod.toString().latin1() ); | 2634 | //qDebug("lsy %s --- lo %s --- re %s ", lastSync.toString().latin1(), localMod.toString().latin1(), remoteMod.toString().latin1() ); |
2635 | if ( lastSync > remoteMod ) | 2635 | if ( lastSync > remoteMod ) |
2636 | return 1; | 2636 | return 1; |
2637 | if ( lastSync > localMod ) | 2637 | if ( lastSync > localMod ) |
2638 | return 2; | 2638 | return 2; |
2639 | localIsNew = localMod >= remoteMod; | 2639 | localIsNew = localMod >= remoteMod; |
2640 | //qDebug("conflict! ************************************** "); | 2640 | //qDebug("conflict! ************************************** "); |
2641 | { | 2641 | { |
2642 | KPIM::AddresseeChooser acd ( *local,*remote, localIsNew , this ); | 2642 | KPIM::AddresseeChooser acd ( *local,*remote, localIsNew , this ); |
2643 | result = acd.executeD(localIsNew); | 2643 | result = acd.executeD(localIsNew); |
2644 | return result; | 2644 | return result; |
2645 | } | 2645 | } |
2646 | break; | 2646 | break; |
2647 | case SYNC_PREF_FORCE_LOCAL: | 2647 | case SYNC_PREF_FORCE_LOCAL: |
2648 | return 1; | 2648 | return 1; |
2649 | break; | 2649 | break; |
2650 | case SYNC_PREF_FORCE_REMOTE: | 2650 | case SYNC_PREF_FORCE_REMOTE: |
2651 | return 2; | 2651 | return 2; |
2652 | break; | 2652 | break; |
2653 | 2653 | ||
2654 | default: | 2654 | default: |
2655 | // SYNC_PREF_TAKE_BOTH not implemented | 2655 | // SYNC_PREF_TAKE_BOTH not implemented |
2656 | break; | 2656 | break; |
2657 | } | 2657 | } |
2658 | return 0; | 2658 | return 0; |
2659 | } | 2659 | } |
2660 | bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBook* remote,int mode) | 2660 | bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBook* remote,int mode) |
2661 | { | 2661 | { |
2662 | bool syncOK = true; | 2662 | bool syncOK = true; |
2663 | int addedAddressee = 0; | 2663 | int addedAddressee = 0; |
2664 | int addedAddresseeR = 0; | 2664 | int addedAddresseeR = 0; |
2665 | int deletedAddresseeR = 0; | 2665 | int deletedAddresseeR = 0; |
2666 | int deletedAddresseeL = 0; | 2666 | int deletedAddresseeL = 0; |
2667 | int changedLocal = 0; | 2667 | int changedLocal = 0; |
2668 | int changedRemote = 0; | 2668 | int changedRemote = 0; |
2669 | //QPtrList<Addressee> el = local->rawAddressees(); | 2669 | //QPtrList<Addressee> el = local->rawAddressees(); |
2670 | Addressee addresseeR; | 2670 | Addressee addresseeR; |
2671 | QString uid; | 2671 | QString uid; |
2672 | int take; | 2672 | int take; |
2673 | Addressee addresseeL; | 2673 | Addressee addresseeL; |
2674 | Addressee addresseeRSync; | 2674 | Addressee addresseeRSync; |
2675 | Addressee addresseeLSync; | 2675 | Addressee addresseeLSync; |
2676 | // KABC::Addressee::List addresseeRSyncSharp = remote->getExternLastSyncAddressees(); | 2676 | // KABC::Addressee::List addresseeRSyncSharp = remote->getExternLastSyncAddressees(); |
2677 | //KABC::Addressee::List addresseeLSyncSharp = local->getExternLastSyncAddressees(); | 2677 | //KABC::Addressee::List addresseeLSyncSharp = local->getExternLastSyncAddressees(); |
2678 | bool fullDateRange = false; | 2678 | bool fullDateRange = false; |
2679 | local->resetTempSyncStat(); | 2679 | local->resetTempSyncStat(); |
2680 | mLastAddressbookSync = QDateTime::currentDateTime(); | 2680 | mLastAddressbookSync = QDateTime::currentDateTime(); |
2681 | QDateTime modifiedCalendar = mLastAddressbookSync;; | 2681 | QDateTime modifiedCalendar = mLastAddressbookSync;; |
2682 | addresseeLSync = getLastSyncAddressee(); | 2682 | addresseeLSync = getLastSyncAddressee(); |
2683 | qDebug("Last Sync %s ", addresseeLSync.revision().toString().latin1()); | 2683 | qDebug("Last Sync %s ", addresseeLSync.revision().toString().latin1()); |
2684 | addresseeR = remote->findByUid("last-syncAddressee-"+mCurrentSyncName ); | 2684 | addresseeR = remote->findByUid("last-syncAddressee-"+mCurrentSyncName ); |
2685 | if ( !addresseeR.isEmpty() ) { | 2685 | if ( !addresseeR.isEmpty() ) { |
2686 | addresseeRSync = addresseeR; | 2686 | addresseeRSync = addresseeR; |
2687 | remote->removeAddressee(addresseeR ); | 2687 | remote->removeAddressee(addresseeR ); |
2688 | 2688 | ||
2689 | } else { | 2689 | } else { |
2690 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { | 2690 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { |
2691 | addresseeRSync = addresseeLSync ; | 2691 | addresseeRSync = addresseeLSync ; |
2692 | } else { | 2692 | } else { |
2693 | qDebug("FULLDATE 1"); | 2693 | qDebug("FULLDATE 1"); |
2694 | fullDateRange = true; | 2694 | fullDateRange = true; |
2695 | Addressee newAdd; | 2695 | Addressee newAdd; |
2696 | addresseeRSync = newAdd; | 2696 | addresseeRSync = newAdd; |
2697 | addresseeRSync.setFamilyName(mCurrentSyncName + i18n(" - sync addressee")); | 2697 | addresseeRSync.setFamilyName(mCurrentSyncName + i18n(" - sync addressee")); |
2698 | addresseeRSync.setUid("last-syncAddressee-"+mCurrentSyncName ); | 2698 | addresseeRSync.setUid("last-syncAddressee-"+mCurrentSyncName ); |
2699 | addresseeRSync.setRevision( mLastAddressbookSync ); | 2699 | addresseeRSync.setRevision( mLastAddressbookSync ); |
2700 | addresseeRSync.setCategories( i18n("SyncAddressee") ); | 2700 | addresseeRSync.setCategories( i18n("SyncAddressee") ); |
2701 | } | 2701 | } |
2702 | } | 2702 | } |
2703 | if ( addresseeLSync.revision() == mLastAddressbookSync ) { | 2703 | if ( addresseeLSync.revision() == mLastAddressbookSync ) { |
2704 | qDebug("FULLDATE 2"); | 2704 | qDebug("FULLDATE 2"); |
2705 | fullDateRange = true; | 2705 | fullDateRange = true; |
2706 | } | 2706 | } |
2707 | if ( ! fullDateRange ) { | 2707 | if ( ! fullDateRange ) { |
2708 | if ( addresseeLSync.revision() != addresseeRSync.revision() ) { | 2708 | if ( addresseeLSync.revision() != addresseeRSync.revision() ) { |
2709 | 2709 | ||
2710 | // qDebug("set fulldate to true %s %s" ,addresseeLSync->dtStart().toString().latin1(), addresseeRSync->dtStart().toString().latin1() ); | 2710 | // qDebug("set fulldate to true %s %s" ,addresseeLSync->dtStart().toString().latin1(), addresseeRSync->dtStart().toString().latin1() ); |
2711 | //qDebug("%d %d %d %d ", addresseeLSync->dtStart().time().second(), addresseeLSync->dtStart().time().msec() , addresseeRSync->dtStart().time().second(), addresseeRSync->dtStart().time().msec()); | 2711 | //qDebug("%d %d %d %d ", addresseeLSync->dtStart().time().second(), addresseeLSync->dtStart().time().msec() , addresseeRSync->dtStart().time().second(), addresseeRSync->dtStart().time().msec()); |
2712 | fullDateRange = true; | 2712 | fullDateRange = true; |
2713 | qDebug("FULLDATE 3 %s %s", addresseeLSync.revision().toString().latin1() , addresseeRSync.revision().toString().latin1() ); | 2713 | qDebug("FULLDATE 3 %s %s", addresseeLSync.revision().toString().latin1() , addresseeRSync.revision().toString().latin1() ); |
2714 | } | 2714 | } |
2715 | } | 2715 | } |
2716 | // fullDateRange = true; // debug only! | 2716 | // fullDateRange = true; // debug only! |
2717 | if ( fullDateRange ) | 2717 | if ( fullDateRange ) |
2718 | mLastAddressbookSync = QDateTime::currentDateTime().addDays( -100*365); | 2718 | mLastAddressbookSync = QDateTime::currentDateTime().addDays( -100*365); |
2719 | else | 2719 | else |
2720 | mLastAddressbookSync = addresseeLSync.revision(); | 2720 | mLastAddressbookSync = addresseeLSync.revision(); |
2721 | // for resyncing if own file has changed | 2721 | // for resyncing if own file has changed |
2722 | // PENDING fixme later when implemented | 2722 | // PENDING fixme later when implemented |
2723 | #if 0 | 2723 | #if 0 |
2724 | if ( mCurrentSyncDevice == "deleteaftersync" ) { | 2724 | if ( mCurrentSyncDevice == "deleteaftersync" ) { |
2725 | mLastAddressbookSync = loadedFileVersion; | 2725 | mLastAddressbookSync = loadedFileVersion; |
2726 | qDebug("setting mLastAddressbookSync "); | 2726 | qDebug("setting mLastAddressbookSync "); |
2727 | } | 2727 | } |
2728 | #endif | 2728 | #endif |
2729 | 2729 | ||
2730 | //qDebug("*************************** "); | 2730 | //qDebug("*************************** "); |
2731 | // qDebug("mLastAddressbookSync %s ",mLastAddressbookSync.toString().latin1() ); | 2731 | // qDebug("mLastAddressbookSync %s ",mLastAddressbookSync.toString().latin1() ); |
2732 | QStringList er = remote->uidList(); | 2732 | QStringList er = remote->uidList(); |
2733 | Addressee inR ;//= er.first(); | 2733 | Addressee inR ;//= er.first(); |
2734 | Addressee inL; | 2734 | Addressee inL; |
2735 | QProgressBar bar( er.count(),0 ); | 2735 | QProgressBar bar( er.count(),0 ); |
2736 | bar.setCaption (i18n("Syncing - close to abort!") ); | 2736 | bar.setCaption (i18n("Syncing - close to abort!") ); |
2737 | 2737 | ||
2738 | int w = 300; | 2738 | int w = 300; |
2739 | if ( QApplication::desktop()->width() < 320 ) | 2739 | if ( QApplication::desktop()->width() < 320 ) |
2740 | w = 220; | 2740 | w = 220; |
2741 | int h = bar.sizeHint().height() ; | 2741 | int h = bar.sizeHint().height() ; |
2742 | int dw = QApplication::desktop()->width(); | 2742 | int dw = QApplication::desktop()->width(); |
2743 | int dh = QApplication::desktop()->height(); | 2743 | int dh = QApplication::desktop()->height(); |
2744 | bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); | 2744 | bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); |
2745 | bar.show(); | 2745 | bar.show(); |
2746 | int modulo = (er.count()/10)+1; | 2746 | int modulo = (er.count()/10)+1; |
2747 | int incCounter = 0; | 2747 | int incCounter = 0; |
2748 | while ( incCounter < er.count()) { | 2748 | while ( incCounter < er.count()) { |
2749 | if ( ! bar.isVisible() ) | 2749 | if ( ! bar.isVisible() ) |
2750 | return false; | 2750 | return false; |
2751 | if ( incCounter % modulo == 0 ) | 2751 | if ( incCounter % modulo == 0 ) |
2752 | bar.setProgress( incCounter ); | 2752 | bar.setProgress( incCounter ); |
2753 | uid = er[ incCounter ]; | 2753 | uid = er[ incCounter ]; |
2754 | bool skipIncidence = false; | 2754 | bool skipIncidence = false; |
2755 | if ( uid.left(19) == QString("last-syncAddressee-") ) | 2755 | if ( uid.left(19) == QString("last-syncAddressee-") ) |
2756 | skipIncidence = true; | 2756 | skipIncidence = true; |
2757 | QString idS,OidS; | 2757 | QString idS,OidS; |
2758 | qApp->processEvents(); | 2758 | qApp->processEvents(); |
2759 | if ( !skipIncidence ) { | 2759 | if ( !skipIncidence ) { |
2760 | inL = local->findByUid( uid ); | 2760 | inL = local->findByUid( uid ); |
2761 | inR = remote->findByUid( uid ); | 2761 | inR = remote->findByUid( uid ); |
2762 | //inL.setResource( 0 ); | 2762 | //inL.setResource( 0 ); |
2763 | //inR.setResource( 0 ); | 2763 | //inR.setResource( 0 ); |
2764 | if ( !inL.isEmpty() ) { // maybe conflict - same uid in both calendars | 2764 | if ( !inL.isEmpty() ) { // maybe conflict - same uid in both calendars |
2765 | if ( take = takeAddressee( &inL, &inR, mode, fullDateRange ) ) { | 2765 | if ( take = takeAddressee( &inL, &inR, mode, fullDateRange ) ) { |
2766 | //qDebug("take %d %s ", take, inL.summary().latin1()); | 2766 | //qDebug("take %d %s ", take, inL.summary().latin1()); |
2767 | if ( take == 3 ) | 2767 | if ( take == 3 ) |
2768 | return false; | 2768 | return false; |
2769 | if ( take == 1 ) {// take local | 2769 | if ( take == 1 ) {// take local |
2770 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { | 2770 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { |
2771 | inL.setCsum( mCurrentSyncDevice, inR.getCsum(mCurrentSyncDevice) ); | 2771 | inL.setCsum( mCurrentSyncDevice, inR.getCsum(mCurrentSyncDevice) ); |
2772 | inL.setID( mCurrentSyncDevice, inR.getID(mCurrentSyncDevice) ); | 2772 | inL.setID( mCurrentSyncDevice, inR.getID(mCurrentSyncDevice) ); |
2773 | local->insertAddressee( inL, false ); | 2773 | local->insertAddressee( inL, false ); |
2774 | idS = inR.externalUID(); | 2774 | idS = inR.externalUID(); |
2775 | OidS = inR.originalExternalUID(); | 2775 | OidS = inR.originalExternalUID(); |
2776 | } | 2776 | } |
2777 | else | 2777 | else |
2778 | idS = inR.IDStr(); | 2778 | idS = inR.IDStr(); |
2779 | remote->removeAddressee( inR ); | 2779 | remote->removeAddressee( inR ); |
2780 | inR = inL; | 2780 | inR = inL; |
2781 | inR.setTempSyncStat( SYNC_TEMPSTATE_INITIAL ); | 2781 | inR.setTempSyncStat( SYNC_TEMPSTATE_INITIAL ); |
2782 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { | 2782 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { |
2783 | inR.setOriginalExternalUID( OidS ); | 2783 | inR.setOriginalExternalUID( OidS ); |
2784 | inR.setExternalUID( idS ); | 2784 | inR.setExternalUID( idS ); |
2785 | } else { | 2785 | } else { |
2786 | inR.setIDStr( idS ); | 2786 | inR.setIDStr( idS ); |
2787 | } | 2787 | } |
2788 | inR.setResource( 0 ); | 2788 | inR.setResource( 0 ); |
2789 | remote->insertAddressee( inR , false); | 2789 | remote->insertAddressee( inR , false); |
2790 | ++changedRemote; | 2790 | ++changedRemote; |
2791 | } else { // take == 2 take remote | 2791 | } else { // take == 2 take remote |
2792 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { | 2792 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { |
2793 | if ( inR.revision().date().year() < 2004 ) | 2793 | if ( inR.revision().date().year() < 2004 ) |
2794 | inR.setRevision( modifiedCalendar ); | 2794 | inR.setRevision( modifiedCalendar ); |
2795 | } | 2795 | } |
2796 | idS = inL.IDStr(); | 2796 | idS = inL.IDStr(); |
2797 | local->removeAddressee( inL ); | 2797 | local->removeAddressee( inL ); |
2798 | inL = inR; | 2798 | inL = inR; |
2799 | inL.setIDStr( idS ); | 2799 | inL.setIDStr( idS ); |
2800 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { | 2800 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { |
2801 | inL.setCsum( mCurrentSyncDevice, inR.getCsum(mCurrentSyncDevice) ); | 2801 | inL.setCsum( mCurrentSyncDevice, inR.getCsum(mCurrentSyncDevice) ); |
2802 | inL.setID( mCurrentSyncDevice, inR.getID(mCurrentSyncDevice) ); | 2802 | inL.setID( mCurrentSyncDevice, inR.getID(mCurrentSyncDevice) ); |
2803 | } | 2803 | } |
2804 | inL.setResource( 0 ); | 2804 | inL.setResource( 0 ); |
2805 | local->insertAddressee( inL , false ); | 2805 | local->insertAddressee( inL , false ); |
2806 | ++changedLocal; | 2806 | ++changedLocal; |
2807 | } | 2807 | } |
2808 | } | 2808 | } |
2809 | } else { // no conflict | 2809 | } else { // no conflict |
2810 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { | 2810 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { |
2811 | QString des = addresseeLSync.note(); | 2811 | QString des = addresseeLSync.note(); |
2812 | if ( des.find( inR.getID(mCurrentSyncDevice) +"," ) >= 0 && mode != 5) { // delete it | 2812 | if ( des.find( inR.getID(mCurrentSyncDevice) +"," ) >= 0 && mode != 5) { // delete it |
2813 | inR.setTempSyncStat( SYNC_TEMPSTATE_DELETE ); | 2813 | inR.setTempSyncStat( SYNC_TEMPSTATE_DELETE ); |
2814 | remote->insertAddressee( inR, false ); | 2814 | remote->insertAddressee( inR, false ); |
2815 | ++deletedAddresseeR; | 2815 | ++deletedAddresseeR; |
2816 | } else { | 2816 | } else { |
2817 | inR.setRevision( modifiedCalendar ); | 2817 | inR.setRevision( modifiedCalendar ); |
2818 | remote->insertAddressee( inR, false ); | 2818 | remote->insertAddressee( inR, false ); |
2819 | inL = inR; | 2819 | inL = inR; |
2820 | inL.setResource( 0 ); | 2820 | inL.setResource( 0 ); |
2821 | local->insertAddressee( inL , false); | 2821 | local->insertAddressee( inL , false); |
2822 | ++addedAddressee; | 2822 | ++addedAddressee; |
2823 | } | 2823 | } |
2824 | } else { | 2824 | } else { |
2825 | if ( inR.revision() > mLastAddressbookSync || mode == 5 ) { | 2825 | if ( inR.revision() > mLastAddressbookSync || mode == 5 ) { |
2826 | inR.setRevision( modifiedCalendar ); | 2826 | inR.setRevision( modifiedCalendar ); |
2827 | remote->insertAddressee( inR, false ); | 2827 | remote->insertAddressee( inR, false ); |
2828 | inR.setResource( 0 ); | 2828 | inR.setResource( 0 ); |
2829 | local->insertAddressee( inR, false ); | 2829 | local->insertAddressee( inR, false ); |
2830 | ++addedAddressee; | 2830 | ++addedAddressee; |
2831 | } else { | 2831 | } else { |
2832 | // pending checkExternSyncAddressee(addresseeRSyncSharp, inR); | 2832 | // pending checkExternSyncAddressee(addresseeRSyncSharp, inR); |
2833 | remote->removeAddressee( inR ); | 2833 | remote->removeAddressee( inR ); |
2834 | ++deletedAddresseeR; | 2834 | ++deletedAddresseeR; |
2835 | } | 2835 | } |
2836 | } | 2836 | } |
2837 | } | 2837 | } |
2838 | } | 2838 | } |
2839 | ++incCounter; | 2839 | ++incCounter; |
2840 | } | 2840 | } |
2841 | er.clear(); | 2841 | er.clear(); |
2842 | QStringList el = local->uidList(); | 2842 | QStringList el = local->uidList(); |
2843 | modulo = (el.count()/10)+1; | 2843 | modulo = (el.count()/10)+1; |
2844 | bar.setCaption (i18n("Add / remove addressees") ); | 2844 | bar.setCaption (i18n("Add / remove addressees") ); |
2845 | bar.setTotalSteps ( el.count() ) ; | 2845 | bar.setTotalSteps ( el.count() ) ; |
2846 | bar.show(); | 2846 | bar.show(); |
2847 | incCounter = 0; | 2847 | incCounter = 0; |
2848 | while ( incCounter < el.count()) { | 2848 | while ( incCounter < el.count()) { |
2849 | qApp->processEvents(); | 2849 | qApp->processEvents(); |
2850 | if ( ! bar.isVisible() ) | 2850 | if ( ! bar.isVisible() ) |
2851 | return false; | 2851 | return false; |
2852 | if ( incCounter % modulo == 0 ) | 2852 | if ( incCounter % modulo == 0 ) |
2853 | bar.setProgress( incCounter ); | 2853 | bar.setProgress( incCounter ); |
2854 | uid = el[ incCounter ]; | 2854 | uid = el[ incCounter ]; |
2855 | bool skipIncidence = false; | 2855 | bool skipIncidence = false; |
2856 | if ( uid.left(19) == QString("last-syncAddressee-") ) | 2856 | if ( uid.left(19) == QString("last-syncAddressee-") ) |
2857 | skipIncidence = true; | 2857 | skipIncidence = true; |
2858 | if ( !skipIncidence ) { | 2858 | if ( !skipIncidence ) { |
2859 | inL = local->findByUid( uid ); | 2859 | inL = local->findByUid( uid ); |
2860 | inR = remote->findByUid( uid ); | 2860 | inR = remote->findByUid( uid ); |
2861 | if ( inR.isEmpty() ) { | 2861 | if ( inR.isEmpty() ) { |
2862 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { | 2862 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { |
2863 | if ( !inL.getID(mCurrentSyncDevice).isEmpty() && mode != 4 ) { | 2863 | if ( !inL.getID(mCurrentSyncDevice).isEmpty() && mode != 4 ) { |
2864 | // pending checkExternSyncAddressee(addresseeLSyncSharp, inL); | 2864 | // pending checkExternSyncAddressee(addresseeLSyncSharp, inL); |
2865 | local->removeAddressee( inL ); | 2865 | local->removeAddressee( inL ); |
2866 | ++deletedAddresseeL; | 2866 | ++deletedAddresseeL; |
2867 | } else { | 2867 | } else { |
2868 | if ( ! KABPrefs::instance()->mWriteBackExistingOnly ) { | 2868 | if ( ! KABPrefs::instance()->mWriteBackExistingOnly ) { |
2869 | inL.removeID(mCurrentSyncDevice ); | 2869 | inL.removeID(mCurrentSyncDevice ); |
2870 | ++addedAddresseeR; | 2870 | ++addedAddresseeR; |
2871 | inL.setRevision( modifiedCalendar ); | 2871 | inL.setRevision( modifiedCalendar ); |
2872 | local->insertAddressee( inL, false ); | 2872 | local->insertAddressee( inL, false ); |
2873 | inR = inL; | 2873 | inR = inL; |
2874 | inR.setTempSyncStat( SYNC_TEMPSTATE_ADDED_EXTERNAL ); | 2874 | inR.setTempSyncStat( SYNC_TEMPSTATE_ADDED_EXTERNAL ); |
2875 | inR.setResource( 0 ); | 2875 | inR.setResource( 0 ); |
2876 | remote->insertAddressee( inR, false ); | 2876 | remote->insertAddressee( inR, false ); |
2877 | } | 2877 | } |
2878 | } | 2878 | } |
2879 | } else { | 2879 | } else { |
2880 | if ( inL.revision() < mLastAddressbookSync && mode != 4 ) { | 2880 | if ( inL.revision() < mLastAddressbookSync && mode != 4 ) { |
2881 | // pending checkExternSyncAddressee(addresseeLSyncSharp, inL); | 2881 | // pending checkExternSyncAddressee(addresseeLSyncSharp, inL); |
2882 | local->removeAddressee( inL ); | 2882 | local->removeAddressee( inL ); |
2883 | ++deletedAddresseeL; | 2883 | ++deletedAddresseeL; |
2884 | } else { | 2884 | } else { |
2885 | if ( ! KABPrefs::instance()->mWriteBackExistingOnly ) { | 2885 | if ( ! KABPrefs::instance()->mWriteBackExistingOnly ) { |
2886 | ++addedAddresseeR; | 2886 | ++addedAddresseeR; |
2887 | inL.setRevision( modifiedCalendar ); | 2887 | inL.setRevision( modifiedCalendar ); |
2888 | local->insertAddressee( inL, false ); | 2888 | local->insertAddressee( inL, false ); |
2889 | inR = inL; | 2889 | inR = inL; |
2890 | inR.setResource( 0 ); | 2890 | inR.setResource( 0 ); |
2891 | remote->insertAddressee( inR, false ); | 2891 | remote->insertAddressee( inR, false ); |
2892 | } | 2892 | } |
2893 | } | 2893 | } |
2894 | } | 2894 | } |
2895 | } | 2895 | } |
2896 | } | 2896 | } |
2897 | ++incCounter; | 2897 | ++incCounter; |
2898 | } | 2898 | } |
2899 | el.clear(); | 2899 | el.clear(); |
2900 | bar.hide(); | 2900 | bar.hide(); |
2901 | mLastAddressbookSync = QDateTime::currentDateTime().addSecs( 1 ); | 2901 | mLastAddressbookSync = QDateTime::currentDateTime().addSecs( 1 ); |
2902 | // get rid of micro seconds | 2902 | // get rid of micro seconds |
2903 | QTime t = mLastAddressbookSync.time(); | 2903 | QTime t = mLastAddressbookSync.time(); |
2904 | mLastAddressbookSync.setTime( QTime (t.hour (), t.minute (), t.second () ) ); | 2904 | mLastAddressbookSync.setTime( QTime (t.hour (), t.minute (), t.second () ) ); |
2905 | addresseeLSync.setRevision( mLastAddressbookSync ); | 2905 | addresseeLSync.setRevision( mLastAddressbookSync ); |
2906 | addresseeRSync.setRevision( mLastAddressbookSync ); | 2906 | addresseeRSync.setRevision( mLastAddressbookSync ); |
2907 | addresseeRSync.setRole( i18n("!Remote from: ")+mCurrentSyncName ) ; | 2907 | addresseeRSync.setRole( i18n("!Remote from: ")+mCurrentSyncName ) ; |
2908 | addresseeLSync.setRole(i18n("!Local from: ") + mCurrentSyncName ); | 2908 | addresseeLSync.setRole(i18n("!Local from: ") + mCurrentSyncName ); |
2909 | addresseeRSync.setGivenName( i18n("!DO NOT EDIT!") ) ; | 2909 | addresseeRSync.setGivenName( i18n("!DO NOT EDIT!") ) ; |
2910 | addresseeLSync.setGivenName(i18n("!DO NOT EDIT!") ); | 2910 | addresseeLSync.setGivenName(i18n("!DO NOT EDIT!") ); |
2911 | addresseeRSync.setOrganization( "!"+mLastAddressbookSync.toString() ) ; | 2911 | addresseeRSync.setOrganization( "!"+mLastAddressbookSync.toString() ) ; |
2912 | addresseeLSync.setOrganization("!"+ mLastAddressbookSync.toString() ); | 2912 | addresseeLSync.setOrganization("!"+ mLastAddressbookSync.toString() ); |
2913 | addresseeRSync.setNote( "" ) ; | 2913 | addresseeRSync.setNote( "" ) ; |
2914 | addresseeLSync.setNote( "" ); | 2914 | addresseeLSync.setNote( "" ); |
2915 | 2915 | ||
2916 | if ( mGlobalSyncMode == SYNC_MODE_NORMAL) | 2916 | if ( mGlobalSyncMode == SYNC_MODE_NORMAL) |
2917 | remote->insertAddressee( addresseeRSync, false ); | 2917 | remote->insertAddressee( addresseeRSync, false ); |
2918 | local->insertAddressee( addresseeLSync, false ); | 2918 | local->insertAddressee( addresseeLSync, false ); |
2919 | QString mes; | 2919 | QString mes; |
2920 | mes .sprintf( i18n("Synchronization summary:\n\n %d items added to local\n %d items added to remote\n %d items updated on local\n %d items updated on remote\n %d items deleted on local\n %d items deleted on remote\n"),addedAddressee, addedAddresseeR, changedLocal, changedRemote, deletedAddresseeL, deletedAddresseeR ); | 2920 | mes .sprintf( i18n("Synchronization summary:\n\n %d items added to local\n %d items added to remote\n %d items updated on local\n %d items updated on remote\n %d items deleted on local\n %d items deleted on remote\n"),addedAddressee, addedAddresseeR, changedLocal, changedRemote, deletedAddresseeL, deletedAddresseeR ); |
2921 | if ( KABPrefs::instance()->mShowSyncSummary ) { | 2921 | if ( KABPrefs::instance()->mShowSyncSummary ) { |
2922 | KMessageBox::information(this, mes, i18n("KA/Pi Synchronization") ); | 2922 | KMessageBox::information(this, mes, i18n("KA/Pi Synchronization") ); |
2923 | } | 2923 | } |
2924 | qDebug( mes ); | 2924 | qDebug( mes ); |
2925 | return syncOK; | 2925 | return syncOK; |
2926 | } | 2926 | } |
2927 | 2927 | ||
2928 | bool KABCore::syncAB(QString filename, int mode) | 2928 | bool KABCore::syncAB(QString filename, int mode) |
2929 | { | 2929 | { |
2930 | 2930 | ||
2931 | //pending prepare addresseeview for output | 2931 | //pending prepare addresseeview for output |
2932 | //pending detect, if remote file has REV field. if not switch to external sync | 2932 | //pending detect, if remote file has REV field. if not switch to external sync |
2933 | mGlobalSyncMode = SYNC_MODE_NORMAL; | 2933 | mGlobalSyncMode = SYNC_MODE_NORMAL; |
2934 | AddressBook abLocal(filename,"syncContact"); | 2934 | AddressBook abLocal(filename,"syncContact"); |
2935 | bool syncOK = false; | 2935 | bool syncOK = false; |
2936 | if ( abLocal.load() ) { | 2936 | if ( abLocal.load() ) { |
2937 | qDebug("AB loaded %s,sync mode %d",filename.latin1(), mode ); | 2937 | qDebug("AB loaded %s,sync mode %d",filename.latin1(), mode ); |
2938 | bool external = false; | 2938 | bool external = false; |
2939 | bool isXML = false; | 2939 | bool isXML = false; |
2940 | if ( filename.right(4) == ".xml") { | 2940 | if ( filename.right(4) == ".xml") { |
2941 | mGlobalSyncMode = SYNC_MODE_EXTERNAL; | 2941 | mGlobalSyncMode = SYNC_MODE_EXTERNAL; |
2942 | isXML = true; | 2942 | isXML = true; |
2943 | abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice ); | 2943 | abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice ); |
2944 | } else { | 2944 | } else { |
2945 | Addressee lse = mAddressBook->findByUid( "last-syncAddressee-"+mCurrentSyncDevice ); | 2945 | Addressee lse = mAddressBook->findByUid( "last-syncAddressee-"+mCurrentSyncDevice ); |
2946 | if ( ! lse.isEmpty() ) { | 2946 | if ( ! lse.isEmpty() ) { |
2947 | if ( lse.familyName().left(4) == "!E: " ) | 2947 | if ( lse.familyName().left(4) == "!E: " ) |
2948 | external = true; | 2948 | external = true; |
2949 | } else { | 2949 | } else { |
2950 | bool found = false; | 2950 | bool found = false; |
2951 | AddressBook::Iterator it; | 2951 | AddressBook::Iterator it; |