sync

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
@@ -3,9 +3,9 @@
 
   Requires the Qt and KDE widget libraries, available at no cost at
   http://www.troll.no and http://www.kde.org respectively
 
-  Copyright (c) 1997, 1998, 1999
+  Copyright (c) savecale1997, 1998, 1999
   Preston Brown (preton.brown@yale.edu)
   Fester Zigterman (F.J.F.ZigtermanRustenburg@student.utwente.nl)
   Ian Dawes (iadawes@globalserve.net)
   Laszlo Boloni (boloni@cs.purdue.edu)
@@ -778,8 +778,10 @@ void CalendarView::setCalReadOnly( int id, bool readO )
 void CalendarView::setScrollBarStep(int val )
 {
 #ifdef DESKTOP_VERSION
     mDateScrollBar->setLineStep ( val );
+#else
+    Q_UNUSED( val );
 #endif
 }
 void CalendarView::scrollBarValue(int val )
 {
@@ -804,8 +806,10 @@ void CalendarView::scrollBarValue(int val )
     int year =  mNavigator->selectedDates().first().year();
     QDate d ( year,1,1 );
     mNavigator->selectDates( d.addDays(  stepdays-1) , count );
     flag_blockScrollBar = false;
+#else
+    Q_UNUSED( val );
 #endif
 
 }
 void CalendarView::updateView(const QDate &start, const QDate &end)
@@ -1601,8 +1605,9 @@ void CalendarView::checkExternalId( Incidence * inc )
 
 }
 bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int mode )
 {
+
     bool syncOK = true;
     int addedEvent = 0;
     int addedEventR = 0;
     int deletedEventR = 0;
@@ -1731,9 +1736,9 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
                             idS = inR->IDStr();
                         int calID = inR->calID();
                         remote->deleteIncidence( inR );
                         inR = inL->clone();
-                        inR->setCalID( calID );
+                        inR->setCalID_block( calID );
                         inR->setTempSyncStat( SYNC_TEMPSTATE_INITIAL );
                         if ( mGlobalSyncMode != SYNC_MODE_EXTERNAL )
                             inR->setIDStr( idS );
                         remote->addIncidence(  inR );
@@ -1746,9 +1751,9 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
                             int pid = inL->pilotId();
                             int calID = inL->calID();
                             local->deleteIncidence( inL );
                             inL = inR->clone();
-                            inL->setCalID( calID );
+                            inL->setCalID_block( calID );
                             if ( mSyncManager->syncWithDesktop() )
                                 inL->setPilotId( pid  );
                             inL->setIDStr( idS );
                             if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
@@ -1777,9 +1782,9 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
                             inL->setIDStr( ":" );
                             inL->setCsum( mCurrentSyncDevice, inR->getCsum(mCurrentSyncDevice) );
                             inL->setID( mCurrentSyncDevice, inR->getID(mCurrentSyncDevice) );
                             
-                            inL->setCalID( 0 );// add to default cal
+                            inL->setCalID_block( 0 );// add to default cal
                             local->addIncidence( inL );
                             ++addedEvent;
                         
                         }
@@ -1787,9 +1792,9 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
                         if ( inR->lastModified() > mLastCalendarSync || mode == 5 ) {
                             inR->setLastModified( modifiedCalendar );
                             inL = inR->clone();
                             inL->setIDStr( ":" );
-                            inL->setCalID( 0 );// add to default cal
+                            inL->setCalID_block( 0 );// add to default cal
                             local->addIncidence( inL );
                             ++addedEvent;
                         
                         } else {
@@ -1845,9 +1850,9 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
                                 inL->setLastModified( modifiedCalendar );
                                 inR = inL->clone();
                                 inR->setIDStr( ":" );
                                 inR->setTempSyncStat( SYNC_TEMPSTATE_INITIAL );
-                                inR->setCalID( 0 );// add to default cal
+                                inR->setCalID_block( 0 );// add to default cal
                                 remote->addIncidence(  inR );
                             }
                         }
                     } else {
@@ -1860,9 +1865,9 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
                                 ++addedEventR; 
                                 inL->setLastModified( modifiedCalendar );
                                 inR = inL->clone();
                                 inR->setIDStr( ":" );
-                                inR->setCalID( 0 );// add to default cal
+                                inR->setCalID_block( 0 );// add to default cal
                                 remote->addIncidence(  inR );
                             }
                         }
                     }
@@ -2448,9 +2453,11 @@ void CalendarView::mergeFile( QString fn )
 void CalendarView::mergeFileResource( QString fn ,QString resource )
 {
 
     if ( resource == "ALL" ) {
+        mCalendar->setAllCalendarEnabled( true ); 
         mergeFile( fn );
+        restoreCalendarSettings();
         return;
     }
 
     int exclusiveResource = KOPrefs::instance()->getFuzzyCalendarID( resource );
@@ -2596,10 +2603,14 @@ bool CalendarView::saveCalendars()
     return true;
 }
 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 );
     if ( !exclusiveResource ) {
         qDebug("KO: CalendarView::saveCalendarResource: resource not found %s", resource.latin1() );
         return false;