author | zautrix <zautrix> | 2005-01-26 00:32:18 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-01-26 00:32:18 (UTC) |
commit | c3ec0a5a43fb328f2d190b8adee1ef662746fb41 (patch) (unidiff) | |
tree | dd34f587205f8567a59bf7abb6161e1ba6667444 | |
parent | eeb9059d1cbf2ffb13300d0491b4b61126507373 (diff) | |
download | kdepimpi-c3ec0a5a43fb328f2d190b8adee1ef662746fb41.zip kdepimpi-c3ec0a5a43fb328f2d190b8adee1ef662746fb41.tar.gz kdepimpi-c3ec0a5a43fb328f2d190b8adee1ef662746fb41.tar.bz2 |
debug fixes
-rw-r--r-- | bin/kdepim/korganizer/allday.png | bin | 0 -> 279 bytes | |||
-rw-r--r-- | bin/kdepim/korganizer/icons16/allday.png | bin | 0 -> 271 bytes | |||
-rw-r--r-- | bin/kdepim/korganizer/iconsmini/allday.png | bin | 0 -> 273 bytes | |||
-rw-r--r-- | bin/kdepim/korganizer/iconsmini/configure.png | bin | 0 -> 763 bytes | |||
-rw-r--r-- | kaddressbook/kabcore.cpp | 40 | ||||
-rw-r--r-- | korganizer/calendarview.cpp | 21 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 3 | ||||
-rw-r--r-- | libkdepim/ksyncmanager.cpp | 34 |
8 files changed, 50 insertions, 48 deletions
diff --git a/bin/kdepim/korganizer/allday.png b/bin/kdepim/korganizer/allday.png new file mode 100644 index 0000000..735eae2 --- a/dev/null +++ b/bin/kdepim/korganizer/allday.png | |||
Binary files differ | |||
diff --git a/bin/kdepim/korganizer/icons16/allday.png b/bin/kdepim/korganizer/icons16/allday.png new file mode 100644 index 0000000..426d250 --- a/dev/null +++ b/bin/kdepim/korganizer/icons16/allday.png | |||
Binary files differ | |||
diff --git a/bin/kdepim/korganizer/iconsmini/allday.png b/bin/kdepim/korganizer/iconsmini/allday.png new file mode 100644 index 0000000..be9a2ba --- a/dev/null +++ b/bin/kdepim/korganizer/iconsmini/allday.png | |||
Binary files differ | |||
diff --git a/bin/kdepim/korganizer/iconsmini/configure.png b/bin/kdepim/korganizer/iconsmini/configure.png new file mode 100644 index 0000000..ad965e2 --- a/dev/null +++ b/bin/kdepim/korganizer/iconsmini/configure.png | |||
Binary files differ | |||
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 590cc82..ae0a068 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -422,38 +422,38 @@ KABCore::~KABCore() | |||
422 | delete syncManager; | 422 | delete syncManager; |
423 | #ifndef DESKTOP_VERSION | 423 | #ifndef DESKTOP_VERSION |
424 | if ( infrared ) | 424 | if ( infrared ) |
425 | delete infrared; | 425 | delete infrared; |
426 | #endif | 426 | #endif |
427 | } | 427 | } |
428 | void KABCore::receive( const QCString& cmsg, const QByteArray& data ) | 428 | void KABCore::receive( const QCString& cmsg, const QByteArray& data ) |
429 | { | 429 | { |
430 | qDebug("KA: QCOP message received: %s ", cmsg.data() ); | 430 | //qDebug("KA: QCOP message received: %s ", cmsg.data() ); |
431 | if ( cmsg == "setDocument(QString)" ) { | 431 | if ( cmsg == "setDocument(QString)" ) { |
432 | QDataStream stream( data, IO_ReadOnly ); | 432 | QDataStream stream( data, IO_ReadOnly ); |
433 | QString fileName; | 433 | QString fileName; |
434 | stream >> fileName; | 434 | stream >> fileName; |
435 | recieve( fileName ); | 435 | recieve( fileName ); |
436 | return; | 436 | return; |
437 | } | 437 | } |
438 | } | 438 | } |
439 | void KABCore::toggleBeamReceive( ) | 439 | void KABCore::toggleBeamReceive( ) |
440 | { | 440 | { |
441 | if ( mBRdisabled ) | 441 | if ( mBRdisabled ) |
442 | return; | 442 | return; |
443 | #ifndef DESKTOP_VERSION | 443 | #ifndef DESKTOP_VERSION |
444 | if ( infrared ) { | 444 | if ( infrared ) { |
445 | qDebug("AB disable BeamReceive "); | 445 | qDebug("KA: AB disable BeamReceive "); |
446 | delete infrared; | 446 | delete infrared; |
447 | infrared = 0; | 447 | infrared = 0; |
448 | mActionBR->setChecked(false); | 448 | mActionBR->setChecked(false); |
449 | return; | 449 | return; |
450 | } | 450 | } |
451 | qDebug("AB enable BeamReceive "); | 451 | qDebug("KA: AB enable BeamReceive "); |
452 | mActionBR->setChecked(true); | 452 | mActionBR->setChecked(true); |
453 | 453 | ||
454 | infrared = new QCopChannel("QPE/Application/addressbook",this, "channelAB" ) ; | 454 | infrared = new QCopChannel("QPE/Application/addressbook",this, "channelAB" ) ; |
455 | QObject::connect( infrared, SIGNAL (received ( const QCString &, const QByteArray & )),this, SLOT(receive( const QCString&, const QByteArray& ))); | 455 | QObject::connect( infrared, SIGNAL (received ( const QCString &, const QByteArray & )),this, SLOT(receive( const QCString&, const QByteArray& ))); |
456 | #endif | 456 | #endif |
457 | } | 457 | } |
458 | 458 | ||
459 | 459 | ||
@@ -563,17 +563,17 @@ void KABCore::saveSettings() | |||
563 | KABPrefs::instance()->mExtensionsSplitter = mExtensionBarSplitter->sizes(); | 563 | KABPrefs::instance()->mExtensionsSplitter = mExtensionBarSplitter->sizes(); |
564 | KABPrefs::instance()->mDetailsSplitter = mDetailsSplitter->sizes(); | 564 | KABPrefs::instance()->mDetailsSplitter = mDetailsSplitter->sizes(); |
565 | #endif //KAB_EMBEDDED | 565 | #endif //KAB_EMBEDDED |
566 | mExtensionManager->saveSettings(); | 566 | mExtensionManager->saveSettings(); |
567 | mViewManager->saveSettings(); | 567 | mViewManager->saveSettings(); |
568 | 568 | ||
569 | KABPrefs::instance()->mCurrentIncSearchField = mIncSearchWidget->currentItem(); | 569 | KABPrefs::instance()->mCurrentIncSearchField = mIncSearchWidget->currentItem(); |
570 | KABPrefs::instance()->writeConfig(); | 570 | KABPrefs::instance()->writeConfig(); |
571 | qDebug("KABCore::saveSettings() "); | 571 | qDebug("KA: KABCore::saveSettings() "); |
572 | } | 572 | } |
573 | 573 | ||
574 | KABC::AddressBook *KABCore::addressBook() const | 574 | KABC::AddressBook *KABCore::addressBook() const |
575 | { | 575 | { |
576 | return mAddressBook; | 576 | return mAddressBook; |
577 | } | 577 | } |
578 | 578 | ||
579 | KConfig *KABCore::config() | 579 | KConfig *KABCore::config() |
@@ -901,17 +901,17 @@ QString KABCore::getPhoneFile() | |||
901 | #endif | 901 | #endif |
902 | 902 | ||
903 | } | 903 | } |
904 | void KABCore::writeToPhone( ) | 904 | void KABCore::writeToPhone( ) |
905 | { | 905 | { |
906 | if ( PhoneAccess::writeToPhone( getPhoneFile() ) ) | 906 | if ( PhoneAccess::writeToPhone( getPhoneFile() ) ) |
907 | message(i18n("Export to phone finished!")); | 907 | message(i18n("Export to phone finished!")); |
908 | else | 908 | else |
909 | qDebug(i18n("Error exporting to phone")); | 909 | qDebug(i18n("KA: Error exporting to phone")); |
910 | } | 910 | } |
911 | void KABCore::beamVCard() | 911 | void KABCore::beamVCard() |
912 | { | 912 | { |
913 | QStringList uids; | 913 | QStringList uids; |
914 | XXPortSelectDialog dlg( this, false, this ); | 914 | XXPortSelectDialog dlg( this, false, this ); |
915 | if ( dlg.exec() ) | 915 | if ( dlg.exec() ) |
916 | uids = dlg.uids(); | 916 | uids = dlg.uids(); |
917 | else | 917 | else |
@@ -972,17 +972,17 @@ void KABCore::beamVCard(const QStringList& uids) | |||
972 | //t.setEncoding( QTextStream::UnicodeUTF8 ); | 972 | //t.setEncoding( QTextStream::UnicodeUTF8 ); |
973 | t.setEncoding( QTextStream::Latin1 ); | 973 | t.setEncoding( QTextStream::Latin1 ); |
974 | t <<datastream.latin1(); | 974 | t <<datastream.latin1(); |
975 | outFile.close(); | 975 | outFile.close(); |
976 | Ir *ir = new Ir( this ); | 976 | Ir *ir = new Ir( this ); |
977 | connect( ir, SIGNAL( done(Ir*) ), this, SLOT( beamDone(Ir*) ) ); | 977 | connect( ir, SIGNAL( done(Ir*) ), this, SLOT( beamDone(Ir*) ) ); |
978 | ir->send( fileName, description, "text/x-vCard" ); | 978 | ir->send( fileName, description, "text/x-vCard" ); |
979 | } else { | 979 | } else { |
980 | qDebug("Error open temp beam file "); | 980 | qDebug("KA: Error open temp beam file "); |
981 | return; | 981 | return; |
982 | } | 982 | } |
983 | #endif | 983 | #endif |
984 | 984 | ||
985 | } | 985 | } |
986 | 986 | ||
987 | void KABCore::beamDone( Ir *ir ) | 987 | void KABCore::beamDone( Ir *ir ) |
988 | { | 988 | { |
@@ -2679,17 +2679,17 @@ void KABCore::faq() | |||
2679 | KABC::Addressee KABCore::getLastSyncAddressee() | 2679 | KABC::Addressee KABCore::getLastSyncAddressee() |
2680 | { | 2680 | { |
2681 | Addressee lse; | 2681 | Addressee lse; |
2682 | QString mCurrentSyncDevice = syncManager->getCurrentSyncDevice(); | 2682 | QString mCurrentSyncDevice = syncManager->getCurrentSyncDevice(); |
2683 | 2683 | ||
2684 | //qDebug("CurrentSyncDevice %s ",mCurrentSyncDevice .latin1() ); | 2684 | //qDebug("CurrentSyncDevice %s ",mCurrentSyncDevice .latin1() ); |
2685 | lse = mAddressBook->findByUid( "last-syncAddressee-"+mCurrentSyncDevice ); | 2685 | lse = mAddressBook->findByUid( "last-syncAddressee-"+mCurrentSyncDevice ); |
2686 | if (lse.isEmpty()) { | 2686 | if (lse.isEmpty()) { |
2687 | qDebug("Creating new last-syncAddressee "); | 2687 | qDebug("KA: Creating new last-syncAddressee "); |
2688 | lse.setUid( "last-syncAddressee-"+mCurrentSyncDevice ); | 2688 | lse.setUid( "last-syncAddressee-"+mCurrentSyncDevice ); |
2689 | QString sum = ""; | 2689 | QString sum = ""; |
2690 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) | 2690 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) |
2691 | sum = "E: "; | 2691 | sum = "E: "; |
2692 | lse.setFamilyName("!"+sum+mCurrentSyncDevice + i18n(" - sync event")); | 2692 | lse.setFamilyName("!"+sum+mCurrentSyncDevice + i18n(" - sync event")); |
2693 | lse.setRevision( mLastAddressbookSync ); | 2693 | lse.setRevision( mLastAddressbookSync ); |
2694 | lse.setCategories( i18n("SyncEvent") ); | 2694 | lse.setCategories( i18n("SyncEvent") ); |
2695 | mAddressBook->insertAddressee( lse ); | 2695 | mAddressBook->insertAddressee( lse ); |
@@ -2713,18 +2713,18 @@ int KABCore::takeAddressee( KABC::Addressee* local, KABC::Addressee* remote, i | |||
2713 | QDateTime localMod = local->revision(); | 2713 | QDateTime localMod = local->revision(); |
2714 | QDateTime remoteMod = remote->revision(); | 2714 | QDateTime remoteMod = remote->revision(); |
2715 | 2715 | ||
2716 | QString mCurrentSyncDevice = syncManager->getCurrentSyncDevice(); | 2716 | QString mCurrentSyncDevice = syncManager->getCurrentSyncDevice(); |
2717 | 2717 | ||
2718 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { | 2718 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { |
2719 | bool remCh, locCh; | 2719 | bool remCh, locCh; |
2720 | remCh = ( remote->getCsum(mCurrentSyncDevice) != local->getCsum(mCurrentSyncDevice) ); | 2720 | remCh = ( remote->getCsum(mCurrentSyncDevice) != local->getCsum(mCurrentSyncDevice) ); |
2721 | if ( remCh ) | 2721 | //if ( remCh ) |
2722 | qDebug("loc %s rem %s", local->getCsum(mCurrentSyncDevice).latin1(), remote->getCsum(mCurrentSyncDevice).latin1() ); | 2722 | // qDebug("loc %s rem %s", local->getCsum(mCurrentSyncDevice).latin1(), remote->getCsum(mCurrentSyncDevice).latin1() ); |
2723 | locCh = ( localMod > mLastAddressbookSync ); | 2723 | locCh = ( localMod > mLastAddressbookSync ); |
2724 | //qDebug("cahnged rem %d loc %d",remCh, locCh ); | 2724 | //qDebug("cahnged rem %d loc %d",remCh, locCh ); |
2725 | if ( !remCh && ! locCh ) { | 2725 | if ( !remCh && ! locCh ) { |
2726 | //qDebug("both not changed "); | 2726 | //qDebug("both not changed "); |
2727 | lastSync = localMod.addDays(1); | 2727 | lastSync = localMod.addDays(1); |
2728 | if ( mode <= SYNC_PREF_ASK ) | 2728 | if ( mode <= SYNC_PREF_ASK ) |
2729 | return 0; | 2729 | return 0; |
2730 | } else { | 2730 | } else { |
@@ -2851,24 +2851,24 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo | |||
2851 | //KABC::Addressee::List addresseeLSyncSharp = local->getExternLastSyncAddressees(); | 2851 | //KABC::Addressee::List addresseeLSyncSharp = local->getExternLastSyncAddressees(); |
2852 | bool fullDateRange = false; | 2852 | bool fullDateRange = false; |
2853 | local->resetTempSyncStat(); | 2853 | local->resetTempSyncStat(); |
2854 | mLastAddressbookSync = QDateTime::currentDateTime(); | 2854 | mLastAddressbookSync = QDateTime::currentDateTime(); |
2855 | if ( syncManager->syncWithDesktop() ) { | 2855 | if ( syncManager->syncWithDesktop() ) { |
2856 | // remote->removeSyncInfo( QString());//remove all info | 2856 | // remote->removeSyncInfo( QString());//remove all info |
2857 | if ( KSyncManager::mRequestedSyncEvent.isValid() ) { | 2857 | if ( KSyncManager::mRequestedSyncEvent.isValid() ) { |
2858 | mLastAddressbookSync = KSyncManager::mRequestedSyncEvent; | 2858 | mLastAddressbookSync = KSyncManager::mRequestedSyncEvent; |
2859 | qDebug("using extern time for calendar sync: %s ", mLastAddressbookSync.toString().latin1() ); | 2859 | qDebug("KA: using extern time for calendar sync: %s ", mLastAddressbookSync.toString().latin1() ); |
2860 | } else { | 2860 | } else { |
2861 | qDebug("KSyncManager::mRequestedSyncEvent has invalid datatime "); | 2861 | qDebug("KA: KSyncManager::mRequestedSyncEvent has invalid datatime "); |
2862 | } | 2862 | } |
2863 | } | 2863 | } |
2864 | QDateTime modifiedCalendar = mLastAddressbookSync; | 2864 | QDateTime modifiedCalendar = mLastAddressbookSync; |
2865 | addresseeLSync = getLastSyncAddressee(); | 2865 | addresseeLSync = getLastSyncAddressee(); |
2866 | qDebug("Last Sync %s ", addresseeLSync.revision().toString().latin1()); | 2866 | qDebug("KA: Last Sync %s ", addresseeLSync.revision().toString().latin1()); |
2867 | addresseeR = remote->findByUid("last-syncAddressee-"+mCurrentSyncName ); | 2867 | addresseeR = remote->findByUid("last-syncAddressee-"+mCurrentSyncName ); |
2868 | if ( !addresseeR.isEmpty() ) { | 2868 | if ( !addresseeR.isEmpty() ) { |
2869 | addresseeRSync = addresseeR; | 2869 | addresseeRSync = addresseeR; |
2870 | remote->removeAddressee(addresseeR ); | 2870 | remote->removeAddressee(addresseeR ); |
2871 | 2871 | ||
2872 | } else { | 2872 | } else { |
2873 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { | 2873 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { |
2874 | addresseeRSync = addresseeLSync ; | 2874 | addresseeRSync = addresseeLSync ; |
@@ -3120,17 +3120,17 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo | |||
3120 | local->insertAddressee( addresseeLSync, false ); | 3120 | local->insertAddressee( addresseeLSync, false ); |
3121 | QString mes; | 3121 | QString mes; |
3122 | 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 %d incoming filtered out\n %d outgoing filtered out"),addedAddressee, addedAddresseeR, changedLocal, changedRemote, deletedAddresseeL, deletedAddresseeR, filteredIN, filteredOUT ); | 3122 | 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 %d incoming filtered out\n %d outgoing filtered out"),addedAddressee, addedAddresseeR, changedLocal, changedRemote, deletedAddresseeL, deletedAddresseeR, filteredIN, filteredOUT ); |
3123 | qDebug( mes ); | 3123 | qDebug( mes ); |
3124 | mes = i18n("Local addressbook changed!\n") +mes; | 3124 | mes = i18n("Local addressbook changed!\n") +mes; |
3125 | if ( syncManager->mShowSyncSummary ) { | 3125 | if ( syncManager->mShowSyncSummary ) { |
3126 | if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(this, mes, | 3126 | if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(this, mes, |
3127 | i18n("KA/Pi Synchronization"),i18n("Write back"))) { | 3127 | i18n("KA/Pi Synchronization"),i18n("Write back"))) { |
3128 | qDebug("cancelled "); | 3128 | qDebug("KA: WB cancelled "); |
3129 | return false; | 3129 | return false; |
3130 | } | 3130 | } |
3131 | } | 3131 | } |
3132 | return syncOK; | 3132 | return syncOK; |
3133 | } | 3133 | } |
3134 | 3134 | ||
3135 | 3135 | ||
3136 | //this is a overwritten callbackmethods from the syncinterface | 3136 | //this is a overwritten callbackmethods from the syncinterface |
@@ -3142,27 +3142,27 @@ bool KABCore::sync(KSyncManager* manager, QString filename, int mode) | |||
3142 | mGlobalSyncMode = SYNC_MODE_NORMAL; | 3142 | mGlobalSyncMode = SYNC_MODE_NORMAL; |
3143 | if ( manager != syncManager ) | 3143 | if ( manager != syncManager ) |
3144 | qDebug("KABCore::sync:: ERROR! :: manager != syncManager "); | 3144 | qDebug("KABCore::sync:: ERROR! :: manager != syncManager "); |
3145 | QString mCurrentSyncDevice = manager->getCurrentSyncDevice(); | 3145 | QString mCurrentSyncDevice = manager->getCurrentSyncDevice(); |
3146 | 3146 | ||
3147 | AddressBook abLocal(filename,"syncContact"); | 3147 | AddressBook abLocal(filename,"syncContact"); |
3148 | bool syncOK = false; | 3148 | bool syncOK = false; |
3149 | if ( abLocal.load() ) { | 3149 | if ( abLocal.load() ) { |
3150 | qDebug("Sync:AB loaded %s,sync mode %d",filename.latin1(), mode ); | 3150 | qDebug("KA: Sync::AB loaded %s,sync mode %d",filename.latin1(), mode ); |
3151 | bool external = false; | 3151 | bool external = false; |
3152 | bool isXML = false; | 3152 | bool isXML = false; |
3153 | if ( filename.right(4) == ".xml") { | 3153 | if ( filename.right(4) == ".xml") { |
3154 | mGlobalSyncMode = SYNC_MODE_EXTERNAL; | 3154 | mGlobalSyncMode = SYNC_MODE_EXTERNAL; |
3155 | isXML = true; | 3155 | isXML = true; |
3156 | abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice, true ); | 3156 | abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice, true ); |
3157 | } else { | 3157 | } else { |
3158 | external = !manager->mIsKapiFile; | 3158 | external = !manager->mIsKapiFile; |
3159 | if ( external ) { | 3159 | if ( external ) { |
3160 | qDebug("Sync:Setting vcf mode to external "); | 3160 | qDebug("KA: Sync::Setting vcf mode to external "); |
3161 | mGlobalSyncMode = SYNC_MODE_EXTERNAL; | 3161 | mGlobalSyncMode = SYNC_MODE_EXTERNAL; |
3162 | AddressBook::Iterator it; | 3162 | AddressBook::Iterator it; |
3163 | for ( it = abLocal.begin(); it != abLocal.end(); ++it ) { | 3163 | for ( it = abLocal.begin(); it != abLocal.end(); ++it ) { |
3164 | (*it).setID( mCurrentSyncDevice, (*it).uid() ); | 3164 | (*it).setID( mCurrentSyncDevice, (*it).uid() ); |
3165 | (*it).computeCsum( mCurrentSyncDevice ); | 3165 | (*it).computeCsum( mCurrentSyncDevice ); |
3166 | } | 3166 | } |
3167 | } | 3167 | } |
3168 | } | 3168 | } |
@@ -3172,19 +3172,19 @@ bool KABCore::sync(KSyncManager* manager, QString filename, int mode) | |||
3172 | // qDebug("Name %s ", (*it).familyName().latin1()); | 3172 | // qDebug("Name %s ", (*it).familyName().latin1()); |
3173 | //} | 3173 | //} |
3174 | syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, mode ); | 3174 | syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, mode ); |
3175 | if ( syncOK ) { | 3175 | if ( syncOK ) { |
3176 | if ( syncManager->mWriteBackFile ) | 3176 | if ( syncManager->mWriteBackFile ) |
3177 | { | 3177 | { |
3178 | if ( external ) | 3178 | if ( external ) |
3179 | abLocal.removeSyncAddressees( !isXML); | 3179 | abLocal.removeSyncAddressees( !isXML); |
3180 | qDebug("Sync:Saving remote AB "); | 3180 | qDebug("KA: Sync::Saving remote AB "); |
3181 | if ( ! abLocal.saveAB()) | 3181 | if ( ! abLocal.saveAB()) |
3182 | qDebug("Error writing back AB to file "); | 3182 | qDebug("KA: sync::Error writing back AB to file "); |
3183 | if ( external ) { | 3183 | if ( external ) { |
3184 | // afterwrite processing | 3184 | // afterwrite processing |
3185 | abLocal.postExternSync( mAddressBook,mCurrentSyncDevice ,isXML); | 3185 | abLocal.postExternSync( mAddressBook,mCurrentSyncDevice ,isXML); |
3186 | } | 3186 | } |
3187 | } | 3187 | } |
3188 | } | 3188 | } |
3189 | setModified(); | 3189 | setModified(); |
3190 | 3190 | ||
@@ -3192,17 +3192,17 @@ bool KABCore::sync(KSyncManager* manager, QString filename, int mode) | |||
3192 | abLocal.removeResources(); | 3192 | abLocal.removeResources(); |
3193 | if ( syncOK ) | 3193 | if ( syncOK ) |
3194 | mViewManager->refreshView(); | 3194 | mViewManager->refreshView(); |
3195 | return syncOK; | 3195 | return syncOK; |
3196 | 3196 | ||
3197 | } | 3197 | } |
3198 | void KABCore::removeSyncInfo( QString syncProfile) | 3198 | void KABCore::removeSyncInfo( QString syncProfile) |
3199 | { | 3199 | { |
3200 | qDebug("AB:removeSyncInfo for profile %s ", syncProfile.latin1()); | 3200 | qDebug("KA: AB:removeSyncInfo for profile %s ", syncProfile.latin1()); |
3201 | mAddressBook->removeSyncInfo( syncProfile ); | 3201 | mAddressBook->removeSyncInfo( syncProfile ); |
3202 | setModified(); | 3202 | setModified(); |
3203 | } | 3203 | } |
3204 | 3204 | ||
3205 | 3205 | ||
3206 | //this is a overwritten callbackmethods from the syncinterface | 3206 | //this is a overwritten callbackmethods from the syncinterface |
3207 | bool KABCore::syncExternal(KSyncManager* manager, QString resource) | 3207 | bool KABCore::syncExternal(KSyncManager* manager, QString resource) |
3208 | { | 3208 | { |
@@ -3212,17 +3212,17 @@ bool KABCore::syncExternal(KSyncManager* manager, QString resource) | |||
3212 | if ( manager != syncManager ) | 3212 | if ( manager != syncManager ) |
3213 | qDebug("KABCore::syncExternal:: ERROR! :: manager != syncManager "); | 3213 | qDebug("KABCore::syncExternal:: ERROR! :: manager != syncManager "); |
3214 | QString mCurrentSyncDevice = manager->getCurrentSyncDevice(); | 3214 | QString mCurrentSyncDevice = manager->getCurrentSyncDevice(); |
3215 | 3215 | ||
3216 | AddressBook abLocal( resource,"syncContact"); | 3216 | AddressBook abLocal( resource,"syncContact"); |
3217 | bool syncOK = false; | 3217 | bool syncOK = false; |
3218 | message(i18n("Loading DTM address data..."), false); | 3218 | message(i18n("Loading DTM address data..."), false); |
3219 | if ( abLocal.load() ) { | 3219 | if ( abLocal.load() ) { |
3220 | qDebug("AB sharp loaded ,sync device %s",mCurrentSyncDevice.latin1()); | 3220 | qDebug("KA: AB sharp loaded ,sync device %s",mCurrentSyncDevice.latin1()); |
3221 | mGlobalSyncMode = SYNC_MODE_EXTERNAL; | 3221 | mGlobalSyncMode = SYNC_MODE_EXTERNAL; |
3222 | message(i18n("Sync preprocessing..."),false); | 3222 | message(i18n("Sync preprocessing..."),false); |
3223 | abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice, false ); | 3223 | abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice, false ); |
3224 | message(i18n("Synchronizing..."),false); | 3224 | message(i18n("Synchronizing..."),false); |
3225 | syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, syncManager->mSyncAlgoPrefs ); | 3225 | syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, syncManager->mSyncAlgoPrefs ); |
3226 | if ( syncOK ) { | 3226 | if ( syncOK ) { |
3227 | if ( syncManager->mWriteBackFile ) { | 3227 | if ( syncManager->mWriteBackFile ) { |
3228 | abLocal.removeSyncAddressees( false ); | 3228 | abLocal.removeSyncAddressees( false ); |
@@ -3260,17 +3260,17 @@ bool KABCore::syncPhone() | |||
3260 | if ( !PhoneAccess::readFromPhone( fileName) ) { | 3260 | if ( !PhoneAccess::readFromPhone( fileName) ) { |
3261 | message(i18n("Phone access failed!")); | 3261 | message(i18n("Phone access failed!")); |
3262 | return false; | 3262 | return false; |
3263 | } | 3263 | } |
3264 | AddressBook abLocal( fileName,"syncContact"); | 3264 | AddressBook abLocal( fileName,"syncContact"); |
3265 | bool syncOK = false; | 3265 | bool syncOK = false; |
3266 | { | 3266 | { |
3267 | abLocal.importFromFile( fileName ); | 3267 | abLocal.importFromFile( fileName ); |
3268 | qDebug("AB phone loaded ,sync device %s",mCurrentSyncDevice.latin1()); | 3268 | qDebug("KA: AB phone loaded ,sync device %s",mCurrentSyncDevice.latin1()); |
3269 | mGlobalSyncMode = SYNC_MODE_EXTERNAL; | 3269 | mGlobalSyncMode = SYNC_MODE_EXTERNAL; |
3270 | abLocal.preparePhoneSync( mCurrentSyncDevice, true ); | 3270 | abLocal.preparePhoneSync( mCurrentSyncDevice, true ); |
3271 | abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice, true ); | 3271 | abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice, true ); |
3272 | syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, syncManager->mSyncAlgoPrefs ); | 3272 | syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, syncManager->mSyncAlgoPrefs ); |
3273 | if ( syncOK ) { | 3273 | if ( syncOK ) { |
3274 | if ( syncManager->mWriteBackFile ) { | 3274 | if ( syncManager->mWriteBackFile ) { |
3275 | abLocal.removeSyncAddressees( true ); | 3275 | abLocal.removeSyncAddressees( true ); |
3276 | abLocal.saveABphone( fileName ); | 3276 | abLocal.saveABphone( fileName ); |
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 038da54..06454c2 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -943,17 +943,17 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
943 | QPtrList<Event> eventLSyncSharp = local->getExternLastSyncEvents(); | 943 | QPtrList<Event> eventLSyncSharp = local->getExternLastSyncEvents(); |
944 | bool fullDateRange = false; | 944 | bool fullDateRange = false; |
945 | local->resetTempSyncStat(); | 945 | local->resetTempSyncStat(); |
946 | mLastCalendarSync = QDateTime::currentDateTime(); | 946 | mLastCalendarSync = QDateTime::currentDateTime(); |
947 | if ( mSyncManager->syncWithDesktop() ) { | 947 | if ( mSyncManager->syncWithDesktop() ) { |
948 | remote->resetPilotStat(1); | 948 | remote->resetPilotStat(1); |
949 | if ( KSyncManager::mRequestedSyncEvent.isValid() ) { | 949 | if ( KSyncManager::mRequestedSyncEvent.isValid() ) { |
950 | mLastCalendarSync = KSyncManager::mRequestedSyncEvent; | 950 | mLastCalendarSync = KSyncManager::mRequestedSyncEvent; |
951 | qDebug("using extern time for calendar sync: %s ", mLastCalendarSync.toString().latin1() ); | 951 | qDebug("KO: using extern time for calendar sync: %s ", mLastCalendarSync.toString().latin1() ); |
952 | } else { | 952 | } else { |
953 | qDebug("KSyncManager::mRequestedSyncEvent has invalid datatime "); | 953 | qDebug("KSyncManager::mRequestedSyncEvent has invalid datatime "); |
954 | } | 954 | } |
955 | } | 955 | } |
956 | QDateTime modifiedCalendar = mLastCalendarSync; | 956 | QDateTime modifiedCalendar = mLastCalendarSync; |
957 | eventLSync = getLastSyncEvent(); | 957 | eventLSync = getLastSyncEvent(); |
958 | eventR = remote->event("last-syncEvent-"+mCurrentSyncName ); | 958 | eventR = remote->event("last-syncEvent-"+mCurrentSyncName ); |
959 | if ( eventR ) { | 959 | if ( eventR ) { |
@@ -992,17 +992,17 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
992 | else | 992 | else |
993 | mLastCalendarSync = eventLSync->dtStart(); | 993 | mLastCalendarSync = eventLSync->dtStart(); |
994 | // for resyncing if own file has changed | 994 | // for resyncing if own file has changed |
995 | if ( mCurrentSyncDevice == "deleteaftersync" ) { | 995 | if ( mCurrentSyncDevice == "deleteaftersync" ) { |
996 | mLastCalendarSync = loadedFileVersion; | 996 | mLastCalendarSync = loadedFileVersion; |
997 | //qDebug("setting mLastCalendarSync "); | 997 | //qDebug("setting mLastCalendarSync "); |
998 | } | 998 | } |
999 | //qDebug("*************************** "); | 999 | //qDebug("*************************** "); |
1000 | qDebug("mLastCalendarSync %s full: %d",mLastCalendarSync.toString().latin1(), fullDateRange); | 1000 | qDebug("KO: mLastCalendarSync %s .Full: %d",mLastCalendarSync.toString().latin1(), fullDateRange); |
1001 | QPtrList<Incidence> er = remote->rawIncidences(); | 1001 | QPtrList<Incidence> er = remote->rawIncidences(); |
1002 | Incidence* inR = er.first(); | 1002 | Incidence* inR = er.first(); |
1003 | Incidence* inL; | 1003 | Incidence* inL; |
1004 | QProgressBar bar( er.count(),0 ); | 1004 | QProgressBar bar( er.count(),0 ); |
1005 | bar.setCaption (i18n("Syncing - close to abort!") ); | 1005 | bar.setCaption (i18n("Syncing - close to abort!") ); |
1006 | 1006 | ||
1007 | // ************** setting up filter ************* | 1007 | // ************** setting up filter ************* |
1008 | CalFilter *filterIN = 0; | 1008 | CalFilter *filterIN = 0; |
@@ -1219,35 +1219,36 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
1219 | eventLSync->setReadOnly( false ); | 1219 | eventLSync->setReadOnly( false ); |
1220 | eventLSync->setDtStart( mLastCalendarSync ); | 1220 | eventLSync->setDtStart( mLastCalendarSync ); |
1221 | eventRSync->setDtStart( mLastCalendarSync ); | 1221 | eventRSync->setDtStart( mLastCalendarSync ); |
1222 | eventLSync->setDtEnd( mLastCalendarSync.addSecs( 3600 ) ); | 1222 | eventLSync->setDtEnd( mLastCalendarSync.addSecs( 3600 ) ); |
1223 | eventRSync->setDtEnd( mLastCalendarSync.addSecs( 3600 ) ); | 1223 | eventRSync->setDtEnd( mLastCalendarSync.addSecs( 3600 ) ); |
1224 | eventRSync->setLocation( i18n("Remote from: ")+mCurrentSyncName ) ; | 1224 | eventRSync->setLocation( i18n("Remote from: ")+mCurrentSyncName ) ; |
1225 | eventLSync->setLocation(i18n("Local from: ") + mCurrentSyncName ); | 1225 | eventLSync->setLocation(i18n("Local from: ") + mCurrentSyncName ); |
1226 | eventLSync->setReadOnly( true ); | 1226 | eventLSync->setReadOnly( true ); |
1227 | qDebug("********** %d %d ", mGlobalSyncMode == SYNC_MODE_NORMAL, mSyncManager->syncWithDesktop() ); | 1227 | qDebug("KO: Normal sync: %d ",mGlobalSyncMode == SYNC_MODE_NORMAL ); |
1228 | if ( mGlobalSyncMode == SYNC_MODE_NORMAL && !mSyncManager->syncWithDesktop()) // kde is abnormal... | 1228 | if ( mGlobalSyncMode == SYNC_MODE_NORMAL && !mSyncManager->syncWithDesktop()) // kde is abnormal... |
1229 | remote->addEvent( eventRSync ); | 1229 | remote->addEvent( eventRSync ); |
1230 | else | 1230 | else |
1231 | delete eventRSync; | 1231 | delete eventRSync; |
1232 | qDebug("KO: Sync with desktop %d ",mSyncManager->syncWithDesktop() ); | ||
1232 | QString mes; | 1233 | QString mes; |
1233 | 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 %d incoming filtered out\n %d outgoing filtered out\n"),addedEvent, addedEventR, changedLocal, changedRemote, deletedEventL, deletedEventR, filteredIN, filteredOUT ); | 1234 | 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 %d incoming filtered out\n %d outgoing filtered out\n"),addedEvent, addedEventR, changedLocal, changedRemote, deletedEventL, deletedEventR, filteredIN, filteredOUT ); |
1234 | QString delmess; | 1235 | QString delmess; |
1235 | if ( delFut ) { | 1236 | if ( delFut ) { |
1236 | delmess.sprintf( i18n("%d items skipped on remote,\nbecause they are more\nthan %d weeks in the past or\nmore than %d weeks in the future.\nAfter skipping, remote has\n%d calendar/todo items."), delFut,mSyncManager->mWriteBackInPast,mSyncManager->mWriteBackInFuture, remRem-delFut); | 1237 | delmess.sprintf( i18n("%d items skipped on remote,\nbecause they are more\nthan %d weeks in the past or\nmore than %d weeks in the future.\nAfter skipping, remote has\n%d calendar/todo items."), delFut,mSyncManager->mWriteBackInPast,mSyncManager->mWriteBackInFuture, remRem-delFut); |
1237 | mes += delmess; | 1238 | mes += delmess; |
1238 | } | 1239 | } |
1239 | mes = i18n("Local calendar changed!\n") +mes; | 1240 | mes = i18n("Local calendar changed!\n") +mes; |
1240 | mCalendar->checkAlarmForIncidence( 0, true ); | 1241 | mCalendar->checkAlarmForIncidence( 0, true ); |
1241 | qDebug( mes ); | 1242 | qDebug( mes ); |
1242 | if ( mSyncManager->mShowSyncSummary ) { | 1243 | if ( mSyncManager->mShowSyncSummary ) { |
1243 | if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(this, mes, | 1244 | if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(this, mes, |
1244 | i18n("KO/Pi Synchronization"),i18n("Write back"))) { | 1245 | i18n("KO/Pi Synchronization"),i18n("Write back"))) { |
1245 | qDebug("cancelled "); | 1246 | qDebug("KO: WB cancelled "); |
1246 | return false; | 1247 | return false; |
1247 | } | 1248 | } |
1248 | } | 1249 | } |
1249 | return syncOK; | 1250 | return syncOK; |
1250 | } | 1251 | } |
1251 | 1252 | ||
1252 | void CalendarView::setSyncDevice( QString s ) | 1253 | void CalendarView::setSyncDevice( QString s ) |
1253 | { | 1254 | { |
@@ -1435,24 +1436,24 @@ bool CalendarView::importBday() | |||
1435 | } | 1436 | } |
1436 | 1437 | ||
1437 | // This method will be called from Ka/Pi as a response to requestBirthdayListFromKAPI | 1438 | // This method will be called from Ka/Pi as a response to requestBirthdayListFromKAPI |
1438 | void CalendarView::insertBirthdays(const QString& uid, const QStringList& birthdayList, | 1439 | void CalendarView::insertBirthdays(const QString& uid, const QStringList& birthdayList, |
1439 | const QStringList& anniversaryList, const QStringList& realNameList, | 1440 | const QStringList& anniversaryList, const QStringList& realNameList, |
1440 | const QStringList& emailList, const QStringList& assembledNameList, | 1441 | const QStringList& emailList, const QStringList& assembledNameList, |
1441 | const QStringList& uidList) | 1442 | const QStringList& uidList) |
1442 | { | 1443 | { |
1443 | qDebug("CalendarView::insertBirthdays"); | 1444 | //qDebug("KO::CalendarView::insertBirthdays"); |
1444 | if (uid == this->name()) | 1445 | if (uid == this->name()) |
1445 | { | 1446 | { |
1446 | int count = birthdayList.count(); | 1447 | int count = birthdayList.count(); |
1447 | int addCount = 0; | 1448 | int addCount = 0; |
1448 | KCal::Attendee* a = 0; | 1449 | KCal::Attendee* a = 0; |
1449 | 1450 | ||
1450 | qDebug("CalView 1 %i", count); | 1451 | //qDebug("CalView 1 %i", count); |
1451 | 1452 | ||
1452 | QProgressBar bar(count,0 ); | 1453 | QProgressBar bar(count,0 ); |
1453 | int w = 300; | 1454 | int w = 300; |
1454 | if ( QApplication::desktop()->width() < 320 ) | 1455 | if ( QApplication::desktop()->width() < 320 ) |
1455 | w = 220; | 1456 | w = 220; |
1456 | int h = bar.sizeHint().height() ; | 1457 | int h = bar.sizeHint().height() ; |
1457 | int dw = QApplication::desktop()->width(); | 1458 | int dw = QApplication::desktop()->width(); |
1458 | int dh = QApplication::desktop()->height(); | 1459 | int dh = QApplication::desktop()->height(); |
@@ -2504,32 +2505,32 @@ void CalendarView::showDatePicker( ) | |||
2504 | 2505 | ||
2505 | void CalendarView::showEventEditor() | 2506 | void CalendarView::showEventEditor() |
2506 | { | 2507 | { |
2507 | #ifdef DESKTOP_VERSION | 2508 | #ifdef DESKTOP_VERSION |
2508 | mEventEditor->show(); | 2509 | mEventEditor->show(); |
2509 | #else | 2510 | #else |
2510 | if ( mEventEditor->width() < QApplication::desktop()->width() -60 || mEventEditor->width() > QApplication::desktop()->width() ) { | 2511 | if ( mEventEditor->width() < QApplication::desktop()->width() -60 || mEventEditor->width() > QApplication::desktop()->width() ) { |
2511 | topLevelWidget()->setCaption( i18n("Recreating edit dialog. Please wait...") ); | 2512 | topLevelWidget()->setCaption( i18n("Recreating edit dialog. Please wait...") ); |
2512 | qDebug("CalendarView: recreate mEventEditor %d %d", mEventEditor->width(), QApplication::desktop()->width() ); | 2513 | qDebug("KO: CalendarView: recreate mEventEditor %d %d", mEventEditor->width(), QApplication::desktop()->width() ); |
2513 | delete mEventEditor; | 2514 | delete mEventEditor; |
2514 | mEventEditor = mDialogManager->getEventEditor(); | 2515 | mEventEditor = mDialogManager->getEventEditor(); |
2515 | } | 2516 | } |
2516 | mEventEditor->showMaximized(); | 2517 | mEventEditor->showMaximized(); |
2517 | topLevelWidget()->setCaption( i18n("") ); | 2518 | topLevelWidget()->setCaption( i18n("") ); |
2518 | #endif | 2519 | #endif |
2519 | } | 2520 | } |
2520 | void CalendarView::showTodoEditor() | 2521 | void CalendarView::showTodoEditor() |
2521 | { | 2522 | { |
2522 | #ifdef DESKTOP_VERSION | 2523 | #ifdef DESKTOP_VERSION |
2523 | mTodoEditor->show(); | 2524 | mTodoEditor->show(); |
2524 | #else | 2525 | #else |
2525 | if ( mTodoEditor->width() < QApplication::desktop()->width() -60|| mTodoEditor->width() > QApplication::desktop()->width() ) { | 2526 | if ( mTodoEditor->width() < QApplication::desktop()->width() -60|| mTodoEditor->width() > QApplication::desktop()->width() ) { |
2526 | topLevelWidget()->setCaption( i18n("Recreating edit dialog. Please wait...") ); | 2527 | topLevelWidget()->setCaption( i18n("Recreating edit dialog. Please wait...") ); |
2527 | qDebug("CalendarView: recreate mTodoEditor %d %d ", mTodoEditor->width() ,QApplication::desktop()->width() ); | 2528 | qDebug("KO: CalendarView: recreate mTodoEditor %d %d ", mTodoEditor->width() ,QApplication::desktop()->width() ); |
2528 | delete mTodoEditor; | 2529 | delete mTodoEditor; |
2529 | mTodoEditor = mDialogManager->getTodoEditor(); | 2530 | mTodoEditor = mDialogManager->getTodoEditor(); |
2530 | } | 2531 | } |
2531 | mTodoEditor->showMaximized(); | 2532 | mTodoEditor->showMaximized(); |
2532 | topLevelWidget()->setCaption( i18n("") ); | 2533 | topLevelWidget()->setCaption( i18n("") ); |
2533 | #endif | 2534 | #endif |
2534 | } | 2535 | } |
2535 | 2536 | ||
@@ -3852,17 +3853,17 @@ void CalendarView::keyPressEvent ( QKeyEvent *e) | |||
3852 | e->ignore(); | 3853 | e->ignore(); |
3853 | } | 3854 | } |
3854 | 3855 | ||
3855 | 3856 | ||
3856 | bool CalendarView::sync(KSyncManager* manager, QString filename, int mode) | 3857 | bool CalendarView::sync(KSyncManager* manager, QString filename, int mode) |
3857 | { | 3858 | { |
3858 | // mSyncManager = manager; | 3859 | // mSyncManager = manager; |
3859 | if ( filename == QDir::homeDirPath ()+"/.kdecalendardump.ics" ) { | 3860 | if ( filename == QDir::homeDirPath ()+"/.kdecalendardump.ics" ) { |
3860 | qDebug("SyncKDE request detected!"); | 3861 | qDebug("KO: SyncKDE request detected!"); |
3861 | } | 3862 | } |
3862 | mCurrentSyncDevice = mSyncManager->getCurrentSyncDevice(); | 3863 | mCurrentSyncDevice = mSyncManager->getCurrentSyncDevice(); |
3863 | mCurrentSyncName = mSyncManager->getCurrentSyncName(); | 3864 | mCurrentSyncName = mSyncManager->getCurrentSyncName(); |
3864 | return syncCalendar( filename, mode ); | 3865 | return syncCalendar( filename, mode ); |
3865 | } | 3866 | } |
3866 | bool CalendarView::syncExternal(KSyncManager* manager, QString resource) | 3867 | bool CalendarView::syncExternal(KSyncManager* manager, QString resource) |
3867 | { | 3868 | { |
3868 | //mSyncManager = manager; | 3869 | //mSyncManager = manager; |
@@ -3877,17 +3878,17 @@ bool CalendarView::syncExternal(KSyncManager* manager, QString resource) | |||
3877 | } | 3878 | } |
3878 | void CalendarView::setSyncManager(KSyncManager* manager) | 3879 | void CalendarView::setSyncManager(KSyncManager* manager) |
3879 | { | 3880 | { |
3880 | mSyncManager = manager; | 3881 | mSyncManager = manager; |
3881 | } | 3882 | } |
3882 | 3883 | ||
3883 | void CalendarView::removeSyncInfo( QString syncProfile) | 3884 | void CalendarView::removeSyncInfo( QString syncProfile) |
3884 | { | 3885 | { |
3885 | qDebug("removeSyncInfo for profile %s ", syncProfile.latin1()); | 3886 | qDebug("KO: removeSyncInfo for profile %s ", syncProfile.latin1()); |
3886 | mCalendar->removeSyncInfo( syncProfile ); | 3887 | mCalendar->removeSyncInfo( syncProfile ); |
3887 | 3888 | ||
3888 | } | 3889 | } |
3889 | 3890 | ||
3890 | void CalendarView::undo_delete() | 3891 | void CalendarView::undo_delete() |
3891 | { | 3892 | { |
3892 | //qDebug("undo_delete() "); | 3893 | //qDebug("undo_delete() "); |
3893 | Incidence* undo = mCalendar->undoIncidence(); | 3894 | Incidence* undo = mCalendar->undoIncidence(); |
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 26ea1e2..877b6f2 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -602,17 +602,18 @@ void MainWindow::initActions() | |||
602 | action->addTo( viewMenu ); | 602 | action->addTo( viewMenu ); |
603 | connect( action, SIGNAL( activated() ), | 603 | connect( action, SIGNAL( activated() ), |
604 | mView, SLOT( toggleDateNavigatorWidget() ) ); | 604 | mView, SLOT( toggleDateNavigatorWidget() ) ); |
605 | icon = loadPixmap( pathString + "filter" ); | 605 | icon = loadPixmap( pathString + "filter" ); |
606 | action = new QAction( i18n("Toggle FilterView"), icon, i18n("Toggle FilterView"), 0, this ); | 606 | action = new QAction( i18n("Toggle FilterView"), icon, i18n("Toggle FilterView"), 0, this ); |
607 | action->addTo( viewMenu ); | 607 | action->addTo( viewMenu ); |
608 | connect( action, SIGNAL( activated() ), | 608 | connect( action, SIGNAL( activated() ), |
609 | mView, SLOT( toggleFilter() ) ); | 609 | mView, SLOT( toggleFilter() ) ); |
610 | action = new QAction( i18n("Toggle Allday"), i18n("Toggle Allday"), 0, this ); | 610 | icon = loadPixmap( pathString + "allday" ); |
611 | action = new QAction( i18n("Toggle Allday"), icon,i18n("Toggle Allday"), 0, this ); | ||
611 | action->addTo( viewMenu ); | 612 | action->addTo( viewMenu ); |
612 | connect( action, SIGNAL( activated() ), | 613 | connect( action, SIGNAL( activated() ), |
613 | mView, SLOT( toggleAllDaySize() ) ); | 614 | mView, SLOT( toggleAllDaySize() ) ); |
614 | 615 | ||
615 | viewMenu->insertSeparator(); | 616 | viewMenu->insertSeparator(); |
616 | icon = loadPixmap( pathString + "picker" ); | 617 | icon = loadPixmap( pathString + "picker" ); |
617 | action = new QAction( i18n("Date Picker"), icon, i18n("Date Picker"), 0, this ); | 618 | action = new QAction( i18n("Date Picker"), icon, i18n("Date Picker"), 0, this ); |
618 | action->addTo( viewMenu ); | 619 | action->addTo( viewMenu ); |
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp index f488a07..3adbf61 100644 --- a/libkdepim/ksyncmanager.cpp +++ b/libkdepim/ksyncmanager.cpp | |||
@@ -179,17 +179,17 @@ void KSyncManager::slotClearMenu( int action ) | |||
179 | result = QMessageBox::warning( mParent, i18n("Warning!"),sd,i18n("OK"), i18n("Cancel"), 0, | 179 | result = QMessageBox::warning( mParent, i18n("Warning!"),sd,i18n("OK"), i18n("Cancel"), 0, |
180 | 0, 1 ); | 180 | 0, 1 ); |
181 | if ( result ) | 181 | if ( result ) |
182 | return; | 182 | return; |
183 | mImplementation->removeSyncInfo( syncDevice ); | 183 | mImplementation->removeSyncInfo( syncDevice ); |
184 | } | 184 | } |
185 | void KSyncManager::slotSyncMenu( int action ) | 185 | void KSyncManager::slotSyncMenu( int action ) |
186 | { | 186 | { |
187 | qDebug("syncaction %d ", action); | 187 | qDebug("KSM::syncaction %d ", action); |
188 | if ( action == 5000 ) | 188 | if ( action == 5000 ) |
189 | return; | 189 | return; |
190 | mSyncWithDesktop = false; | 190 | mSyncWithDesktop = false; |
191 | if ( action == 0 ) { | 191 | if ( action == 0 ) { |
192 | 192 | ||
193 | // seems to be a Qt2 event handling bug | 193 | // seems to be a Qt2 event handling bug |
194 | // syncmenu.clear causes a segfault at first time | 194 | // syncmenu.clear causes a segfault at first time |
195 | // when we call it after the main event loop, it is ok | 195 | // when we call it after the main event loop, it is ok |
@@ -287,17 +287,17 @@ void KSyncManager::slotSyncMenu( int action ) | |||
287 | if ( syncWithFile( temp->getRemoteFileName( ), false ) ) | 287 | if ( syncWithFile( temp->getRemoteFileName( ), false ) ) |
288 | mPrefs->mLastSyncedLocalFile = temp->getRemoteFileName(); | 288 | mPrefs->mLastSyncedLocalFile = temp->getRemoteFileName(); |
289 | break; | 289 | break; |
290 | case (PWMPI): | 290 | case (PWMPI): |
291 | if ( syncWithFile( temp->getRemoteFileNamePWM( ), false ) ) | 291 | if ( syncWithFile( temp->getRemoteFileNamePWM( ), false ) ) |
292 | mPrefs->mLastSyncedLocalFile = temp->getRemoteFileNamePWM(); | 292 | mPrefs->mLastSyncedLocalFile = temp->getRemoteFileNamePWM(); |
293 | break; | 293 | break; |
294 | default: | 294 | default: |
295 | qDebug("KSyncManager::slotSyncMenu: invalid apptype selected"); | 295 | qDebug("KSM::slotSyncMenu: invalid apptype selected"); |
296 | break; | 296 | break; |
297 | 297 | ||
298 | } | 298 | } |
299 | } else { | 299 | } else { |
300 | if ( temp->getIsPhoneSync() ) { | 300 | if ( temp->getIsPhoneSync() ) { |
301 | mPhoneDevice = temp->getPhoneDevice( ) ; | 301 | mPhoneDevice = temp->getPhoneDevice( ) ; |
302 | mPhoneConnection = temp->getPhoneConnection( ); | 302 | mPhoneConnection = temp->getPhoneConnection( ); |
303 | mPhoneModel = temp->getPhoneModel( ); | 303 | mPhoneModel = temp->getPhoneModel( ); |
@@ -435,26 +435,26 @@ void KSyncManager::syncLocalFile() | |||
435 | break; | 435 | break; |
436 | case (KOPI): | 436 | case (KOPI): |
437 | ext = "(*.ics/*.vcs)"; | 437 | ext = "(*.ics/*.vcs)"; |
438 | break; | 438 | break; |
439 | case (PWMPI): | 439 | case (PWMPI): |
440 | ext = "(*.pwm)"; | 440 | ext = "(*.pwm)"; |
441 | break; | 441 | break; |
442 | default: | 442 | default: |
443 | qDebug("KSyncManager::syncLocalFile: invalid apptype selected"); | 443 | qDebug("KSM::syncLocalFile: invalid apptype selected"); |
444 | break; | 444 | break; |
445 | 445 | ||
446 | } | 446 | } |
447 | 447 | ||
448 | fn =KFileDialog:: getOpenFileName( fn, i18n("Sync filename"+ext), mParent ); | 448 | fn =KFileDialog:: getOpenFileName( fn, i18n("Sync filename"+ext), mParent ); |
449 | if ( fn == "" ) | 449 | if ( fn == "" ) |
450 | return; | 450 | return; |
451 | if ( syncWithFile( fn, false ) ) { | 451 | if ( syncWithFile( fn, false ) ) { |
452 | qDebug("syncLocalFile() successful "); | 452 | qDebug("KSM::syncLocalFile() successful "); |
453 | } | 453 | } |
454 | 454 | ||
455 | } | 455 | } |
456 | 456 | ||
457 | bool KSyncManager::syncWithFile( QString fn , bool quick ) | 457 | bool KSyncManager::syncWithFile( QString fn , bool quick ) |
458 | { | 458 | { |
459 | bool ret = false; | 459 | bool ret = false; |
460 | QFileInfo info; | 460 | QFileInfo info; |
@@ -493,17 +493,17 @@ bool KSyncManager::syncWithFile( QString fn , bool quick ) | |||
493 | } | 493 | } |
494 | return ret; | 494 | return ret; |
495 | } | 495 | } |
496 | 496 | ||
497 | void KSyncManager::quickSyncLocalFile() | 497 | void KSyncManager::quickSyncLocalFile() |
498 | { | 498 | { |
499 | 499 | ||
500 | if ( syncWithFile( mPrefs->mLastSyncedLocalFile, true ) ) { | 500 | if ( syncWithFile( mPrefs->mLastSyncedLocalFile, true ) ) { |
501 | qDebug("quick syncLocalFile() successful "); | 501 | qDebug("KSM::quick syncLocalFile() successful "); |
502 | 502 | ||
503 | } | 503 | } |
504 | } | 504 | } |
505 | 505 | ||
506 | void KSyncManager::multiSync( bool askforPrefs ) | 506 | void KSyncManager::multiSync( bool askforPrefs ) |
507 | { | 507 | { |
508 | if (blockSave()) | 508 | if (blockSave()) |
509 | return; | 509 | return; |
@@ -564,17 +564,17 @@ int KSyncManager::ringSync() | |||
564 | break; | 564 | break; |
565 | case (KOPI): | 565 | case (KOPI): |
566 | includeInRingSync = temp->getIncludeInRingSync(); | 566 | includeInRingSync = temp->getIncludeInRingSync(); |
567 | break; | 567 | break; |
568 | case (PWMPI): | 568 | case (PWMPI): |
569 | includeInRingSync = temp->getIncludeInRingSyncPWM(); | 569 | includeInRingSync = temp->getIncludeInRingSyncPWM(); |
570 | break; | 570 | break; |
571 | default: | 571 | default: |
572 | qDebug("KSyncManager::ringSync: invalid apptype selected"); | 572 | qDebug("KSM::ringSync: invalid apptype selected"); |
573 | break; | 573 | break; |
574 | 574 | ||
575 | } | 575 | } |
576 | 576 | ||
577 | 577 | ||
578 | if ( includeInRingSync && ( i < 1 || i > 2 )) { | 578 | if ( includeInRingSync && ( i < 1 || i > 2 )) { |
579 | mParent->topLevelWidget()->setCaption(i18n("Profile ")+syncProfileNames[mCurrentSyncProfile]+ i18n(" is synced ... ")); | 579 | mParent->topLevelWidget()->setCaption(i18n("Profile ")+syncProfileNames[mCurrentSyncProfile]+ i18n(" is synced ... ")); |
580 | ++syncedProfiles; | 580 | ++syncedProfiles; |
@@ -614,17 +614,17 @@ int KSyncManager::ringSync() | |||
614 | if ( syncWithFile( temp->getRemoteFileName( ), false ) ) | 614 | if ( syncWithFile( temp->getRemoteFileName( ), false ) ) |
615 | mPrefs->mLastSyncedLocalFile = temp->getRemoteFileName(); | 615 | mPrefs->mLastSyncedLocalFile = temp->getRemoteFileName(); |
616 | break; | 616 | break; |
617 | case (PWMPI): | 617 | case (PWMPI): |
618 | if ( syncWithFile( temp->getRemoteFileNamePWM( ), false ) ) | 618 | if ( syncWithFile( temp->getRemoteFileNamePWM( ), false ) ) |
619 | mPrefs->mLastSyncedLocalFile = temp->getRemoteFileNamePWM(); | 619 | mPrefs->mLastSyncedLocalFile = temp->getRemoteFileNamePWM(); |
620 | break; | 620 | break; |
621 | default: | 621 | default: |
622 | qDebug("KSyncManager::slotSyncMenu: invalid apptype selected"); | 622 | qDebug("KSM: invalid apptype selected"); |
623 | break; | 623 | break; |
624 | } | 624 | } |
625 | } else { | 625 | } else { |
626 | if ( temp->getIsPhoneSync() ) { | 626 | if ( temp->getIsPhoneSync() ) { |
627 | mPhoneDevice = temp->getPhoneDevice( ) ; | 627 | mPhoneDevice = temp->getPhoneDevice( ) ; |
628 | mPhoneConnection = temp->getPhoneConnection( ); | 628 | mPhoneConnection = temp->getPhoneConnection( ); |
629 | mPhoneModel = temp->getPhoneModel( ); | 629 | mPhoneModel = temp->getPhoneModel( ); |
630 | syncPhone(); | 630 | syncPhone(); |
@@ -701,17 +701,17 @@ void KSyncManager::syncRemote( KSyncProfile* prof, bool ask) | |||
701 | localTempFile = prof->getLocalTempFile(); | 701 | localTempFile = prof->getLocalTempFile(); |
702 | break; | 702 | break; |
703 | case (PWMPI): | 703 | case (PWMPI): |
704 | preCommand = prof->getPreSyncCommandPWM(); | 704 | preCommand = prof->getPreSyncCommandPWM(); |
705 | postCommand = prof->getPostSyncCommandPWM(); | 705 | postCommand = prof->getPostSyncCommandPWM(); |
706 | localTempFile = prof->getLocalTempFilePWM(); | 706 | localTempFile = prof->getLocalTempFilePWM(); |
707 | break; | 707 | break; |
708 | default: | 708 | default: |
709 | qDebug("KSyncManager::syncRemote: invalid apptype selected"); | 709 | qDebug("KSM::syncRemote: invalid apptype selected"); |
710 | break; | 710 | break; |
711 | } | 711 | } |
712 | 712 | ||
713 | 713 | ||
714 | int fi; | 714 | int fi; |
715 | if ( (fi = preCommand.find("$PWD$")) > 0 ) { | 715 | if ( (fi = preCommand.find("$PWD$")) > 0 ) { |
716 | QString pwd = getPassword(); | 716 | QString pwd = getPassword(); |
717 | preCommand = preCommand.left( fi )+ pwd + preCommand.mid( fi+5 ); | 717 | preCommand = preCommand.left( fi )+ pwd + preCommand.mid( fi+5 ); |
@@ -721,17 +721,17 @@ void KSyncManager::syncRemote( KSyncProfile* prof, bool ask) | |||
721 | if ( QApplication::desktop()->width() > 320 ) | 721 | if ( QApplication::desktop()->width() > 320 ) |
722 | maxlen += 25; | 722 | maxlen += 25; |
723 | mParent->topLevelWidget()->setCaption ( i18n( "Copy remote file to local machine..." ) ); | 723 | mParent->topLevelWidget()->setCaption ( i18n( "Copy remote file to local machine..." ) ); |
724 | int fileSize = 0; | 724 | int fileSize = 0; |
725 | int result = system ( preCommand ); | 725 | int result = system ( preCommand ); |
726 | // 0 : okay | 726 | // 0 : okay |
727 | // 256: no such file or dir | 727 | // 256: no such file or dir |
728 | // | 728 | // |
729 | qDebug("Sync: Remote copy result(0 = okay): %d ",result ); | 729 | qDebug("KSM::Sync: Remote copy result(0 = okay): %d ",result ); |
730 | if ( result != 0 ) { | 730 | if ( result != 0 ) { |
731 | unsigned int len = maxlen; | 731 | unsigned int len = maxlen; |
732 | while ( len < preCommand.length() ) { | 732 | while ( len < preCommand.length() ) { |
733 | preCommand.insert( len , "\n" ); | 733 | preCommand.insert( len , "\n" ); |
734 | len += maxlen +2; | 734 | len += maxlen +2; |
735 | } | 735 | } |
736 | 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 (preCommand) ; | 736 | 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 (preCommand) ; |
737 | QMessageBox::information( mParent, i18n("Sync - ERROR"), | 737 | QMessageBox::information( mParent, i18n("Sync - ERROR"), |
@@ -749,17 +749,17 @@ void KSyncManager::syncRemote( KSyncProfile* prof, bool ask) | |||
749 | int fi; | 749 | int fi; |
750 | if ( (fi = postCommand.find("$PWD$")) > 0 ) { | 750 | if ( (fi = postCommand.find("$PWD$")) > 0 ) { |
751 | QString pwd = getPassword(); | 751 | QString pwd = getPassword(); |
752 | postCommand = postCommand.left( fi )+ pwd + postCommand.mid( fi+5 ); | 752 | postCommand = postCommand.left( fi )+ pwd + postCommand.mid( fi+5 ); |
753 | 753 | ||
754 | } | 754 | } |
755 | mParent->topLevelWidget()->setCaption ( i18n( "Writing back file ..." ) ); | 755 | mParent->topLevelWidget()->setCaption ( i18n( "Writing back file ..." ) ); |
756 | result = system ( postCommand ); | 756 | result = system ( postCommand ); |
757 | qDebug("Sync:Writing back file result: %d ", result); | 757 | qDebug("KSM::Sync:Writing back file result: %d ", result); |
758 | if ( result != 0 ) { | 758 | if ( result != 0 ) { |
759 | mParent->topLevelWidget()->setCaption ( i18n( "Writing back file result: " )+QString::number( result ) ); | 759 | mParent->topLevelWidget()->setCaption ( i18n( "Writing back file result: " )+QString::number( result ) ); |
760 | return; | 760 | return; |
761 | } else { | 761 | } else { |
762 | mParent->topLevelWidget()->setCaption ( i18n( "Syncronization sucessfully completed" ) ); | 762 | mParent->topLevelWidget()->setCaption ( i18n( "Syncronization sucessfully completed" ) ); |
763 | } | 763 | } |
764 | } | 764 | } |
765 | } | 765 | } |
@@ -944,41 +944,41 @@ void KSyncManager::syncKDE() | |||
944 | } | 944 | } |
945 | 945 | ||
946 | } | 946 | } |
947 | break; | 947 | break; |
948 | case (PWMPI): | 948 | case (PWMPI): |
949 | 949 | ||
950 | break; | 950 | break; |
951 | default: | 951 | default: |
952 | qDebug("KSyncManager::slotSyncMenu: invalid apptype selected"); | 952 | qDebug("KSM::slotSyncMenu: invalid apptype selected"); |
953 | break; | 953 | break; |
954 | 954 | ||
955 | } | 955 | } |
956 | } | 956 | } |
957 | 957 | ||
958 | void KSyncManager::syncSharp() | 958 | void KSyncManager::syncSharp() |
959 | { | 959 | { |
960 | 960 | ||
961 | if ( ! syncExternalApplication("sharp") ) | 961 | if ( ! syncExternalApplication("sharp") ) |
962 | qDebug("ERROR sync sharp "); | 962 | qDebug("KSM::ERROR sync sharp "); |
963 | } | 963 | } |
964 | 964 | ||
965 | bool KSyncManager::syncExternalApplication(QString resource) | 965 | bool KSyncManager::syncExternalApplication(QString resource) |
966 | { | 966 | { |
967 | 967 | ||
968 | emit save(); | 968 | emit save(); |
969 | 969 | ||
970 | if ( mAskForPreferences ) | 970 | if ( mAskForPreferences ) |
971 | if ( !edit_sync_options()) { | 971 | if ( !edit_sync_options()) { |
972 | mParent->topLevelWidget()->setCaption( i18n("Syncing aborted. Nothing synced.") ); | 972 | mParent->topLevelWidget()->setCaption( i18n("Syncing aborted. Nothing synced.") ); |
973 | return false; | 973 | return false; |
974 | } | 974 | } |
975 | 975 | ||
976 | qDebug("Sync extern %s", resource.latin1()); | 976 | qDebug("KSM::Sync extern %s", resource.latin1()); |
977 | 977 | ||
978 | bool syncOK = mImplementation->syncExternal(this, resource); | 978 | bool syncOK = mImplementation->syncExternal(this, resource); |
979 | 979 | ||
980 | return syncOK; | 980 | return syncOK; |
981 | 981 | ||
982 | } | 982 | } |
983 | 983 | ||
984 | void KSyncManager::syncPhone() | 984 | void KSyncManager::syncPhone() |
@@ -1115,17 +1115,17 @@ KServerSocket:: KServerSocket ( QString pw, Q_UINT16 port, int backlog, QObject | |||
1115 | mSyncActionDialog = 0; | 1115 | mSyncActionDialog = 0; |
1116 | blockRC = false; | 1116 | blockRC = false; |
1117 | }; | 1117 | }; |
1118 | 1118 | ||
1119 | void KServerSocket::newConnection ( int socket ) | 1119 | void KServerSocket::newConnection ( int socket ) |
1120 | { | 1120 | { |
1121 | // qDebug("KServerSocket:New connection %d ", socket); | 1121 | // qDebug("KServerSocket:New connection %d ", socket); |
1122 | if ( mSocket ) { | 1122 | if ( mSocket ) { |
1123 | qDebug("KServerSocket::newConnection Socket deleted! "); | 1123 | qDebug("KSS::newConnection Socket deleted! "); |
1124 | delete mSocket; | 1124 | delete mSocket; |
1125 | mSocket = 0; | 1125 | mSocket = 0; |
1126 | } | 1126 | } |
1127 | mSocket = new QSocket( this ); | 1127 | mSocket = new QSocket( this ); |
1128 | connect( mSocket , SIGNAL(readyRead()), this, SLOT(readClient()) ); | 1128 | connect( mSocket , SIGNAL(readyRead()), this, SLOT(readClient()) ); |
1129 | connect( mSocket , SIGNAL(delayedCloseFinished()), this, SLOT(discardClient()) ); | 1129 | connect( mSocket , SIGNAL(delayedCloseFinished()), this, SLOT(discardClient()) ); |
1130 | mSocket->setSocket( socket ); | 1130 | mSocket->setSocket( socket ); |
1131 | } | 1131 | } |
@@ -1139,17 +1139,17 @@ void KServerSocket::discardClient() | |||
1139 | } | 1139 | } |
1140 | //emit endConnect(); | 1140 | //emit endConnect(); |
1141 | } | 1141 | } |
1142 | void KServerSocket::readClient() | 1142 | void KServerSocket::readClient() |
1143 | { | 1143 | { |
1144 | if ( blockRC ) | 1144 | if ( blockRC ) |
1145 | return; | 1145 | return; |
1146 | if ( mSocket == 0 ) { | 1146 | if ( mSocket == 0 ) { |
1147 | qDebug("ERROR::KServerSocket::readClient(): mSocket == 0 "); | 1147 | qDebug("ERROR::KSS::readClient(): mSocket == 0 "); |
1148 | return; | 1148 | return; |
1149 | } | 1149 | } |
1150 | //qDebug("KServerSocket::readClient()"); | 1150 | //qDebug("KServerSocket::readClient()"); |
1151 | if ( mSocket->canReadLine() ) { | 1151 | if ( mSocket->canReadLine() ) { |
1152 | QString line = mSocket->readLine(); | 1152 | QString line = mSocket->readLine(); |
1153 | //qDebug("KServerSocket readline: %s ", line.latin1()); | 1153 | //qDebug("KServerSocket readline: %s ", line.latin1()); |
1154 | QStringList tokens = QStringList::split( QRegExp("[ \r\n][ \r\n]*"), line ); | 1154 | QStringList tokens = QStringList::split( QRegExp("[ \r\n][ \r\n]*"), line ); |
1155 | if ( tokens[0] == "GET" ) { | 1155 | if ( tokens[0] == "GET" ) { |
@@ -1214,17 +1214,17 @@ void KServerSocket::send_file() | |||
1214 | QString warning = i18n("Clock skew of\nsyncing devices\nis %1 seconds!").arg( secs ); | 1214 | QString warning = i18n("Clock skew of\nsyncing devices\nis %1 seconds!").arg( secs ); |
1215 | QLabel* label = new QLabel( warning, mSyncActionDialog ); | 1215 | QLabel* label = new QLabel( warning, mSyncActionDialog ); |
1216 | label->setAlignment ( Qt::AlignHCenter ); | 1216 | label->setAlignment ( Qt::AlignHCenter ); |
1217 | lay->addWidget( label); | 1217 | lay->addWidget( label); |
1218 | if ( secs > 180 ) | 1218 | if ( secs > 180 ) |
1219 | { | 1219 | { |
1220 | if ( secs > 300 ) { | 1220 | if ( secs > 300 ) { |
1221 | if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(0, i18n("The clocks of the syncing\ndevices have a difference\n of more than 5 minutes.\nPlease adjust your clocks.\n<b>You may get wrong syncing results!<\b>\nPlease confirm synchronization!"), i18n("High clock skew!"),i18n("Synchronize!"))) { | 1221 | if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(0, i18n("The clocks of the syncing\ndevices have a difference\n of more than 5 minutes.\nPlease adjust your clocks.\n<b>You may get wrong syncing results!<\b>\nPlease confirm synchronization!"), i18n("High clock skew!"),i18n("Synchronize!"))) { |
1222 | qDebug("cancelled "); | 1222 | qDebug("KSS::Sync cancelled ,cs"); |
1223 | return ; | 1223 | return ; |
1224 | } | 1224 | } |
1225 | } | 1225 | } |
1226 | QFont f = label->font(); | 1226 | QFont f = label->font(); |
1227 | f.setPointSize ( f.pointSize() *2 ); | 1227 | f.setPointSize ( f.pointSize() *2 ); |
1228 | f. setBold (true ); | 1228 | f. setBold (true ); |
1229 | QLabel* label = new QLabel( warning, mSyncActionDialog ); | 1229 | QLabel* label = new QLabel( warning, mSyncActionDialog ); |
1230 | label->setFont( f ); | 1230 | label->setFont( f ); |
@@ -1460,17 +1460,17 @@ void KCommandSocket::readFileFromSocket() | |||
1460 | } | 1460 | } |
1461 | 1461 | ||
1462 | void KCommandSocket::deleteSocket() | 1462 | void KCommandSocket::deleteSocket() |
1463 | { | 1463 | { |
1464 | //qDebug("KCommandSocket::deleteSocket() "); | 1464 | //qDebug("KCommandSocket::deleteSocket() "); |
1465 | if ( mTimerSocket->isActive () ) { | 1465 | if ( mTimerSocket->isActive () ) { |
1466 | mTimerSocket->stop(); | 1466 | mTimerSocket->stop(); |
1467 | mRetVal = errorTO; | 1467 | mRetVal = errorTO; |
1468 | qDebug("Connection to remote host timed out"); | 1468 | qDebug("KCS::Connection to remote host timed out"); |
1469 | if ( mSocket ) { | 1469 | if ( mSocket ) { |
1470 | mSocket->close(); | 1470 | mSocket->close(); |
1471 | //if ( mSocket->state() == QSocket::Idle ) | 1471 | //if ( mSocket->state() == QSocket::Idle ) |
1472 | // deleteSocket(); | 1472 | // deleteSocket(); |
1473 | delete mSocket; | 1473 | delete mSocket; |
1474 | mSocket = 0; | 1474 | mSocket = 0; |
1475 | } | 1475 | } |
1476 | KMessageBox::error( 0, i18n("Connection to remote\nhost timed out!\nDid you forgot to enable\nsyncing on remote host? ")); | 1476 | KMessageBox::error( 0, i18n("Connection to remote\nhost timed out!\nDid you forgot to enable\nsyncing on remote host? ")); |