| -rw-r--r-- | korganizer/calendarview.cpp | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 9571f16..8d024c1 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -6,3 +6,3 @@ - Copyright (c) 1997, 1998, 1999 + Copyright (c) savecale1997, 1998, 1999 Preston Brown (preton.brown@yale.edu) @@ -781,2 +781,4 @@ void CalendarView::setScrollBarStep(int val ) mDateScrollBar->setLineStep ( val ); +#else + Q_UNUSED( val ); #endif @@ -807,2 +809,4 @@ void CalendarView::scrollBarValue(int val ) flag_blockScrollBar = false; +#else + Q_UNUSED( val ); #endif @@ -1604,2 +1608,3 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int { + bool syncOK = true; @@ -1734,3 +1739,3 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int inR = inL->clone(); - inR->setCalID( calID ); + inR->setCalID_block( calID ); inR->setTempSyncStat( SYNC_TEMPSTATE_INITIAL ); @@ -1749,3 +1754,3 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int inL = inR->clone(); - inL->setCalID( calID ); + inL->setCalID_block( calID ); if ( mSyncManager->syncWithDesktop() ) @@ -1780,3 +1785,3 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int - inL->setCalID( 0 );// add to default cal + inL->setCalID_block( 0 );// add to default cal local->addIncidence( inL ); @@ -1790,3 +1795,3 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int inL->setIDStr( ":" ); - inL->setCalID( 0 );// add to default cal + inL->setCalID_block( 0 );// add to default cal local->addIncidence( inL ); @@ -1848,3 +1853,3 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int inR->setTempSyncStat( SYNC_TEMPSTATE_INITIAL ); - inR->setCalID( 0 );// add to default cal + inR->setCalID_block( 0 );// add to default cal remote->addIncidence( inR ); @@ -1863,3 +1868,3 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int inR->setIDStr( ":" ); - inR->setCalID( 0 );// add to default cal + inR->setCalID_block( 0 );// add to default cal remote->addIncidence( inR ); @@ -2451,3 +2456,5 @@ void CalendarView::mergeFileResource( QString fn ,QString resource ) if ( resource == "ALL" ) { + mCalendar->setAllCalendarEnabled( true ); mergeFile( fn ); + restoreCalendarSettings(); return; @@ -2599,4 +2606,8 @@ bool CalendarView::saveCalendarResource(QString filename, QString resource) { - if ( resource == "ALL" ) - return saveCalendar( filename ); + if ( resource == "ALL" ) { + mCalendar->setAllCalendarEnabled( true ); + bool retval = saveCalendar( filename ); + restoreCalendarSettings(); + return retval; + } int exclusiveResource = KOPrefs::instance()->getFuzzyCalendarID( resource ); |