4 files changed, 78 insertions, 17 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 8965d3b..307027a 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -345,48 +345,49 @@ CalendarView::CalendarView( CalendarResources *calendar,
       mCalendar( calendar ),
       mResourceManager( calendar->resourceManager() )
 {
 
     mEventEditor = 0;
     mTodoEditor = 0;
  
     init();
 }
 
 CalendarView::CalendarView( Calendar *calendar,
                             QWidget *parent, const char *name )
     : CalendarViewBase( parent, name ),
       mCalendar( calendar ),
       mResourceManager( 0 )
 {
  
     mEventEditor = 0;
     mTodoEditor = 0;
     init();
 }
 
 void CalendarView::init()
 { 
+    mMultiResourceSync = false; 
     flag_blockConflict = false; 
     flag_blockScrollBar = false;
     flag_checkFileFirsttime = true;
     flag_clearallviewsEventDisplay = false;
     flag_clearallviewsupdateView = false;
     mNextAlarmDateTime = QDateTime::currentDateTime();
     setFocusPolicy (NoFocus ); 
     mViewerCallerIsSearchDialog = false;
     mBlockShowDates = false;
     mConflictingEvent = 0;
     mDatePickerMode = 0;
     mCurrentSyncDevice = "";
     mViewManager = new KOViewManager( this );
     mDialogManager = new KODialogManager( this );
     mEventViewerDialog = 0;
     mModified = false;
     mReadOnly = false;
     mSelectedIncidence = 0;
     mCalPrinter = 0;
     mFilters.setAutoDelete(true);
 
     mCalendar->registerObserver( this );
     // TODO: Make sure that view is updated, when calendar is changed.
 
@@ -1531,48 +1532,49 @@ int  CalendarView::takeEvent( Incidence* local,  Incidence* remote, int mode , b
         break;
        
     default:
         // SYNC_PREF_TAKE_BOTH not implemented
         break;
     }
     return 0;
 }
 Event* CalendarView::getLastSyncEvent()
 {
     Event* lse; 
     //qDebug("CurrentSyncDevice %s ",mCurrentSyncDevice .latin1() );
     lse =   mCalendar->event( "last-syncEvent-"+mCurrentSyncDevice );
     if (!lse) {
         lse = new Event();
         lse->setUid( "last-syncEvent-"+mCurrentSyncDevice ); 
         QString sum = "";
         if ( mSyncManager->mExternSyncProfiles.contains( mCurrentSyncDevice ) )
             sum = "E: ";
         lse->setSummary(sum+mCurrentSyncDevice + i18n(" - sync event"));
         lse->setDtStart( mLastCalendarSync );
         lse->setDtEnd( mLastCalendarSync.addSecs( 7200 ) );
         lse->setCategories( i18n("SyncEvent") );
         lse->setReadOnly( true );
+        lse->setCalID( 1 );
         mCalendar->addEvent( lse );
     }
 
     return lse;
 
 }
 
 // we check, if the to delete event has a id for a profile
 //  if yes, we set this id in the profile to delete
 void CalendarView::checkExternSyncEvent( QPtrList<Event> lastSync , Incidence* toDelete )
 {
     if ( lastSync.count() == 0 ) {
         //qDebug(" lastSync.count() == 0");
         return;
     }
     if ( toDelete->typeID() == journalID )
         return;
 
     Event* eve = lastSync.first();
 
     while ( eve ) {
         QString id = toDelete->getID( eve->uid().mid( 15 ) ); // this is the sync profile name
         if ( !id.isEmpty() ) {
             QString des = eve->description();
@@ -1881,58 +1883,63 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
             if ( inR->typeID() == todoID ) {
                 Todo * t = (Todo*)inR;
                 if ( t->hasDueDate() )
                     dt = t->dtDue();
                 else
                     dt = cur.addSecs( 62 );
             }
             else if (inR->typeID() == eventID ) {
                 bool ok;
                 dt =  inR->getNextOccurence( cur, &ok );
                     if ( !ok )
                         dt = cur.addSecs( -62 );
                 }
             else
                 dt = inR->dtStart();
             if ( dt < cur || dt > end ) {
                 remote->deleteIncidence( inR );
                 ++delFut;
             }
             inR =  er.next();
         }
     }
     bar.hide();
     mLastCalendarSync = QDateTime::currentDateTime().addSecs( 1 );
-    eventLSync->setReadOnly( false );
-    eventLSync->setDtStart( mLastCalendarSync );
-    eventRSync->setDtStart( mLastCalendarSync );
-    eventLSync->setDtEnd( mLastCalendarSync.addSecs( 3600 ) );
-    eventRSync->setDtEnd( mLastCalendarSync.addSecs( 3600 ) );
-    eventRSync->setLocation( i18n("Remote from: ")+mCurrentSyncName ) ;
-    eventLSync->setLocation(i18n("Local from: ") + mCurrentSyncName  );
-    eventLSync->setReadOnly( true );
+    if ( mMultiResourceSync ) {
+        remote->removeSyncInfo( "" ); //all
+
+    } else {
+        eventLSync->setReadOnly( false );
+        eventLSync->setDtStart( mLastCalendarSync );
+        eventRSync->setDtStart( mLastCalendarSync );
+        eventLSync->setDtEnd( mLastCalendarSync.addSecs( 3600 ) );
+        eventRSync->setDtEnd( mLastCalendarSync.addSecs( 3600 ) );
+        eventRSync->setLocation( i18n("Remote from: ")+mCurrentSyncName ) ;
+        eventLSync->setLocation(i18n("Local from: ") + mCurrentSyncName  );
+        eventLSync->setReadOnly( true );
+    }
     qDebug("KO: Normal sync: %d ",mGlobalSyncMode ==  SYNC_MODE_NORMAL );
-    if ( mGlobalSyncMode ==  SYNC_MODE_NORMAL && !mSyncManager->syncWithDesktop()) // kde is abnormal...
+    if ( mGlobalSyncMode ==  SYNC_MODE_NORMAL && !mSyncManager->syncWithDesktop() && !mMultiResourceSync ) // kde is abnormal...
         remote->addEvent( eventRSync );
     else
         delete eventRSync;
     qDebug("KO: Sync with desktop %d ",mSyncManager->syncWithDesktop() );
     QString mes;
     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 %d incoming filtered out\n %d outgoing filtered out\n"),addedEvent, addedEventR, changedLocal, changedRemote, deletedEventL, deletedEventR, filteredIN, filteredOUT ); 
     QString delmess;
     if ( delFut  ) {
         delmess.sprintf(  i18n("%d items skipped on remote,\nbecause they are more\nthan %d weeks in the past or\nmore than %d weeks in the future.\nAfter skipping, remote has\n%d calendar/todo items."), delFut,mSyncManager->mWriteBackInPast,mSyncManager->mWriteBackInFuture, remRem-delFut); 
         mes += delmess;
     }
     mes = i18n("Local calendar changed!\n") +mes;
     mCalendar->checkAlarmForIncidence( 0, true );
     qDebug( mes );
     if ( mSyncManager->mShowSyncSummary ) {
         if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(this, mes,
                                                  i18n("KO/Pi  Synchronization"),i18n("Write back"))) {
             qDebug("KO: WB cancelled ");
             mSyncManager->mWriteBackFile = false;
             return syncOK;
         }
     }
     return syncOK;
 }
@@ -2414,48 +2421,74 @@ bool CalendarView::openCalendar(QString filename, bool merge)
             mDialogManager->setDocumentId( filename );
             mTodoList->setDocumentId( filename );
         }
 
         //KMessageBox::error(this,i18n("Couldn't load calendar\n '%1'.").arg(filename));
 
         QTimer::singleShot ( 1, this, SLOT ( showOpenError() ) ); 
         globalFlagBlockAgenda = 2;
         mCalendar->reInitAlarmSettings();
         setSyncEventsReadOnly();
         updateUnmanagedViews();
         updateView();
     }
     return false;
 }
 void CalendarView::mergeFile( QString fn )
 {
     clearAllViews();
     mCalendar->mergeCalendarFile( fn ); 
     mCalendar->reInitAlarmSettings();
     setSyncEventsReadOnly();
     updateUnmanagedViews();
     updateView();
 }
+void CalendarView::mergeFileResource( QString fn ,QString resource )
+{
+
+    if ( resource == "ALL" ) {
+        mergeFile( fn );
+        return;
+    }
+
+    int exclusiveResource = KOPrefs::instance()->getFuzzyCalendarID( resource );
+    if ( !exclusiveResource ) {
+        qDebug("KO: CalendarView::mergeFileResource: resource not found %s", resource.latin1() );
+        return;
+    }
+    clearAllViews();
+    mCalendar->setCalendarRemove( exclusiveResource );
+    int def = mCalendar->defaultCalendar();
+    mCalendar->setDefaultCalendar(exclusiveResource);
+    if ( !mCalendar->addCalendarFile( fn, exclusiveResource )) {
+        qDebug("KO: CalendarView::mergeFileResource: error adding file %s", fn.latin1() );
+    }
+    mCalendar->setDefaultCalendar( def );
+    mCalendar->reInitAlarmSettings();
+    setSyncEventsReadOnly();
+    updateUnmanagedViews();
+    updateView();
+}
 void CalendarView::showOpenError()
 {
    KMessageBox::error(this,i18n("Couldn't load calendar\n."));
 }
 void CalendarView::setLoadedFileVersion(QDateTime dt)
 {
     loadedFileVersion = dt;
 }
 bool CalendarView::checkFileChanged(QString fn)
 {
     QFileInfo finf ( fn ); 
     if ( !finf.exists() )
         return true;
     QDateTime dt = finf.lastModified ();
     if ( dt <= loadedFileVersion )
         return false;
     return true;
 
 }
 void CalendarView::watchSavedFile()
 {
   QFileInfo finf ( MainWindow::defaultFileName());   
   if ( !finf.exists() )
     return;
@@ -2501,84 +2534,102 @@ bool CalendarView::checkFileVersion(QString fn)
 {
     QFileInfo finf ( fn );  
     if ( !finf.exists() )
         return true;
     QDateTime dt = finf.lastModified ();
     //qDebug("loaded file version %s %s", fn.latin1(), loadedFileVersion.toString().latin1());
     //qDebug("file on disk version  %s %s", fn.latin1(),dt.toString().latin1());
     if ( dt <= loadedFileVersion )
         return true;
     int km = KMessageBox::warningYesNoCancel(this, i18n("\nThe file\n%1\non disk has changed!\nFile size: %2 bytes.\nLast modified: %3\nDo you want to:\n\n - Save and overwrite file?\n - Sync with file, then save?\n - Cancel without saving? \n").arg(KGlobal::formatMessage(fn,0)).arg( QString::number( finf.size())).arg( KGlobal::locale()->formatDateTime(finf.lastModified (), true, true)) ,
                                                  i18n("KO/Pi Warning"),i18n("Overwrite"),
                                                  i18n("Sync+save"));
    
    if ( km ==  KMessageBox::Cancel )
        return false;
    if ( km ==  KMessageBox::Yes )
        return true;
 
     setSyncDevice("deleteaftersync" );
     mSyncManager->mAskForPreferences = true;
     mSyncManager->mSyncAlgoPrefs = 3;
     mSyncManager->mWriteBackFile = false;
     mSyncManager->mWriteBackExistingOnly = false;
     mSyncManager->mShowSyncSummary = false;
+    mMultiResourceSync = false;
     syncCalendar( fn, 3 );
     Event * e = getLastSyncEvent();
     if ( e )
         mCalendar->deleteEvent( e );
     return true;
 }
 bool CalendarView::saveCalendars()
 {
     QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
     KopiCalendarFile * cal = calendars.first();
     mCalendar->setDefaultCalendar( 1 ); 
     mCalendar->setDefaultCalendarEnabledOnly();
     QString saveError;
     if ( !saveCalendar( MainWindow::defaultFileName() ) )
         saveError =  cal->mName +"\n";
     cal = calendars.next();
     while ( cal ) {
         if ( !cal->isReadOnly && !cal->mErrorOnLoad ) {
             mCalendar->setDefaultCalendar( cal->mCalNumber ); 
             mCalendar->setDefaultCalendarEnabledOnly();
             if ( saveCalendar( cal->mFileName ) )
                 cal->mLoadDt = QDateTime::currentDateTime();
             else
                 saveError += cal->mName + "\n";
         }
         cal = calendars.next();
     }
     restoreCalendarSettings();
     //saveError = "test error";
     if ( !saveError.isEmpty() ) {
         saveError = KGlobal::formatMessage( i18n("Calendar(s) not saved:"),0 )+"\n" + saveError;
         KMessageBox::error(this, saveError, i18n("Error saving data"));
         return false;
     }
     return true;
 }
+bool CalendarView::saveCalendarResource(QString filename, QString resource)
+{
+    if ( resource == "ALL" )
+        return saveCalendar( filename );
+    int exclusiveResource = KOPrefs::instance()->getFuzzyCalendarID( resource );
+    if ( !exclusiveResource ) {
+        qDebug("KO: CalendarView::saveCalendarResource: resource not found %s", resource.latin1() );
+        return false;
+    }
+    mCalendar->setDefaultCalendar( exclusiveResource ); 
+    mCalendar->setDefaultCalendarEnabledOnly(); 
+    mCalendar->setSyncEventsEnabled();
+    bool res = saveCalendar( filename );
+    restoreCalendarSettings();
+    return res;
+    
+}
 bool CalendarView::saveCalendar( QString filename )
 {
  
     // Store back all unsaved data into calendar object
     // qDebug("file %s %d ",  filename.latin1()           , mViewManager->currentView()         );
     if ( mViewManager->currentView() )
         mViewManager->currentView()->flushView();
 
     
     QDateTime lfv = QDateTime::currentDateTime().addSecs( -2);
     mStorage->setSaveFormat( new ICalFormat() );
     mStorage->setFileName( filename );
     bool success;
     success = mStorage->save();
     if ( !success ) {
         return false;
     }
     if ( filename == MainWindow::defaultFileName() ) {
         setLoadedFileVersion( lfv );
         watchSavedFile();
     }
     return true;
 }
 
@@ -5011,49 +5062,53 @@ void CalendarView::purgeCompleted()
         todoCal = calendar()->todos();
         for (aTodo = todoCal.first(); aTodo; aTodo = todoCal.next()) {
             if ( !aTodo->relatedTo() )
                 rootTodos.append( aTodo );
         }
         for (aTodo = rootTodos.first(); aTodo; aTodo = rootTodos.next()) {
             removeCompletedSubTodos( aTodo );
         }
 
         updateView();
     }
 }
 
 void CalendarView::slotCalendarChanged()
 {
    ; 
 }
 
 void CalendarView::keyPressEvent ( QKeyEvent *e) 
 {
     //qDebug("CalendarView::keyPressEvent ");
      e->ignore();
 }
 
+void CalendarView::multiResourceSyncStart( bool start )
+{
+    mMultiResourceSync = start;
 
+}
 bool CalendarView::sync(KSyncManager* manager, QString filename, int mode,QString resource)
 {
    
     if ( manager != mSyncManager)
         qDebug("KO: Internal error-1. SyncManager mismatch ");
     if ( filename == QDir::homeDirPath ()+"/.kdecalendardump.ics" ) {
         qDebug("KO: SyncKDE request detected!");
     }
     mCurrentSyncDevice = mSyncManager->getCurrentSyncDevice();
     mCurrentSyncName = mSyncManager->getCurrentSyncName();
     if ( !resource.isEmpty() ) {
         int exclusiveSyncResource = KOPrefs::instance()->getFuzzyCalendarID( resource );
         qDebug( "KO: Sync request for resource: %s", resource.latin1() );
         
         if ( !exclusiveSyncResource ) {
             qDebug( "KO: Requested sync resource not found: %s", resource.latin1() );
             return false;
         }
         mCalendar->setDefaultCalendar( exclusiveSyncResource ); 
         mCalendar->setDefaultCalendarEnabledOnly();
     }
     bool result =  syncCalendar( filename, mode );
     if ( !resource.isEmpty() )
          restoreCalendarSettings();
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index f85b6a3..60b1276 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -118,48 +118,49 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
     CalendarView( Calendar *calendar, QWidget *parent = 0,
                   const char *name = 0 );
     virtual ~CalendarView();
   
     Calendar *calendar() { return mCalendar; }
 
     KOViewManager *viewManager();
     KODialogManager *dialogManager();
 
     QDate startDate();
     QDate endDate();
 
     QWidgetStack *viewStack();
     QWidget *leftFrame();
 
     DateNavigator *dateNavigator();
     KDateNavigator *dateNavigatorWidget();
 
     void addView(KOrg::BaseView *);
     void showView(KOrg::BaseView *);
     KOEventViewerDialog* getEventViewerDialog();
     Incidence *currentSelection();
     void checkSuspendAlarm();
     void mergeFile( QString fn );
+    void mergeFileResource( QString fn  ,QString res);
 
   signals:
     void save ();
     void saveStopTimer ();
     void tempDisableBR(bool);
     /** This todo has been modified */
     void todoModified(Todo *, int);
   
     /** when change is made to options dialog, the topwidget will catch this
      *  and emit this signal which notifies all widgets which have registered 
      *  for notification to update their settings. */
     void configChanged();
     /** emitted when the topwidget is closing down, so that any attached
         child windows can also close. */
     void closingDown();
     /** emitted right before we die */
     void closed(QWidget *);
     
     /** Emitted when state of modified flag changes */
     void modifiedChanged(bool);
     void signalmodified();
   
     /** Emitted when state of read-only flag changes */
     void readOnlyChanged(bool);
@@ -180,93 +181,95 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
     /** Emitted, when a todoitem is selected or deselected. */
     void todoSelected( bool );
 
     /**
       Emitted, when clipboard content changes. Parameter indicates if paste
       is possible or not.
     */
     void pasteEnabled(bool);
     
     /** Emitted, when the number of incoming messages has changed. */
     void numIncomingChanged(int);
 
     /** Emitted, when the number of outgoing messages has changed. */
     void numOutgoingChanged(int);
 
     /** Send status message, which can e.g. be displayed in the status bar. */
     void statusMessage(const QString &);
     
     void calendarViewExpanded( bool );
     void updateSearchDialog();
     void filtersUpdated();
 
 
   public slots: 
+    void multiResourceSyncStart( bool );
     void displayCalendarInfo( int id );
     void nextConflict( bool all, bool allday );
     void conflictAll();
     void conflictAllday();
     void conflictNotAll();
     void setCalReadOnly( int id, bool readO );
     void checkAlarms();
     void checkFiles();
     void slotprintSelInc();
     void showNextAlarms();
     void showOpenError();
     void watchSavedFile();
     void recheckTimerAlarm();
     void checkNextTimerAlarm();
     void addAlarm(const QDateTime &qdt, const QString &noti  );
     void addSuspendAlarm(const QDateTime &qdt, const QString &noti  );
     void removeAlarm(const QDateTime &qdt, const QString &noti  );
 
     /** options dialog made a changed to the configuration. we catch this
      *  and notify all widgets which need to update their configuration. */
     void updateConfig();
 
     void insertBirthdays(const QString& uid, const QStringList& birthdayList, 
                          const QStringList& anniversaryList, const QStringList& realNameList,
                          const QStringList& emailList, const QStringList& assembledNameList,
                          const QStringList& uidList);
 
     /**
       Load calendar from file \a filename. If \a merge is true, load 
       calendar into existing one, if it is false, clear calendar, before
       loading. Return true, if calendar could be successfully loaded.
     */
     bool openCalendar(QString filename, bool merge=false);
     bool loadCalendars();
     bool saveCalendars();
     bool restoreCalendarSettings();
     bool addCalendar( KopiCalendarFile * );
     void addCalendarId( int id );
     bool syncCalendar(QString filename,int mode = 0 );
 
     /**
       Save calendar data to file. Return true if calendar could be
       successfully saved.
     */
     bool saveCalendar(QString filename);
+    bool saveCalendarResource(QString filename, QString resource);
   
     /**
       Close calendar. Clear calendar data and reset views to display an empty
       calendar.
     */
     void closeCalendar();
   
     /** Archive old events of calendar */
     void archiveCalendar();
 
     void showIncidence();
     void editIncidence();
     void editIncidenceDescription();
     void deleteIncidence();
     void cloneIncidence();
     void moveIncidence();
     void beamIncidence();
     void toggleCancelIncidence();
   
     /** create an editeventwin with supplied date/time, and if bool is true,
      * make the event take all day. */
     void newEvent(QDateTime, QDateTime, bool allDay );
     void newEvent(QDateTime, QDateTime);
     void newEvent(QDateTime fh);
@@ -518,48 +521,49 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
     // show a standard warning
     // returns KMsgBox::yesNoCancel()
     int msgCalModified(); 
     virtual bool sync(KSyncManager* manager, QString filename, int mode, QString resource);
 
     virtual bool syncExternal(KSyncManager* manager, QString resource);
     virtual void removeSyncInfo( QString syncProfile);
     void setSyncManager(KSyncManager* manager);
     void setLoadedFileVersion(QDateTime);
     bool checkFileVersion(QString fn);
     bool checkAllFileVersions();
     bool checkFileChanged(QString fn);
     Event* getLastSyncEvent();
     /** Adapt navigation units correpsonding to step size of navigation of the
      * current view.
      */
     void adaptNavigationUnits();
     bool synchronizeCalendar( Calendar* local,  Calendar* remote, int mode );
     int  takeEvent( Incidence* local,  Incidence* remote, int mode, bool full = false );
     //Attendee* getYourAttendee(Event *event);
     void setBlockShowDates( bool b ) { mBlockShowDates = b ;}
     void setScrollBarStep(int val );
 
   protected:
+    bool mMultiResourceSync;
     Event *mConflictingEvent;
     void schedule(Scheduler::Method, Incidence *incidence = 0);
     
     // returns KMsgBox::OKCandel()
     int msgItemDelete(const QString name);
     void showEventEditor();
     void showTodoEditor();
     Todo *selectedTodo();
   private:
 #ifdef DESKTOP_VERSION
     QScrollBar * mDateScrollBar;
 #endif
     bool flag_blockConflict;
     bool flag_blockScrollBar;
     bool flag_checkFileFirsttime;
     bool flag_clearallviewsEventDisplay;
     bool flag_clearallviewsupdateView;
     QDateTime mNextAlarmDateTime;
     bool mViewerCallerIsSearchDialog;
     bool mBlockShowDates;
     KSyncManager* mSyncManager;
     AlarmDialog * mAlarmDialog;
     QString mAlarmNotification;
     QString mSuspendAlarmNotification;
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 66bb19b..69ccde1 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -353,50 +353,52 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) :
     //int msNeeded = neededSaveTime.msecsTo( QDateTime::currentDateTime().time() );
     //qDebug("KO: Calendar loading time: %d ms",msNeeded );
 
     if ( KPimGlobalPrefs::instance()->mPreferredLanguage != KOPrefs::instance()->mOldLoadedLanguage ) {
         KOPrefs::instance()->setAllDefaults();
     }
 
 
     connect( mView, SIGNAL( tempDisableBR(bool) ),
              SLOT( disableBR(bool) ) );
     connect( &mSaveTimer, SIGNAL( timeout() ), SLOT( save() ) );
     setCentralWidget( mView );
     globalFlagBlockStartup = 0;
     //mView->show();
     //delete splash;
     if ( newFile )
         mView->updateConfig();
     // qApp->processEvents();
     //qDebug("MainView x %d y %d w %d  h %d",  mView->x(),mView-> y(), mView->width(), mView->height ());
     //fillSyncMenu();
    
     
     connect(mSyncManager , SIGNAL( save() ), this, SLOT( save() ) );
     connect(mView , SIGNAL( saveStopTimer() ), this, SLOT( saveStopTimer() ) );
-    connect(mSyncManager , SIGNAL( request_file() ), this, SLOT( syncFileRequest() ) );
-    connect(mSyncManager , SIGNAL( getFile( bool )), this, SLOT(getFile( bool ) ) );
+    connect(mSyncManager , SIGNAL( request_file(const QString &) ), this, SLOT( syncFileRequest(const QString &) ) );
+    connect(mSyncManager , SIGNAL( getFile( bool, const QString &)), this, SLOT(getFile( bool,const QString & ) ) );
+    connect(mSyncManager , SIGNAL( multiResourceSyncStart( bool )), mView, SLOT( multiResourceSyncStart( bool ) ) );
+
     mSyncManager->setDefaultFileName( sentSyncFile()); 
     connect ( syncMenu, SIGNAL( activated ( int )  ), mSyncManager, SLOT (slotSyncMenu( int ) ) );
     mSyncManager->fillSyncMenu();
 
 
 
     mView->viewManager()->agendaView()->setStartHour( KOPrefs::instance()->mDayBegins  );
     if ( showWarning ) {
         KMessageBox::information( this,
                          "You are starting KO/Pi for the first time.\nPlease read menu: Help-What's New,\nif you did an update!\nPlease choose your timezone in the \nConfigure Dialog TAB Time Zone!\nPlease choose your language\nin the TAB Locale!\nYou get the Configure Dialog\nvia Menu: Actions - Configure....\nClick OK to show the Configure Dialog!\n", "KO/Pi information");
         //qApp->processEvents();
         mView->dialogManager()->showSyncOptions();
     }
 
   //US listen for result adressed from Ka/Pi
 
 #ifndef DESKTOP_VERSION
     infrared = 0;
 #endif
     updateFilterToolbar();
     updateWeek( mView->startDate() );
     connect( mView->dateNavigator(), SIGNAL( datesSelected( const KCal::DateList & ) ),
              SLOT( updateWeekNum( const KCal::DateList & ) ) );
     mBRdisabled = false;
@@ -2683,72 +2685,72 @@ void MainWindow::exportCalendar( bool iCalFormat )
             else
                 mes = i18n("KO/Pi:Exported to %1").arg(fn );
             setCaption(mes);
         }
     }
 
 }
 void MainWindow::exportICalendar()
 {
     exportCalendar( true );
 }
 void MainWindow::exportVCalendar()
 {
     exportCalendar( false );
 }
 QString MainWindow::sentSyncFile()
 {
 #ifdef DESKTOP_VERSION
     return  QDir::convertSeparators( locateLocal( "tmp", "copysynccal.ics" ) );
 #else
     return QString( "/tmp/copysynccal.ics" );
 #endif 
 }
 
-void MainWindow::syncFileRequest()
+void MainWindow::syncFileRequest(const QString& resource)
 {
     while ( mSyncManager->blockSave() ) {
         qApp->processEvents(); 
     }
     mSyncManager->setBlockSave(true);
 
     if ( KOPrefs::instance()->mPassiveSyncWithDesktop ) {
         mSyncManager->slotSyncMenu( 999 );
     } 
 
     setCaption(i18n("Saving Data to temp file ..." ));
-    mView->saveCalendar( sentSyncFile() );
+    mView->saveCalendarResource( sentSyncFile(), resource );
     setCaption(i18n("Data saved to temp file!" ));
     mSyncManager->setBlockSave( false );
 
 }
-void MainWindow::getFile( bool success )
+void MainWindow::getFile( bool success ,const QString& resource)
 {
     if ( ! success ) {
         setCaption( i18n("Error receiving file. Nothing changed!") );
         return;
     }
-    mView->mergeFile( sentSyncFile() ); 
+    mView->mergeFileResource( sentSyncFile(), resource); 
     if ( KOPrefs::instance()->mPassiveSyncWithDesktop ) {
         mSyncManager->slotSyncMenu( 999 );
     } 
     setCaption( i18n("Pi-Sync successful!") );
 } 
 void MainWindow::printListView()
 {
     
     QString message = i18n("You can make a printout of the <b>List View</b> and the list view in the <b>Search Dialog</b>! To do this, please go to the <b>List View/Search Dialog</b>. Right click on the list. Select in the popup menu the entry <b>Print complete list</b>. That prints the list as you see it. You can remove items from the list before printing without deleting the corresponding event/todo! Simply select all items you do not want to print out. Then right click on one of the items and choose <b>Hide selected items</b>. After that you can print the list without these items.");
     
     KMessageBox::information( this, message);
 }
 void MainWindow::printSel( )
 {
     mView->viewManager()->agendaView()->agenda()->printSelection();
 }
 
 void MainWindow::printCal()
 {
     mView->print();//mCp->showDialog();
 }
 
 
 #include "libkdepim/kdatepicker.h"
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h
index d8018b6..a533d8b 100644
--- a/korganizer/mainwindow.h
+++ b/korganizer/mainwindow.h
@@ -89,50 +89,50 @@ class MainWindow : public QMainWindow
     void saveStopTimer();
     void configureToolBar( int );
     void printSel();
     void printCal();
     void printListView();
     void saveCalendar();
     void loadCalendar();
     void exportVCalendar();
     void exportICalendar();
     void exportCalendar( bool );
     void fillFilterMenu();
     void fillFilterMenuTB();
     void selectFilter( int );
     void fillFilterMenuPopup();
     void selectFilterPopup( int );
     void exportToPhone( int );
     void toggleBeamReceive();
     void disableBR(bool);
  signals:
     void selectWeek ( int ); 
   private slots:
     void slotResetFocus();
     void slotResetFocusLoop();
     void showConfigureAgenda();
-    void getFile( bool );
-    void syncFileRequest();
+    void getFile( bool ,const QString &);
+    void syncFileRequest(const QString &);
     
   protected:
     int mFocusLoop;
     void hideEvent ( QHideEvent * );
     QString sentSyncFile();
     void displayText( QString, QString);
     void enableIncidenceActions( bool );
     bool askForQuitOnSaveError();
     
   private:
     bool mAutoSaveDisabled;
     bool checkAutosave();
     QCString mCStringMess;
     QByteArray mByteData;
 
     //void setMenuBar( QMenuBar * );
     bool mBRdisabled;
 #ifndef DESKTOP_VERSION
     QCopChannel* infrared;
 #endif
     QAction* brAction; 
     KSyncManager* mSyncManager;
     bool mClosed;
     void saveOnClose();