author | zautrix <zautrix> | 2005-11-25 23:24:37 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-11-25 23:24:37 (UTC) |
commit | 3cd0013c04172b312ee21e80224a3b7734b4d413 (patch) (unidiff) | |
tree | 9c5557ecfe874a8a4901a674c5eddcc91f585b0c | |
parent | 0e18027f386280bf427ef9d0ffec61a5516cebda (diff) | |
download | kdepimpi-3cd0013c04172b312ee21e80224a3b7734b4d413.zip kdepimpi-3cd0013c04172b312ee21e80224a3b7734b4d413.tar.gz kdepimpi-3cd0013c04172b312ee21e80224a3b7734b4d413.tar.bz2 |
sync
-rw-r--r-- | libkcal/calendar.cpp | 2 | ||||
-rw-r--r-- | libkcal/calendarlocal.cpp | 12 | ||||
-rw-r--r-- | libkcal/incidencebase.cpp | 7 | ||||
-rw-r--r-- | libkcal/incidencebase.h | 1 | ||||
-rw-r--r-- | libkdepim/ksyncmanager.cpp | 2 | ||||
-rw-r--r-- | libkdepim/ksyncprefsdialog.cpp | 2 |
6 files changed, 17 insertions, 9 deletions
diff --git a/libkcal/calendar.cpp b/libkcal/calendar.cpp index b1806ee..8535191 100644 --- a/libkcal/calendar.cpp +++ b/libkcal/calendar.cpp | |||
@@ -375,17 +375,17 @@ void Calendar::addIncidenceBranch(Incidence *i) | |||
375 | addIncidenceBranch( inc ); | 375 | addIncidenceBranch( inc ); |
376 | } | 376 | } |
377 | } | 377 | } |
378 | 378 | ||
379 | bool Calendar::addIncidence(Incidence *i) | 379 | bool Calendar::addIncidence(Incidence *i) |
380 | { | 380 | { |
381 | Incidence::AddVisitor<Calendar> v(this); | 381 | Incidence::AddVisitor<Calendar> v(this); |
382 | if ( i->calID() == 0 ) | 382 | if ( i->calID() == 0 ) |
383 | i->setCalID( mDefaultCalendar ); | 383 | i->setCalID_block( mDefaultCalendar ); |
384 | i->setCalEnabled( true ); | 384 | i->setCalEnabled( true ); |
385 | return i->accept(v); | 385 | return i->accept(v); |
386 | } | 386 | } |
387 | void Calendar::deleteIncidence(Incidence *in) | 387 | void Calendar::deleteIncidence(Incidence *in) |
388 | { | 388 | { |
389 | if ( in->typeID() == eventID ) | 389 | if ( in->typeID() == eventID ) |
390 | deleteEvent( (Event*) in ); | 390 | deleteEvent( (Event*) in ); |
391 | else if ( in->typeID() == todoID ) | 391 | else if ( in->typeID() == todoID ) |
diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp index c82ea92..b02f706 100644 --- a/libkcal/calendarlocal.cpp +++ b/libkcal/calendarlocal.cpp | |||
@@ -144,22 +144,22 @@ bool CalendarLocal::mergeCalendar( Calendar* remote ) | |||
144 | Incidence* inR = er.first(); | 144 | Incidence* inR = er.first(); |
145 | while ( inR ) { | 145 | while ( inR ) { |
146 | inL = incidenceForUid( inR->uid(),false ); | 146 | inL = incidenceForUid( inR->uid(),false ); |
147 | if ( inL ) { | 147 | if ( inL ) { |
148 | if ( ! inL->isReadOnly () || inL->uid().left(15) == QString("last-syncEvent-") ) { | 148 | if ( ! inL->isReadOnly () || inL->uid().left(15) == QString("last-syncEvent-") ) { |
149 | int calID = inL->calID(); | 149 | int calID = inL->calID(); |
150 | deleteIncidence( inL ); | 150 | deleteIncidence( inL ); |
151 | inL = inR->clone(); | 151 | inL = inR->clone(); |
152 | inL->setCalID( calID ); | 152 | inL->setCalID_block( calID ); |
153 | addIncidence( inL ); | 153 | addIncidence( inL ); |
154 | } | 154 | } |
155 | } else { | 155 | } else { |
156 | inL = inR->clone(); | 156 | inL = inR->clone(); |
157 | inL->setCalID( 0 );// add to default cal | 157 | inL->setCalID_block( 0 );// add to default cal |
158 | addIncidence( inL ); | 158 | addIncidence( inL ); |
159 | } | 159 | } |
160 | inR = er.next(); | 160 | inR = er.next(); |
161 | } | 161 | } |
162 | return true; | 162 | return true; |
163 | } | 163 | } |
164 | 164 | ||
165 | 165 | ||
@@ -203,17 +203,17 @@ void CalendarLocal::addCalendar( Calendar* cal ) | |||
203 | QPtrList<Event> EventList = cal->rawEvents(); | 203 | QPtrList<Event> EventList = cal->rawEvents(); |
204 | QPtrList<Event> el; | 204 | QPtrList<Event> el; |
205 | Event * ev = EventList.first(); | 205 | Event * ev = EventList.first(); |
206 | while ( ev ) { | 206 | while ( ev ) { |
207 | if ( ev->uid().left( 15 ) == QString("last-syncEvent-") ) { | 207 | if ( ev->uid().left( 15 ) == QString("last-syncEvent-") ) { |
208 | Event * se = event( ev->uid() ); | 208 | Event * se = event( ev->uid() ); |
209 | if ( se ) | 209 | if ( se ) |
210 | el.append( se ); | 210 | el.append( se ); |
211 | ev->setCalID( 1 ); | 211 | ev->setCalID_block( 1 ); |
212 | } | 212 | } |
213 | ev->unRegisterObserver( cal ); | 213 | ev->unRegisterObserver( cal ); |
214 | ev->registerObserver( this ); | 214 | ev->registerObserver( this ); |
215 | mEventList.append( ev ); | 215 | mEventList.append( ev ); |
216 | ev = EventList.next(); | 216 | ev = EventList.next(); |
217 | } | 217 | } |
218 | for ( ev = el.first(); ev; ev = el.next() ) { | 218 | for ( ev = el.first(); ev; ev = el.next() ) { |
219 | deleteIncidence ( ev ); | 219 | deleteIncidence ( ev ); |
@@ -337,17 +337,17 @@ bool CalendarLocal::addEventNoDup( Event *event ) | |||
337 | bool CalendarLocal::addEvent( Event *event ) | 337 | bool CalendarLocal::addEvent( Event *event ) |
338 | { | 338 | { |
339 | insertEvent( event ); | 339 | insertEvent( event ); |
340 | 340 | ||
341 | event->registerObserver( this ); | 341 | event->registerObserver( this ); |
342 | 342 | ||
343 | setModified( true ); | 343 | setModified( true ); |
344 | if ( event->calID() == 0 ) | 344 | if ( event->calID() == 0 ) |
345 | event->setCalID( mDefaultCalendar ); | 345 | event->setCalID_block( mDefaultCalendar ); |
346 | event->setCalEnabled( true ); | 346 | event->setCalEnabled( true ); |
347 | 347 | ||
348 | return true; | 348 | return true; |
349 | } | 349 | } |
350 | 350 | ||
351 | void CalendarLocal::deleteEvent( Event *event ) | 351 | void CalendarLocal::deleteEvent( Event *event ) |
352 | { | 352 | { |
353 | clearUndo(event); | 353 | clearUndo(event); |
@@ -391,17 +391,17 @@ bool CalendarLocal::addTodo( Todo *todo ) | |||
391 | 391 | ||
392 | todo->registerObserver( this ); | 392 | todo->registerObserver( this ); |
393 | 393 | ||
394 | // Set up subtask relations | 394 | // Set up subtask relations |
395 | setupRelations( todo ); | 395 | setupRelations( todo ); |
396 | 396 | ||
397 | setModified( true ); | 397 | setModified( true ); |
398 | if ( todo->calID() == 0 ) | 398 | if ( todo->calID() == 0 ) |
399 | todo->setCalID( mDefaultCalendar ); | 399 | todo->setCalID_block( mDefaultCalendar ); |
400 | todo->setCalEnabled( true ); | 400 | todo->setCalEnabled( true ); |
401 | return true; | 401 | return true; |
402 | } | 402 | } |
403 | 403 | ||
404 | void CalendarLocal::deleteTodo( Todo *todo ) | 404 | void CalendarLocal::deleteTodo( Todo *todo ) |
405 | { | 405 | { |
406 | // Handle orphaned children | 406 | // Handle orphaned children |
407 | removeRelations( todo ); | 407 | removeRelations( todo ); |
@@ -919,17 +919,17 @@ QPtrList<Event> CalendarLocal::rawEvents() | |||
919 | bool CalendarLocal::addJournal(Journal *journal) | 919 | bool CalendarLocal::addJournal(Journal *journal) |
920 | { | 920 | { |
921 | mJournalList.append(journal); | 921 | mJournalList.append(journal); |
922 | 922 | ||
923 | journal->registerObserver( this ); | 923 | journal->registerObserver( this ); |
924 | 924 | ||
925 | setModified( true ); | 925 | setModified( true ); |
926 | if ( journal->calID() == 0 ) | 926 | if ( journal->calID() == 0 ) |
927 | journal->setCalID( mDefaultCalendar ); | 927 | journal->setCalID_block( mDefaultCalendar ); |
928 | journal->setCalEnabled( true ); | 928 | journal->setCalEnabled( true ); |
929 | return true; | 929 | return true; |
930 | } | 930 | } |
931 | 931 | ||
932 | void CalendarLocal::deleteJournal( Journal *journal ) | 932 | void CalendarLocal::deleteJournal( Journal *journal ) |
933 | { | 933 | { |
934 | clearUndo(journal); | 934 | clearUndo(journal); |
935 | if ( mJournalList.removeRef(journal) ) { | 935 | if ( mJournalList.removeRef(journal) ) { |
diff --git a/libkcal/incidencebase.cpp b/libkcal/incidencebase.cpp index cfef973..56c0560 100644 --- a/libkcal/incidencebase.cpp +++ b/libkcal/incidencebase.cpp | |||
@@ -147,16 +147,23 @@ bool IncidenceBase::isTagged() const | |||
147 | } | 147 | } |
148 | void IncidenceBase::setTagged( bool b) | 148 | void IncidenceBase::setTagged( bool b) |
149 | { | 149 | { |
150 | mIsTagged = b; | 150 | mIsTagged = b; |
151 | } | 151 | } |
152 | void IncidenceBase::setCalID( int id ) | 152 | void IncidenceBase::setCalID( int id ) |
153 | { | 153 | { |
154 | if ( mCalID > 0 ) { | 154 | if ( mCalID > 0 ) { |
155 | updated(); | ||
156 | } | ||
157 | mCalID = id; | ||
158 | } | ||
159 | void IncidenceBase::setCalID_block( int id ) | ||
160 | { | ||
161 | if ( mCalID > 0 ) { | ||
155 | blockLastModified = true; | 162 | blockLastModified = true; |
156 | updated(); | 163 | updated(); |
157 | blockLastModified = false; | 164 | blockLastModified = false; |
158 | } | 165 | } |
159 | mCalID = id; | 166 | mCalID = id; |
160 | } | 167 | } |
161 | int IncidenceBase::calID() const | 168 | int IncidenceBase::calID() const |
162 | { | 169 | { |
diff --git a/libkcal/incidencebase.h b/libkcal/incidencebase.h index 444d4c4..3edc03b 100644 --- a/libkcal/incidencebase.h +++ b/libkcal/incidencebase.h | |||
@@ -138,16 +138,17 @@ class IncidenceBase : public CustomProperties | |||
138 | void setCsum( const QString &, const QString & ); | 138 | void setCsum( const QString &, const QString & ); |
139 | QString getCsum( const QString & ); | 139 | QString getCsum( const QString & ); |
140 | void removeID(const QString &); | 140 | void removeID(const QString &); |
141 | 141 | ||
142 | void registerObserver( Observer * ); | 142 | void registerObserver( Observer * ); |
143 | void unRegisterObserver( Observer * ); | 143 | void unRegisterObserver( Observer * ); |
144 | void updated(); | 144 | void updated(); |
145 | void setCalID( int id ); | 145 | void setCalID( int id ); |
146 | void setCalID_block( int id ); | ||
146 | int calID() const; | 147 | int calID() const; |
147 | void setCalEnabled( bool ); | 148 | void setCalEnabled( bool ); |
148 | bool calEnabled() const; | 149 | bool calEnabled() const; |
149 | void setAlarmEnabled( bool ); | 150 | void setAlarmEnabled( bool ); |
150 | bool alarmEnabled() const; | 151 | bool alarmEnabled() const; |
151 | bool isTagged() const; | 152 | bool isTagged() const; |
152 | void setTagged( bool ); | 153 | void setTagged( bool ); |
153 | virtual void setLastModifiedSubInvalid(); | 154 | virtual void setLastModifiedSubInvalid(); |
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp index fa7804e..0109c02 100644 --- a/libkdepim/ksyncmanager.cpp +++ b/libkdepim/ksyncmanager.cpp | |||
@@ -1175,17 +1175,17 @@ void KSyncManager::syncPi() | |||
1175 | timer.start(); | 1175 | timer.start(); |
1176 | while ( timer.elapsed () < 2000 ) { | 1176 | while ( timer.elapsed () < 2000 ) { |
1177 | qApp->processEvents(); | 1177 | qApp->processEvents(); |
1178 | } | 1178 | } |
1179 | } | 1179 | } |
1180 | } | 1180 | } |
1181 | ++startRemote; | 1181 | ++startRemote; |
1182 | ++startLocal; | 1182 | ++startLocal; |
1183 | 1183 | mAskForPreferences = false; | |
1184 | } | 1184 | } |
1185 | mPisyncFinished = true; | 1185 | mPisyncFinished = true; |
1186 | } else { | 1186 | } else { |
1187 | KCommandSocket* commandSocket = new KCommandSocket( "", mPassWordPiSync, port, mActiveSyncIP, this, mParent->topLevelWidget() ); | 1187 | KCommandSocket* commandSocket = new KCommandSocket( "", mPassWordPiSync, port, mActiveSyncIP, this, mParent->topLevelWidget() ); |
1188 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) ); | 1188 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) ); |
1189 | commandSocket->readFile( syncFileName() ); | 1189 | commandSocket->readFile( syncFileName() ); |
1190 | } | 1190 | } |
1191 | } | 1191 | } |
diff --git a/libkdepim/ksyncprefsdialog.cpp b/libkdepim/ksyncprefsdialog.cpp index 744a914..1f9afcb 100644 --- a/libkdepim/ksyncprefsdialog.cpp +++ b/libkdepim/ksyncprefsdialog.cpp | |||
@@ -364,17 +364,17 @@ void KSyncPrefsDialog::setupSyncAlgTab() | |||
364 | mRemoteIPPWM = new QLineEdit(temphb); | 364 | mRemoteIPPWM = new QLineEdit(temphb); |
365 | 365 | ||
366 | lab = new QLabel( i18n("Remote port number: (should be different for each)"), piWidget); | 366 | lab = new QLabel( i18n("Remote port number: (should be different for each)"), piWidget); |
367 | temphb = new QHBox( piWidget ); | 367 | temphb = new QHBox( piWidget ); |
368 | mRemotePort = new QLineEdit(temphb); | 368 | mRemotePort = new QLineEdit(temphb); |
369 | mRemotePortAB = new QLineEdit(temphb); | 369 | mRemotePortAB = new QLineEdit(temphb); |
370 | mRemotePortPWM = new QLineEdit(temphb); | 370 | mRemotePortPWM = new QLineEdit(temphb); |
371 | 371 | ||
372 | lab = new QLabel( i18n("Local/remote Resource sync partners"), piWidget); | 372 | lab = new QLabel( i18n("Local/remote Resource sync partners (Leave empty to not sync)"), piWidget); |
373 | mTableBox = new QHBox( piWidget ); | 373 | mTableBox = new QHBox( piWidget ); |
374 | mResTableKopi = new QTable( 1, 1, mTableBox ); | 374 | mResTableKopi = new QTable( 1, 1, mTableBox ); |
375 | mResTableKapi = new QTable( 1, 1, mTableBox ); | 375 | mResTableKapi = new QTable( 1, 1, mTableBox ); |
376 | mResTablePwmpi = new QTable( 1, 1, mTableBox ); | 376 | mResTablePwmpi = new QTable( 1, 1, mTableBox ); |
377 | mResTableKopi->horizontalHeader()->setLabel( 0, i18n("Remote") ); | 377 | mResTableKopi->horizontalHeader()->setLabel( 0, i18n("Remote") ); |
378 | mResTableKapi->horizontalHeader()->setLabel( 0, i18n("Remote") ); | 378 | mResTableKapi->horizontalHeader()->setLabel( 0, i18n("Remote") ); |
379 | mResTablePwmpi->horizontalHeader()->setLabel( 0, i18n("Remote") ); | 379 | mResTablePwmpi->horizontalHeader()->setLabel( 0, i18n("Remote") ); |
380 | mResTableKopi->setLeftMargin( 80 ); | 380 | mResTableKopi->setLeftMargin( 80 ); |