-rw-r--r-- | korganizer/calendarview.cpp | 29 | ||||
-rw-r--r-- | korganizer/calendarview.h | 1 |
2 files changed, 19 insertions, 11 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index f727cd4..ff1db2c 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -736,49 +736,49 @@ int CalendarView::takeEvent( Incidence* local, Incidence* remote, int mode , b | |||
736 | if ( !remCh && ! locCh ) { | 736 | if ( !remCh && ! locCh ) { |
737 | //qDebug("both not changed "); | 737 | //qDebug("both not changed "); |
738 | lastSync = localMod.addDays(1); | 738 | lastSync = localMod.addDays(1); |
739 | if ( mode <= SYNC_PREF_ASK ) | 739 | if ( mode <= SYNC_PREF_ASK ) |
740 | return 0; | 740 | return 0; |
741 | } else { | 741 | } else { |
742 | if ( locCh ) { | 742 | if ( locCh ) { |
743 | //qDebug("loc changed %d %s %s", local->revision() , localMod.toString().latin1(), mLastCalendarSync.toString().latin1()); | 743 | //qDebug("loc changed %d %s %s", local->revision() , localMod.toString().latin1(), mLastCalendarSync.toString().latin1()); |
744 | lastSync = localMod.addDays( -1 ); | 744 | lastSync = localMod.addDays( -1 ); |
745 | if ( !remCh ) | 745 | if ( !remCh ) |
746 | remoteMod = ( lastSync.addDays( -1 ) ); | 746 | remoteMod = ( lastSync.addDays( -1 ) ); |
747 | } else { | 747 | } else { |
748 | //qDebug(" not loc changed "); | 748 | //qDebug(" not loc changed "); |
749 | lastSync = localMod.addDays( 1 ); | 749 | lastSync = localMod.addDays( 1 ); |
750 | if ( remCh ) | 750 | if ( remCh ) |
751 | remoteMod =( lastSync.addDays( 1 ) ); | 751 | remoteMod =( lastSync.addDays( 1 ) ); |
752 | 752 | ||
753 | } | 753 | } |
754 | } | 754 | } |
755 | full = true; | 755 | full = true; |
756 | if ( mode < SYNC_PREF_ASK ) | 756 | if ( mode < SYNC_PREF_ASK ) |
757 | mode = SYNC_PREF_ASK; | 757 | mode = SYNC_PREF_ASK; |
758 | } else { | 758 | } else { |
759 | if ( localMod == remoteMod ) | 759 | if ( localMod == remoteMod ) |
760 | if ( local->revision() == remote->revision() ) | 760 | // if ( local->revision() == remote->revision() ) |
761 | return 0; | 761 | return 0; |
762 | 762 | ||
763 | } | 763 | } |
764 | // qDebug(" %d %d conflict on %s %s ", mode, full, local->summary().latin1(), remote->summary().latin1() ); | 764 | // qDebug(" %d %d conflict on %s %s ", mode, full, local->summary().latin1(), remote->summary().latin1() ); |
765 | 765 | ||
766 | //qDebug("%s %d %s %d", localMod.toString().latin1() , local->revision(), remoteMod.toString().latin1(), remote->revision()); | 766 | //qDebug("%s %d %s %d", localMod.toString().latin1() , local->revision(), remoteMod.toString().latin1(), remote->revision()); |
767 | //qDebug("%d %d %d %d ", localMod.time().second(), localMod.time().msec(), remoteMod.time().second(), remoteMod.time().msec() ); | 767 | //qDebug("%d %d %d %d ", localMod.time().second(), localMod.time().msec(), remoteMod.time().second(), remoteMod.time().msec() ); |
768 | //full = true; //debug only | 768 | //full = true; //debug only |
769 | if ( full ) { | 769 | if ( full ) { |
770 | bool equ = false; | 770 | bool equ = false; |
771 | if ( local->type() == "Event" ) { | 771 | if ( local->type() == "Event" ) { |
772 | equ = (*((Event*) local) == *((Event*) remote)); | 772 | equ = (*((Event*) local) == *((Event*) remote)); |
773 | } | 773 | } |
774 | else if ( local->type() =="Todo" ) | 774 | else if ( local->type() =="Todo" ) |
775 | equ = (*((Todo*) local) == (*(Todo*) remote)); | 775 | equ = (*((Todo*) local) == (*(Todo*) remote)); |
776 | else if ( local->type() =="Journal" ) | 776 | else if ( local->type() =="Journal" ) |
777 | equ = (*((Journal*) local) == *((Journal*) remote)); | 777 | equ = (*((Journal*) local) == *((Journal*) remote)); |
778 | if ( equ ) { | 778 | if ( equ ) { |
779 | //qDebug("equal "); | 779 | //qDebug("equal "); |
780 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { | 780 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { |
781 | local->setCsum( mCurrentSyncDevice, remote->getCsum(mCurrentSyncDevice) ); | 781 | local->setCsum( mCurrentSyncDevice, remote->getCsum(mCurrentSyncDevice) ); |
782 | } | 782 | } |
783 | if ( mode < SYNC_PREF_FORCE_LOCAL ) | 783 | if ( mode < SYNC_PREF_FORCE_LOCAL ) |
784 | return 0; | 784 | return 0; |
@@ -911,86 +911,83 @@ void CalendarView::checkExternalId( Incidence * inc ) | |||
911 | QPtrList<Event> lastSync = mCalendar->getExternLastSyncEvents() ; | 911 | QPtrList<Event> lastSync = mCalendar->getExternLastSyncEvents() ; |
912 | checkExternSyncEvent( lastSync, inc ); | 912 | checkExternSyncEvent( lastSync, inc ); |
913 | 913 | ||
914 | } | 914 | } |
915 | bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int mode ) | 915 | bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int mode ) |
916 | { | 916 | { |
917 | bool syncOK = true; | 917 | bool syncOK = true; |
918 | int addedEvent = 0; | 918 | int addedEvent = 0; |
919 | int addedEventR = 0; | 919 | int addedEventR = 0; |
920 | int deletedEventR = 0; | 920 | int deletedEventR = 0; |
921 | int deletedEventL = 0; | 921 | int deletedEventL = 0; |
922 | int changedLocal = 0; | 922 | int changedLocal = 0; |
923 | int changedRemote = 0; | 923 | int changedRemote = 0; |
924 | //QPtrList<Event> el = local->rawEvents(); | 924 | //QPtrList<Event> el = local->rawEvents(); |
925 | Event* eventR; | 925 | Event* eventR; |
926 | QString uid; | 926 | QString uid; |
927 | int take; | 927 | int take; |
928 | Event* eventL; | 928 | Event* eventL; |
929 | Event* eventRSync; | 929 | Event* eventRSync; |
930 | Event* eventLSync; | 930 | Event* eventLSync; |
931 | QPtrList<Event> eventRSyncSharp = remote->getExternLastSyncEvents(); | 931 | QPtrList<Event> eventRSyncSharp = remote->getExternLastSyncEvents(); |
932 | QPtrList<Event> eventLSyncSharp = local->getExternLastSyncEvents(); | 932 | QPtrList<Event> eventLSyncSharp = local->getExternLastSyncEvents(); |
933 | bool fullDateRange = false; | 933 | bool fullDateRange = false; |
934 | local->resetTempSyncStat(); | 934 | local->resetTempSyncStat(); |
935 | #ifdef DESKTOP_VERSION | 935 | if ( mSyncKDE ) |
936 | //Needed for KDE - OL sync | 936 | remote->resetPilotStat(1); |
937 | local->resetPilotStat(); | ||
938 | remote->resetPilotStat(); | ||
939 | #endif | ||
940 | mLastCalendarSync = QDateTime::currentDateTime(); | 937 | mLastCalendarSync = QDateTime::currentDateTime(); |
941 | QDateTime modifiedCalendar = mLastCalendarSync;; | 938 | QDateTime modifiedCalendar = mLastCalendarSync;; |
942 | eventLSync = getLastSyncEvent(); | 939 | eventLSync = getLastSyncEvent(); |
943 | eventR = remote->event("last-syncEvent-"+mCurrentSyncName ); | 940 | eventR = remote->event("last-syncEvent-"+mCurrentSyncName ); |
944 | if ( eventR ) { | 941 | if ( eventR ) { |
945 | eventRSync = (Event*) eventR->clone(); | 942 | eventRSync = (Event*) eventR->clone(); |
946 | remote->deleteEvent(eventR ); | 943 | remote->deleteEvent(eventR ); |
947 | 944 | ||
948 | } else { | 945 | } else { |
949 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { | 946 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { |
950 | eventRSync = (Event*)eventLSync->clone(); | 947 | eventRSync = (Event*)eventLSync->clone(); |
951 | } else { | 948 | } else { |
952 | fullDateRange = true; | 949 | fullDateRange = true; |
953 | eventRSync = new Event(); | 950 | eventRSync = new Event(); |
954 | eventRSync->setSummary(mCurrentSyncName + i18n(" - sync event")); | 951 | eventRSync->setSummary(mCurrentSyncName + i18n(" - sync event")); |
955 | eventRSync->setUid("last-syncEvent-"+mCurrentSyncName ); | 952 | eventRSync->setUid("last-syncEvent-"+mCurrentSyncName ); |
956 | eventRSync->setDtStart( mLastCalendarSync ); | 953 | eventRSync->setDtStart( mLastCalendarSync ); |
957 | eventRSync->setDtEnd( mLastCalendarSync.addSecs( 7200 ) ); | 954 | eventRSync->setDtEnd( mLastCalendarSync.addSecs( 7200 ) ); |
958 | eventRSync->setCategories( i18n("SyncEvent") ); | 955 | eventRSync->setCategories( i18n("SyncEvent") ); |
959 | } | 956 | } |
960 | } | 957 | } |
961 | if ( eventLSync->dtStart() == mLastCalendarSync ) | 958 | if ( eventLSync->dtStart() == mLastCalendarSync ) |
962 | fullDateRange = true; | 959 | fullDateRange = true; |
963 | 960 | ||
964 | if ( ! fullDateRange ) { | 961 | if ( ! fullDateRange ) { |
965 | if ( eventLSync->dtStart() != eventRSync->dtStart() ) { | 962 | if ( eventLSync->dtStart() != eventRSync->dtStart() ) { |
966 | 963 | ||
967 | // qDebug("set fulldate to true %s %s" ,eventLSync->dtStart().toString().latin1(), eventRSync->dtStart().toString().latin1() ); | 964 | // qDebug("set fulldate to true %s %s" ,eventLSync->dtStart().toString().latin1(), eventRSync->dtStart().toString().latin1() ); |
968 | //qDebug("%d %d %d %d ", eventLSync->dtStart().time().second(), eventLSync->dtStart().time().msec() , eventRSync->dtStart().time().second(), eventRSync->dtStart().time().msec()); | 965 | //qDebug("%d %d %d %d ", eventLSync->dtStart().time().second(), eventLSync->dtStart().time().msec() , eventRSync->dtStart().time().second(), eventRSync->dtStart().time().msec()); |
969 | fullDateRange = true; | 966 | fullDateRange = true; |
970 | } | 967 | } |
971 | } | 968 | } |
972 | if ( fullDateRange ) | 969 | if ( fullDateRange && !mSyncKDE ) |
973 | mLastCalendarSync = QDateTime::currentDateTime().addDays( -100*365); | 970 | mLastCalendarSync = QDateTime::currentDateTime().addDays( -100*365); |
974 | else | 971 | else |
975 | mLastCalendarSync = eventLSync->dtStart(); | 972 | mLastCalendarSync = eventLSync->dtStart(); |
976 | // for resyncing if own file has changed | 973 | // for resyncing if own file has changed |
977 | if ( mCurrentSyncDevice == "deleteaftersync" ) { | 974 | if ( mCurrentSyncDevice == "deleteaftersync" ) { |
978 | mLastCalendarSync = loadedFileVersion; | 975 | mLastCalendarSync = loadedFileVersion; |
979 | qDebug("setting mLastCalendarSync "); | 976 | qDebug("setting mLastCalendarSync "); |
980 | } | 977 | } |
981 | //qDebug("*************************** "); | 978 | //qDebug("*************************** "); |
982 | qDebug("mLastCalendarSync %s ",mLastCalendarSync.toString().latin1() ); | 979 | qDebug("mLastCalendarSync %s ",mLastCalendarSync.toString().latin1() ); |
983 | QPtrList<Incidence> er = remote->rawIncidences(); | 980 | QPtrList<Incidence> er = remote->rawIncidences(); |
984 | Incidence* inR = er.first(); | 981 | Incidence* inR = er.first(); |
985 | Incidence* inL; | 982 | Incidence* inL; |
986 | QProgressBar bar( er.count(),0 ); | 983 | QProgressBar bar( er.count(),0 ); |
987 | bar.setCaption (i18n("Syncing - close to abort!") ); | 984 | bar.setCaption (i18n("Syncing - close to abort!") ); |
988 | 985 | ||
989 | int w = 300; | 986 | int w = 300; |
990 | if ( QApplication::desktop()->width() < 320 ) | 987 | if ( QApplication::desktop()->width() < 320 ) |
991 | w = 220; | 988 | w = 220; |
992 | int h = bar.sizeHint().height() ; | 989 | int h = bar.sizeHint().height() ; |
993 | int dw = QApplication::desktop()->width(); | 990 | int dw = QApplication::desktop()->width(); |
994 | int dh = QApplication::desktop()->height(); | 991 | int dh = QApplication::desktop()->height(); |
995 | bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); | 992 | bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); |
996 | bar.show(); | 993 | bar.show(); |
@@ -1010,58 +1007,60 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
1010 | qApp->processEvents(); | 1007 | qApp->processEvents(); |
1011 | if ( !skipIncidence ) { | 1008 | if ( !skipIncidence ) { |
1012 | inL = local->incidence( uid ); | 1009 | inL = local->incidence( uid ); |
1013 | if ( inL ) { // maybe conflict - same uid in both calendars | 1010 | if ( inL ) { // maybe conflict - same uid in both calendars |
1014 | int maxrev = inL->revision(); | 1011 | int maxrev = inL->revision(); |
1015 | if ( maxrev < inR->revision() ) | 1012 | if ( maxrev < inR->revision() ) |
1016 | maxrev = inR->revision(); | 1013 | maxrev = inR->revision(); |
1017 | if ( (take = takeEvent( inL, inR, mode, fullDateRange )) > 0 ) { | 1014 | if ( (take = takeEvent( inL, inR, mode, fullDateRange )) > 0 ) { |
1018 | //qDebug("take %d %s ", take, inL->summary().latin1()); | 1015 | //qDebug("take %d %s ", take, inL->summary().latin1()); |
1019 | if ( take == 3 ) | 1016 | if ( take == 3 ) |
1020 | return false; | 1017 | return false; |
1021 | if ( take == 1 ) {// take local | 1018 | if ( take == 1 ) {// take local |
1022 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) | 1019 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) |
1023 | inL->setCsum( mCurrentSyncDevice, inR->getCsum(mCurrentSyncDevice) ); | 1020 | inL->setCsum( mCurrentSyncDevice, inR->getCsum(mCurrentSyncDevice) ); |
1024 | else | 1021 | else |
1025 | idS = inR->IDStr(); | 1022 | idS = inR->IDStr(); |
1026 | remote->deleteIncidence( inR ); | 1023 | remote->deleteIncidence( inR ); |
1027 | if ( inL->revision() < maxrev ) | 1024 | if ( inL->revision() < maxrev ) |
1028 | inL->setRevision( maxrev ); | 1025 | inL->setRevision( maxrev ); |
1029 | inR = inL->clone(); | 1026 | inR = inL->clone(); |
1030 | inR->setTempSyncStat( SYNC_TEMPSTATE_INITIAL ); | 1027 | inR->setTempSyncStat( SYNC_TEMPSTATE_INITIAL ); |
1031 | if ( mGlobalSyncMode != SYNC_MODE_EXTERNAL ) | 1028 | if ( mGlobalSyncMode != SYNC_MODE_EXTERNAL ) |
1032 | inR->setIDStr( idS ); | 1029 | inR->setIDStr( idS ); |
1033 | remote->addIncidence( inR ); | 1030 | remote->addIncidence( inR ); |
1034 | #ifdef DESKTOP_VERSION | 1031 | if ( mSyncKDE ) |
1035 | inR->setPilotId( 1 ); | 1032 | inR->setPilotId( 2 ); |
1036 | #endif | ||
1037 | ++changedRemote; | 1033 | ++changedRemote; |
1038 | } else { | 1034 | } else { |
1039 | if ( inR->revision() < maxrev ) | 1035 | if ( inR->revision() < maxrev ) |
1040 | inR->setRevision( maxrev ); | 1036 | inR->setRevision( maxrev ); |
1041 | idS = inL->IDStr(); | 1037 | idS = inL->IDStr(); |
1038 | int pid = inL->pilotId(); | ||
1042 | local->deleteIncidence( inL ); | 1039 | local->deleteIncidence( inL ); |
1043 | inL = inR->clone(); | 1040 | inL = inR->clone(); |
1041 | if ( mSyncKDE ) | ||
1042 | inL->setPilotId( pid ); | ||
1044 | inL->setIDStr( idS ); | 1043 | inL->setIDStr( idS ); |
1045 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { | 1044 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { |
1046 | inL->setCsum( mCurrentSyncDevice, inR->getCsum(mCurrentSyncDevice) ); | 1045 | inL->setCsum( mCurrentSyncDevice, inR->getCsum(mCurrentSyncDevice) ); |
1047 | inL->setID( mCurrentSyncDevice, inR->getID(mCurrentSyncDevice) ); | 1046 | inL->setID( mCurrentSyncDevice, inR->getID(mCurrentSyncDevice) ); |
1048 | } | 1047 | } |
1049 | local->addIncidence( inL ); | 1048 | local->addIncidence( inL ); |
1050 | ++changedLocal; | 1049 | ++changedLocal; |
1051 | } | 1050 | } |
1052 | } | 1051 | } |
1053 | } else { // no conflict | 1052 | } else { // no conflict |
1054 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { | 1053 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { |
1055 | QString des = eventLSync->description(); | 1054 | QString des = eventLSync->description(); |
1056 | QString pref = "e"; | 1055 | QString pref = "e"; |
1057 | if ( inR->type() == "Todo" ) | 1056 | if ( inR->type() == "Todo" ) |
1058 | pref = "t"; | 1057 | pref = "t"; |
1059 | if ( des.find(pref+ inR->getID(mCurrentSyncDevice) +"," ) >= 0 && mode != 5) { // delete it | 1058 | if ( des.find(pref+ inR->getID(mCurrentSyncDevice) +"," ) >= 0 && mode != 5) { // delete it |
1060 | inR->setTempSyncStat( SYNC_TEMPSTATE_DELETE ); | 1059 | inR->setTempSyncStat( SYNC_TEMPSTATE_DELETE ); |
1061 | //remote->deleteIncidence( inR ); | 1060 | //remote->deleteIncidence( inR ); |
1062 | ++deletedEventR; | 1061 | ++deletedEventR; |
1063 | } else { | 1062 | } else { |
1064 | inR->setLastModified( modifiedCalendar ); | 1063 | inR->setLastModified( modifiedCalendar ); |
1065 | inL = inR->clone(); | 1064 | inL = inR->clone(); |
1066 | local->addIncidence( inL ); | 1065 | local->addIncidence( inL ); |
1067 | ++addedEvent; | 1066 | ++addedEvent; |
@@ -1160,50 +1159,52 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
1160 | bool ok; | 1159 | bool ok; |
1161 | dt = inR->getNextOccurence( cur, &ok ); | 1160 | dt = inR->getNextOccurence( cur, &ok ); |
1162 | if ( !ok ) | 1161 | if ( !ok ) |
1163 | dt = cur.addSecs( -62 ); | 1162 | dt = cur.addSecs( -62 ); |
1164 | } | 1163 | } |
1165 | else | 1164 | else |
1166 | dt = inR->dtStart(); | 1165 | dt = inR->dtStart(); |
1167 | if ( dt < cur || dt > end ) { | 1166 | if ( dt < cur || dt > end ) { |
1168 | remote->deleteIncidence( inR ); | 1167 | remote->deleteIncidence( inR ); |
1169 | ++delFut; | 1168 | ++delFut; |
1170 | } | 1169 | } |
1171 | inR = er.next(); | 1170 | inR = er.next(); |
1172 | } | 1171 | } |
1173 | } | 1172 | } |
1174 | bar.hide(); | 1173 | bar.hide(); |
1175 | mLastCalendarSync = QDateTime::currentDateTime().addSecs( 1 ); | 1174 | mLastCalendarSync = QDateTime::currentDateTime().addSecs( 1 ); |
1176 | eventLSync->setReadOnly( false ); | 1175 | eventLSync->setReadOnly( false ); |
1177 | eventLSync->setDtStart( mLastCalendarSync ); | 1176 | eventLSync->setDtStart( mLastCalendarSync ); |
1178 | eventRSync->setDtStart( mLastCalendarSync ); | 1177 | eventRSync->setDtStart( mLastCalendarSync ); |
1179 | eventLSync->setDtEnd( mLastCalendarSync.addSecs( 3600 ) ); | 1178 | eventLSync->setDtEnd( mLastCalendarSync.addSecs( 3600 ) ); |
1180 | eventRSync->setDtEnd( mLastCalendarSync.addSecs( 3600 ) ); | 1179 | eventRSync->setDtEnd( mLastCalendarSync.addSecs( 3600 ) ); |
1181 | eventRSync->setLocation( i18n("Remote from: ")+mCurrentSyncName ) ; | 1180 | eventRSync->setLocation( i18n("Remote from: ")+mCurrentSyncName ) ; |
1182 | eventLSync->setLocation(i18n("Local from: ") + mCurrentSyncName ); | 1181 | eventLSync->setLocation(i18n("Local from: ") + mCurrentSyncName ); |
1183 | eventLSync->setReadOnly( true ); | 1182 | eventLSync->setReadOnly( true ); |
1184 | if ( mGlobalSyncMode == SYNC_MODE_NORMAL) | 1183 | if ( mGlobalSyncMode == SYNC_MODE_NORMAL && !mSyncKDE) // kde is abnormal... |
1185 | remote->addEvent( eventRSync ); | 1184 | remote->addEvent( eventRSync ); |
1185 | else | ||
1186 | delete eventRSync; | ||
1186 | QString mes; | 1187 | QString mes; |
1187 | 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"),addedEvent, addedEventR, changedLocal, changedRemote, deletedEventL, deletedEventR ); | 1188 | 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"),addedEvent, addedEventR, changedLocal, changedRemote, deletedEventL, deletedEventR ); |
1188 | QString delmess; | 1189 | QString delmess; |
1189 | if ( delFut ) { | 1190 | if ( delFut ) { |
1190 | delmess.sprintf( i18n("%d items skipped on remote,\nbecause they are in the past or\nmore than %d weeks in the future.\nAfter skipping, remote has\n%d calendar/todo items."), delFut,mSyncManager->mWriteBackInFuture, remRem-delFut); | 1191 | delmess.sprintf( i18n("%d items skipped on remote,\nbecause they are in the past or\nmore than %d weeks in the future.\nAfter skipping, remote has\n%d calendar/todo items."), delFut,mSyncManager->mWriteBackInFuture, remRem-delFut); |
1191 | mes += delmess; | 1192 | mes += delmess; |
1192 | } | 1193 | } |
1193 | if ( mSyncManager->mShowSyncSummary ) { | 1194 | if ( mSyncManager->mShowSyncSummary ) { |
1194 | KMessageBox::information(this, mes, i18n("KO/Pi Synchronization") ); | 1195 | KMessageBox::information(this, mes, i18n("KO/Pi Synchronization") ); |
1195 | } | 1196 | } |
1196 | qDebug( mes ); | 1197 | qDebug( mes ); |
1197 | mCalendar->checkAlarmForIncidence( 0, true ); | 1198 | mCalendar->checkAlarmForIncidence( 0, true ); |
1198 | return syncOK; | 1199 | return syncOK; |
1199 | } | 1200 | } |
1200 | 1201 | ||
1201 | void CalendarView::setSyncDevice( QString s ) | 1202 | void CalendarView::setSyncDevice( QString s ) |
1202 | { | 1203 | { |
1203 | mCurrentSyncDevice= s; | 1204 | mCurrentSyncDevice= s; |
1204 | } | 1205 | } |
1205 | void CalendarView::setSyncName( QString s ) | 1206 | void CalendarView::setSyncName( QString s ) |
1206 | { | 1207 | { |
1207 | mCurrentSyncName= s; | 1208 | mCurrentSyncName= s; |
1208 | } | 1209 | } |
1209 | bool CalendarView::syncCalendar(QString filename, int mode) | 1210 | bool CalendarView::syncCalendar(QString filename, int mode) |
@@ -3713,44 +3714,50 @@ void CalendarView::purgeCompleted() | |||
3713 | } | 3714 | } |
3714 | 3715 | ||
3715 | void CalendarView::slotCalendarChanged() | 3716 | void CalendarView::slotCalendarChanged() |
3716 | { | 3717 | { |
3717 | ; | 3718 | ; |
3718 | } | 3719 | } |
3719 | 3720 | ||
3720 | NavigatorBar *CalendarView::navigatorBar() | 3721 | NavigatorBar *CalendarView::navigatorBar() |
3721 | { | 3722 | { |
3722 | return mNavigatorBar; | 3723 | return mNavigatorBar; |
3723 | } | 3724 | } |
3724 | 3725 | ||
3725 | 3726 | ||
3726 | 3727 | ||
3727 | void CalendarView::keyPressEvent ( QKeyEvent *e) | 3728 | void CalendarView::keyPressEvent ( QKeyEvent *e) |
3728 | { | 3729 | { |
3729 | //qDebug(" alendarView::keyPressEvent "); | 3730 | //qDebug(" alendarView::keyPressEvent "); |
3730 | e->ignore(); | 3731 | e->ignore(); |
3731 | } | 3732 | } |
3732 | 3733 | ||
3733 | 3734 | ||
3734 | bool CalendarView::sync(KSyncManager* manager, QString filename, int mode) | 3735 | bool CalendarView::sync(KSyncManager* manager, QString filename, int mode) |
3735 | { | 3736 | { |
3736 | // mSyncManager = manager; | 3737 | // mSyncManager = manager; |
3738 | mSyncKDE = false; | ||
3739 | if ( filename == QDir::homeDirPath ()+"/.kdecalendardump.ics" ) { | ||
3740 | qDebug("SyncKDE request detected!"); | ||
3741 | mSyncKDE = true; | ||
3742 | } | ||
3737 | mCurrentSyncDevice = mSyncManager->getCurrentSyncDevice(); | 3743 | mCurrentSyncDevice = mSyncManager->getCurrentSyncDevice(); |
3738 | mCurrentSyncName = mSyncManager->getCurrentSyncName(); | 3744 | mCurrentSyncName = mSyncManager->getCurrentSyncName(); |
3739 | return syncCalendar( filename, mode ); | 3745 | return syncCalendar( filename, mode ); |
3740 | } | 3746 | } |
3741 | bool CalendarView::syncExternal(KSyncManager* manager, QString resource) | 3747 | bool CalendarView::syncExternal(KSyncManager* manager, QString resource) |
3742 | { | 3748 | { |
3749 | mSyncKDE = false; | ||
3743 | //mSyncManager = manager; | 3750 | //mSyncManager = manager; |
3744 | mCurrentSyncDevice = mSyncManager->getCurrentSyncDevice(); | 3751 | mCurrentSyncDevice = mSyncManager->getCurrentSyncDevice(); |
3745 | mCurrentSyncName = mSyncManager->getCurrentSyncName(); | 3752 | mCurrentSyncName = mSyncManager->getCurrentSyncName(); |
3746 | if ( resource == "sharp" ) | 3753 | if ( resource == "sharp" ) |
3747 | syncExternal( 0 ); | 3754 | syncExternal( 0 ); |
3748 | if ( resource == "phone" ) | 3755 | if ( resource == "phone" ) |
3749 | syncExternal( 1 ); | 3756 | syncExternal( 1 ); |
3750 | // pending setmodified | 3757 | // pending setmodified |
3751 | return true; | 3758 | return true; |
3752 | } | 3759 | } |
3753 | void CalendarView::setSyncManager(KSyncManager* manager) | 3760 | void CalendarView::setSyncManager(KSyncManager* manager) |
3754 | { | 3761 | { |
3755 | mSyncManager = manager; | 3762 | mSyncManager = manager; |
3756 | } | 3763 | } |
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h index 9f56cc8..1cd896d 100644 --- a/korganizer/calendarview.h +++ b/korganizer/calendarview.h | |||
@@ -466,48 +466,49 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser | |||
466 | virtual bool syncExternal(KSyncManager* manager, QString resource); | 466 | virtual bool syncExternal(KSyncManager* manager, QString resource); |
467 | void setSyncManager(KSyncManager* manager); | 467 | void setSyncManager(KSyncManager* manager); |
468 | void setLoadedFileVersion(QDateTime); | 468 | void setLoadedFileVersion(QDateTime); |
469 | bool checkFileVersion(QString fn); | 469 | bool checkFileVersion(QString fn); |
470 | bool checkFileChanged(QString fn); | 470 | bool checkFileChanged(QString fn); |
471 | Event* getLastSyncEvent(); | 471 | Event* getLastSyncEvent(); |
472 | /** Adapt navigation units correpsonding to step size of navigation of the | 472 | /** Adapt navigation units correpsonding to step size of navigation of the |
473 | * current view. | 473 | * current view. |
474 | */ | 474 | */ |
475 | void adaptNavigationUnits(); | 475 | void adaptNavigationUnits(); |
476 | bool synchronizeCalendar( Calendar* local, Calendar* remote, int mode ); | 476 | bool synchronizeCalendar( Calendar* local, Calendar* remote, int mode ); |
477 | int takeEvent( Incidence* local, Incidence* remote, int mode, bool full = false ); | 477 | int takeEvent( Incidence* local, Incidence* remote, int mode, bool full = false ); |
478 | //Attendee* getYourAttendee(Event *event); | 478 | //Attendee* getYourAttendee(Event *event); |
479 | protected: | 479 | protected: |
480 | void schedule(Scheduler::Method, Incidence *incidence = 0); | 480 | void schedule(Scheduler::Method, Incidence *incidence = 0); |
481 | 481 | ||
482 | // returns KMsgBox::OKCandel() | 482 | // returns KMsgBox::OKCandel() |
483 | int msgItemDelete(); | 483 | int msgItemDelete(); |
484 | void showEventEditor(); | 484 | void showEventEditor(); |
485 | void showTodoEditor(); | 485 | void showTodoEditor(); |
486 | void writeLocale(); | 486 | void writeLocale(); |
487 | Todo *selectedTodo(); | 487 | Todo *selectedTodo(); |
488 | 488 | ||
489 | private: | 489 | private: |
490 | bool mSyncKDE; | ||
490 | KSyncManager* mSyncManager; | 491 | KSyncManager* mSyncManager; |
491 | AlarmDialog * mAlarmDialog; | 492 | AlarmDialog * mAlarmDialog; |
492 | QString mAlarmNotification; | 493 | QString mAlarmNotification; |
493 | QString mSuspendAlarmNotification; | 494 | QString mSuspendAlarmNotification; |
494 | QTimer* mSuspendTimer; | 495 | QTimer* mSuspendTimer; |
495 | QTimer* mAlarmTimer; | 496 | QTimer* mAlarmTimer; |
496 | QTimer* mRecheckAlarmTimer; | 497 | QTimer* mRecheckAlarmTimer; |
497 | void computeAlarm( QString ); | 498 | void computeAlarm( QString ); |
498 | void startAlarm( QString, QString ); | 499 | void startAlarm( QString, QString ); |
499 | void setSyncEventsReadOnly(); | 500 | void setSyncEventsReadOnly(); |
500 | 501 | ||
501 | QDateTime loadedFileVersion; | 502 | QDateTime loadedFileVersion; |
502 | void checkExternSyncEvent( QPtrList<Event> lastSync , Incidence* toDelete ); | 503 | void checkExternSyncEvent( QPtrList<Event> lastSync , Incidence* toDelete ); |
503 | void checkExternalId( Incidence * inc ); | 504 | void checkExternalId( Incidence * inc ); |
504 | int mGlobalSyncMode; | 505 | int mGlobalSyncMode; |
505 | QString mCurrentSyncDevice; | 506 | QString mCurrentSyncDevice; |
506 | QString mCurrentSyncName; | 507 | QString mCurrentSyncName; |
507 | KOBeamPrefs* beamDialog; | 508 | KOBeamPrefs* beamDialog; |
508 | void init(); | 509 | void init(); |
509 | int mDatePickerMode; | 510 | int mDatePickerMode; |
510 | bool mFlagEditDescription; | 511 | bool mFlagEditDescription; |
511 | QDateTime mLastCalendarSync; | 512 | QDateTime mLastCalendarSync; |
512 | void createPrinter(); | 513 | void createPrinter(); |
513 | 514 | ||