-rw-r--r-- | korganizer/calendarview.cpp | 2 | ||||
-rw-r--r-- | korganizer/korganizerE.pro | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index a7f7010..b307649 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -935,513 +935,513 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
935 | int take; | 935 | int take; |
936 | Event* eventL; | 936 | Event* eventL; |
937 | Event* eventRSync; | 937 | Event* eventRSync; |
938 | Event* eventLSync; | 938 | Event* eventLSync; |
939 | QPtrList<Event> eventRSyncSharp = remote->getExternLastSyncEvents(); | 939 | QPtrList<Event> eventRSyncSharp = remote->getExternLastSyncEvents(); |
940 | QPtrList<Event> eventLSyncSharp = local->getExternLastSyncEvents(); | 940 | QPtrList<Event> eventLSyncSharp = local->getExternLastSyncEvents(); |
941 | bool fullDateRange = false; | 941 | bool fullDateRange = false; |
942 | mLastCalendarSync = QDateTime::currentDateTime(); | 942 | mLastCalendarSync = QDateTime::currentDateTime(); |
943 | QDateTime modifiedCalendar = mLastCalendarSync;; | 943 | QDateTime modifiedCalendar = mLastCalendarSync;; |
944 | eventR = remote->event("last-syncEvent-"+mCurrentSyncName ); | 944 | eventR = remote->event("last-syncEvent-"+mCurrentSyncName ); |
945 | if ( eventR ) { | 945 | if ( eventR ) { |
946 | eventRSync = (Event*) eventR->clone(); | 946 | eventRSync = (Event*) eventR->clone(); |
947 | remote->deleteEvent(eventR ); | 947 | remote->deleteEvent(eventR ); |
948 | 948 | ||
949 | } else { | 949 | } else { |
950 | fullDateRange = true; | 950 | fullDateRange = true; |
951 | eventRSync = new Event(); | 951 | eventRSync = new Event(); |
952 | eventRSync->setSummary(mCurrentSyncName + i18n(" - sync event")); | 952 | eventRSync->setSummary(mCurrentSyncName + i18n(" - sync event")); |
953 | eventRSync->setUid("last-syncEvent-"+mCurrentSyncName ); | 953 | eventRSync->setUid("last-syncEvent-"+mCurrentSyncName ); |
954 | eventRSync->setDtStart( mLastCalendarSync ); | 954 | eventRSync->setDtStart( mLastCalendarSync ); |
955 | eventRSync->setDtEnd( mLastCalendarSync.addSecs( 7200 ) ); | 955 | eventRSync->setDtEnd( mLastCalendarSync.addSecs( 7200 ) ); |
956 | eventRSync->setCategories( i18n("SyncEvent") ); | 956 | eventRSync->setCategories( i18n("SyncEvent") ); |
957 | } | 957 | } |
958 | eventLSync = getLastSyncEvent(); | 958 | eventLSync = getLastSyncEvent(); |
959 | if ( eventLSync->dtStart() == mLastCalendarSync ) | 959 | if ( eventLSync->dtStart() == mLastCalendarSync ) |
960 | fullDateRange = true; | 960 | fullDateRange = true; |
961 | 961 | ||
962 | if ( ! fullDateRange ) { | 962 | if ( ! fullDateRange ) { |
963 | if ( eventLSync->dtStart() != eventRSync->dtStart() ) { | 963 | if ( eventLSync->dtStart() != eventRSync->dtStart() ) { |
964 | 964 | ||
965 | // qDebug("set fulldate to true %s %s" ,eventLSync->dtStart().toString().latin1(), eventRSync->dtStart().toString().latin1() ); | 965 | // qDebug("set fulldate to true %s %s" ,eventLSync->dtStart().toString().latin1(), eventRSync->dtStart().toString().latin1() ); |
966 | //qDebug("%d %d %d %d ", eventLSync->dtStart().time().second(), eventLSync->dtStart().time().msec() , eventRSync->dtStart().time().second(), eventRSync->dtStart().time().msec()); | 966 | //qDebug("%d %d %d %d ", eventLSync->dtStart().time().second(), eventLSync->dtStart().time().msec() , eventRSync->dtStart().time().second(), eventRSync->dtStart().time().msec()); |
967 | fullDateRange = true; | 967 | fullDateRange = true; |
968 | } | 968 | } |
969 | } | 969 | } |
970 | if ( fullDateRange ) | 970 | if ( fullDateRange ) |
971 | mLastCalendarSync = QDateTime::currentDateTime().addDays( -100*365); | 971 | mLastCalendarSync = QDateTime::currentDateTime().addDays( -100*365); |
972 | else | 972 | else |
973 | mLastCalendarSync = eventLSync->dtStart(); | 973 | mLastCalendarSync = eventLSync->dtStart(); |
974 | // for resyncing if own file has changed | 974 | // for resyncing if own file has changed |
975 | if ( mCurrentSyncDevice == "deleteaftersync" ) { | 975 | if ( mCurrentSyncDevice == "deleteaftersync" ) { |
976 | mLastCalendarSync = loadedFileVersion; | 976 | mLastCalendarSync = loadedFileVersion; |
977 | qDebug("setting mLastCalendarSync "); | 977 | qDebug("setting mLastCalendarSync "); |
978 | } | 978 | } |
979 | //qDebug("*************************** "); | 979 | //qDebug("*************************** "); |
980 | qDebug("mLastCalendarSync %s ",mLastCalendarSync.toString().latin1() ); | 980 | qDebug("mLastCalendarSync %s ",mLastCalendarSync.toString().latin1() ); |
981 | QPtrList<Incidence> er = remote->rawIncidences(); | 981 | QPtrList<Incidence> er = remote->rawIncidences(); |
982 | Incidence* inR = er.first(); | 982 | Incidence* inR = er.first(); |
983 | Incidence* inL; | 983 | Incidence* inL; |
984 | QProgressBar bar( er.count(),0 ); | 984 | QProgressBar bar( er.count(),0 ); |
985 | bar.setCaption (i18n("Syncing - close to abort!") ); | 985 | bar.setCaption (i18n("Syncing - close to abort!") ); |
986 | 986 | ||
987 | int w = 300; | 987 | int w = 300; |
988 | if ( QApplication::desktop()->width() < 320 ) | 988 | if ( QApplication::desktop()->width() < 320 ) |
989 | w = 220; | 989 | w = 220; |
990 | int h = bar.sizeHint().height() ; | 990 | int h = bar.sizeHint().height() ; |
991 | int dw = QApplication::desktop()->width(); | 991 | int dw = QApplication::desktop()->width(); |
992 | int dh = QApplication::desktop()->height(); | 992 | int dh = QApplication::desktop()->height(); |
993 | bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); | 993 | bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); |
994 | bar.show(); | 994 | bar.show(); |
995 | int modulo = (er.count()/10)+1; | 995 | int modulo = (er.count()/10)+1; |
996 | int incCounter = 0; | 996 | int incCounter = 0; |
997 | while ( inR ) { | 997 | while ( inR ) { |
998 | if ( ! bar.isVisible() ) | 998 | if ( ! bar.isVisible() ) |
999 | return false; | 999 | return false; |
1000 | if ( incCounter % modulo == 0 ) | 1000 | if ( incCounter % modulo == 0 ) |
1001 | bar.setProgress( incCounter ); | 1001 | bar.setProgress( incCounter ); |
1002 | ++incCounter; | 1002 | ++incCounter; |
1003 | uid = inR->uid(); | 1003 | uid = inR->uid(); |
1004 | bool skipIncidence = false; | 1004 | bool skipIncidence = false; |
1005 | if ( uid.left(15) == QString("last-syncEvent-") ) | 1005 | if ( uid.left(15) == QString("last-syncEvent-") ) |
1006 | skipIncidence = true; | 1006 | skipIncidence = true; |
1007 | 1007 | ||
1008 | qApp->processEvents(); | 1008 | qApp->processEvents(); |
1009 | if ( !skipIncidence ) { | 1009 | if ( !skipIncidence ) { |
1010 | inL = local->incidence( uid ); | 1010 | inL = local->incidence( uid ); |
1011 | if ( inL ) { // maybe conflict - same uid in both calendars | 1011 | if ( inL ) { // maybe conflict - same uid in both calendars |
1012 | int maxrev = inL->revision(); | 1012 | int maxrev = inL->revision(); |
1013 | if ( maxrev < inR->revision() ) | 1013 | if ( maxrev < inR->revision() ) |
1014 | maxrev = inR->revision(); | 1014 | maxrev = inR->revision(); |
1015 | if ( (take = takeEvent( inL, inR, mode, fullDateRange )) > 0 ) { | 1015 | if ( (take = takeEvent( inL, inR, mode, fullDateRange )) > 0 ) { |
1016 | //qDebug("take %d %s ", take, inL->summary().latin1()); | 1016 | //qDebug("take %d %s ", take, inL->summary().latin1()); |
1017 | if ( take == 3 ) | 1017 | if ( take == 3 ) |
1018 | return false; | 1018 | return false; |
1019 | if ( take == 1 ) {// take local | 1019 | if ( take == 1 ) {// take local |
1020 | inL->setCsum( mCurrentSyncDevice, inR->getCsum(mCurrentSyncDevice) ); | 1020 | inL->setCsum( mCurrentSyncDevice, inR->getCsum(mCurrentSyncDevice) ); |
1021 | remote->deleteIncidence( inR ); | 1021 | remote->deleteIncidence( inR ); |
1022 | if ( inL->revision() < maxrev ) | 1022 | if ( inL->revision() < maxrev ) |
1023 | inL->setRevision( maxrev ); | 1023 | inL->setRevision( maxrev ); |
1024 | remote->addIncidence( inL->clone() ); | 1024 | remote->addIncidence( inL->clone() ); |
1025 | ++changedRemote; | 1025 | ++changedRemote; |
1026 | } else { | 1026 | } else { |
1027 | if ( inR->revision() < maxrev ) | 1027 | if ( inR->revision() < maxrev ) |
1028 | inR->setRevision( maxrev ); | 1028 | inR->setRevision( maxrev ); |
1029 | local->deleteIncidence( inL ); | 1029 | local->deleteIncidence( inL ); |
1030 | local->addIncidence( inR->clone() ); | 1030 | local->addIncidence( inR->clone() ); |
1031 | ++changedLocal; | 1031 | ++changedLocal; |
1032 | } | 1032 | } |
1033 | } | 1033 | } |
1034 | } else { // no conflict | 1034 | } else { // no conflict |
1035 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { | 1035 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { |
1036 | QString des = eventLSync->description(); | 1036 | QString des = eventLSync->description(); |
1037 | QString pref = "e"; | 1037 | QString pref = "e"; |
1038 | if ( inR->type() == "Todo" ) | 1038 | if ( inR->type() == "Todo" ) |
1039 | pref = "t"; | 1039 | pref = "t"; |
1040 | if ( des.find(pref+ inR->getID(mCurrentSyncDevice) +"," ) >= 0 && mode != 5) { // delete it | 1040 | if ( des.find(pref+ inR->getID(mCurrentSyncDevice) +"," ) >= 0 && mode != 5) { // delete it |
1041 | inR->setTempSyncStat( SYNC_TEMPSTATE_DELETE ); | 1041 | inR->setTempSyncStat( SYNC_TEMPSTATE_DELETE ); |
1042 | //remote->deleteIncidence( inR ); | 1042 | //remote->deleteIncidence( inR ); |
1043 | ++deletedEventR; | 1043 | ++deletedEventR; |
1044 | } else { | 1044 | } else { |
1045 | inR->setLastModified( modifiedCalendar ); | 1045 | inR->setLastModified( modifiedCalendar ); |
1046 | local->addIncidence( inR->clone() ); | 1046 | local->addIncidence( inR->clone() ); |
1047 | ++addedEvent; | 1047 | ++addedEvent; |
1048 | } | 1048 | } |
1049 | } else { | 1049 | } else { |
1050 | if ( inR->lastModified() > mLastCalendarSync || mode == 5 ) { | 1050 | if ( inR->lastModified() > mLastCalendarSync || mode == 5 ) { |
1051 | inR->setLastModified( modifiedCalendar ); | 1051 | inR->setLastModified( modifiedCalendar ); |
1052 | local->addIncidence( inR->clone() ); | 1052 | local->addIncidence( inR->clone() ); |
1053 | ++addedEvent; | 1053 | ++addedEvent; |
1054 | } else { | 1054 | } else { |
1055 | checkExternSyncEvent(eventRSyncSharp, inR); | 1055 | checkExternSyncEvent(eventRSyncSharp, inR); |
1056 | remote->deleteIncidence( inR ); | 1056 | remote->deleteIncidence( inR ); |
1057 | ++deletedEventR; | 1057 | ++deletedEventR; |
1058 | } | 1058 | } |
1059 | } | 1059 | } |
1060 | } | 1060 | } |
1061 | } | 1061 | } |
1062 | inR = er.next(); | 1062 | inR = er.next(); |
1063 | } | 1063 | } |
1064 | QPtrList<Incidence> el = local->rawIncidences(); | 1064 | QPtrList<Incidence> el = local->rawIncidences(); |
1065 | inL = el.first(); | 1065 | inL = el.first(); |
1066 | modulo = (el.count()/10)+1; | 1066 | modulo = (el.count()/10)+1; |
1067 | bar.setCaption (i18n("Add / remove events") ); | 1067 | bar.setCaption (i18n("Add / remove events") ); |
1068 | bar.setTotalSteps ( el.count() ) ; | 1068 | bar.setTotalSteps ( el.count() ) ; |
1069 | bar.show(); | 1069 | bar.show(); |
1070 | incCounter = 0; | 1070 | incCounter = 0; |
1071 | 1071 | ||
1072 | while ( inL ) { | 1072 | while ( inL ) { |
1073 | 1073 | ||
1074 | qApp->processEvents(); | 1074 | qApp->processEvents(); |
1075 | if ( ! bar.isVisible() ) | 1075 | if ( ! bar.isVisible() ) |
1076 | return false; | 1076 | return false; |
1077 | if ( incCounter % modulo == 0 ) | 1077 | if ( incCounter % modulo == 0 ) |
1078 | bar.setProgress( incCounter ); | 1078 | bar.setProgress( incCounter ); |
1079 | ++incCounter; | 1079 | ++incCounter; |
1080 | uid = inL->uid(); | 1080 | uid = inL->uid(); |
1081 | bool skipIncidence = false; | 1081 | bool skipIncidence = false; |
1082 | if ( uid.left(15) == QString("last-syncEvent-") ) | 1082 | if ( uid.left(15) == QString("last-syncEvent-") ) |
1083 | skipIncidence = true; | 1083 | skipIncidence = true; |
1084 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL && inL->type() == "Journal" ) | 1084 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL && inL->type() == "Journal" ) |
1085 | skipIncidence = true; | 1085 | skipIncidence = true; |
1086 | if ( !skipIncidence ) { | 1086 | if ( !skipIncidence ) { |
1087 | inR = remote->incidence( uid ); | 1087 | inR = remote->incidence( uid ); |
1088 | if ( ! inR ) { | 1088 | if ( ! inR ) { |
1089 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { | 1089 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { |
1090 | if ( !inL->getID(mCurrentSyncDevice).isEmpty() && mode != 4 ) { | 1090 | if ( !inL->getID(mCurrentSyncDevice).isEmpty() && mode != 4 ) { |
1091 | local->deleteIncidence( inL ); | 1091 | local->deleteIncidence( inL ); |
1092 | ++deletedEventL; | 1092 | ++deletedEventL; |
1093 | } else { | 1093 | } else { |
1094 | if ( ! KOPrefs::instance()->mWriteBackExistingOnly ) { | 1094 | if ( ! KOPrefs::instance()->mWriteBackExistingOnly ) { |
1095 | inL->removeID(mCurrentSyncDevice ); | 1095 | inL->removeID(mCurrentSyncDevice ); |
1096 | ++addedEventR; | 1096 | ++addedEventR; |
1097 | inL->setLastModified( modifiedCalendar ); | 1097 | inL->setLastModified( modifiedCalendar ); |
1098 | remote->addIncidence( inL->clone() ); | 1098 | remote->addIncidence( inL->clone() ); |
1099 | } | 1099 | } |
1100 | } | 1100 | } |
1101 | } else { | 1101 | } else { |
1102 | if ( inL->lastModified() < mLastCalendarSync && mode != 4 ) { | 1102 | if ( inL->lastModified() < mLastCalendarSync && mode != 4 ) { |
1103 | checkExternSyncEvent(eventLSyncSharp, inL); | 1103 | checkExternSyncEvent(eventLSyncSharp, inL); |
1104 | local->deleteIncidence( inL ); | 1104 | local->deleteIncidence( inL ); |
1105 | ++deletedEventL; | 1105 | ++deletedEventL; |
1106 | } else { | 1106 | } else { |
1107 | if ( ! KOPrefs::instance()->mWriteBackExistingOnly ) { | 1107 | if ( ! KOPrefs::instance()->mWriteBackExistingOnly ) { |
1108 | ++addedEventR; | 1108 | ++addedEventR; |
1109 | inL->setLastModified( modifiedCalendar ); | 1109 | inL->setLastModified( modifiedCalendar ); |
1110 | remote->addIncidence( inL->clone() ); | 1110 | remote->addIncidence( inL->clone() ); |
1111 | } | 1111 | } |
1112 | } | 1112 | } |
1113 | } | 1113 | } |
1114 | } | 1114 | } |
1115 | } | 1115 | } |
1116 | inL = el.next(); | 1116 | inL = el.next(); |
1117 | } | 1117 | } |
1118 | 1118 | ||
1119 | bar.hide(); | 1119 | bar.hide(); |
1120 | mLastCalendarSync = QDateTime::currentDateTime().addSecs( 1 ); | 1120 | mLastCalendarSync = QDateTime::currentDateTime().addSecs( 1 ); |
1121 | eventLSync->setReadOnly( false ); | 1121 | eventLSync->setReadOnly( false ); |
1122 | eventLSync->setDtStart( mLastCalendarSync ); | 1122 | eventLSync->setDtStart( mLastCalendarSync ); |
1123 | eventRSync->setDtStart( mLastCalendarSync ); | 1123 | eventRSync->setDtStart( mLastCalendarSync ); |
1124 | eventLSync->setDtEnd( mLastCalendarSync.addSecs( 3600 ) ); | 1124 | eventLSync->setDtEnd( mLastCalendarSync.addSecs( 3600 ) ); |
1125 | eventRSync->setDtEnd( mLastCalendarSync.addSecs( 3600 ) ); | 1125 | eventRSync->setDtEnd( mLastCalendarSync.addSecs( 3600 ) ); |
1126 | eventRSync->setLocation( i18n("Remote from: ")+mCurrentSyncName ) ; | 1126 | eventRSync->setLocation( i18n("Remote from: ")+mCurrentSyncName ) ; |
1127 | eventLSync->setLocation(i18n("Local from: ") + mCurrentSyncName ); | 1127 | eventLSync->setLocation(i18n("Local from: ") + mCurrentSyncName ); |
1128 | eventLSync->setReadOnly( true ); | 1128 | eventLSync->setReadOnly( true ); |
1129 | if ( mGlobalSyncMode == SYNC_MODE_NORMAL) | 1129 | if ( mGlobalSyncMode == SYNC_MODE_NORMAL) |
1130 | remote->addEvent( eventRSync ); | 1130 | remote->addEvent( eventRSync ); |
1131 | QString mes; | 1131 | QString mes; |
1132 | 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 ); | 1132 | 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 ); |
1133 | if ( KOPrefs::instance()->mShowSyncSummary ) { | 1133 | if ( KOPrefs::instance()->mShowSyncSummary ) { |
1134 | KMessageBox::information(this, mes, i18n("KO/Pi Synchronization") ); | 1134 | KMessageBox::information(this, mes, i18n("KO/Pi Synchronization") ); |
1135 | } | 1135 | } |
1136 | qDebug( mes ); | 1136 | qDebug( mes ); |
1137 | mCalendar->checkAlarmForIncidence( 0, true ); | 1137 | mCalendar->checkAlarmForIncidence( 0, true ); |
1138 | return syncOK; | 1138 | return syncOK; |
1139 | } | 1139 | } |
1140 | 1140 | ||
1141 | void CalendarView::setSyncDevice( QString s ) | 1141 | void CalendarView::setSyncDevice( QString s ) |
1142 | { | 1142 | { |
1143 | mCurrentSyncDevice= s; | 1143 | mCurrentSyncDevice= s; |
1144 | } | 1144 | } |
1145 | void CalendarView::setSyncName( QString s ) | 1145 | void CalendarView::setSyncName( QString s ) |
1146 | { | 1146 | { |
1147 | mCurrentSyncName= s; | 1147 | mCurrentSyncName= s; |
1148 | } | 1148 | } |
1149 | bool CalendarView::syncCalendar(QString filename, int mode) | 1149 | bool CalendarView::syncCalendar(QString filename, int mode) |
1150 | { | 1150 | { |
1151 | mGlobalSyncMode = SYNC_MODE_NORMAL; | 1151 | mGlobalSyncMode = SYNC_MODE_NORMAL; |
1152 | CalendarLocal* calendar = new CalendarLocal(); | 1152 | CalendarLocal* calendar = new CalendarLocal(); |
1153 | calendar->setTimeZoneId(KOPrefs::instance()->mTimeZoneId); | 1153 | calendar->setTimeZoneId(KOPrefs::instance()->mTimeZoneId); |
1154 | FileStorage* storage = new FileStorage( calendar ); | 1154 | FileStorage* storage = new FileStorage( calendar ); |
1155 | bool syncOK = false; | 1155 | bool syncOK = false; |
1156 | storage->setFileName( filename ); | 1156 | storage->setFileName( filename ); |
1157 | // qDebug("loading ... "); | 1157 | // qDebug("loading ... "); |
1158 | if ( storage->load(KOPrefs::instance()->mUseQuicksave) ) { | 1158 | if ( storage->load(KOPrefs::instance()->mUseQuicksave) ) { |
1159 | getEventViewerDialog()->setSyncMode( true ); | 1159 | getEventViewerDialog()->setSyncMode( true ); |
1160 | syncOK = synchronizeCalendar( mCalendar, calendar, mode ); | 1160 | syncOK = synchronizeCalendar( mCalendar, calendar, mode ); |
1161 | getEventViewerDialog()->setSyncMode( false ); | 1161 | getEventViewerDialog()->setSyncMode( false ); |
1162 | if ( syncOK ) { | 1162 | if ( syncOK ) { |
1163 | if ( KOPrefs::instance()->mWriteBackFile ) | 1163 | if ( KOPrefs::instance()->mWriteBackFile ) |
1164 | { | 1164 | { |
1165 | storage->setSaveFormat( new ICalFormat( KOPrefs::instance()->mUseQuicksave) ); | 1165 | storage->setSaveFormat( new ICalFormat( KOPrefs::instance()->mUseQuicksave) ); |
1166 | storage->save(); | 1166 | storage->save(); |
1167 | } | 1167 | } |
1168 | } | 1168 | } |
1169 | setModified( true ); | 1169 | setModified( true ); |
1170 | } | 1170 | } |
1171 | delete storage; | 1171 | delete storage; |
1172 | delete calendar; | 1172 | delete calendar; |
1173 | if ( syncOK ) | 1173 | if ( syncOK ) |
1174 | updateView(); | 1174 | updateView(); |
1175 | return syncOK; | 1175 | return syncOK; |
1176 | } | 1176 | } |
1177 | void CalendarView::syncPhone() | 1177 | void CalendarView::syncPhone() |
1178 | { | 1178 | { |
1179 | syncExternal( 1 ); | 1179 | syncExternal( 1 ); |
1180 | } | 1180 | } |
1181 | void CalendarView::syncExternal( int mode ) | 1181 | void CalendarView::syncExternal( int mode ) |
1182 | { | 1182 | { |
1183 | mGlobalSyncMode = SYNC_MODE_EXTERNAL; | 1183 | mGlobalSyncMode = SYNC_MODE_EXTERNAL; |
1184 | //mCurrentSyncDevice = "sharp-DTM"; | 1184 | //mCurrentSyncDevice = "sharp-DTM"; |
1185 | if ( KOPrefs::instance()->mAskForPreferences ) | 1185 | if ( KOPrefs::instance()->mAskForPreferences ) |
1186 | edit_sync_options(); | 1186 | edit_sync_options(); |
1187 | qApp->processEvents(); | 1187 | qApp->processEvents(); |
1188 | CalendarLocal* calendar = new CalendarLocal(); | 1188 | CalendarLocal* calendar = new CalendarLocal(); |
1189 | calendar->setTimeZoneId(KOPrefs::instance()->mTimeZoneId); | 1189 | calendar->setTimeZoneId(KOPrefs::instance()->mTimeZoneId); |
1190 | bool syncOK = false; | 1190 | bool syncOK = false; |
1191 | boo loadSuccess = false; | 1191 | bool loadSuccess = false; |
1192 | PhoneFormat* phoneFormat = 0; | 1192 | PhoneFormat* phoneFormat = 0; |
1193 | #ifndef DESKTOP_VERSION | 1193 | #ifndef DESKTOP_VERSION |
1194 | SharpFormat* sharpFormat = 0; | 1194 | SharpFormat* sharpFormat = 0; |
1195 | if ( mode == 0 ) { // sharp | 1195 | if ( mode == 0 ) { // sharp |
1196 | sharpFormat = new SharpFormat () ; | 1196 | sharpFormat = new SharpFormat () ; |
1197 | loadSuccess = sharpFormat->load( calendar, mCalendar ); | 1197 | loadSuccess = sharpFormat->load( calendar, mCalendar ); |
1198 | 1198 | ||
1199 | } else | 1199 | } else |
1200 | #endif | 1200 | #endif |
1201 | if ( mode == 1 ) { // phone | 1201 | if ( mode == 1 ) { // phone |
1202 | phoneFormat = new PhoneFormat (); | 1202 | phoneFormat = new PhoneFormat (); |
1203 | loadSuccess = phoneFormat->load( calendar, mCalendar ); | 1203 | loadSuccess = phoneFormat->load( calendar, mCalendar ); |
1204 | 1204 | ||
1205 | } else | 1205 | } else |
1206 | return; | 1206 | return; |
1207 | if ( loadSuccess ) { | 1207 | if ( loadSuccess ) { |
1208 | getEventViewerDialog()->setSyncMode( true ); | 1208 | getEventViewerDialog()->setSyncMode( true ); |
1209 | syncOK = synchronizeCalendar( mCalendar, calendar, KOPrefs::instance()->mSyncAlgoPrefs ); | 1209 | syncOK = synchronizeCalendar( mCalendar, calendar, KOPrefs::instance()->mSyncAlgoPrefs ); |
1210 | getEventViewerDialog()->setSyncMode( false ); | 1210 | getEventViewerDialog()->setSyncMode( false ); |
1211 | qApp->processEvents(); | 1211 | qApp->processEvents(); |
1212 | if ( syncOK ) { | 1212 | if ( syncOK ) { |
1213 | if ( KOPrefs::instance()->mWriteBackFile ) | 1213 | if ( KOPrefs::instance()->mWriteBackFile ) |
1214 | { | 1214 | { |
1215 | QPtrList<Incidence> iL = mCalendar->rawIncidences(); | 1215 | QPtrList<Incidence> iL = mCalendar->rawIncidences(); |
1216 | Incidence* inc = iL.first(); | 1216 | Incidence* inc = iL.first(); |
1217 | /* obsolete | 1217 | /* obsolete |
1218 | while ( inc ) { | 1218 | while ( inc ) { |
1219 | inc->setZaurusStat( inc->revision () ); | 1219 | inc->setZaurusStat( inc->revision () ); |
1220 | inc = iL.next(); | 1220 | inc = iL.next(); |
1221 | } | 1221 | } |
1222 | */ | 1222 | */ |
1223 | #ifndef DESKTOP_VERSION | 1223 | #ifndef DESKTOP_VERSION |
1224 | if ( sharpFormat ) | 1224 | if ( sharpFormat ) |
1225 | sharpFormat->save(calendar); | 1225 | sharpFormat->save(calendar); |
1226 | #endif | 1226 | #endif |
1227 | if ( phoneFormat ) | 1227 | if ( phoneFormat ) |
1228 | phoneFormat->save(calendar); | 1228 | phoneFormat->save(calendar); |
1229 | iL = calendar->rawIncidences(); | 1229 | iL = calendar->rawIncidences(); |
1230 | inc = iL.first(); | 1230 | inc = iL.first(); |
1231 | Incidence* loc; | 1231 | Incidence* loc; |
1232 | while ( inc ) { | 1232 | while ( inc ) { |
1233 | if ( inc->tempSyncStat() == SYNC_TEMPSTATE_NEW_ID ) { | 1233 | if ( inc->tempSyncStat() == SYNC_TEMPSTATE_NEW_ID ) { |
1234 | loc = mCalendar->incidence(inc->uid() ); | 1234 | loc = mCalendar->incidence(inc->uid() ); |
1235 | if ( loc ) { | 1235 | if ( loc ) { |
1236 | loc->setID(mCurrentSyncDevice, inc->getID(mCurrentSyncDevice) ); | 1236 | loc->setID(mCurrentSyncDevice, inc->getID(mCurrentSyncDevice) ); |
1237 | loc->setCsum( mCurrentSyncDevice, inc->getCsum(mCurrentSyncDevice) ); | 1237 | loc->setCsum( mCurrentSyncDevice, inc->getCsum(mCurrentSyncDevice) ); |
1238 | } | 1238 | } |
1239 | } | 1239 | } |
1240 | inc = iL.next(); | 1240 | inc = iL.next(); |
1241 | } | 1241 | } |
1242 | Incidence* lse = getLastSyncEvent(); | 1242 | Incidence* lse = getLastSyncEvent(); |
1243 | if ( lse ) { | 1243 | if ( lse ) { |
1244 | lse->setReadOnly( false ); | 1244 | lse->setReadOnly( false ); |
1245 | lse->setDescription( "" ); | 1245 | lse->setDescription( "" ); |
1246 | lse->setReadOnly( true ); | 1246 | lse->setReadOnly( true ); |
1247 | } | 1247 | } |
1248 | } | 1248 | } |
1249 | } | 1249 | } |
1250 | setModified( true ); | 1250 | setModified( true ); |
1251 | } else { | 1251 | } else { |
1252 | QString question = i18n("Sorry, the database access\ncommand failed!\n\nNothing synced!\n") ; | 1252 | QString question = i18n("Sorry, the database access\ncommand failed!\n\nNothing synced!\n") ; |
1253 | QMessageBox::information( 0, i18n("KO/Pi Import - ERROR"), | 1253 | QMessageBox::information( 0, i18n("KO/Pi Import - ERROR"), |
1254 | question, i18n("Ok")) ; | 1254 | question, i18n("Ok")) ; |
1255 | 1255 | ||
1256 | } | 1256 | } |
1257 | delete calendar; | 1257 | delete calendar; |
1258 | updateView(); | 1258 | updateView(); |
1259 | return ;//syncOK; | 1259 | return ;//syncOK; |
1260 | 1260 | ||
1261 | } | 1261 | } |
1262 | void CalendarView::syncSharp() | 1262 | void CalendarView::syncSharp() |
1263 | { | 1263 | { |
1264 | syncExternal( 0 ); | 1264 | syncExternal( 0 ); |
1265 | 1265 | ||
1266 | } | 1266 | } |
1267 | 1267 | ||
1268 | 1268 | ||
1269 | #include <kabc/stdaddressbook.h> | 1269 | #include <kabc/stdaddressbook.h> |
1270 | bool CalendarView::importBday() | 1270 | bool CalendarView::importBday() |
1271 | { | 1271 | { |
1272 | KABC::StdAddressBook* AddressBook = KABC::StdAddressBook::self( true ); | 1272 | KABC::StdAddressBook* AddressBook = KABC::StdAddressBook::self( true ); |
1273 | KABC::AddressBook::Iterator it; | 1273 | KABC::AddressBook::Iterator it; |
1274 | int count = 0; | 1274 | int count = 0; |
1275 | for( it = AddressBook->begin(); it != AddressBook->end(); ++it ) { | 1275 | for( it = AddressBook->begin(); it != AddressBook->end(); ++it ) { |
1276 | ++count; | 1276 | ++count; |
1277 | } | 1277 | } |
1278 | QProgressBar bar(count,0 ); | 1278 | QProgressBar bar(count,0 ); |
1279 | int w = 300; | 1279 | int w = 300; |
1280 | if ( QApplication::desktop()->width() < 320 ) | 1280 | if ( QApplication::desktop()->width() < 320 ) |
1281 | w = 220; | 1281 | w = 220; |
1282 | int h = bar.sizeHint().height() ; | 1282 | int h = bar.sizeHint().height() ; |
1283 | int dw = QApplication::desktop()->width(); | 1283 | int dw = QApplication::desktop()->width(); |
1284 | int dh = QApplication::desktop()->height(); | 1284 | int dh = QApplication::desktop()->height(); |
1285 | bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); | 1285 | bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); |
1286 | bar.show(); | 1286 | bar.show(); |
1287 | bar.setCaption (i18n("Reading addressbook - close to abort!") ); | 1287 | bar.setCaption (i18n("Reading addressbook - close to abort!") ); |
1288 | qApp->processEvents(); | 1288 | qApp->processEvents(); |
1289 | count = 0; | 1289 | count = 0; |
1290 | int addCount = 0; | 1290 | int addCount = 0; |
1291 | KCal::Attendee* a = 0; | 1291 | KCal::Attendee* a = 0; |
1292 | for( it = AddressBook->begin(); it != AddressBook->end(); ++it ) { | 1292 | for( it = AddressBook->begin(); it != AddressBook->end(); ++it ) { |
1293 | if ( ! bar.isVisible() ) | 1293 | if ( ! bar.isVisible() ) |
1294 | return false; | 1294 | return false; |
1295 | bar.setProgress( count++ ); | 1295 | bar.setProgress( count++ ); |
1296 | qApp->processEvents(); | 1296 | qApp->processEvents(); |
1297 | //qDebug("add BDay %s %s", (*it).realName().latin1(),(*it).birthday().date().toString().latin1() ); | 1297 | //qDebug("add BDay %s %s", (*it).realName().latin1(),(*it).birthday().date().toString().latin1() ); |
1298 | if ( (*it).birthday().date().isValid() ){ | 1298 | if ( (*it).birthday().date().isValid() ){ |
1299 | a = new KCal::Attendee( (*it).realName(), (*it).preferredEmail(),false,KCal::Attendee::NeedsAction,KCal::Attendee::ReqParticipant,(*it).uid()) ; | 1299 | a = new KCal::Attendee( (*it).realName(), (*it).preferredEmail(),false,KCal::Attendee::NeedsAction,KCal::Attendee::ReqParticipant,(*it).uid()) ; |
1300 | if ( addAnniversary( (*it).birthday().date(), (*it).assembledName(), a, true ) ) | 1300 | if ( addAnniversary( (*it).birthday().date(), (*it).assembledName(), a, true ) ) |
1301 | ++addCount; | 1301 | ++addCount; |
1302 | } | 1302 | } |
1303 | QDate anni = KGlobal::locale()->readDate( (*it).custom("KADDRESSBOOK", "X-Anniversary" ), "%Y-%m-%d"); | 1303 | QDate anni = KGlobal::locale()->readDate( (*it).custom("KADDRESSBOOK", "X-Anniversary" ), "%Y-%m-%d"); |
1304 | if ( anni.isValid() ){ | 1304 | if ( anni.isValid() ){ |
1305 | a = new KCal::Attendee( (*it).realName(), (*it).preferredEmail(),false,KCal::Attendee::NeedsAction,KCal::Attendee::ReqParticipant,(*it).uid()) ; | 1305 | a = new KCal::Attendee( (*it).realName(), (*it).preferredEmail(),false,KCal::Attendee::NeedsAction,KCal::Attendee::ReqParticipant,(*it).uid()) ; |
1306 | if ( addAnniversary( anni, (*it).assembledName(), a, false ) ) | 1306 | if ( addAnniversary( anni, (*it).assembledName(), a, false ) ) |
1307 | ++addCount; | 1307 | ++addCount; |
1308 | } | 1308 | } |
1309 | } | 1309 | } |
1310 | updateView(); | 1310 | updateView(); |
1311 | topLevelWidget()->setCaption(QString::number( addCount )+ i18n(" birthdays/anniversaries added!")); | 1311 | topLevelWidget()->setCaption(QString::number( addCount )+ i18n(" birthdays/anniversaries added!")); |
1312 | return true; | 1312 | return true; |
1313 | } | 1313 | } |
1314 | 1314 | ||
1315 | bool CalendarView::addAnniversary( QDate date, QString name, KCal::Attendee* a, bool birthday) | 1315 | bool CalendarView::addAnniversary( QDate date, QString name, KCal::Attendee* a, bool birthday) |
1316 | { | 1316 | { |
1317 | //qDebug("addAnni "); | 1317 | //qDebug("addAnni "); |
1318 | Event * ev = new Event(); | 1318 | Event * ev = new Event(); |
1319 | if ( a ) { | 1319 | if ( a ) { |
1320 | ev->addAttendee( a ); | 1320 | ev->addAttendee( a ); |
1321 | } | 1321 | } |
1322 | QString kind; | 1322 | QString kind; |
1323 | if ( birthday ) | 1323 | if ( birthday ) |
1324 | kind = i18n( "Birthday" ); | 1324 | kind = i18n( "Birthday" ); |
1325 | else | 1325 | else |
1326 | kind = i18n( "Anniversary" ); | 1326 | kind = i18n( "Anniversary" ); |
1327 | ev->setSummary( name + " - " + kind ); | 1327 | ev->setSummary( name + " - " + kind ); |
1328 | ev->setOrganizer( "nobody@nowhere" ); | 1328 | ev->setOrganizer( "nobody@nowhere" ); |
1329 | ev->setCategories( kind ); | 1329 | ev->setCategories( kind ); |
1330 | ev->setDtStart( QDateTime(date) ); | 1330 | ev->setDtStart( QDateTime(date) ); |
1331 | ev->setDtEnd( QDateTime(date) ); | 1331 | ev->setDtEnd( QDateTime(date) ); |
1332 | ev->setFloats( true ); | 1332 | ev->setFloats( true ); |
1333 | Recurrence * rec = ev->recurrence(); | 1333 | Recurrence * rec = ev->recurrence(); |
1334 | rec->setYearly(Recurrence::rYearlyMonth,1,-1); | 1334 | rec->setYearly(Recurrence::rYearlyMonth,1,-1); |
1335 | rec->addYearlyNum( date.month() ); | 1335 | rec->addYearlyNum( date.month() ); |
1336 | if ( !mCalendar->addAnniversaryNoDup( ev ) ) { | 1336 | if ( !mCalendar->addAnniversaryNoDup( ev ) ) { |
1337 | delete ev; | 1337 | delete ev; |
1338 | return false; | 1338 | return false; |
1339 | } | 1339 | } |
1340 | return true; | 1340 | return true; |
1341 | 1341 | ||
1342 | } | 1342 | } |
1343 | bool CalendarView::importQtopia( const QString &categories, | 1343 | bool CalendarView::importQtopia( const QString &categories, |
1344 | const QString &datebook, | 1344 | const QString &datebook, |
1345 | const QString &todolist ) | 1345 | const QString &todolist ) |
1346 | { | 1346 | { |
1347 | 1347 | ||
1348 | QtopiaFormat qtopiaFormat; | 1348 | QtopiaFormat qtopiaFormat; |
1349 | qtopiaFormat.setCategoriesList ( &(KOPrefs::instance()->mCustomCategories)); | 1349 | qtopiaFormat.setCategoriesList ( &(KOPrefs::instance()->mCustomCategories)); |
1350 | if ( !categories.isEmpty() ) qtopiaFormat.load( mCalendar, categories ); | 1350 | if ( !categories.isEmpty() ) qtopiaFormat.load( mCalendar, categories ); |
1351 | if ( !datebook.isEmpty() ) qtopiaFormat.load( mCalendar, datebook ); | 1351 | if ( !datebook.isEmpty() ) qtopiaFormat.load( mCalendar, datebook ); |
1352 | if ( !todolist.isEmpty() ) qtopiaFormat.load( mCalendar, todolist ); | 1352 | if ( !todolist.isEmpty() ) qtopiaFormat.load( mCalendar, todolist ); |
1353 | 1353 | ||
1354 | updateView(); | 1354 | updateView(); |
1355 | return true; | 1355 | return true; |
1356 | 1356 | ||
1357 | #if 0 | 1357 | #if 0 |
1358 | mGlobalSyncMode = SYNC_MODE_QTOPIA; | 1358 | mGlobalSyncMode = SYNC_MODE_QTOPIA; |
1359 | mCurrentSyncDevice = "qtopia-XML"; | 1359 | mCurrentSyncDevice = "qtopia-XML"; |
1360 | if ( KOPrefs::instance()->mAskForPreferences ) | 1360 | if ( KOPrefs::instance()->mAskForPreferences ) |
1361 | edit_sync_options(); | 1361 | edit_sync_options(); |
1362 | qApp->processEvents(); | 1362 | qApp->processEvents(); |
1363 | CalendarLocal* calendar = new CalendarLocal(); | 1363 | CalendarLocal* calendar = new CalendarLocal(); |
1364 | calendar->setTimeZoneId(KOPrefs::instance()->mTimeZoneId); | 1364 | calendar->setTimeZoneId(KOPrefs::instance()->mTimeZoneId); |
1365 | bool syncOK = false; | 1365 | bool syncOK = false; |
1366 | QtopiaFormat qtopiaFormat; | 1366 | QtopiaFormat qtopiaFormat; |
1367 | qtopiaFormat.setCategoriesList ( &(KOPrefs::instance()->mCustomCategories)); | 1367 | qtopiaFormat.setCategoriesList ( &(KOPrefs::instance()->mCustomCategories)); |
1368 | bool loadOk = true; | 1368 | bool loadOk = true; |
1369 | if ( !categories.isEmpty() ) | 1369 | if ( !categories.isEmpty() ) |
1370 | loadOk = qtopiaFormat.load( calendar, categories ); | 1370 | loadOk = qtopiaFormat.load( calendar, categories ); |
1371 | if ( loadOk && !datebook.isEmpty() ) | 1371 | if ( loadOk && !datebook.isEmpty() ) |
1372 | loadOk = qtopiaFormat.load( calendar, datebook ); | 1372 | loadOk = qtopiaFormat.load( calendar, datebook ); |
1373 | if ( loadOk && !todolist.isEmpty() ) | 1373 | if ( loadOk && !todolist.isEmpty() ) |
1374 | loadOk = qtopiaFormat.load( calendar, todolist ); | 1374 | loadOk = qtopiaFormat.load( calendar, todolist ); |
1375 | 1375 | ||
1376 | if ( loadOk ) { | 1376 | if ( loadOk ) { |
1377 | getEventViewerDialog()->setSyncMode( true ); | 1377 | getEventViewerDialog()->setSyncMode( true ); |
1378 | syncOK = synchronizeCalendar( mCalendar, calendar, KOPrefs::instance()->mSyncAlgoPrefs ); | 1378 | syncOK = synchronizeCalendar( mCalendar, calendar, KOPrefs::instance()->mSyncAlgoPrefs ); |
1379 | getEventViewerDialog()->setSyncMode( false ); | 1379 | getEventViewerDialog()->setSyncMode( false ); |
1380 | qApp->processEvents(); | 1380 | qApp->processEvents(); |
1381 | if ( syncOK ) { | 1381 | if ( syncOK ) { |
1382 | if ( KOPrefs::instance()->mWriteBackFile ) | 1382 | if ( KOPrefs::instance()->mWriteBackFile ) |
1383 | { | 1383 | { |
1384 | // write back XML file | 1384 | // write back XML file |
1385 | 1385 | ||
1386 | } | 1386 | } |
1387 | setModified( true ); | 1387 | setModified( true ); |
1388 | } | 1388 | } |
1389 | } else { | 1389 | } else { |
1390 | QString question = i18n("Sorry, the file loading\ncommand failed!\n\nNothing synced!\n") ; | 1390 | QString question = i18n("Sorry, the file loading\ncommand failed!\n\nNothing synced!\n") ; |
1391 | QMessageBox::information( 0, i18n("KO/Pi Sync - ERROR"), | 1391 | QMessageBox::information( 0, i18n("KO/Pi Sync - ERROR"), |
1392 | question, i18n("Ok")) ; | 1392 | question, i18n("Ok")) ; |
1393 | } | 1393 | } |
1394 | delete calendar; | 1394 | delete calendar; |
1395 | updateView(); | 1395 | updateView(); |
1396 | return syncOK; | 1396 | return syncOK; |
1397 | 1397 | ||
1398 | 1398 | ||
1399 | #endif | 1399 | #endif |
1400 | 1400 | ||
1401 | } | 1401 | } |
1402 | 1402 | ||
1403 | void CalendarView::setSyncEventsReadOnly() | 1403 | void CalendarView::setSyncEventsReadOnly() |
1404 | { | 1404 | { |
1405 | Event * ev; | 1405 | Event * ev; |
1406 | QPtrList<Event> eL = mCalendar->rawEvents(); | 1406 | QPtrList<Event> eL = mCalendar->rawEvents(); |
1407 | ev = eL.first(); | 1407 | ev = eL.first(); |
1408 | while ( ev ) { | 1408 | while ( ev ) { |
1409 | if ( ev->uid().left(15) == QString("last-syncEvent-") ) | 1409 | if ( ev->uid().left(15) == QString("last-syncEvent-") ) |
1410 | ev->setReadOnly( true ); | 1410 | ev->setReadOnly( true ); |
1411 | ev = eL.next(); | 1411 | ev = eL.next(); |
1412 | } | 1412 | } |
1413 | } | 1413 | } |
1414 | bool CalendarView::openCalendar(QString filename, bool merge) | 1414 | bool CalendarView::openCalendar(QString filename, bool merge) |
1415 | { | 1415 | { |
1416 | 1416 | ||
1417 | if (filename.isEmpty()) { | 1417 | if (filename.isEmpty()) { |
1418 | return false; | 1418 | return false; |
1419 | } | 1419 | } |
1420 | 1420 | ||
1421 | if (!QFile::exists(filename)) { | 1421 | if (!QFile::exists(filename)) { |
1422 | KMessageBox::error(this,i18n("File does not exist:\n '%1'.").arg(filename)); | 1422 | KMessageBox::error(this,i18n("File does not exist:\n '%1'.").arg(filename)); |
1423 | return false; | 1423 | return false; |
1424 | } | 1424 | } |
1425 | 1425 | ||
1426 | globalFlagBlockAgenda = 1; | 1426 | globalFlagBlockAgenda = 1; |
1427 | if (!merge) mCalendar->close(); | 1427 | if (!merge) mCalendar->close(); |
1428 | 1428 | ||
1429 | mStorage->setFileName( filename ); | 1429 | mStorage->setFileName( filename ); |
1430 | 1430 | ||
1431 | if ( mStorage->load(KOPrefs::instance()->mUseQuicksave) ) { | 1431 | if ( mStorage->load(KOPrefs::instance()->mUseQuicksave) ) { |
1432 | if ( merge ) ;//setModified( true ); | 1432 | if ( merge ) ;//setModified( true ); |
1433 | else { | 1433 | else { |
1434 | //setModified( true ); | 1434 | //setModified( true ); |
1435 | mViewManager->setDocumentId( filename ); | 1435 | mViewManager->setDocumentId( filename ); |
1436 | mDialogManager->setDocumentId( filename ); | 1436 | mDialogManager->setDocumentId( filename ); |
1437 | mTodoList->setDocumentId( filename ); | 1437 | mTodoList->setDocumentId( filename ); |
1438 | } | 1438 | } |
1439 | globalFlagBlockAgenda = 2; | 1439 | globalFlagBlockAgenda = 2; |
1440 | // if ( getLastSyncEvent() ) | 1440 | // if ( getLastSyncEvent() ) |
1441 | // getLastSyncEvent()->setReadOnly( true ); | 1441 | // getLastSyncEvent()->setReadOnly( true ); |
1442 | mCalendar->reInitAlarmSettings(); | 1442 | mCalendar->reInitAlarmSettings(); |
1443 | setSyncEventsReadOnly(); | 1443 | setSyncEventsReadOnly(); |
1444 | updateUnmanagedViews(); | 1444 | updateUnmanagedViews(); |
1445 | updateView(); | 1445 | updateView(); |
1446 | if ( filename != MainWindow::defaultFileName() ) | 1446 | if ( filename != MainWindow::defaultFileName() ) |
1447 | saveCalendar( MainWindow::defaultFileName() ); | 1447 | saveCalendar( MainWindow::defaultFileName() ); |
diff --git a/korganizer/korganizerE.pro b/korganizer/korganizerE.pro index 727764a..b39de35 100644 --- a/korganizer/korganizerE.pro +++ b/korganizer/korganizerE.pro | |||
@@ -1,149 +1,156 @@ | |||
1 | TEMPLATE= app | 1 | TEMPLATE= app |
2 | CONFIG += qt warn_on | 2 | CONFIG += qt warn_on |
3 | TARGET = kopi | 3 | TARGET = kopi |
4 | OBJECTS_DIR = obj/$(PLATFORM) | 4 | OBJECTS_DIR = obj/$(PLATFORM) |
5 | MOC_DIR = moc/$(PLATFORM) | 5 | MOC_DIR = moc/$(PLATFORM) |
6 | DESTDIR=$(QPEDIR)/bin | 6 | DESTDIR=$(QPEDIR)/bin |
7 | 7 | ||
8 | INCLUDEPATH += ../microkde ../microkde/kdecore ../microkde/kio/kfile ../microkde/kio/kio ../microkde/kdeui ../qtcompat ../ interfaces ../kabc $(QPEDIR)/include | 8 | INCLUDEPATH += ../microkde ../microkde/kdecore ../microkde/kio/kfile ../microkde/kio/kio ../microkde/kdeui ../qtcompat ../ interfaces ../kabc $(QPEDIR)/include |
9 | #../libkabcwrap | 9 | #../libkabcwrap |
10 | DEFINES += KORG_NODND KORG_NOPLUGINS KORG_NOARCHIVE KORG_NOMAIL | 10 | DEFINES += KORG_NODND KORG_NOPLUGINS KORG_NOARCHIVE KORG_NOMAIL |
11 | DEFINES += KORG_NOPRINTER KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER | 11 | DEFINES += KORG_NOPRINTER KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER |
12 | DEFINES += KORG_NOLVALTERNATION | 12 | DEFINES += KORG_NOLVALTERNATION |
13 | #KORG_NOKABC | 13 | #KORG_NOKABC |
14 | LIBS += -lmicrokdepim | 14 | LIBS += -lmicrokdepim |
15 | LIBS += -lmicrokcal | 15 | LIBS += -lmicrokcal |
16 | LIBS += -lmicrokde | 16 | LIBS += -lmicrokde |
17 | LIBS += -lmicroqtcompat | 17 | LIBS += -lmicroqtcompat |
18 | LIBS += -lmicrokabc | 18 | LIBS += -lmicrokabc |
19 | #LIBS += -lmicrokabcwrap | 19 | #LIBS += -lmicrokabcwrap |
20 | |||
21 | #LIBS += $(QPEDIR)/lib/gammu | ||
22 | LIBS += -lmicrogammu | ||
23 | LIBS += -lbluetooth | ||
24 | LIBS += -lsdp | ||
25 | |||
26 | |||
20 | LIBS += -lqpe | 27 | LIBS += -lqpe |
21 | LIBS += -ljpeg | 28 | LIBS += -ljpeg |
22 | LIBS += $(QTOPIALIB) | 29 | LIBS += $(QTOPIALIB) |
23 | LIBS += -L$(QPEDIR)/lib | 30 | LIBS += -L$(QPEDIR)/lib |
24 | 31 | ||
25 | INTERFACES = kofilterview_base.ui | 32 | INTERFACES = kofilterview_base.ui |
26 | #filteredit_base.ui | 33 | #filteredit_base.ui |
27 | 34 | ||
28 | HEADERS = \ | 35 | HEADERS = \ |
29 | wordsgerman.h \ | 36 | wordsgerman.h \ |
30 | filteredit_base.h \ | 37 | filteredit_base.h \ |
31 | alarmclient.h \ | 38 | alarmclient.h \ |
32 | calendarview.h \ | 39 | calendarview.h \ |
33 | customlistviewitem.h \ | 40 | customlistviewitem.h \ |
34 | datenavigator.h \ | 41 | datenavigator.h \ |
35 | docprefs.h \ | 42 | docprefs.h \ |
36 | filtereditdialog.h \ | 43 | filtereditdialog.h \ |
37 | incomingdialog.h \ | 44 | incomingdialog.h \ |
38 | incomingdialog_base.h \ | 45 | incomingdialog_base.h \ |
39 | interfaces/korganizer/baseview.h \ | 46 | interfaces/korganizer/baseview.h \ |
40 | interfaces/korganizer/calendarviewbase.h \ | 47 | interfaces/korganizer/calendarviewbase.h \ |
41 | journalentry.h \ | 48 | journalentry.h \ |
42 | kdateedit.h \ | 49 | kdateedit.h \ |
43 | kdatenavigator.h \ | 50 | kdatenavigator.h \ |
44 | koagenda.h \ | 51 | koagenda.h \ |
45 | koagendaitem.h \ | 52 | koagendaitem.h \ |
46 | koagendaview.h \ | 53 | koagendaview.h \ |
47 | kocounterdialog.h \ | 54 | kocounterdialog.h \ |
48 | kodaymatrix.h \ | 55 | kodaymatrix.h \ |
49 | kodialogmanager.h \ | 56 | kodialogmanager.h \ |
50 | koeditordetails.h \ | 57 | koeditordetails.h \ |
51 | koeditorgeneral.h \ | 58 | koeditorgeneral.h \ |
52 | koeditorgeneralevent.h \ | 59 | koeditorgeneralevent.h \ |
53 | koeditorgeneraltodo.h \ | 60 | koeditorgeneraltodo.h \ |
54 | koeditorrecurrence.h \ | 61 | koeditorrecurrence.h \ |
55 | koeventeditor.h \ | 62 | koeventeditor.h \ |
56 | koeventpopupmenu.h \ | 63 | koeventpopupmenu.h \ |
57 | koeventview.h \ | 64 | koeventview.h \ |
58 | koeventviewer.h \ | 65 | koeventviewer.h \ |
59 | koeventviewerdialog.h \ | 66 | koeventviewerdialog.h \ |
60 | kofilterview.h \ | 67 | kofilterview.h \ |
61 | koglobals.h \ | 68 | koglobals.h \ |
62 | koincidenceeditor.h \ | 69 | koincidenceeditor.h \ |
63 | kojournalview.h \ | 70 | kojournalview.h \ |
64 | kolistview.h \ | 71 | kolistview.h \ |
65 | kolocationbox.h \ | 72 | kolocationbox.h \ |
66 | komonthview.h \ | 73 | komonthview.h \ |
67 | koprefs.h \ | 74 | koprefs.h \ |
68 | koprefsdialog.h \ | 75 | koprefsdialog.h \ |
69 | kotimespanview.h \ | 76 | kotimespanview.h \ |
70 | kotodoeditor.h \ | 77 | kotodoeditor.h \ |
71 | kotodoview.h \ | 78 | kotodoview.h \ |
72 | kotodoviewitem.h \ | 79 | kotodoviewitem.h \ |
73 | koviewmanager.h \ | 80 | koviewmanager.h \ |
74 | kowhatsnextview.h \ | 81 | kowhatsnextview.h \ |
75 | ktimeedit.h \ | 82 | ktimeedit.h \ |
76 | lineview.h \ | 83 | lineview.h \ |
77 | mainwindow.h \ | 84 | mainwindow.h \ |
78 | navigatorbar.h \ | 85 | navigatorbar.h \ |
79 | outgoingdialog.h \ | 86 | outgoingdialog.h \ |
80 | outgoingdialog_base.h \ | 87 | outgoingdialog_base.h \ |
81 | publishdialog.h \ | 88 | publishdialog.h \ |
82 | publishdialog_base.h \ | 89 | publishdialog_base.h \ |
83 | savetemplatedialog.h \ | 90 | savetemplatedialog.h \ |
84 | searchdialog.h \ | 91 | searchdialog.h \ |
85 | simplealarmclient.h \ | 92 | simplealarmclient.h \ |
86 | statusdialog.h \ | 93 | statusdialog.h \ |
87 | timeline.h \ | 94 | timeline.h \ |
88 | timespanview.h \ | 95 | timespanview.h \ |
89 | version.h \ | 96 | version.h \ |
90 | ../kalarmd/alarmdialog.h | 97 | ../kalarmd/alarmdialog.h |
91 | 98 | ||
92 | SOURCES = \ | 99 | SOURCES = \ |
93 | filteredit_base.cpp \ | 100 | filteredit_base.cpp \ |
94 | calendarview.cpp \ | 101 | calendarview.cpp \ |
95 | datenavigator.cpp \ | 102 | datenavigator.cpp \ |
96 | docprefs.cpp \ | 103 | docprefs.cpp \ |
97 | filtereditdialog.cpp \ | 104 | filtereditdialog.cpp \ |
98 | incomingdialog.cpp \ | 105 | incomingdialog.cpp \ |
99 | incomingdialog_base.cpp \ | 106 | incomingdialog_base.cpp \ |
100 | journalentry.cpp \ | 107 | journalentry.cpp \ |
101 | kdatenavigator.cpp \ | 108 | kdatenavigator.cpp \ |
102 | koagenda.cpp \ | 109 | koagenda.cpp \ |
103 | koagendaitem.cpp \ | 110 | koagendaitem.cpp \ |
104 | koagendaview.cpp \ | 111 | koagendaview.cpp \ |
105 | kocounterdialog.cpp \ | 112 | kocounterdialog.cpp \ |
106 | kodaymatrix.cpp \ | 113 | kodaymatrix.cpp \ |
107 | kodialogmanager.cpp \ | 114 | kodialogmanager.cpp \ |
108 | koeditordetails.cpp \ | 115 | koeditordetails.cpp \ |
109 | koeditorgeneral.cpp \ | 116 | koeditorgeneral.cpp \ |
110 | koeditorgeneralevent.cpp \ | 117 | koeditorgeneralevent.cpp \ |
111 | koeditorgeneraltodo.cpp \ | 118 | koeditorgeneraltodo.cpp \ |
112 | koeditorrecurrence.cpp \ | 119 | koeditorrecurrence.cpp \ |
113 | koeventeditor.cpp \ | 120 | koeventeditor.cpp \ |
114 | koeventpopupmenu.cpp \ | 121 | koeventpopupmenu.cpp \ |
115 | koeventview.cpp \ | 122 | koeventview.cpp \ |
116 | koeventviewer.cpp \ | 123 | koeventviewer.cpp \ |
117 | koeventviewerdialog.cpp \ | 124 | koeventviewerdialog.cpp \ |
118 | kofilterview.cpp \ | 125 | kofilterview.cpp \ |
119 | koglobals.cpp \ | 126 | koglobals.cpp \ |
120 | koincidenceeditor.cpp \ | 127 | koincidenceeditor.cpp \ |
121 | kojournalview.cpp \ | 128 | kojournalview.cpp \ |
122 | kolistview.cpp \ | 129 | kolistview.cpp \ |
123 | kolocationbox.cpp \ | 130 | kolocationbox.cpp \ |
124 | komonthview.cpp \ | 131 | komonthview.cpp \ |
125 | koprefs.cpp \ | 132 | koprefs.cpp \ |
126 | koprefsdialog.cpp \ | 133 | koprefsdialog.cpp \ |
127 | kotimespanview.cpp \ | 134 | kotimespanview.cpp \ |
128 | kotodoeditor.cpp \ | 135 | kotodoeditor.cpp \ |
129 | kotodoview.cpp \ | 136 | kotodoview.cpp \ |
130 | kotodoviewitem.cpp \ | 137 | kotodoviewitem.cpp \ |
131 | koviewmanager.cpp \ | 138 | koviewmanager.cpp \ |
132 | kowhatsnextview.cpp \ | 139 | kowhatsnextview.cpp \ |
133 | ktimeedit.cpp \ | 140 | ktimeedit.cpp \ |
134 | lineview.cpp \ | 141 | lineview.cpp \ |
135 | main.cpp \ | 142 | main.cpp \ |
136 | mainwindow.cpp \ | 143 | mainwindow.cpp \ |
137 | navigatorbar.cpp \ | 144 | navigatorbar.cpp \ |
138 | outgoingdialog.cpp \ | 145 | outgoingdialog.cpp \ |
139 | outgoingdialog_base.cpp \ | 146 | outgoingdialog_base.cpp \ |
140 | publishdialog.cpp \ | 147 | publishdialog.cpp \ |
141 | publishdialog_base.cpp \ | 148 | publishdialog_base.cpp \ |
142 | savetemplatedialog.cpp \ | 149 | savetemplatedialog.cpp \ |
143 | searchdialog.cpp \ | 150 | searchdialog.cpp \ |
144 | simplealarmclient.cpp \ | 151 | simplealarmclient.cpp \ |
145 | statusdialog.cpp \ | 152 | statusdialog.cpp \ |
146 | timeline.cpp \ | 153 | timeline.cpp \ |
147 | timespanview.cpp \ | 154 | timespanview.cpp \ |
148 | ../kalarmd/alarmdialog.cpp | 155 | ../kalarmd/alarmdialog.cpp |
149 | 156 | ||