-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 | |||
@@ -9,21 +9,27 @@ 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 | ||
diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp index dc3cda1..bf6d053 100644 --- a/kabc/addressbook.cpp +++ b/kabc/addressbook.cpp | |||
@@ -397,32 +397,40 @@ void AddressBook::export2File( QString fileName ) | |||
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; |
diff --git a/kabc/addressbook.h b/kabc/addressbook.h index 3603ec1..cea1b03 100644 --- a/kabc/addressbook.h +++ b/kabc/addressbook.h | |||
@@ -138,17 +138,17 @@ class AddressBook : public QObject | |||
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 | */ |
diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp index 19a1845..3f3d5c0 100644 --- a/kabc/addressee.cpp +++ b/kabc/addressee.cpp | |||
@@ -310,16 +310,33 @@ void Addressee::mergeContact( const Addressee& ad ) | |||
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 ) |
diff --git a/kabc/addressee.h b/kabc/addressee.h index 44f0629..9336edc 100644 --- a/kabc/addressee.h +++ b/kabc/addressee.h | |||
@@ -116,16 +116,17 @@ class Addressee | |||
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 | */ |
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 9b059d3..3a542ba 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -320,16 +320,22 @@ KABCore::~KABCore() | |||
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; |
@@ -2081,30 +2087,18 @@ void KABCore::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 | { |
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h index c628399..43c5f99 100644 --- a/kaddressbook/kabcore.h +++ b/kaddressbook/kabcore.h | |||
@@ -337,16 +337,17 @@ class KABCore : public QWidget, public KSyncInterface | |||
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(); |
diff --git a/kaddressbook/kaddressbookmain.cpp b/kaddressbook/kaddressbookmain.cpp index f48f214..8c4ca09 100644 --- a/kaddressbook/kaddressbookmain.cpp +++ b/kaddressbook/kaddressbookmain.cpp | |||
@@ -87,17 +87,27 @@ KAddressBookMain::KAddressBookMain() : DCOPObject( "KAddressBookIface" ), KMainW | |||
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 | } |
diff --git a/kaddressbook/kaddressbookmain.h b/kaddressbook/kaddressbookmain.h index cf6f899..40d2bdd 100644 --- a/kaddressbook/kaddressbookmain.h +++ b/kaddressbook/kaddressbookmain.h | |||
@@ -76,17 +76,17 @@ class KAddressBookMain : public KMainWindow, virtual public KAddressBookIface | |||
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 | /** |
diff --git a/kaddressbook/mainembedded.cpp b/kaddressbook/mainembedded.cpp index 965fb06..6dd97b8 100644 --- a/kaddressbook/mainembedded.cpp +++ b/kaddressbook/mainembedded.cpp | |||
@@ -1,10 +1,11 @@ | |||
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 | ||
@@ -72,23 +73,28 @@ int main( int argc, char **argv ) | |||
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 | ||
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 3c16458..a69a0bd 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -329,23 +329,24 @@ void MainWindow::closeEvent( QCloseEvent* ce ) | |||
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(); |
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp index 08b1a3d..80fb147 100644 --- a/libkdepim/ksyncmanager.cpp +++ b/libkdepim/ksyncmanager.cpp | |||
@@ -186,16 +186,20 @@ void KSyncManager::slotSyncMenu( int action ) | |||
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 ) ) |
@@ -361,17 +365,17 @@ bool KSyncManager::syncWithFile( QString fn , bool 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()) |