-rw-r--r-- | bin/kdepim/korganizer/kopiWhatsNew.txt | 8 | ||||
-rw-r--r-- | kabc/addressbook.cpp | 16 | ||||
-rw-r--r-- | kabc/addressbook.h | 2 | ||||
-rw-r--r-- | kabc/addressee.cpp | 17 | ||||
-rw-r--r-- | kabc/addressee.h | 1 | ||||
-rw-r--r-- | kaddressbook/kabcore.cpp | 22 | ||||
-rw-r--r-- | kaddressbook/kabcore.h | 1 | ||||
-rw-r--r-- | kaddressbook/kaddressbookmain.cpp | 12 | ||||
-rw-r--r-- | kaddressbook/kaddressbookmain.h | 2 | ||||
-rw-r--r-- | kaddressbook/mainembedded.cpp | 8 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 15 | ||||
-rw-r--r-- | libkdepim/ksyncmanager.cpp | 6 |
12 files changed, 79 insertions, 31 deletions
diff --git a/bin/kdepim/korganizer/kopiWhatsNew.txt b/bin/kdepim/korganizer/kopiWhatsNew.txt index eea860c..3f95dcf 100644 --- a/bin/kdepim/korganizer/kopiWhatsNew.txt +++ b/bin/kdepim/korganizer/kopiWhatsNew.txt | |||
@@ -1,45 +1,51 @@ | |||
1 | Info about the changes in new versions of KO/Pi | 1 | Info about the changes in new versions of KO/Pi |
2 | and KDE-Pim/Pi | 2 | and KDE-Pim/Pi |
3 | 3 | ||
4 | ********** VERSION 1.9.7 ************ | 4 | ********** VERSION 1.9.7 ************ |
5 | 5 | ||
6 | KO/Pi - KA/Pi on Windows: | 6 | KO/Pi - KA/Pi on Windows: |
7 | Now a directory can be defined by the user, where the | 7 | Now a directory can be defined by the user, where the |
8 | application/config data should be saved. | 8 | application/config data should be saved. |
9 | Define your desired path in the evironment variable | 9 | Define your desired path in the evironment variable |
10 | MICROKDEHOME | 10 | MICROKDEHOME |
11 | before starting KO/Pi or KA/Pi. | 11 | before starting KO/Pi or KA/Pi. |
12 | 12 | ||
13 | An easy Kx/Pi to Kx/Pi syncing is now possible | 13 | An easy Kx/Pi to Kx/Pi syncing is now possible |
14 | (it is called Pi-Sync) via network. | 14 | (it is called Pi-Sync) via network. |
15 | Please look at the Sync Howto. | 15 | Please look at the Sync Howto. |
16 | 16 | ||
17 | Exporting of data to mobile phones is now possible. | 17 | Exporting of calendar data and contacts to mobile phones is now possible. |
18 | The SyncHowto is updated with information howto | 18 | The SyncHowto is updated with information howto |
19 | access/sync mobile phones. | 19 | access/sync mobile phones. |
20 | Please look at the Sync Howto. | 20 | Please look at the Sync Howto. |
21 | 21 | ||
22 | Now KO/Pi and KA/Pi on the Zaurus can receive data via infrared directly. | ||
23 | Please disable Fastload for the original contact/calendar applications | ||
24 | and close them. | ||
25 | KO/Pi and KA/Pi must be running in order to receive the data. | ||
26 | (KO/Pi and KA/Pi are always running if Fastload for them is enabled!) | ||
27 | |||
22 | 28 | ||
23 | ********** VERSION 1.9.6 ************ | 29 | ********** VERSION 1.9.6 ************ |
24 | 30 | ||
25 | Changes in the external application communication on the Zaurus | 31 | Changes in the external application communication on the Zaurus |
26 | in order to use less RAM when the apps are running. | 32 | in order to use less RAM when the apps are running. |
27 | First syncing of addressbooks (KA/Pi) is possible. | 33 | First syncing of addressbooks (KA/Pi) is possible. |
28 | 34 | ||
29 | 35 | ||
30 | ********** VERSION 1.9.5a ************ | 36 | ********** VERSION 1.9.5a ************ |
31 | 37 | ||
32 | Fixed a bug in KO/Pi in the SharpDTM sync of version 1.9.5. | 38 | Fixed a bug in KO/Pi in the SharpDTM sync of version 1.9.5. |
33 | Fixed some small bugs. | 39 | Fixed some small bugs. |
34 | KA/Pi shows now the birthday in summary view. | 40 | KA/Pi shows now the birthday in summary view. |
35 | Now OM/Pi and KA/Pi are using the date format defined in KO/Pi | 41 | Now OM/Pi and KA/Pi are using the date format defined in KO/Pi |
36 | for displaying dates. | 42 | for displaying dates. |
37 | 43 | ||
38 | 44 | ||
39 | ********** VERSION 1.9.5 ************ | 45 | ********** VERSION 1.9.5 ************ |
40 | 46 | ||
41 | There is still no Addressbook syncing! | 47 | There is still no Addressbook syncing! |
42 | 48 | ||
43 | New in 1.9.5: | 49 | New in 1.9.5: |
44 | 50 | ||
45 | Many bugfixes. | 51 | Many bugfixes. |
diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp index dc3cda1..bf6d053 100644 --- a/kabc/addressbook.cpp +++ b/kabc/addressbook.cpp | |||
@@ -381,64 +381,72 @@ void AddressBook::export2File( QString fileName ) | |||
381 | QFile outFile( fileName ); | 381 | QFile outFile( fileName ); |
382 | if ( !outFile.open( IO_WriteOnly ) ) { | 382 | if ( !outFile.open( IO_WriteOnly ) ) { |
383 | QString text = i18n( "<qt>Unable to open file <b>%1</b> for export.</qt>" ); | 383 | QString text = i18n( "<qt>Unable to open file <b>%1</b> for export.</qt>" ); |
384 | KMessageBox::error( 0, text.arg( fileName ) ); | 384 | KMessageBox::error( 0, text.arg( fileName ) ); |
385 | return ; | 385 | return ; |
386 | } | 386 | } |
387 | QTextStream t( &outFile ); | 387 | QTextStream t( &outFile ); |
388 | t.setEncoding( QTextStream::UnicodeUTF8 ); | 388 | t.setEncoding( QTextStream::UnicodeUTF8 ); |
389 | Iterator it; | 389 | Iterator it; |
390 | KABC::VCardConverter::Version version; | 390 | KABC::VCardConverter::Version version; |
391 | version = KABC::VCardConverter::v3_0; | 391 | version = KABC::VCardConverter::v3_0; |
392 | for ( it = begin(); it != end(); ++it ) { | 392 | for ( it = begin(); it != end(); ++it ) { |
393 | if ( !(*it).IDStr().isEmpty() ) { | 393 | if ( !(*it).IDStr().isEmpty() ) { |
394 | (*it).insertCustom( "KADDRESSBOOK", "X-ExternalID", (*it).IDStr() ); | 394 | (*it).insertCustom( "KADDRESSBOOK", "X-ExternalID", (*it).IDStr() ); |
395 | } | 395 | } |
396 | KABC::VCardConverter converter; | 396 | KABC::VCardConverter converter; |
397 | QString vcard; | 397 | QString vcard; |
398 | //Resource *resource() const; | 398 | //Resource *resource() const; |
399 | converter.addresseeToVCard( *it, vcard, version ); | 399 | converter.addresseeToVCard( *it, vcard, version ); |
400 | t << vcard << "\r\n"; | 400 | t << vcard << "\r\n"; |
401 | } | 401 | } |
402 | t << "\r\n\r\n"; | 402 | t << "\r\n\r\n"; |
403 | outFile.close(); | 403 | outFile.close(); |
404 | } | 404 | } |
405 | void AddressBook::importFromFile( QString fileName ) | 405 | void AddressBook::importFromFile( QString fileName, bool replaceLabel ) |
406 | { | 406 | { |
407 | 407 | ||
408 | KABC::Addressee::List list; | 408 | KABC::Addressee::List list; |
409 | QFile file( fileName ); | 409 | QFile file( fileName ); |
410 | 410 | ||
411 | file.open( IO_ReadOnly ); | 411 | file.open( IO_ReadOnly ); |
412 | QByteArray rawData = file.readAll(); | 412 | QByteArray rawData = file.readAll(); |
413 | file.close(); | 413 | file.close(); |
414 | 414 | qDebug("AddressBook::importFromFile "); | |
415 | QString data = QString::fromUtf8( rawData.data(), rawData.size() + 1 ); | 415 | QString data; |
416 | if ( replaceLabel ) { | ||
417 | data = QString::fromLatin1( rawData.data(), rawData.size() + 1 ); | ||
418 | data.replace ( QRegExp("LABEL") , "ADR" ); | ||
419 | data.replace ( QRegExp("CHARSET=ISO-8859-1") , "" ); | ||
420 | } else | ||
421 | data = QString::fromUtf8( rawData.data(), rawData.size() + 1 ); | ||
416 | KABC::VCardTool tool; | 422 | KABC::VCardTool tool; |
417 | list = tool.parseVCards( data ); | 423 | list = tool.parseVCards( data ); |
418 | KABC::Addressee::List::Iterator it; | 424 | KABC::Addressee::List::Iterator it; |
419 | for ( it = list.begin(); it != list.end(); ++it ) { | 425 | for ( it = list.begin(); it != list.end(); ++it ) { |
420 | (*it).setResource( 0 ); | 426 | (*it).setResource( 0 ); |
427 | if ( replaceLabel ) | ||
428 | (*it).removeVoice(); | ||
421 | insertAddressee( (*it), false, true ); | 429 | insertAddressee( (*it), false, true ); |
422 | } | 430 | } |
423 | 431 | ||
424 | } | 432 | } |
425 | 433 | ||
426 | bool AddressBook::saveAB() | 434 | bool AddressBook::saveAB() |
427 | { | 435 | { |
428 | bool ok = true; | 436 | bool ok = true; |
429 | 437 | ||
430 | deleteRemovedAddressees(); | 438 | deleteRemovedAddressees(); |
431 | Iterator ait; | 439 | Iterator ait; |
432 | for ( ait = begin(); ait != end(); ++ait ) { | 440 | for ( ait = begin(); ait != end(); ++ait ) { |
433 | if ( !(*ait).IDStr().isEmpty() ) { | 441 | if ( !(*ait).IDStr().isEmpty() ) { |
434 | (*ait).insertCustom( "KADDRESSBOOK", "X-ExternalID", (*ait).IDStr() ); | 442 | (*ait).insertCustom( "KADDRESSBOOK", "X-ExternalID", (*ait).IDStr() ); |
435 | } | 443 | } |
436 | } | 444 | } |
437 | KRES::Manager<Resource>::ActiveIterator it; | 445 | KRES::Manager<Resource>::ActiveIterator it; |
438 | KRES::Manager<Resource> *manager = d->mManager; | 446 | KRES::Manager<Resource> *manager = d->mManager; |
439 | for ( it = manager->activeBegin(); it != manager->activeEnd(); ++it ) { | 447 | for ( it = manager->activeBegin(); it != manager->activeEnd(); ++it ) { |
440 | if ( !(*it)->readOnly() && (*it)->isOpen() ) { | 448 | if ( !(*it)->readOnly() && (*it)->isOpen() ) { |
441 | Ticket *ticket = requestSaveTicket( *it ); | 449 | Ticket *ticket = requestSaveTicket( *it ); |
442 | // qDebug("StdAddressBook::save '%s'", (*it)->resourceName().latin1() ); | 450 | // qDebug("StdAddressBook::save '%s'", (*it)->resourceName().latin1() ); |
443 | if ( !ticket ) { | 451 | if ( !ticket ) { |
444 | error( i18n( "Unable to save to resource '%1'. It is locked." ) | 452 | error( i18n( "Unable to save to resource '%1'. It is locked." ) |
diff --git a/kabc/addressbook.h b/kabc/addressbook.h index 3603ec1..cea1b03 100644 --- a/kabc/addressbook.h +++ b/kabc/addressbook.h | |||
@@ -122,49 +122,49 @@ class AddressBook : public QObject | |||
122 | /** | 122 | /** |
123 | Requests a ticket for saving the addressbook. Calling this function locks | 123 | Requests a ticket for saving the addressbook. Calling this function locks |
124 | the addressbook for all other processes. If the address book is already | 124 | the addressbook for all other processes. If the address book is already |
125 | locked the function returns 0. You need the returned @ref Ticket object | 125 | locked the function returns 0. You need the returned @ref Ticket object |
126 | for calling the @ref save() function. | 126 | for calling the @ref save() function. |
127 | 127 | ||
128 | @see save() | 128 | @see save() |
129 | */ | 129 | */ |
130 | Ticket *requestSaveTicket( Resource *resource=0 ); | 130 | Ticket *requestSaveTicket( Resource *resource=0 ); |
131 | 131 | ||
132 | /** | 132 | /** |
133 | Load address book from file. | 133 | Load address book from file. |
134 | */ | 134 | */ |
135 | bool load(); | 135 | bool load(); |
136 | 136 | ||
137 | /** | 137 | /** |
138 | Save address book. The address book is saved to the file, the Ticket | 138 | Save address book. The address book is saved to the file, the Ticket |
139 | object has been requested for by @ref requestSaveTicket(). | 139 | object has been requested for by @ref requestSaveTicket(). |
140 | 140 | ||
141 | @param ticket a ticket object returned by @ref requestSaveTicket() | 141 | @param ticket a ticket object returned by @ref requestSaveTicket() |
142 | */ | 142 | */ |
143 | bool save( Ticket *ticket ); | 143 | bool save( Ticket *ticket ); |
144 | bool saveAB( ); | 144 | bool saveAB( ); |
145 | void export2File( QString fileName ); | 145 | void export2File( QString fileName ); |
146 | void importFromFile( QString fileName ); | 146 | void importFromFile( QString fileName, bool replaceLabel = false ); |
147 | /** | 147 | /** |
148 | Returns a iterator for first entry of address book. | 148 | Returns a iterator for first entry of address book. |
149 | */ | 149 | */ |
150 | Iterator begin(); | 150 | Iterator begin(); |
151 | 151 | ||
152 | /** | 152 | /** |
153 | Returns a const iterator for first entry of address book. | 153 | Returns a const iterator for first entry of address book. |
154 | */ | 154 | */ |
155 | ConstIterator begin() const; | 155 | ConstIterator begin() const; |
156 | 156 | ||
157 | /** | 157 | /** |
158 | Returns a iterator for first entry of address book. | 158 | Returns a iterator for first entry of address book. |
159 | */ | 159 | */ |
160 | Iterator end(); | 160 | Iterator end(); |
161 | 161 | ||
162 | /** | 162 | /** |
163 | Returns a const iterator for first entry of address book. | 163 | Returns a const iterator for first entry of address book. |
164 | */ | 164 | */ |
165 | ConstIterator end() const; | 165 | ConstIterator end() const; |
166 | 166 | ||
167 | /** | 167 | /** |
168 | Removes all entries from address book. | 168 | Removes all entries from address book. |
169 | */ | 169 | */ |
170 | void clear(); | 170 | void clear(); |
diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp index 19a1845..3f3d5c0 100644 --- a/kabc/addressee.cpp +++ b/kabc/addressee.cpp | |||
@@ -294,48 +294,65 @@ void Addressee::mergeContact( const Addressee& ad ) | |||
294 | if ( mData->mailer.isEmpty() ) mData->mailer = ad.mData->mailer; | 294 | if ( mData->mailer.isEmpty() ) mData->mailer = ad.mData->mailer; |
295 | if ( !mData->timeZone.isValid() ) mData->timeZone = ad.mData->timeZone; | 295 | if ( !mData->timeZone.isValid() ) mData->timeZone = ad.mData->timeZone; |
296 | if ( !mData->geo.isValid() ) mData->geo = ad.mData->geo; | 296 | if ( !mData->geo.isValid() ) mData->geo = ad.mData->geo; |
297 | if ( mData->title .isEmpty() ) mData->title = ad.mData->title ; | 297 | if ( mData->title .isEmpty() ) mData->title = ad.mData->title ; |
298 | if ( mData->role.isEmpty() ) mData->role = ad.mData->role ; | 298 | if ( mData->role.isEmpty() ) mData->role = ad.mData->role ; |
299 | if ( mData->organization.isEmpty() ) mData->organization = ad.mData->organization ; | 299 | if ( mData->organization.isEmpty() ) mData->organization = ad.mData->organization ; |
300 | if ( mData->note.isEmpty() ) mData->note = ad.mData->note ; | 300 | if ( mData->note.isEmpty() ) mData->note = ad.mData->note ; |
301 | if ( mData->productId.isEmpty() ) mData->productId = ad.mData->productId; | 301 | if ( mData->productId.isEmpty() ) mData->productId = ad.mData->productId; |
302 | if ( mData->sortString.isEmpty() ) mData->sortString = ad.mData->sortString; | 302 | if ( mData->sortString.isEmpty() ) mData->sortString = ad.mData->sortString; |
303 | if ( !mData->secrecy.isValid() ) mData->secrecy = ad.mData->secrecy; | 303 | if ( !mData->secrecy.isValid() ) mData->secrecy = ad.mData->secrecy; |
304 | if ( ( !mData->url.isValid() && ad.mData->url.isValid() ) ) mData->url = ad.mData->url ; | 304 | if ( ( !mData->url.isValid() && ad.mData->url.isValid() ) ) mData->url = ad.mData->url ; |
305 | 305 | ||
306 | // pending: | 306 | // pending: |
307 | // merging phonenumbers | 307 | // merging phonenumbers |
308 | // merging addresses | 308 | // merging addresses |
309 | // merging emails; | 309 | // merging emails; |
310 | // merging categories; | 310 | // merging categories; |
311 | // merging custom; | 311 | // merging custom; |
312 | // merging keys | 312 | // merging keys |
313 | qDebug("merge contact %s ", ad.uid().latin1()); | 313 | qDebug("merge contact %s ", ad.uid().latin1()); |
314 | setUid( ad.uid() ); | 314 | setUid( ad.uid() ); |
315 | setRevision( ad.revision() ); | 315 | setRevision( ad.revision() ); |
316 | } | 316 | } |
317 | 317 | ||
318 | bool Addressee::removeVoice() | ||
319 | { | ||
320 | PhoneNumber::List phoneN = phoneNumbers(); | ||
321 | PhoneNumber::List::Iterator phoneIt; | ||
322 | bool found = false; | ||
323 | for ( phoneIt = phoneN.begin(); phoneIt != phoneN.end(); ++phoneIt ) { | ||
324 | if ( (*phoneIt).type() & PhoneNumber::Voice) { // voice found | ||
325 | if ((*phoneIt).type() - PhoneNumber::Voice ) { | ||
326 | (*phoneIt).setType((*phoneIt).type() - PhoneNumber::Voice ); | ||
327 | insertPhoneNumber( (*phoneIt) ); | ||
328 | found = true; | ||
329 | } | ||
330 | } | ||
331 | |||
332 | } | ||
333 | return found; | ||
334 | } | ||
318 | void Addressee::simplifyAddresses() | 335 | void Addressee::simplifyAddresses() |
319 | { | 336 | { |
320 | if ( mData->addresses.count() < 3 ) return ; | 337 | if ( mData->addresses.count() < 3 ) return ; |
321 | int count = 0; | 338 | int count = 0; |
322 | Address::List list; | 339 | Address::List list; |
323 | Address::List::Iterator it; | 340 | Address::List::Iterator it; |
324 | for( it = mData->addresses.begin(); it != mData->addresses.end(); ++it ) { | 341 | for( it = mData->addresses.begin(); it != mData->addresses.end(); ++it ) { |
325 | if ( count > 1 ) | 342 | if ( count > 1 ) |
326 | list.append( *it ); | 343 | list.append( *it ); |
327 | ++count; | 344 | ++count; |
328 | } | 345 | } |
329 | for( it = list.begin(); it != list.end(); ++it ) { | 346 | for( it = list.begin(); it != list.end(); ++it ) { |
330 | removeAddress( (*it) ); | 347 | removeAddress( (*it) ); |
331 | } | 348 | } |
332 | } | 349 | } |
333 | 350 | ||
334 | // removes all emails but the first | 351 | // removes all emails but the first |
335 | // needed by phone sync | 352 | // needed by phone sync |
336 | void Addressee::simplifyEmails() | 353 | void Addressee::simplifyEmails() |
337 | { | 354 | { |
338 | if ( mData->emails.count() == 0 ) return ; | 355 | if ( mData->emails.count() == 0 ) return ; |
339 | QString email = mData->emails.first(); | 356 | QString email = mData->emails.first(); |
340 | detach(); | 357 | detach(); |
341 | mData->emails.clear(); | 358 | mData->emails.clear(); |
diff --git a/kabc/addressee.h b/kabc/addressee.h index 44f0629..9336edc 100644 --- a/kabc/addressee.h +++ b/kabc/addressee.h | |||
@@ -100,48 +100,49 @@ class Addressee | |||
100 | void setTempSyncStat(int id); | 100 | void setTempSyncStat(int id); |
101 | int tempSyncStat() const; | 101 | int tempSyncStat() const; |
102 | void setIDStr( const QString & ); | 102 | void setIDStr( const QString & ); |
103 | QString IDStr() const; | 103 | QString IDStr() const; |
104 | void setID( const QString &, const QString & ); | 104 | void setID( const QString &, const QString & ); |
105 | QString getID( const QString & ); | 105 | QString getID( const QString & ); |
106 | void setCsum( const QString &, const QString & ); | 106 | void setCsum( const QString &, const QString & ); |
107 | QString getCsum( const QString & ); | 107 | QString getCsum( const QString & ); |
108 | void removeID(const QString &); | 108 | void removeID(const QString &); |
109 | void computeCsum(const QString &dev); | 109 | void computeCsum(const QString &dev); |
110 | ulong getCsum4List( const QStringList & attList); | 110 | ulong getCsum4List( const QStringList & attList); |
111 | /** | 111 | /** |
112 | Return, if the address book entry is empty. | 112 | Return, if the address book entry is empty. |
113 | */ | 113 | */ |
114 | bool isEmpty() const; | 114 | bool isEmpty() const; |
115 | void setExternalUID( const QString &id ); | 115 | void setExternalUID( const QString &id ); |
116 | QString externalUID() const; | 116 | QString externalUID() const; |
117 | void setOriginalExternalUID( const QString &id ); | 117 | void setOriginalExternalUID( const QString &id ); |
118 | QString originalExternalUID() const; | 118 | QString originalExternalUID() const; |
119 | void mergeContact( const Addressee& ad ); | 119 | void mergeContact( const Addressee& ad ); |
120 | void simplifyEmails(); | 120 | void simplifyEmails(); |
121 | void simplifyAddresses(); | 121 | void simplifyAddresses(); |
122 | void simplifyPhoneNumbers(); | 122 | void simplifyPhoneNumbers(); |
123 | void simplifyPhoneNumberTypes(); | 123 | void simplifyPhoneNumberTypes(); |
124 | bool removeVoice(); | ||
124 | 125 | ||
125 | /** | 126 | /** |
126 | Set unique identifier. | 127 | Set unique identifier. |
127 | */ | 128 | */ |
128 | void setUid( const QString &uid ); | 129 | void setUid( const QString &uid ); |
129 | /** | 130 | /** |
130 | Return unique identifier. | 131 | Return unique identifier. |
131 | */ | 132 | */ |
132 | QString uid() const; | 133 | QString uid() const; |
133 | /** | 134 | /** |
134 | Return translated label for uid field. | 135 | Return translated label for uid field. |
135 | */ | 136 | */ |
136 | static QString uidLabel(); | 137 | static QString uidLabel(); |
137 | 138 | ||
138 | /** | 139 | /** |
139 | Set name. | 140 | Set name. |
140 | */ | 141 | */ |
141 | void setName( const QString &name ); | 142 | void setName( const QString &name ); |
142 | /** | 143 | /** |
143 | Return name. | 144 | Return name. |
144 | */ | 145 | */ |
145 | QString name() const; | 146 | QString name() const; |
146 | /** | 147 | /** |
147 | Return translated label for name field. | 148 | Return translated label for name field. |
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 9b059d3..3a542ba 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -304,48 +304,54 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const | |||
304 | SLOT( browse( const QString& ) ) ); | 304 | SLOT( browse( const QString& ) ) ); |
305 | 305 | ||
306 | 306 | ||
307 | mAddressBookService = new KAddressBookService( this ); | 307 | mAddressBookService = new KAddressBookService( this ); |
308 | 308 | ||
309 | #endif //KAB_EMBEDDED | 309 | #endif //KAB_EMBEDDED |
310 | mEditorDialog = 0; | 310 | mEditorDialog = 0; |
311 | createAddresseeEditorDialog( this ); | 311 | createAddresseeEditorDialog( this ); |
312 | setModified( false ); | 312 | setModified( false ); |
313 | } | 313 | } |
314 | 314 | ||
315 | KABCore::~KABCore() | 315 | KABCore::~KABCore() |
316 | { | 316 | { |
317 | // save(); | 317 | // save(); |
318 | //saveSettings(); | 318 | //saveSettings(); |
319 | //KABPrefs::instance()->writeConfig(); | 319 | //KABPrefs::instance()->writeConfig(); |
320 | delete AddresseeConfig::instance(); | 320 | delete AddresseeConfig::instance(); |
321 | mAddressBook = 0; | 321 | mAddressBook = 0; |
322 | KABC::StdAddressBook::close(); | 322 | KABC::StdAddressBook::close(); |
323 | 323 | ||
324 | delete syncManager; | 324 | delete syncManager; |
325 | 325 | ||
326 | } | 326 | } |
327 | 327 | ||
328 | void KABCore::recieve( QString fn ) | ||
329 | { | ||
330 | qDebug("KABCore::recieve "); | ||
331 | mAddressBook->importFromFile( fn, true ); | ||
332 | topLevelWidget()->raise(); | ||
333 | } | ||
328 | void KABCore::restoreSettings() | 334 | void KABCore::restoreSettings() |
329 | { | 335 | { |
330 | mMultipleViewsAtOnce = KABPrefs::instance()->mMultipleViewsAtOnce; | 336 | mMultipleViewsAtOnce = KABPrefs::instance()->mMultipleViewsAtOnce; |
331 | 337 | ||
332 | bool state; | 338 | bool state; |
333 | 339 | ||
334 | if (mMultipleViewsAtOnce) | 340 | if (mMultipleViewsAtOnce) |
335 | state = KABPrefs::instance()->mDetailsPageVisible; | 341 | state = KABPrefs::instance()->mDetailsPageVisible; |
336 | else | 342 | else |
337 | state = false; | 343 | state = false; |
338 | 344 | ||
339 | mActionDetails->setChecked( state ); | 345 | mActionDetails->setChecked( state ); |
340 | setDetailsVisible( state ); | 346 | setDetailsVisible( state ); |
341 | 347 | ||
342 | state = KABPrefs::instance()->mJumpButtonBarVisible; | 348 | state = KABPrefs::instance()->mJumpButtonBarVisible; |
343 | 349 | ||
344 | mActionJumpBar->setChecked( state ); | 350 | mActionJumpBar->setChecked( state ); |
345 | setJumpButtonBarVisible( state ); | 351 | setJumpButtonBarVisible( state ); |
346 | /*US | 352 | /*US |
347 | QValueList<int> splitterSize = KABPrefs::instance()->mDetailsSplitter; | 353 | QValueList<int> splitterSize = KABPrefs::instance()->mDetailsSplitter; |
348 | if ( splitterSize.count() == 0 ) { | 354 | if ( splitterSize.count() == 0 ) { |
349 | splitterSize.append( width() / 2 ); | 355 | splitterSize.append( width() / 2 ); |
350 | splitterSize.append( width() / 2 ); | 356 | splitterSize.append( width() / 2 ); |
351 | } | 357 | } |
@@ -2065,62 +2071,50 @@ void KABCore::addActionsManually() | |||
2065 | mJumpButtonBar = new JumpButtonBar( this, this ); | 2071 | mJumpButtonBar = new JumpButtonBar( this, this ); |
2066 | 2072 | ||
2067 | //US topLayout->addWidget( mJumpButtonBar ); | 2073 | //US topLayout->addWidget( mJumpButtonBar ); |
2068 | this->layout()->add( mJumpButtonBar ); | 2074 | this->layout()->add( mJumpButtonBar ); |
2069 | */ | 2075 | */ |
2070 | 2076 | ||
2071 | #endif //KAB_EMBEDDED | 2077 | #endif //KAB_EMBEDDED |
2072 | 2078 | ||
2073 | mActionExport2phone->plug( ExportMenu ); | 2079 | mActionExport2phone->plug( ExportMenu ); |
2074 | connect ( syncMenu, SIGNAL( activated ( int ) ), syncManager, SLOT (slotSyncMenu( int ) ) ); | 2080 | connect ( syncMenu, SIGNAL( activated ( int ) ), syncManager, SLOT (slotSyncMenu( int ) ) ); |
2075 | syncManager->fillSyncMenu(); | 2081 | syncManager->fillSyncMenu(); |
2076 | 2082 | ||
2077 | } | 2083 | } |
2078 | void KABCore::showLicence() | 2084 | void KABCore::showLicence() |
2079 | { | 2085 | { |
2080 | KApplication::showLicence(); | 2086 | KApplication::showLicence(); |
2081 | } | 2087 | } |
2082 | void KABCore::removeVoice() | 2088 | void KABCore::removeVoice() |
2083 | { | 2089 | { |
2084 | if ( KMessageBox::questionYesNo( this, i18n("After importing, phone numbers\nmay have two or more types.\n(E.g. work+voice)\nThese numbers are shown as \"other\".\nClick Yes to remove the voice type\nfrom numbers with more than one type.\n\nRemove voice type?") ) == KMessageBox::No ) | 2090 | if ( KMessageBox::questionYesNo( this, i18n("After importing, phone numbers\nmay have two or more types.\n(E.g. work+voice)\nThese numbers are shown as \"other\".\nClick Yes to remove the voice type\nfrom numbers with more than one type.\n\nRemove voice type?") ) == KMessageBox::No ) |
2085 | return; | 2091 | return; |
2086 | KABC::Addressee::List list = mViewManager->selectedAddressees(); | 2092 | KABC::Addressee::List list = mViewManager->selectedAddressees(); |
2087 | KABC::Addressee::List::Iterator it; | 2093 | KABC::Addressee::List::Iterator it; |
2088 | for ( it = list.begin(); it != list.end(); ++it ) { | 2094 | for ( it = list.begin(); it != list.end(); ++it ) { |
2089 | PhoneNumber::List phoneNumbers = (*it).phoneNumbers(); | 2095 | |
2090 | PhoneNumber::List::Iterator phoneIt; | 2096 | if ( (*it).removeVoice() ) |
2091 | bool found = false; | ||
2092 | for ( phoneIt = phoneNumbers.begin(); phoneIt != phoneNumbers.end(); ++phoneIt ) { | ||
2093 | if ( (*phoneIt).type() & PhoneNumber::Voice) { // voice found | ||
2094 | if ((*phoneIt).type() - PhoneNumber::Voice ) { | ||
2095 | (*phoneIt).setType((*phoneIt).type() - PhoneNumber::Voice ); | ||
2096 | (*it).insertPhoneNumber( (*phoneIt) ); | ||
2097 | found = true; | ||
2098 | } | ||
2099 | } | ||
2100 | |||
2101 | } | ||
2102 | if ( found ) | ||
2103 | contactModified((*it) ); | 2097 | contactModified((*it) ); |
2104 | } | 2098 | } |
2105 | } | 2099 | } |
2106 | 2100 | ||
2107 | 2101 | ||
2108 | 2102 | ||
2109 | void KABCore::clipboardDataChanged() | 2103 | void KABCore::clipboardDataChanged() |
2110 | { | 2104 | { |
2111 | 2105 | ||
2112 | if ( mReadWrite ) | 2106 | if ( mReadWrite ) |
2113 | mActionPaste->setEnabled( !QApplication::clipboard()->text().isEmpty() ); | 2107 | mActionPaste->setEnabled( !QApplication::clipboard()->text().isEmpty() ); |
2114 | 2108 | ||
2115 | } | 2109 | } |
2116 | 2110 | ||
2117 | void KABCore::updateActionMenu() | 2111 | void KABCore::updateActionMenu() |
2118 | { | 2112 | { |
2119 | UndoStack *undo = UndoStack::instance(); | 2113 | UndoStack *undo = UndoStack::instance(); |
2120 | RedoStack *redo = RedoStack::instance(); | 2114 | RedoStack *redo = RedoStack::instance(); |
2121 | 2115 | ||
2122 | if ( undo->isEmpty() ) | 2116 | if ( undo->isEmpty() ) |
2123 | mActionUndo->setText( i18n( "Undo" ) ); | 2117 | mActionUndo->setText( i18n( "Undo" ) ); |
2124 | else | 2118 | else |
2125 | mActionUndo->setText( i18n( "Undo %1" ).arg( undo->top()->name() ) ); | 2119 | mActionUndo->setText( i18n( "Undo %1" ).arg( undo->top()->name() ) ); |
2126 | 2120 | ||
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h index c628399..43c5f99 100644 --- a/kaddressbook/kabcore.h +++ b/kaddressbook/kabcore.h | |||
@@ -321,48 +321,49 @@ class KABCore : public QWidget, public KSyncInterface | |||
321 | Launches the ldap search dialog. | 321 | Launches the ldap search dialog. |
322 | */ | 322 | */ |
323 | void openLDAPDialog(); | 323 | void openLDAPDialog(); |
324 | 324 | ||
325 | /** | 325 | /** |
326 | Creates a KAddressBookPrinter, which will display the print | 326 | Creates a KAddressBookPrinter, which will display the print |
327 | dialog and do the printing. | 327 | dialog and do the printing. |
328 | */ | 328 | */ |
329 | void print(); | 329 | void print(); |
330 | 330 | ||
331 | /** | 331 | /** |
332 | Registers a new GUI client, so plugins can register its actions. | 332 | Registers a new GUI client, so plugins can register its actions. |
333 | */ | 333 | */ |
334 | void addGUIClient( KXMLGUIClient *client ); | 334 | void addGUIClient( KXMLGUIClient *client ); |
335 | 335 | ||
336 | void requestForNameEmailUidList(const QString& sourceChannel, const QString& sessionuid); | 336 | void requestForNameEmailUidList(const QString& sourceChannel, const QString& sessionuid); |
337 | void requestForDetails(const QString& sourceChannel, const QString& sessionuid, const QString& name, const QString& email, const QString& uid); | 337 | void requestForDetails(const QString& sourceChannel, const QString& sessionuid, const QString& name, const QString& email, const QString& uid); |
338 | void requestForBirthdayList(const QString& sourceChannel, const QString& sessionuid); | 338 | void requestForBirthdayList(const QString& sourceChannel, const QString& sessionuid); |
339 | 339 | ||
340 | 340 | ||
341 | signals: | 341 | signals: |
342 | void contactSelected( const QString &name ); | 342 | void contactSelected( const QString &name ); |
343 | void contactSelected( const QPixmap &pixmap ); | 343 | void contactSelected( const QPixmap &pixmap ); |
344 | public slots: | 344 | public slots: |
345 | void recieve(QString cmsg ); | ||
345 | void getFile( bool success ); | 346 | void getFile( bool success ); |
346 | void syncFileRequest(); | 347 | void syncFileRequest(); |
347 | void setDetailsVisible( bool visible ); | 348 | void setDetailsVisible( bool visible ); |
348 | void setDetailsToState(); | 349 | void setDetailsToState(); |
349 | // void slotSyncMenu( int ); | 350 | // void slotSyncMenu( int ); |
350 | private slots: | 351 | private slots: |
351 | void setJumpButtonBarVisible( bool visible ); | 352 | void setJumpButtonBarVisible( bool visible ); |
352 | void setCaptionBack(); | 353 | void setCaptionBack(); |
353 | void importFromOL(); | 354 | void importFromOL(); |
354 | void extensionModified( const KABC::Addressee::List &list ); | 355 | void extensionModified( const KABC::Addressee::List &list ); |
355 | void extensionChanged( int id ); | 356 | void extensionChanged( int id ); |
356 | void clipboardDataChanged(); | 357 | void clipboardDataChanged(); |
357 | void updateActionMenu(); | 358 | void updateActionMenu(); |
358 | void configureKeyBindings(); | 359 | void configureKeyBindings(); |
359 | void removeVoice(); | 360 | void removeVoice(); |
360 | #ifdef KAB_EMBEDDED | 361 | #ifdef KAB_EMBEDDED |
361 | void configureResources(); | 362 | void configureResources(); |
362 | #endif //KAB_EMBEDDED | 363 | #endif //KAB_EMBEDDED |
363 | 364 | ||
364 | void slotEditorDestroyed( const QString &uid ); | 365 | void slotEditorDestroyed( const QString &uid ); |
365 | void configurationChanged(); | 366 | void configurationChanged(); |
366 | void addressBookChanged(); | 367 | void addressBookChanged(); |
367 | 368 | ||
368 | private: | 369 | private: |
diff --git a/kaddressbook/kaddressbookmain.cpp b/kaddressbook/kaddressbookmain.cpp index f48f214..8c4ca09 100644 --- a/kaddressbook/kaddressbookmain.cpp +++ b/kaddressbook/kaddressbookmain.cpp | |||
@@ -71,49 +71,59 @@ KAddressBookMain::KAddressBookMain() : DCOPObject( "KAddressBookIface" ), KMainW | |||
71 | //mCore->restoreSettings(); | 71 | //mCore->restoreSettings(); |
72 | 72 | ||
73 | initActions(); | 73 | initActions(); |
74 | 74 | ||
75 | setCentralWidget( mCore ); | 75 | setCentralWidget( mCore ); |
76 | 76 | ||
77 | //US statusBar()->show(); | 77 | //US statusBar()->show(); |
78 | 78 | ||
79 | #ifndef KAB_EMBEDDED | 79 | #ifndef KAB_EMBEDDED |
80 | setStandardToolBarMenuEnabled(true); | 80 | setStandardToolBarMenuEnabled(true); |
81 | 81 | ||
82 | createGUI( "kaddressbookui.rc", false ); | 82 | createGUI( "kaddressbookui.rc", false ); |
83 | 83 | ||
84 | 84 | ||
85 | #endif //KAB_EMBEDDED | 85 | #endif //KAB_EMBEDDED |
86 | setAutoSaveSettings(); | 86 | setAutoSaveSettings(); |
87 | qApp->processEvents(); | 87 | qApp->processEvents(); |
88 | mCore->restoreSettings(); | 88 | mCore->restoreSettings(); |
89 | } | 89 | } |
90 | 90 | ||
91 | KAddressBookMain::~KAddressBookMain() | 91 | KAddressBookMain::~KAddressBookMain() |
92 | { | 92 | { |
93 | // mCore->saveSettings(); | 93 | // mCore->saveSettings(); |
94 | } | 94 | } |
95 | 95 | void KAddressBookMain::recieve( const QCString& cmsg, const QByteArray& data ) | |
96 | { | ||
97 | qDebug("KA: QCOP message received: %s ", cmsg.data() ); | ||
98 | if ( cmsg == "setDocument(QString)" ) { | ||
99 | QDataStream stream( data, IO_ReadOnly ); | ||
100 | QString fileName; | ||
101 | stream >> fileName; | ||
102 | mCore->recieve( fileName ); | ||
103 | return; | ||
104 | } | ||
105 | } | ||
96 | void KAddressBookMain::showMinimized () | 106 | void KAddressBookMain::showMinimized () |
97 | { | 107 | { |
98 | QWidget::showMinimized () ; | 108 | QWidget::showMinimized () ; |
99 | } | 109 | } |
100 | void KAddressBookMain::addEmail( QString addr ) | 110 | void KAddressBookMain::addEmail( QString addr ) |
101 | { | 111 | { |
102 | mCore->addEmail( addr ); | 112 | mCore->addEmail( addr ); |
103 | } | 113 | } |
104 | 114 | ||
105 | #ifndef KAB_EMBEDDED | 115 | #ifndef KAB_EMBEDDED |
106 | ASYNC KAddressBookMain::showContactEditor( QString uid ) | 116 | ASYNC KAddressBookMain::showContactEditor( QString uid ) |
107 | { | 117 | { |
108 | mCore->editContact( uid ); | 118 | mCore->editContact( uid ); |
109 | } | 119 | } |
110 | #endif //KAB_EMBEDDED | 120 | #endif //KAB_EMBEDDED |
111 | void KAddressBookMain::newContact() | 121 | void KAddressBookMain::newContact() |
112 | { | 122 | { |
113 | mCore->newContact(); | 123 | mCore->newContact(); |
114 | } | 124 | } |
115 | 125 | ||
116 | QString KAddressBookMain::getNameByPhone( QString phone ) | 126 | QString KAddressBookMain::getNameByPhone( QString phone ) |
117 | { | 127 | { |
118 | return mCore->getNameByPhone( phone ); | 128 | return mCore->getNameByPhone( phone ); |
119 | } | 129 | } |
diff --git a/kaddressbook/kaddressbookmain.h b/kaddressbook/kaddressbookmain.h index cf6f899..40d2bdd 100644 --- a/kaddressbook/kaddressbookmain.h +++ b/kaddressbook/kaddressbookmain.h | |||
@@ -60,49 +60,49 @@ class KAddressBookMain : public KMainWindow, virtual public KAddressBookIface | |||
60 | Q_OBJECT | 60 | Q_OBJECT |
61 | 61 | ||
62 | public: | 62 | public: |
63 | KAddressBookMain(); | 63 | KAddressBookMain(); |
64 | virtual ~KAddressBookMain(); | 64 | virtual ~KAddressBookMain(); |
65 | 65 | ||
66 | #ifdef KAB_EMBEDDED | 66 | #ifdef KAB_EMBEDDED |
67 | // QPEToolBar * getIconToolBar(); | 67 | // QPEToolBar * getIconToolBar(); |
68 | // QToolBar * getIconToolBar(); | 68 | // QToolBar * getIconToolBar(); |
69 | #endif //KAB_EMBEDDED | 69 | #endif //KAB_EMBEDDED |
70 | 70 | ||
71 | 71 | ||
72 | public slots: | 72 | public slots: |
73 | void showMinimized () ; | 73 | void showMinimized () ; |
74 | virtual void addEmail( QString addr ); | 74 | virtual void addEmail( QString addr ); |
75 | #ifndef KAB_EMBEDDED | 75 | #ifndef KAB_EMBEDDED |
76 | //MOC_SKIP_BEGIN | 76 | //MOC_SKIP_BEGIN |
77 | virtual ASYNC showContactEditor( QString uid ); | 77 | virtual ASYNC showContactEditor( QString uid ); |
78 | //MOC_SKIP_END | 78 | //MOC_SKIP_END |
79 | #endif //KAB_EMBEDDED | 79 | #endif //KAB_EMBEDDED |
80 | virtual void newContact(); | 80 | virtual void newContact(); |
81 | virtual QString getNameByPhone( QString phone ); | 81 | virtual QString getNameByPhone( QString phone ); |
82 | virtual void save(); | 82 | virtual void save(); |
83 | virtual void exit(); | 83 | virtual void exit(); |
84 | 84 | void recieve( const QCString& cmsg, const QByteArray& data ); | |
85 | protected: | 85 | protected: |
86 | void initActions(); | 86 | void initActions(); |
87 | #ifdef KAB_EMBEDDED | 87 | #ifdef KAB_EMBEDDED |
88 | //US new method to setup menues and toolbars on embedded systems | 88 | //US new method to setup menues and toolbars on embedded systems |
89 | void createGUI(); | 89 | void createGUI(); |
90 | #endif //KAB_EMBEDDED | 90 | #endif //KAB_EMBEDDED |
91 | 91 | ||
92 | /** | 92 | /** |
93 | This function is called when it is time for the app to save its | 93 | This function is called when it is time for the app to save its |
94 | properties for session management purposes. | 94 | properties for session management purposes. |
95 | */ | 95 | */ |
96 | void saveProperties( KConfig* ); | 96 | void saveProperties( KConfig* ); |
97 | 97 | ||
98 | /** | 98 | /** |
99 | This function is called when this app is restored. The KConfig | 99 | This function is called when this app is restored. The KConfig |
100 | object points to the session management config file that was saved | 100 | object points to the session management config file that was saved |
101 | with @ref saveProperties | 101 | with @ref saveProperties |
102 | */ | 102 | */ |
103 | void readProperties( KConfig* ); | 103 | void readProperties( KConfig* ); |
104 | 104 | ||
105 | void closeEvent( QCloseEvent* ce ); | 105 | void closeEvent( QCloseEvent* ce ); |
106 | 106 | ||
107 | protected slots: | 107 | protected slots: |
108 | void configureToolbars(); | 108 | void configureToolbars(); |
diff --git a/kaddressbook/mainembedded.cpp b/kaddressbook/mainembedded.cpp index 965fb06..6dd97b8 100644 --- a/kaddressbook/mainembedded.cpp +++ b/kaddressbook/mainembedded.cpp | |||
@@ -1,26 +1,27 @@ | |||
1 | #ifndef DESKTOP_VERSION | 1 | #ifndef DESKTOP_VERSION |
2 | #include <qpe/qpeapplication.h> | 2 | #include <qpe/qpeapplication.h> |
3 | #include <qcopchannel_qws.h> | ||
3 | #include <stdlib.h> | 4 | #include <stdlib.h> |
4 | #else | 5 | #else |
5 | #include <qapplication.h> | 6 | #include <qapplication.h> |
6 | #include <qwindowsstyle.h> | 7 | #include <qwindowsstyle.h> |
7 | #include <qplatinumstyle.h> | 8 | #include <qplatinumstyle.h> |
8 | #include <qmainwindow.h> | 9 | #include <qmainwindow.h> |
9 | #endif | 10 | #endif |
10 | 11 | ||
11 | #include <kstandarddirs.h> | 12 | #include <kstandarddirs.h> |
12 | #include <qregexp.h> | 13 | #include <qregexp.h> |
13 | #include <kglobal.h> | 14 | #include <kglobal.h> |
14 | #include <stdio.h> | 15 | #include <stdio.h> |
15 | #include <qdir.h> | 16 | #include <qdir.h> |
16 | #include "kaddressbookmain.h" | 17 | #include "kaddressbookmain.h" |
17 | #include "externalapphandler.h" | 18 | #include "externalapphandler.h" |
18 | #include <libkdepim/kpimglobalprefs.h> | 19 | #include <libkdepim/kpimglobalprefs.h> |
19 | 20 | ||
20 | int main( int argc, char **argv ) | 21 | int main( int argc, char **argv ) |
21 | { | 22 | { |
22 | #ifndef DESKTOP_VERSION | 23 | #ifndef DESKTOP_VERSION |
23 | QPEApplication a( argc, argv ); | 24 | QPEApplication a( argc, argv ); |
24 | a.setKeepRunning (); | 25 | a.setKeepRunning (); |
25 | #else | 26 | #else |
26 | QApplication a( argc, argv ); | 27 | QApplication a( argc, argv ); |
@@ -56,55 +57,60 @@ int main( int argc, char **argv ) | |||
56 | if ( ! exitHelp ) { | 57 | if ( ! exitHelp ) { |
57 | 58 | ||
58 | KGlobal::setAppName( "kaddressbook" ); | 59 | KGlobal::setAppName( "kaddressbook" ); |
59 | #ifndef DESKTOP_VERSION | 60 | #ifndef DESKTOP_VERSION |
60 | if ( QApplication::desktop()->width() > 320 ) | 61 | if ( QApplication::desktop()->width() > 320 ) |
61 | KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/kaddressbook/icons22/"); | 62 | KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/kaddressbook/icons22/"); |
62 | else | 63 | else |
63 | KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/kaddressbook/icons16/"); | 64 | KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/kaddressbook/icons16/"); |
64 | #else | 65 | #else |
65 | QString fileName ; | 66 | QString fileName ; |
66 | fileName = qApp->applicationDirPath () + "/kdepim/kaddressbook/icons22/"; | 67 | fileName = qApp->applicationDirPath () + "/kdepim/kaddressbook/icons22/"; |
67 | KGlobal::iconLoader()->setIconPath(QDir::convertSeparators(fileName)); | 68 | KGlobal::iconLoader()->setIconPath(QDir::convertSeparators(fileName)); |
68 | QApplication::addLibraryPath ( qApp->applicationDirPath () ); | 69 | QApplication::addLibraryPath ( qApp->applicationDirPath () ); |
69 | 70 | ||
70 | #endif | 71 | #endif |
71 | KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "kaddressbook"))); | 72 | KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "kaddressbook"))); |
72 | KAddressBookMain m ; | 73 | KAddressBookMain m ; |
73 | //US MainWindow m; | 74 | //US MainWindow m; |
74 | QObject::connect(&a, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & ))); | 75 | QObject::connect(&a, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & ))); |
75 | 76 | ||
76 | { | 77 | { |
77 | KPimGlobalPrefs::instance()->setGlobalConfig(); | 78 | KPimGlobalPrefs::instance()->setGlobalConfig(); |
78 | } | 79 | } |
79 | #ifndef DESKTOP_VERSION | 80 | #ifndef DESKTOP_VERSION |
80 | a.showMainWidget( &m ); | 81 | a.showMainWidget( &m ); |
82 | QCopChannel* c1 = new QCopChannel("QPE/Application/addressbook",&m, "channelAB" ) ; | ||
83 | QObject::connect( c1, SIGNAL (received ( const QCString &, const QByteArray & )),&m, SLOT(recieve( const QCString&, const QByteArray& ))); | ||
81 | #else | 84 | #else |
82 | a.setMainWidget( &m ); | 85 | a.setMainWidget( &m ); |
83 | m.resize (640, 480 ); | 86 | m.resize (640, 480 ); |
84 | m.show(); | 87 | m.show(); |
85 | #endif | 88 | #endif |
86 | a.exec(); | 89 | a.exec(); |
90 | #ifndef DESKTOP_VERSION | ||
91 | delete c1; | ||
92 | #endif | ||
87 | 93 | ||
88 | } | 94 | } |
89 | qDebug("KA: Bye! "); | 95 | qDebug("KA: Bye! "); |
90 | } | 96 | } |
91 | 97 | ||
92 | /* | 98 | /* |
93 | #include <stdlib.h> | 99 | #include <stdlib.h> |
94 | 100 | ||
95 | #include <qstring.h> | 101 | #include <qstring.h> |
96 | 102 | ||
97 | #include <kabc/stdaddressbook.h> | 103 | #include <kabc/stdaddressbook.h> |
98 | #include <kaboutdata.h> | 104 | #include <kaboutdata.h> |
99 | #include <kcmdlineargs.h> | 105 | #include <kcmdlineargs.h> |
100 | #include <kcrash.h> | 106 | #include <kcrash.h> |
101 | #include <kdebug.h> | 107 | #include <kdebug.h> |
102 | #include <klocale.h> | 108 | #include <klocale.h> |
103 | #include <kstartupinfo.h> | 109 | #include <kstartupinfo.h> |
104 | #include <kuniqueapplication.h> | 110 | #include <kuniqueapplication.h> |
105 | #include <kwin.h> | 111 | #include <kwin.h> |
106 | 112 | ||
107 | #include "kaddressbookmain.h" | 113 | #include "kaddressbookmain.h" |
108 | #include "kabcore.h" | 114 | #include "kabcore.h" |
109 | 115 | ||
110 | extern "C" { | 116 | extern "C" { |
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 3c16458..a69a0bd 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -313,55 +313,56 @@ void MainWindow::closeEvent( QCloseEvent* ce ) | |||
313 | case 0: | 313 | case 0: |
314 | saveOnClose(); | 314 | saveOnClose(); |
315 | mClosed = true; | 315 | mClosed = true; |
316 | ce->accept(); | 316 | ce->accept(); |
317 | break; | 317 | break; |
318 | case 1: | 318 | case 1: |
319 | ce->ignore(); | 319 | ce->ignore(); |
320 | break; | 320 | break; |
321 | case 2: | 321 | case 2: |
322 | 322 | ||
323 | default: | 323 | default: |
324 | break; | 324 | break; |
325 | } | 325 | } |
326 | 326 | ||
327 | 327 | ||
328 | } | 328 | } |
329 | 329 | ||
330 | void MainWindow::recieve( const QCString& cmsg, const QByteArray& data ) | 330 | void MainWindow::recieve( const QCString& cmsg, const QByteArray& data ) |
331 | { | 331 | { |
332 | QDataStream stream( data, IO_ReadOnly ); | 332 | QDataStream stream( data, IO_ReadOnly ); |
333 | // QMessageBox::about( this, "About KOrganizer/Pi", "*" +msg +"*" ); | 333 | // QMessageBox::about( this, "About KOrganizer/Pi", "*" +msg +"*" ); |
334 | //QString datamess; | 334 | //QString datamess; |
335 | //qDebug("message "); | 335 | //qDebug("message "); |
336 | qDebug("KO: QCOP message received: %s ", cmsg.data() ); | 336 | qDebug("KO: QCOP message received: %s ", cmsg.data() ); |
337 | 337 | ||
338 | if ( cmsg == "-writeFile" ) { | 338 | if ( cmsg == "setDocument(QString)" ) { |
339 | // I made from the "-writeFile" an "-writeAlarm" | 339 | QDataStream stream( data, IO_ReadOnly ); |
340 | mView->viewManager()->showWhatsNextView(); | 340 | QString fileName; |
341 | mCalendar->checkAlarmForIncidence( 0, true); | 341 | stream >> fileName; |
342 | showMaximized(); | 342 | qDebug("filename %s ", fileName.latin1()); |
343 | raise(); | 343 | KOPrefs::instance()->mLastSyncedLocalFile = fileName ; |
344 | mSyncManager->slotSyncMenu( 1002 ); | ||
344 | return; | 345 | return; |
345 | } | 346 | } |
346 | 347 | ||
347 | if ( cmsg == "-writeFile" ) { | 348 | if ( cmsg == "-writeFile" ) { |
348 | // I made from the "-writeFile" an "-writeAlarm" | 349 | // I made from the "-writeFile" an "-writeAlarm" |
349 | mView->viewManager()->showWhatsNextView(); | 350 | mView->viewManager()->showWhatsNextView(); |
350 | mCalendar->checkAlarmForIncidence( 0, true); | 351 | mCalendar->checkAlarmForIncidence( 0, true); |
351 | showMaximized(); | 352 | showMaximized(); |
352 | raise(); | 353 | raise(); |
353 | return; | 354 | return; |
354 | 355 | ||
355 | } | 356 | } |
356 | if ( cmsg == "-writeFileSilent" ) { | 357 | if ( cmsg == "-writeFileSilent" ) { |
357 | // I made from the "-writeFile" an "-writeAlarm" | 358 | // I made from the "-writeFile" an "-writeAlarm" |
358 | // mView->viewManager()->showWhatsNextView(); | 359 | // mView->viewManager()->showWhatsNextView(); |
359 | mCalendar->checkAlarmForIncidence( 0, true); | 360 | mCalendar->checkAlarmForIncidence( 0, true); |
360 | //showMaximized(); | 361 | //showMaximized(); |
361 | //raise(); | 362 | //raise(); |
362 | hide(); | 363 | hide(); |
363 | return; | 364 | return; |
364 | } | 365 | } |
365 | if ( cmsg == "-newCountdown" ) { | 366 | if ( cmsg == "-newCountdown" ) { |
366 | qDebug("newCountdown "); | 367 | qDebug("newCountdown "); |
367 | 368 | ||
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp index 08b1a3d..80fb147 100644 --- a/libkdepim/ksyncmanager.cpp +++ b/libkdepim/ksyncmanager.cpp | |||
@@ -170,48 +170,52 @@ void KSyncManager::slotSyncMenu( int action ) | |||
170 | setBlockSave(true); | 170 | setBlockSave(true); |
171 | 171 | ||
172 | mCurrentSyncProfile = action - 1000 ; | 172 | mCurrentSyncProfile = action - 1000 ; |
173 | mCurrentSyncDevice = mSyncProfileNames[mCurrentSyncProfile] ; | 173 | mCurrentSyncDevice = mSyncProfileNames[mCurrentSyncProfile] ; |
174 | mCurrentSyncName = mLocalMachineName ; | 174 | mCurrentSyncName = mLocalMachineName ; |
175 | KConfig config ( locateLocal( "config","ksyncprofilesrc" ) ); | 175 | KConfig config ( locateLocal( "config","ksyncprofilesrc" ) ); |
176 | KSyncProfile* temp = new KSyncProfile (); | 176 | KSyncProfile* temp = new KSyncProfile (); |
177 | temp->setName(mSyncProfileNames[mCurrentSyncProfile]); | 177 | temp->setName(mSyncProfileNames[mCurrentSyncProfile]); |
178 | temp->readConfig(&config); | 178 | temp->readConfig(&config); |
179 | mAskForPreferences = temp->getAskForPreferences(); | 179 | mAskForPreferences = temp->getAskForPreferences(); |
180 | mSyncAlgoPrefs = temp->getSyncPrefs(); | 180 | mSyncAlgoPrefs = temp->getSyncPrefs(); |
181 | mWriteBackFile = temp->getWriteBackFile(); | 181 | mWriteBackFile = temp->getWriteBackFile(); |
182 | mWriteBackExistingOnly = temp->getWriteBackExisting(); | 182 | mWriteBackExistingOnly = temp->getWriteBackExisting(); |
183 | mWriteBackInFuture = 0; | 183 | mWriteBackInFuture = 0; |
184 | if ( temp->getWriteBackFuture() ) | 184 | if ( temp->getWriteBackFuture() ) |
185 | mWriteBackInFuture = temp->getWriteBackFutureWeeks( ); | 185 | mWriteBackInFuture = temp->getWriteBackFutureWeeks( ); |
186 | mShowSyncSummary = temp->getShowSummaryAfterSync(); | 186 | mShowSyncSummary = temp->getShowSummaryAfterSync(); |
187 | if ( action == 1000 ) { | 187 | if ( action == 1000 ) { |
188 | syncSharp(); | 188 | syncSharp(); |
189 | 189 | ||
190 | } else if ( action == 1001 ) { | 190 | } else if ( action == 1001 ) { |
191 | syncLocalFile(); | 191 | syncLocalFile(); |
192 | 192 | ||
193 | } else if ( action == 1002 ) { | 193 | } else if ( action == 1002 ) { |
194 | mWriteBackFile = false; | ||
195 | mAskForPreferences = false; | ||
196 | mShowSyncSummary = false; | ||
197 | mSyncAlgoPrefs = 3; | ||
194 | quickSyncLocalFile(); | 198 | quickSyncLocalFile(); |
195 | 199 | ||
196 | } else if ( action >= 1003 ) { | 200 | } else if ( action >= 1003 ) { |
197 | if ( temp->getIsLocalFileSync() ) { | 201 | if ( temp->getIsLocalFileSync() ) { |
198 | switch(mTargetApp) | 202 | switch(mTargetApp) |
199 | { | 203 | { |
200 | case (KAPI): | 204 | case (KAPI): |
201 | if ( syncWithFile( temp->getRemoteFileNameAB( ), false ) ) | 205 | if ( syncWithFile( temp->getRemoteFileNameAB( ), false ) ) |
202 | mPrefs->mLastSyncedLocalFile = temp->getRemoteFileNameAB(); | 206 | mPrefs->mLastSyncedLocalFile = temp->getRemoteFileNameAB(); |
203 | break; | 207 | break; |
204 | case (KOPI): | 208 | case (KOPI): |
205 | if ( syncWithFile( temp->getRemoteFileName( ), false ) ) | 209 | if ( syncWithFile( temp->getRemoteFileName( ), false ) ) |
206 | mPrefs->mLastSyncedLocalFile = temp->getRemoteFileName(); | 210 | mPrefs->mLastSyncedLocalFile = temp->getRemoteFileName(); |
207 | break; | 211 | break; |
208 | case (PWMPI): | 212 | case (PWMPI): |
209 | if ( syncWithFile( temp->getRemoteFileNamePWM( ), false ) ) | 213 | if ( syncWithFile( temp->getRemoteFileNamePWM( ), false ) ) |
210 | mPrefs->mLastSyncedLocalFile = temp->getRemoteFileNamePWM(); | 214 | mPrefs->mLastSyncedLocalFile = temp->getRemoteFileNamePWM(); |
211 | break; | 215 | break; |
212 | default: | 216 | default: |
213 | qDebug("KSyncManager::slotSyncMenu: invalid apptype selected"); | 217 | qDebug("KSyncManager::slotSyncMenu: invalid apptype selected"); |
214 | break; | 218 | break; |
215 | 219 | ||
216 | } | 220 | } |
217 | } else { | 221 | } else { |
@@ -345,49 +349,49 @@ bool KSyncManager::syncWithFile( QString fn , bool quick ) | |||
345 | result = QMessageBox::warning( mParent, i18n("Warning!"), | 349 | result = QMessageBox::warning( mParent, i18n("Warning!"), |
346 | mess, | 350 | mess, |
347 | i18n("Sync"), i18n("Cancel"), 0, | 351 | i18n("Sync"), i18n("Cancel"), 0, |
348 | 0, 1 ); | 352 | 0, 1 ); |
349 | if ( result ) | 353 | if ( result ) |
350 | return false; | 354 | return false; |
351 | } | 355 | } |
352 | if ( mAskForPreferences ) | 356 | if ( mAskForPreferences ) |
353 | edit_sync_options(); | 357 | edit_sync_options(); |
354 | if ( result == 0 ) { | 358 | if ( result == 0 ) { |
355 | //qDebug("Now sycing ... "); | 359 | //qDebug("Now sycing ... "); |
356 | if ( ret = mImplementation->sync( this, fn, mSyncAlgoPrefs ) ) | 360 | if ( ret = mImplementation->sync( this, fn, mSyncAlgoPrefs ) ) |
357 | mParent->topLevelWidget()->setCaption( i18n("Synchronization successful") ); | 361 | mParent->topLevelWidget()->setCaption( i18n("Synchronization successful") ); |
358 | else | 362 | else |
359 | mParent->topLevelWidget()->setCaption( i18n("Sync cancelled or failed. Nothing synced.") ); | 363 | mParent->topLevelWidget()->setCaption( i18n("Sync cancelled or failed. Nothing synced.") ); |
360 | if ( ! quick ) | 364 | if ( ! quick ) |
361 | mPrefs->mLastSyncedLocalFile = fn; | 365 | mPrefs->mLastSyncedLocalFile = fn; |
362 | } | 366 | } |
363 | return ret; | 367 | return ret; |
364 | } | 368 | } |
365 | 369 | ||
366 | void KSyncManager::quickSyncLocalFile() | 370 | void KSyncManager::quickSyncLocalFile() |
367 | { | 371 | { |
368 | 372 | ||
369 | if ( syncWithFile( mPrefs->mLastSyncedLocalFile, false ) ) { | 373 | if ( syncWithFile( mPrefs->mLastSyncedLocalFile, true ) ) { |
370 | qDebug("quick syncLocalFile() successful "); | 374 | qDebug("quick syncLocalFile() successful "); |
371 | 375 | ||
372 | } | 376 | } |
373 | } | 377 | } |
374 | 378 | ||
375 | void KSyncManager::multiSync( bool askforPrefs ) | 379 | void KSyncManager::multiSync( bool askforPrefs ) |
376 | { | 380 | { |
377 | if (blockSave()) | 381 | if (blockSave()) |
378 | return; | 382 | return; |
379 | setBlockSave(true); | 383 | setBlockSave(true); |
380 | QString question = i18n("Do you really want\nto multiple sync\nwith all checked profiles?\nSyncing takes some\ntime - all profiles\nare synced twice!"); | 384 | QString question = i18n("Do you really want\nto multiple sync\nwith all checked profiles?\nSyncing takes some\ntime - all profiles\nare synced twice!"); |
381 | if ( QMessageBox::information( mParent, i18n("KDE-Pim Sync"), | 385 | if ( QMessageBox::information( mParent, i18n("KDE-Pim Sync"), |
382 | question, | 386 | question, |
383 | i18n("Yes"), i18n("No"), | 387 | i18n("Yes"), i18n("No"), |
384 | 0, 0 ) != 0 ) { | 388 | 0, 0 ) != 0 ) { |
385 | setBlockSave(false); | 389 | setBlockSave(false); |
386 | mParent->topLevelWidget()->setCaption(i18n("Aborted! Nothing synced!")); | 390 | mParent->topLevelWidget()->setCaption(i18n("Aborted! Nothing synced!")); |
387 | return; | 391 | return; |
388 | } | 392 | } |
389 | mCurrentSyncDevice = i18n("Multiple profiles") ; | 393 | mCurrentSyncDevice = i18n("Multiple profiles") ; |
390 | mSyncAlgoPrefs = mPrefs->mRingSyncAlgoPrefs; | 394 | mSyncAlgoPrefs = mPrefs->mRingSyncAlgoPrefs; |
391 | if ( askforPrefs ) { | 395 | if ( askforPrefs ) { |
392 | edit_sync_options(); | 396 | edit_sync_options(); |
393 | mPrefs->mRingSyncAlgoPrefs = mSyncAlgoPrefs; | 397 | mPrefs->mRingSyncAlgoPrefs = mSyncAlgoPrefs; |