sync

author: zautrix <zautrix> 2005-11-25 15:49:13 (UTC)
committer: zautrix <zautrix> 2005-11-25 15:49:13 (UTC)
commit: 794a5204686ad9bfc16172b01db35f1f3b7683e5 (patch) (unidiff)
tree: 29da2cb35a4d6a0cd6885436087fe0659b58a9f4
parent: 90b62d1158d00f162a258541e24aaed4c967480b (diff)
download: kdepimpi-794a5204686ad9bfc16172b01db35f1f3b7683e5.zip
kdepimpi-794a5204686ad9bfc16172b01db35f1f3b7683e5.tar.gz
kdepimpi-794a5204686ad9bfc16172b01db35f1f3b7683e5.tar.bz2
9 files changed, 80 insertions, 21 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 033e537..2dea619 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -3212,193 +3212,193 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
        qApp->processEvents();
        if (syncManager->isProgressBarCanceled())
            return false;
        if ( incCounter % modulo == 0 )
          syncManager->showProgressBar(incCounter);
        uid = el[ incCounter ]; 
        bool skipIncidence = false;
        if ( uid.left(19) == QString("last-syncAddressee-") )
            skipIncidence = true;
        if ( !skipIncidence )  {
            inL = local->findByUid( uid );
            if ( !inL.resource() || inL.resource()->includeInSync() ) {
                inR = remote->findByUid( uid );
                if ( inR.isEmpty() ){
                    if ( filterOUT.name().isEmpty() ||  filterOUT.filterAddressee( inL )  ) { 
                        //  no conflict ********** add or delete local
                        if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
                            if ( !inL.getID(mCurrentSyncDevice).isEmpty() && mode != 4 ) {
                                // pending checkExternSyncAddressee(addresseeLSyncSharp, inL);
                                local->removeAddressee( inL );
                                ++deletedAddresseeL; 
                            } else {
                                if ( ! syncManager->mWriteBackExistingOnly ) {
                                    inL.removeID(mCurrentSyncDevice );
                                    ++addedAddresseeR;
                                    inL.setRevision( modifiedCalendar );
                                    local->insertAddressee( inL, false );
                                    inR = inL;
                                    inR.setTempSyncStat( SYNC_TEMPSTATE_ADDED_EXTERNAL );
                                    inR.setResource( 0 );
                                    remote->insertAddressee( inR, false );
                                }
                            }
                        } else {
                            if ( inL.revision() < mLastAddressbookSync && mode != 4 ) {
                                //qDebug("data %s ", inL.revision().toString().latin1());
                                // pending checkExternSyncAddressee(addresseeLSyncSharp, inL);
                                local->removeAddressee( inL );
                                ++deletedAddresseeL; 
                            } else {
                                if ( ! syncManager->mWriteBackExistingOnly ) {
                                    ++addedAddresseeR; 
                                    inL.setRevision( modifiedCalendar );
                                    local->insertAddressee( inL, false );
                                    inR = inL;
                                    inR.setIDStr( ":" );
                                    inR.setResource( 0 );
                                    remote->insertAddressee( inR, false );
                                }
                            }
                        }
                    } else {
                        ++filteredOUT; 
                    }
                }
            }
        }
        ++incCounter;
    }
    el.clear();
    syncManager->hideProgressBar();
    mLastAddressbookSync = QDateTime::currentDateTime().addSecs( 1 );
    // get rid of micro seconds
    QTime t =  mLastAddressbookSync.time();
    mLastAddressbookSync.setTime( QTime (t.hour (), t.minute (), t.second () )  );
    addresseeLSync.setRevision( mLastAddressbookSync );
    addresseeRSync.setRevision( mLastAddressbookSync );
    addresseeRSync.setRole( i18n("!Remote from: ")+mCurrentSyncName ) ;
    addresseeLSync.setRole(i18n("!Local from: ") + mCurrentSyncName  );
    addresseeRSync.setGivenName( i18n("!DO NOT EDIT!") ) ;
    addresseeLSync.setGivenName(i18n("!DO NOT EDIT!")   );
    addresseeRSync.setOrganization( "!"+mLastAddressbookSync.toString() ) ;
    addresseeLSync.setOrganization("!"+ mLastAddressbookSync.toString() );
    addresseeRSync.setNote( "" ) ;
    addresseeLSync.setNote( "" );
    if ( mGlobalSyncMode ==  SYNC_MODE_NORMAL)
        remote->insertAddressee( addresseeRSync, false );
    local->insertAddressee( addresseeLSync, false );
    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"),addedAddressee, addedAddresseeR, changedLocal, changedRemote, deletedAddresseeL, deletedAddresseeR, filteredIN, filteredOUT ); 
    qDebug( mes );
    mes = i18n("Local addressbook changed!\n") +mes;
    if ( syncManager->mShowSyncSummary ) { 
        if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(this, mes,
                                                                       i18n("KA/Pi  Synchronization"),i18n("Write back"))) {
            qDebug("KA: WB cancelled ");
            syncManager->mWriteBackFile = false; 
            return syncOK;
        }
    }
    return syncOK;
 }
 //this is a overwritten callbackmethods from the syncinterface
-bool KABCore::sync(KSyncManager* manager, QString filename, int mode)
+bool KABCore::sync(KSyncManager* manager, QString filename, int mode,QString resource)
 { 
    //pending prepare addresseeview for output
    //pending detect, if remote file has REV field. if not switch to external sync
    mGlobalSyncMode = SYNC_MODE_NORMAL;
    if ( manager != syncManager )
        qDebug("KABCore::sync:: ERROR! :: manager != syncManager ");
    QString mCurrentSyncDevice = manager->getCurrentSyncDevice();
    AddressBook abLocal(filename,"syncContact");
    bool syncOK = false;
    if ( abLocal.load() ) {
        qDebug("KA: Sync::AB loaded %s,sync mode %d",filename.latin1(), mode );
        bool external = false;
        bool isXML = false;
        if ( filename.right(4) == ".xml") {
            mGlobalSyncMode = SYNC_MODE_EXTERNAL;
            isXML = true;
            abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice, true );
        } else {
            external = !manager->mIsKapiFile;
            if ( external ) {
                qDebug("KA: Sync::Setting vcf mode to external ");
                mGlobalSyncMode = SYNC_MODE_EXTERNAL;
                AddressBook::Iterator it;  
                for ( it = abLocal.begin(); it != abLocal.end(); ++it ) {
                    (*it).setID( mCurrentSyncDevice, (*it).uid() );
                    (*it).computeCsum( mCurrentSyncDevice );
                }
            }
        }
        //AddressBook::Iterator it;
        //QStringList vcards;
        //for ( it = abLocal.begin(); it != abLocal.end(); ++it ) {
        //  qDebug("Name %s ", (*it).familyName().latin1());
        //}
        syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, mode );
        syncManager->hideProgressBar();
        if (  syncOK ) {
            if ( syncManager->mWriteBackFile )
                {
                    if ( external )
                        abLocal.removeSyncAddressees( !isXML);
                    qDebug("KA: Sync::Saving remote AB ");
                    if ( ! abLocal.saveAB()) 
                        qDebug("KA: sync::Error writing back AB to file ");
                    if (  external ) {
                        // afterwrite processing
                        abLocal.postExternSync( mAddressBook,mCurrentSyncDevice ,isXML);
                    }
                }
        }
        setModified();
        
    }
    abLocal.removeResources();
    if ( syncOK )
        mViewManager->refreshView();
    return syncOK;
 }
 void  KABCore::removeSyncInfo( QString syncProfile) 
 {
    qDebug("KA: AB:removeSyncInfo for profile %s ", syncProfile.latin1());
    mAddressBook->removeSyncInfo( syncProfile );
    setModified();
 }
 //this is a overwritten callbackmethods from the syncinterface
 bool KABCore::syncExternal(KSyncManager* manager, QString  resource)
 {
    if (  resource == "phone" )
        return syncPhone();
    disableBR( true );
   if ( manager != syncManager )
        qDebug("KABCore::syncExternal:: ERROR! :: manager != syncManager ");
    QString mCurrentSyncDevice = manager->getCurrentSyncDevice();
    AddressBook abLocal( resource,"syncContact");
    bool syncOK = false;
    message(i18n("Loading DTM address data..."), false);
    if ( abLocal.load() ) {
        qDebug("KA: AB sharp loaded ,sync device %s",mCurrentSyncDevice.latin1());
        mGlobalSyncMode = SYNC_MODE_EXTERNAL;
        message(i18n("Sync preprocessing..."),false);
        abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice, false );
        message(i18n("Synchronizing..."),false);
        syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, syncManager->mSyncAlgoPrefs );
        syncManager->hideProgressBar();
        if (  syncOK ) {
            if ( syncManager->mWriteBackFile ) {
                abLocal.removeSyncAddressees( false );
                message(i18n("Saving DTM address data..."),false);
                abLocal.saveAB();
                message(i18n("Sync postprocessing..."),false);
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index 42b7709..c4a0b3b 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -419,117 +419,117 @@ class KABCore : public QWidget, public KSyncInterface
  // QSplitter *mDetailsSplitter;
  KDGanttMinimizeSplitter *mExtensionBarSplitter;
  ViewContainer *mDetails;
  KDGanttMinimizeSplitter* mMiniSplitter;
  XXPortManager *mXXPortManager;
  JumpButtonBar *mJumpButtonBar;
  IncSearchWidget *mIncSearchWidget;
  ExtensionManager *mExtensionManager;
  KCMultiDialog *mConfigureDialog;
 #ifndef KAB_EMBEDDED
    LDAPSearchDialog *mLdapSearchDialog;
 #endif //KAB_EMBEDDED
    // QDict<AddresseeEditorDialog> mEditorDict;
    AddresseeEditorDialog *mEditorDialog;
    bool mReadWrite;
    bool mModified;
    bool mIsPart;
    bool mMultipleViewsAtOnce;
    //US file menu
    KAction *mActionMail;
    KAction *mActionBeam;
    KToggleAction *mActionBR;
    KAction *mActionExport2phone;
    KAction* mActionPrint;
    KAction* mActionPrintDetails;
    KAction* mActionNewContact;
    KAction *mActionSave;
    KAction *mActionEditAddressee;
    KAction *mActionMailVCard;
    KAction *mActionBeamVCard;
    KAction *mActionQuit;
    //US edit menu
    KAction *mActionCopy;
    KAction *mActionCut;
    KAction *mActionPaste;
    KAction *mActionSelectAll;
    KAction *mActionUndo;
    KAction *mActionRedo;
    KAction *mActionDelete;
    //US settings menu
    KAction *mActionConfigResources;
    KAction *mActionConfigGlobal;
    KAction *mActionConfigKAddressbook;
    KAction *mActionConfigShortcuts;
    KAction *mActionConfigureToolbars;
    KAction *mActionKeyBindings;
    KToggleAction *mActionJumpBar;
    KToggleAction *mActionDetails;
    KAction *mActionWhoAmI;
    KAction *mActionCategories;
    KAction *mActionEditCategories;
    KAction *mActionManageCategories;
    KAction *mActionAboutKAddressbook;
    KAction *mActionLicence;
    KAction *mActionFaq;
    KAction *mActionWN;
    KAction *mActionSyncHowto;
    KAction *mActionStorageHowto;
    KAction *mActionKdeSyncHowto;
    KAction *mActionMultiSyncHowto;
    KAction *mActionDeleteView;
    QPopupMenu *viewMenu;
    QPopupMenu *filterMenu;
    QPopupMenu *settingsMenu;
    QPopupMenu *changeMenu;
    QPopupMenu *beamMenu;
 //US    QAction *mActionSave;
    QPopupMenu *ImportMenu;
    QPopupMenu *ExportMenu;
    //LR additional methods
    KAction *mActionRemoveVoice;
    KAction *mActionSetFormattedName;
    KAction * mActionImportOL;
 #ifndef KAB_EMBEDDED
    KAddressBookService *mAddressBookService;
 #endif //KAB_EMBEDDED
    class KABCorePrivate;
    KABCorePrivate *d;
    //US    bool mBlockSaveFlag;
 #ifdef KAB_EMBEDDED
    KAddressBookMain *mMainWindow;  // should be the same like mGUIClient
 #endif //KAB_EMBEDDED
    //this are the overwritten callbackmethods from the syncinterface
-    virtual bool sync(KSyncManager* manager, QString filename, int mode);
+    virtual bool sync(KSyncManager* manager, QString filename, int mode,QString resource);
    virtual bool syncExternal(KSyncManager* manager, QString resource);
    virtual void removeSyncInfo( QString syncProfile);
    bool syncPhone();
    void message( QString m , bool startTimer = true);
    // LR *******************************
    // sync stuff!
    QString sentSyncFile();
    QPopupMenu *syncMenu;
    KSyncManager* syncManager;
    int mGlobalSyncMode; 
    bool synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBook* remote,int mode);
    KABC::Addressee getLastSyncAddressee();
    QDateTime mLastAddressbookSync;
    int  takeAddressee( KABC::Addressee* local,  KABC::Addressee* remote, int mode , bool full );
    // *********************
 };
 #endif
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 31e103d..8965d3b 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -1885,193 +1885,192 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
                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 );
    qDebug("KO: Normal sync: %d ",mGlobalSyncMode ==  SYNC_MODE_NORMAL );
    if ( mGlobalSyncMode ==  SYNC_MODE_NORMAL && !mSyncManager->syncWithDesktop()) // 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;
 }
 void CalendarView::setSyncDevice( QString s )
 {
    mCurrentSyncDevice= s;
 }
 void CalendarView::setSyncName( QString s )
 {
    mCurrentSyncName= s;
 }
 bool CalendarView::syncCalendar(QString filename, int mode)
 {
    //qDebug("syncCalendar %s ", filename.latin1());
    mGlobalSyncMode = SYNC_MODE_NORMAL;
    CalendarLocal* calendar = new CalendarLocal();
    calendar->setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId);
    FileStorage* storage = new FileStorage( calendar );
    bool syncOK = false;
    storage->setFileName( filename );
    // qDebug("loading ... ");
    if ( storage->load() ) {
        getEventViewerDialog()->setSyncMode( true );
        syncOK = synchronizeCalendar( mCalendar, calendar, mode );
        getEventViewerDialog()->setSyncMode( false );
        if (  syncOK ) {
           if ( mSyncManager->mWriteBackFile )
            {
                storage->setSaveFormat( new ICalFormat() );
                storage->save();
            }
        }
        setModified( true );
    }
    delete storage;
    delete calendar;
    if ( syncOK )
        updateView();
    return syncOK;
 }
 void CalendarView::syncExternal( int mode  )
 {
    mGlobalSyncMode = SYNC_MODE_EXTERNAL;
-   
    qApp->processEvents();
    CalendarLocal* calendar = new CalendarLocal();
    calendar->setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId);
    bool syncOK = false;
    bool loadSuccess = false;
    PhoneFormat* phoneFormat = 0;
    emit tempDisableBR(true);
 #ifndef DESKTOP_VERSION
    SharpFormat* sharpFormat = 0;
    if ( mode == 0 ) { // sharp
        sharpFormat = new SharpFormat () ;
        loadSuccess = sharpFormat->load( calendar, mCalendar ); 
    } else 
 #endif
        if ( mode == 1 ) { // phone 
        phoneFormat = new PhoneFormat (mCurrentSyncDevice,
                                         mSyncManager->mPhoneDevice,
                                         mSyncManager->mPhoneConnection,
                                         mSyncManager->mPhoneModel);
        loadSuccess = phoneFormat->load( calendar,mCalendar); 
        
        } else {
            emit tempDisableBR(false);
            return;
        }
    if ( loadSuccess ) {
        getEventViewerDialog()->setSyncMode( true );
        syncOK = synchronizeCalendar( mCalendar, calendar, mSyncManager->mSyncAlgoPrefs );
        getEventViewerDialog()->setSyncMode( false );
        qApp->processEvents();
        if (  syncOK ) {
            if ( mSyncManager->mWriteBackFile )
            {
                QPtrList<Incidence> iL = mCalendar->rawIncidences(); 
                Incidence* inc = iL.first();
                if ( phoneFormat ) {
                    while ( inc ) {
                        inc->removeID(mCurrentSyncDevice);
                        inc =  iL.next();
                    }
                }
 #ifndef DESKTOP_VERSION
                if ( sharpFormat )
                    sharpFormat->save(calendar);
 #endif
                if ( phoneFormat )
                    phoneFormat->save(calendar);
                iL = calendar->rawIncidences(); 
                inc = iL.first();
                Incidence* loc;
                while ( inc ) {
                    if ( inc->tempSyncStat() == SYNC_TEMPSTATE_NEW_ID ) {
                        loc = mCalendar->incidence(inc->uid() );
                        if ( loc ) {
                            loc->setID(mCurrentSyncDevice, inc->getID(mCurrentSyncDevice) );
                            loc->setCsum( mCurrentSyncDevice, inc->getCsum(mCurrentSyncDevice) );
                        }
                    }
                    inc =  iL.next();
                }
                Incidence* lse = getLastSyncEvent();
                if ( lse ) {
                    lse->setReadOnly( false );
                    lse->setDescription( "" );
                    lse->setReadOnly( true );
                }
            }
        } else {
            topLevelWidget()->setCaption( i18n("Sync cancelled or failed.") );
        }
        setModified( true );
    } else {
        QString question = i18n("Sorry, the database access\ncommand failed!\n\nNothing synced!\n") ;
        QMessageBox::information( 0, i18n("KO/Pi Import - ERROR"),
                                      question, i18n("Ok")) ;
    }
    delete calendar;
    updateView();
    emit tempDisableBR(false);
    return ;//syncOK;
 }
 bool CalendarView::importBday()
 {
 #ifndef KORG_NOKABC
 #ifdef DESKTOP_VERSION
    int curCal = mCalendar->defaultCalendar();
    int bd = mCalEditView->getBirtdayID();
    if ( bd == 0 )
        return false;
    mCalendar->setDefaultCalendar( bd );
    KABC::StdAddressBook* AddressBook = KABC::StdAddressBook::self( true );
@@ -4941,203 +4940,217 @@ void CalendarView::showIncidence(Incidence *incidence)
 void CalendarView::editIncidence(Incidence *incidence)
 { 
    if ( incidence ) {
       
        EditIncidenceVisitor v;
        v.act( incidence, this );
        
    }
 }
 void CalendarView::deleteIncidence(Incidence *incidence)
 {
    //qDebug(" CalendarView::deleteIncidence ");
    if ( incidence == 0 ) {
        updateView();
        emit updateSearchDialog();
        return;
    }
    if ( incidence ) {
        DeleteIncidenceVisitor v;
        v.act( incidence, this );
    }
 }
 void CalendarView::lookForOutgoingMessages()
 {
    OutgoingDialog *ogd = mDialogManager->outgoingDialog();
    ogd->loadMessages();
 }
 void CalendarView::lookForIncomingMessages()
 {
    IncomingDialog *icd = mDialogManager->incomingDialog();
    icd->retrieve();
 }
 bool  CalendarView::removeCompletedSubTodos( Todo* t )
 {
    bool deleteTodo = true;
    QPtrList<Incidence> subTodos;
    Incidence *aTodo;
    subTodos = t->relations();
    for (aTodo = subTodos.first(); aTodo; aTodo = subTodos.next()) {
        if (! removeCompletedSubTodos( (Todo*) aTodo ))
            deleteTodo = false;
    }
    if ( deleteTodo ) {
        if ( t->isCompleted() && !t->doesRecur()) {
            checkExternalId(  t );
            mCalendar->deleteTodo( t );
            changeTodoDisplay( t,KOGlobals::EVENTDELETED );
        }
        else
            deleteTodo = false;
    }
    return deleteTodo;
 }
 void CalendarView::purgeCompleted()
 {
    int result = KMessageBox::warningContinueCancel(this,
                                                    i18n("Delete all completed todos?\n(Completed recurring todos\nwill not be deleted!)"),i18n("Purge Todos"),i18n("Purge"));
    if (result == KMessageBox::Continue) {
        QPtrList<Todo> todoCal;
        QPtrList<Todo> rootTodos;
        //QPtrList<Incidence> rel;
        Todo *aTodo;
        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();
 }
-bool CalendarView::sync(KSyncManager* manager, QString filename, int mode)
+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();
-    return syncCalendar( filename, mode );
+    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();
+    return result;
 }
 bool CalendarView::syncExternal(KSyncManager* manager, QString resource)
 {
    //mSyncManager = manager;
    if ( manager != mSyncManager)
        qDebug("KO: Internal error-2. SyncManager mismatch ");
    mCurrentSyncDevice = mSyncManager->getCurrentSyncDevice();
    mCurrentSyncName = mSyncManager->getCurrentSyncName();
    if ( resource == "sharp" )
        syncExternal( 0 );
    if ( resource == "phone" )
         syncExternal( 1 );  
    // pending setmodified
    return true;
 }
 void CalendarView::setSyncManager(KSyncManager* manager)
 {
   mSyncManager = manager;
 }
 void  CalendarView::removeSyncInfo( QString syncProfile) 
 {
    qDebug("KO: removeSyncInfo for profile %s ", syncProfile.latin1());
    mCalendar->removeSyncInfo( syncProfile );
 }
 void CalendarView::undo_delete()
 {
    //qDebug("undo_delete() ");
    Incidence* undo = mCalendar->undoIncidence();
    if ( !undo ) {
        KMessageBox::sorry(this,i18n("There is nothing to undo!"),
                           i18n("KO/Pi"));
        return;
    }
    if ( KMessageBox::Continue ==KMessageBox::warningContinueCancel(this,KGlobal::formatMessage ( undo->summary(),0 ) +
                                                       i18n("\nAre you sure you want\nto restore this?"),
                                                                    i18n("KO/Pi Confirmation"),i18n("Restore"))) {
        mCalendar->undoDeleteIncidence();
        updateView();
    }
 }
 void  CalendarView::slotViewerClosed()
 {
    QTimer::singleShot( 50, this, SLOT ( resetFocus() ) );
 }
 void CalendarView::resetFocus()
 {
    if ( mViewerCallerIsSearchDialog ) {
        if ( mDialogManager->getSearchDialog()->isVisible() ){
            mDialogManager->getSearchDialog()->raise();
            mDialogManager->getSearchDialog()->setActiveWindow();
            mDialogManager->getSearchDialog()->listview()->resetFocus(); 
        } else
            mViewerCallerIsSearchDialog = false;
    }
    if ( !mViewerCallerIsSearchDialog ) {
        //mViewManager->currentView()->setFocus();
        //qDebug("sssssssssssssssset focus ");
        topLevelWidget()->raise();
        setActiveWindow();
        //setFocus();
    }
    mViewerCallerIsSearchDialog = false;
 }
 void CalendarView::showNextAlarms()
 {
    QString message;
    QDateTime nextAl = mCalendar->nextAlarmEventDateTime();
    if (  nextAl.isValid() && mNextAlarmDateTime > QDateTime::currentDateTime() ) {
        QString sum = mCalendar->nextSummary();
        QDateTime nextA = mNextAlarmDateTime;
        QDateTime cur = QDateTime::currentDateTime();
        int  secs = cur.secsTo( nextA );
        int min = secs /60; 
        int hours = min /60;
        min = min % 60;
        int days = hours /24;
        hours = hours % 24;
        
        //message = i18n("The next alarm is in:\n");
        if ( days > 1 )
            message += i18n("%1 days\n").arg( days );
        else if ( days == 1 )
            message += i18n("1 day\n");
        if ( hours > 1 )
            message += i18n("%1 hours\n").arg( hours );
        else if ( hours == 1 )
            message += i18n("1 hour\n");
        if ( min > 1 )
            message += i18n("%1 minutes\n").arg( min );
        else if ( min == 1 )
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index 80f7ed4..f85b6a3 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -425,193 +425,193 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
    /* iTIP scheduling actions */
    void schedule_publish(Incidence *incidence = 0);
    void schedule_request(Incidence *incidence = 0);
    void schedule_refresh(Incidence *incidence = 0);
    void schedule_cancel(Incidence *incidence = 0);
    void schedule_add(Incidence *incidence = 0);
    void schedule_reply(Incidence *incidence = 0);
    void schedule_counter(Incidence *incidence = 0);
    void schedule_declinecounter(Incidence *incidence = 0);
    void schedule_publish_freebusy(int daysToPublish = 30);
    void openAddressbook();
    void editFilters();
    void toggleFilerEnabled();
    QPtrList<CalFilter> filters();
    void toggleFilter();
    void showFilter(bool visible);
    void updateFilter();
    void filterEdited();
    void selectFilter( int );
    KOFilterView *filterView();
    void showIntro();
    /** Move the curdatepient view date to today */
    void goToday();
    /** Move to the next date(s) in the current view */
    void goNext();
  
    /** Move to the previous date(s) in the current view */
    void goPrevious();
  /** Move to the next date(s) in the current view */
    void goNextMonth();
  
    /** Move to the previous date(s) in the current view */
    void goPreviousMonth();
    void toggleExpand();
    void toggleDateNavigatorWidget();
    void toggleAllDaySize();
  
    /** Look for new messages in the inbox */
    void lookForIncomingMessages();
   /** Look for new messages in the outbox */
    void lookForOutgoingMessages();
    void processMainViewSelection( Incidence * );
    void processTodoListSelection( Incidence * );
    
    void processIncidenceSelection( Incidence * );
    void purgeCompleted();
    bool removeCompletedSubTodos( Todo* );
    void slotCalendarChanged();
    bool importBday();
    bool addAnniversary( QDate data, QString name, KCal::Attendee* a , bool birthday  );
    bool importQtopia( const QString &categoriesFile,
                       const QString &datebookFile,
                       const QString &tasklistFile );
    void syncExternal( int mode );
    void slotSelectPickerDate( QDate ) ;
    void showDatePicker() ;
    void showDatePickerPopup() ;
    void moveIncidence(Incidence *) ;
    void beamIncidence(Incidence *) ;
    void beamCalendar() ;
    void beamFilteredCalendar() ;
    void beamIncidenceList(QPtrList<Incidence>) ;
    void manageCategories();
    void editCategories();
    int addCategories();
    void removeCategories();
    void setSyncDevice( QString );
    void setSyncName( QString );
    void showDay( QDate );
    void undo_delete();
  protected slots:
    void resetFocus();
    void scrollBarValue(int);
    void slotViewerClosed();
    void timerAlarm();
    void suspendAlarm();
    void beamDone( Ir *ir );
    /** Select a view or adapt the current view to display the specified dates. */
    void showDates( const KCal::DateList & );
    void selectWeekNum ( int );
    void checkConflictForEvent();
  
  public:
    void createRunningDate4Todo(  Todo * runT,  QDateTime start ,  QDateTime end,  int secLenRunning, int secLenPausing,int dayInterval );
    // show a standard warning
    // returns KMsgBox::yesNoCancel()
    int msgCalModified(); 
-    virtual bool sync(KSyncManager* manager, QString filename, int mode);
+    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:
    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;
    QTimer* mSuspendTimer;
    QTimer* mAlarmTimer;
    QTimer* mRecheckAlarmTimer;
    void computeAlarm( QString );
    void startAlarm( QString, QString );
    void setSyncEventsReadOnly();
    
    QDateTime loadedFileVersion;
    void checkExternSyncEvent( QPtrList<Event> lastSync , Incidence* toDelete );
    void checkExternalId( Incidence * inc );
    int mGlobalSyncMode;
    QString  mCurrentSyncDevice;
    QString  mCurrentSyncName;
    void init();
    int mDatePickerMode;
    bool mFlagEditDescription;
    QDateTime mLastCalendarSync;
    void createPrinter();
    void calendarModified( bool, Calendar * );
    CalPrinter *mCalPrinter;
    QSplitter    *mPanner;
    QSplitter    *mLeftSplitter;
    KDGanttMinimizeSplitter  *mLeftFrame, *mMainFrame;
    QWidgetStack *mRightFrame;
    KDatePicker* mDatePicker;
    QVBox* mDateFrame;
    DateNavigatorContainer *mDateNavigator;       // widget showing small month view.
    KOFilterView *mFilterView;
    KOCalEditView *mCalEditView;
    ResourceView *mResourceView;
    // calendar object for this viewing instance
    Calendar      *mCalendar;
    CalendarResourceManager *mResourceManager;
    FileStorage *mStorage;
    DateNavigator *mNavigator;
    KOViewManager *mViewManager;
    KODialogManager *mDialogManager;
    // Calendar filters
    QPtrList<CalFilter> mFilters;
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index 1b0e5f4..31ef338 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -435,192 +435,202 @@ void KOPrefs::usrReadConfig()
        mEventSummaryUser  = getDefaultList() ;
    }
    if (mTodoSummaryUser.isEmpty()) {
        mTodoSummaryUser  = getDefaultList() ;
    }
  
    if (mCustomCategories.isEmpty()) setCategoryDefaults();
    config()->setGroup("Personal Settings");
    mName = config()->readEntry("user_name","");
    mEmail = config()->readEntry("user_email","");
    fillMailDefaults();
    config()->setGroup("Category Colors");
    QStringList::Iterator it;
    for (it = mCustomCategories.begin();it != mCustomCategories.end();++it ) {
        setCategoryColor(*it,config()->readColorEntry(*it,&mDefaultCategoryColor));
   
    }
    KConfig fc (locateLocal("config","kopicalendarrc"));
    fc.setGroup("CC");
    int numCals = fc.readNumEntry("NumberCalendars",0 );
    mNextAvailableCalendar = 1;
    if ( numCals == 0 ) {
        KopiCalendarFile *kkf = getNewCalendar();
        kkf->isStandard = true;
        kkf->mName = i18n("Standard");
        kkf->mFileName = QDir::convertSeparators( locateLocal( "data", "korganizer/mycalendar.ics" ) );
    } 
    while ( mNextAvailableCalendar  <= numCals ) {
        //qDebug("Read cal #%d ",  mNextAvailableCalendar );
        QString prefix = "Cal_" +QString::number( mNextAvailableCalendar );
        KopiCalendarFile *kkf = getNewCalendar();
        kkf->isStandard = fc.readBoolEntry( prefix+"_isStandard", false );
        kkf->isEnabled = fc.readBoolEntry( prefix+"_isEnabled", true);
        kkf->isRelative = fc.readBoolEntry( prefix+"_isRelative", false );
        kkf->isAlarmEnabled = fc.readBoolEntry( prefix+"_isAlarmEnabled", true);
        kkf->isReadOnly = fc.readBoolEntry( prefix+"_isReadOnly", false);
        kkf->mName =  fc.readEntry( prefix+"_Name", "Calendar");
        kkf->mFileName = QDir::convertSeparators( fc.readEntry( prefix+"_FileName", kkf->mFileName) );
        kkf->mSavedFileName = QDir::convertSeparators( fc.readEntry( prefix+"_SavedFileName", kkf->mFileName) );
        kkf->mDefaultColor = fc.readColorEntry( prefix+"_Color",&mEventColor);
        if ( kkf->mCalNumber == 1 ) {
            kkf->mFileName = locateLocal( "data", "korganizer/mycalendar.ics" );
        }
        //qDebug("NAME %s %s", kkf->mName.latin1(), i18n("Birthdays").latin1() );
        if ( kkf->mName == i18n("Birthdays") ) {
            kkf->mFileName = locateLocal( "data", "korganizer/birthdays.ics" ); 
        }
        if ( kkf->isRelative )
            kkf->mFileName = QDir::convertSeparators( KGlobalSettings::calendarDir() + kkf->mSavedFileName );
    }
    KPimPrefs::usrReadConfig();
 }
 KopiCalendarFile * KOPrefs::getCalendar( int num )
 {
    return mDefCalColors[num-1];
 }
 KopiCalendarFile * KOPrefs::getNewCalendar()
 {
    KopiCalendarFile * kkf = new KopiCalendarFile();
    kkf->mCalNumber = mNextAvailableCalendar;
    mDefCalColors.resize( mNextAvailableCalendar );
    mDefCalColors[mNextAvailableCalendar-1] = kkf;
    ++mNextAvailableCalendar;
    kkf->mDefaultColor = mEventColor;
    kkf->mName = i18n("New Calendar");
    mCalendars.append( kkf );
    return kkf;
 }
 void  KOPrefs::deleteCalendar( int num )
 {
    KopiCalendarFile * kkf = mCalendars.first();
    while ( kkf ) {
        if ( kkf->mCalNumber == num ) {
            qDebug("KOPrefs::deleteCalendar %d ", num );
            mCalendars.remove( kkf );
            delete kkf;
            return;
        }
        kkf = mCalendars.next();
    }
 }
 int KOPrefs::getCalendarID( const QString & name )
 {
    KopiCalendarFile * kkf = mCalendars.first();
    while ( kkf ) {
        if ( name == kkf->mName)
            return  kkf->mCalNumber;
        kkf = mCalendars.next();
    }
    return 1;
 }
+int KOPrefs::getFuzzyCalendarID( const QString & name )
+{
+    KopiCalendarFile * kkf = mCalendars.first();
+    while ( kkf ) {
+        if ( name.lower() == kkf->mName.lower())
+            return  kkf->mCalNumber;
+        kkf = mCalendars.next();
+    }
+    return 0;
+}
 QString KOPrefs::calName( int calNum) const
 {
    return (mDefCalColors[calNum-1])->mName;
 }
 QColor  KOPrefs::defaultColor( int calNum ) const
 {
    if ( calNum == 1 ) return mEventColor;
    return (mDefCalColors[calNum-1])->mDefaultColor;
 }
 void KOPrefs::usrWriteConfig()
 {
  config()->setGroup("General");
  config()->writeEntry("Custom Categories",mCustomCategories); 
  
  config()->setGroup("Personal Settings");
  config()->writeEntry("user_name",mName);
  config()->writeEntry("user_email",mEmail);
  config()->setGroup("Category Colors");
  QDictIterator<QColor> it(mCategoryColors);
  while (it.current()) {
    config()->writeEntry(it.currentKey(),*(it.current()));
    ++it;
  } 
  KConfig fc (locateLocal("config","kopicalendarrc")); 
  fc.setGroup("CC");
  fc.deleteGroup( "CC");
  fc.setGroup("CC");
  fc.writeEntry("NumberCalendars",mCalendars.count());
    int numCal = 1;
    int writeCal = 0;
    while ( numCal < mNextAvailableCalendar  ) {
        KopiCalendarFile * kkf = mCalendars.first();
        while ( kkf ) {
            //qDebug("cal num %d %d ", kkf->mCalNumber, numCal);
            if ( kkf->mCalNumber == numCal ) {
                ++writeCal;
                //qDebug("Write calendar %d %d ", numCal , writeCal);
                QString prefix = "Cal_" + QString::number( writeCal );
                fc.writeEntry( prefix+"_isStandard", kkf->isStandard );
                fc.writeEntry( prefix+"_isEnabled", kkf->isEnabled );
                fc.writeEntry( prefix+"_isAlarmEnabled", kkf->isAlarmEnabled );
                fc.writeEntry( prefix+"_isReadOnly", kkf->isReadOnly );
                fc.writeEntry( prefix+"_isRelative", kkf->isRelative );
                fc.writeEntry( prefix+"_Name", kkf->mName);
                fc.writeEntry( prefix+"_FileName", kkf->mFileName);
                fc.writeEntry( prefix+"_SavedFileName", kkf->mSavedFileName);
                fc.writeEntry( prefix+"_Color",kkf->mDefaultColor);
            }
            kkf = mCalendars.next();
        }
        ++numCal;
    }
    fc.sync();
  KPimPrefs::usrWriteConfig();
 }
 void KOPrefs::setCategoryColor(QString cat,const QColor & color)
 {
  mCategoryColors.replace(cat,new QColor(color));
 }
 QColor *KOPrefs::categoryColor(QString cat)
 {
  QColor *color = 0;
  if (!cat.isEmpty()) color = mCategoryColors[cat];
  if (color) return color;
  else return &mDefaultCategoryColor;
 }
 void KOPrefs::setFullName(const QString &name)
 {
  mName = name;
 }
 void KOPrefs::setEmail(const QString &email)
 {
    //qDebug(" KOPrefs::setEmai*********** %s",email.latin1() );
  mEmail = email;
 }
 QString KOPrefs::fullName()
 {
  if (mEmailControlCenter) {
    KEMailSettings settings;
    return settings.getSetting(KEMailSettings::RealName);
  } else {
    return mName;
  }
 }
 QString KOPrefs::email()
 {
  if (mEmailControlCenter) {
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h
index bac8010..70da096 100644
--- a/korganizer/koprefs.h
+++ b/korganizer/koprefs.h
@@ -12,192 +12,193 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
    As a special exception, permission is given to link this program
    with any edition of Qt, and distribute the resulting executable,
    without including the source code for Qt in the source distribution.
 */
 #ifndef KOPREFS_H
 #define KOPREFS_H
 #include <libkdepim/kpimprefs.h>
 #include <qdict.h>
 #include <qdir.h>
 #include <qobject.h>
 class KConfig;
 class QFont;
 class QColor;
 class QStringList;
 #define VIEW_WN_VIEW 1
 #define VIEW_NX_VIEW 2
 #define VIEW_J_VIEW 3
 #define VIEW_A_VIEW 4
 #define VIEW_ML_VIEW 5
 #define VIEW_M_VIEW 6
 #define VIEW_L_VIEW 7
 #define VIEW_T_VIEW 8
 class KopiCalendarFile : public QObject
 {
 public:
    KopiCalendarFile(  ) : QObject( )
        {
            isStandard = false;
            isEnabled = true;
            isAlarmEnabled = true;
            isReadOnly = false;
            mName = "Calendar";
            mFileName = QDir::homeDirPath() + "/icalfile.ics";
            mSavedFileName = "icalfile.ics";
            mCalNumber = 0;
            mDefaultColor = Qt::red;
            mErrorOnLoad = false;
            isRelative = false;
        }
    bool isStandard;
    bool isEnabled;
    bool isAlarmEnabled;
    bool isReadOnly;
    bool mErrorOnLoad;
    QString mName;
    QString mFileName;
    QString mSavedFileName;
    bool isRelative;
    int mCalNumber;
    QColor mDefaultColor;
    QDateTime mLoadDt;
 };
 class KOPrefs : public KPimPrefs
 {
  public:
    enum { FormatVCalendar, FormatICalendar };
    enum { MailClientKMail, MailClientSendmail };
    enum { IMIPDummy, IMIPKMail };
    enum { IMIPOutbox, IMIPdirectsend };
    enum { neverAuto, addressbookAuto, selectedAuto };
    enum { standardDestination, askDestination };
    virtual ~KOPrefs();
    /** Get instance of KOPrefs. It is made sure that there is only one
    instance. */
    static KOPrefs *instance();
    /** Set preferences to default values */
    void usrSetDefaults();
    /** Read preferences from config file */
    void usrReadConfig();
    /** Write preferences to config file */
    void usrWriteConfig();
    void setCategoryDefaults();
    void setAllDefaults();
    KopiCalendarFile * getNewCalendar();
    KopiCalendarFile * getCalendar( int );
    void  deleteCalendar( int );
    QColor defaultColor( int ) const;
    QString calName( int ) const;
    int getCalendarID( const QString & name );
+    int getFuzzyCalendarID( const QString & name );
  protected:
    void setTimeZoneIdDefault();
    /** Fill empty mail fields with default values. */
    void fillMailDefaults();
  private:
    /** Constructor disabled for public. Use instance() to create a KOPrefs
    object. */
    KOPrefs();
    static KOPrefs *mInstance;
    QStringList getDefaultList();
    QStringList getLocationDefaultList();
  public:
    // preferences data
    KConfig* getConfig();
    void setFullName(const QString &);
    QString fullName();
    void setEmail(const QString &);
    QString email();
    QString mAdditional;
    bool    mEmailControlCenter;
    bool    mBcc;
    bool    mAutoSave;
    int     mAutoSaveInterval;
    bool    mConfirm;
    bool    mEnableGroupScheduling;
    bool    mEnableProjectView;
    int     mDefaultFormat;
    int     mMailClient;
    int     mStartTime;
    int     mDefaultDuration;
    int     mAlarmTime;
    int     mWorkingHoursStart;
    int     mWorkingHoursEnd;
    bool    mExcludeHolidays;
    bool    mExcludeSaturdays;
    bool    mMarcusBainsShowSeconds;
    QFont   mTimeBarFont;
    QFont   mMonthViewFont;
    QFont   mAgendaViewFont;
    QFont   mMarcusBainsFont;
    QFont   mTimeLabelsFont;
    QFont   mTodoViewFont;
    QFont   mListViewFont;
    QFont   mDateNavigatorFont;
    QFont   mEditBoxFont;
    QFont   mJornalViewFont;
    QFont   mWhatsNextFont;
    QFont   mEventViewFont;
    QColor  mHolidayColor;
    QColor  mHighlightColor;
    QColor  mEventColor;
    QColor  mTodoDoneColor;
    QColor  mAgendaBgColor;
    QColor  mWorkingHoursColor;
    QColor  mTodoDueTodayColor;
    QColor  mTodoOverdueColor;
    QColor  mTodoRunColor;
    QColor  mMonthViewEvenColor;
    QColor  mMonthViewOddColor;
    QColor  mMonthViewHolidayColor;
    bool mMonthViewUsesDayColors;
    bool mMonthViewSatSunTog;
    bool mMonthViewWeek;
    bool mMonthViewWeekRowlayout;
    QColor  mAppColor1;
    QColor  mAppColor2;
    bool mUseAppColors;
    int     mDayBegins;
    int     mHourSize;
    int     mAllDaySize;
    bool    mShowFullMenu;
    bool    mDailyRecur;
    bool    mWeeklyRecur;
    bool    mLongAllday;
    bool    mMonthDailyRecur;
    bool    mMonthWeeklyRecur;
    bool    mMonthShowIcons;
    bool    mMonthShowTimes;
    bool    mMonthShowShort;
    bool    mEnableToolTips;
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index d71264f..a64eb34 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -103,651 +103,659 @@ void KSyncManager::fillSyncMenu()
    mSyncMenu->insertSeparator();
    mSyncMenu->insertItem( i18n("Multiple sync"), 1 );
    mSyncMenu->insertSeparator();
    KConfig config ( locateLocal( "config","ksyncprofilesrc"  ) );
    config.setGroup("General");
    QStringList prof = config.readListEntry("SyncProfileNames");
    mLocalMachineName = config.readEntry("LocalMachineName","undefined");
    if ( prof.count() < 2 ) {
        prof.clear();
        QString externalName;
 #ifdef DESKTOP_VERSION
 #ifdef _WIN32_
        externalName = "OutLook(not_implemented)";
 #else
        externalName = "KDE_Desktop";
 #endif
 #else
        externalName = "Sharp_DTM";
 #endif
        prof << externalName;
        prof << i18n("Local_file");
        prof << i18n("Last_file");
        KSyncProfile* temp = new KSyncProfile ();
        temp->setName( prof[0] );
        temp->writeConfig(&config);
        temp->setName( prof[1] );
        temp->writeConfig(&config);
        temp->setName( prof[2] );
        temp->writeConfig(&config);
        config.setGroup("General");
        config.writeEntry("SyncProfileNames",prof);
        config.writeEntry("ExternSyncProfiles",externalName);
        config.sync();
        delete temp;
    }
    mExternSyncProfiles = config.readListEntry("ExternSyncProfiles");
    mSyncProfileNames = prof;
    unsigned int i;
    for ( i = 0; i < prof.count(); ++i ) {
        QString insertText = prof[i];
        if ( i == 0 ) {
 #ifdef DESKTOP_VERSION
 #ifdef _WIN32_
        insertText = "OutLook(not_implemented)";
 #else
        insertText = "KDE_Desktop";
 #endif
 #else
        insertText = "Sharp_DTM";
 #endif
        }
        mSyncMenu->insertItem(  insertText, 1000+i ); 
        clearMenu->insertItem(  insertText, 1000+i ); 
        if ( i == 2 )
            mSyncMenu->insertSeparator();
    }
    QDir app_dir;
    //US do not display SharpDTM if app is pwmpi, or no sharpfiles available
    if ( mTargetApp == PWMPI) {
        mSyncMenu->removeItem( 1000 );
        clearMenu->removeItem( 1000 );
    }
 #ifndef DESKTOP_VERSION
    else if (!app_dir.exists(QDir::homeDirPath()+"/Applications/dtm" ) ) {
        mSyncMenu->removeItem( 1000 );
        clearMenu->removeItem( 1000 );
    }
 #endif
    mSyncMenu->removeItem( 1002 );
    clearMenu->removeItem( 1002 );
 }
 void KSyncManager::slotClearMenu( int action )
 {
    QString syncDevice;
    if ( action > 999 ) {
        syncDevice = mSyncProfileNames[action - 1000] ;
    }
    int result = 0;
    QString sd;
    if ( syncDevice.isEmpty() )
        sd = i18n("Do you want to\nclear all sync info\nof all profiles?");
    else
        sd = i18n("Do you want to\nclear the sync\ninfo of profile\n%1?\n"). arg( syncDevice );
    result = QMessageBox::warning( mParent, i18n("Warning!"),sd,i18n("OK"), i18n("Cancel"), 0,
                                   0, 1 );
    if ( result )
        return;
    mImplementation->removeSyncInfo( syncDevice );
 }
 void KSyncManager::slotSyncMenu( int action )
 {
    qDebug("KSM::syncaction %d ", action);
+    mCurrentResourceLocal = "";
    if ( action == 5000 )
        return;
    mSyncWithDesktop = false;
    if ( action == 0 ) {
        // seems to be a Qt2 event handling bug
        // syncmenu.clear causes a segfault at first time
        // when we call it after the main event loop, it is ok
        // same behaviour when calling OM/Pi via QCOP for the first time
        QTimer::singleShot ( 1, this, SLOT ( confSync() ) ); 
        //confSync();
        return;
    }
    if ( action == 1 ) {
        multiSync( true );
        return;
    }
    if ( action == 2 ) {
        enableQuick();
        QTimer::singleShot ( 1, this, SLOT ( fillSyncMenu() ) ); 
        return;
    }
    if ( action == 3 ) {
        delete mServerSocket;
        mServerSocket = 0;
        QTimer::singleShot ( 1, this, SLOT ( fillSyncMenu() ) ); 
        return;
    }
    if (blockSave())
        return;
    setBlockSave(true);
    bool silent = false;
    if ( action == 999 ) {
        //special mode for silent syncing
        action = 1000;
        silent = true;
    }
    mCurrentSyncProfile = action - 1000 ;
    mCurrentSyncDevice = mSyncProfileNames[mCurrentSyncProfile] ;
    mCurrentSyncName =  mLocalMachineName ;
    KConfig config ( locateLocal( "config","ksyncprofilesrc"  ) );
    KSyncProfile* temp = new KSyncProfile ();
    temp->setName(mSyncProfileNames[mCurrentSyncProfile]);
    temp->readConfig(&config);
    if (silent) {
        mAskForPreferences = false;
        mShowSyncSummary = false;
        mWriteBackFile = true;
        mSyncAlgoPrefs = 2;// take newest
    }
    else {
        mAskForPreferences = temp->getAskForPreferences();
        mShowSyncSummary = temp->getShowSummaryAfterSync();
        mWriteBackFile = temp->getWriteBackFile();
        mSyncAlgoPrefs = temp->getSyncPrefs();
    }
    mWriteBackExistingOnly = temp->getWriteBackExisting();
    mIsKapiFile = temp->getIsKapiFile();
    mWriteBackInFuture = 0;
    if ( temp->getWriteBackFuture() ) {
        mWriteBackInFuture =  temp->getWriteBackFutureWeeks( );
        mWriteBackInPast =  temp->getWriteBackPastWeeks( );
    }
    mFilterInCal = temp->getFilterInCal();
    mFilterOutCal = temp->getFilterOutCal();
    mFilterInAB = temp->getFilterInAB();
    mFilterOutAB = temp->getFilterOutAB();
    if ( action == 1000  ) {
        mIsKapiFile = false; 
 #ifdef DESKTOP_VERSION
        syncKDE();
 #else
        syncSharp();
 #endif
    
    } else if ( action == 1001 ) {
        syncLocalFile();
    } else if ( action == 1002 ) {
        mWriteBackFile = false;
        mAskForPreferences = false;
        mShowSyncSummary = false; 
        mSyncAlgoPrefs = 3; 
        quickSyncLocalFile();
    } else if ( action >= 1003  ) {
        if ( temp->getIsLocalFileSync() ) {
            switch(mTargetApp)
                {
                case (KAPI):
                    if ( syncWithFile( temp->getRemoteFileNameAB( ), false ) )
                        mPrefs->mLastSyncedLocalFile = temp->getRemoteFileNameAB();
                    break;
                case (KOPI):
                    if ( syncWithFile( temp->getRemoteFileName( ), false ) )
                        mPrefs->mLastSyncedLocalFile = temp->getRemoteFileName();
                    break;
                case (PWMPI):
                    if ( syncWithFile( temp->getRemoteFileNamePWM( ), false ) )
                        mPrefs->mLastSyncedLocalFile = temp->getRemoteFileNamePWM();
                    break;
                default:
                    qDebug("KSM::slotSyncMenu: invalid apptype selected");
                    break;
              
                }
        } else {
            if (  temp->getIsPhoneSync() ) {
                mPhoneDevice = temp->getPhoneDevice( ) ;
                mPhoneConnection = temp->getPhoneConnection( );
                mPhoneModel = temp->getPhoneModel( );
                syncPhone();
-            } else if (  temp->getIsPiSync() ) {
+            } else if (  temp->getIsPiSync()|| temp->getIsPiSyncSpec()) {
+                mSpecificResources.clear();
                if ( mTargetApp == KAPI ) {
                    mPassWordPiSync = temp->getRemotePwAB();
                    mActiveSyncPort = temp->getRemotePortAB();
                    mActiveSyncIP = temp->getRemoteIPAB();
                } else if ( mTargetApp == KOPI ) {
+                if ( temp->getIsPiSyncSpec() )
+                    mSpecificResources = QStringList::split( ":", temp->getResSpecKopi() );
                    mPassWordPiSync = temp->getRemotePw();
                    mActiveSyncPort = temp->getRemotePort();
                    mActiveSyncIP = temp->getRemoteIP();
                } else  {
                    mPassWordPiSync = temp->getRemotePwPWM();
                    mActiveSyncPort = temp->getRemotePortPWM();
                    mActiveSyncIP = temp->getRemoteIPPWM();
                } 
                syncPi();
                while ( !mPisyncFinished ) {
                    //qDebug("waiting ");
                    qApp->processEvents();
                }
            } else
                syncRemote( temp );
        }
    }
    delete temp;
    setBlockSave(false);
 }
 void KSyncManager::enableQuick( bool ask )
 {
    bool autoStart;
    bool changed = false;
    if ( ask ) {
        QDialog dia ( 0, "input-dialog", true );
        QLineEdit lab ( &dia );
        QVBoxLayout lay( &dia );
        lab.setText( mPrefs->mPassiveSyncPort );
        lay.setMargin(7);
        lay.setSpacing(7);
        int po = 9197+mTargetApp;
        QLabel label ( i18n("Port number (Default: %1)\nValid range from 1 to 65535").arg(po), &dia );
        lay.addWidget( &label);
        lay.addWidget( &lab);
        QLineEdit lepw ( &dia );
        lepw.setText( mPrefs->mPassiveSyncPw );
        QLabel label2 ( i18n("Password to enable\naccess from remote:"), &dia );
        lay.addWidget( &label2);
        lay.addWidget( &lepw);
        QCheckBox autostart(i18n("Automatically start\nat application startup"), &dia );
        lay.addWidget( &autostart);
        autostart.setChecked( mPrefs->mPassiveSyncAutoStart );
 #ifdef DESKTOP_VERSION
 #ifdef _WIN32_
        QCheckBox syncdesktop( i18n("Automatically sync with Outlook\nwhen receiving sync request"),&dia );
        syncdesktop.hide();// not implemented!
 #else
        QCheckBox syncdesktop( i18n("Automatically sync with KDE-Desktop\nwhen receiving sync request"),&dia );
 #endif
        lay.addWidget( &syncdesktop);
 #else
        mPrefs->mPassiveSyncWithDesktop = false;
        QCheckBox syncdesktop( i18n("Automatically sync\nwith KDE-Desktop"),&dia );
        syncdesktop.hide();
 #endif
        syncdesktop.setChecked( mPrefs->mPassiveSyncWithDesktop );
        QPushButton pb ( "OK",  &dia);
        lay.addWidget( &pb );
        connect(&pb, SIGNAL( clicked() ), &dia, SLOT ( accept() ) );
        dia.resize( 230,120 );
        dia.setCaption( i18n("Enter port for Pi-Sync") );
        dia.show();
 #ifndef DESKTOP_VERSION
        int dw = QApplication::desktop()->width();
        int dh = QApplication::desktop()->height();
        dia.move( (dw-dia.width())/2, (dh - dia.height() )/2 );
 #endif
        if ( ! dia.exec() )
            return;
        dia.hide();
        qApp->processEvents();
        if ( mPrefs->mPassiveSyncPw != lepw.text() ) {
            changed = true;
            mPrefs->mPassiveSyncPw = lepw.text();
        }
        if ( mPrefs->mPassiveSyncPort != lab.text() ) {
            mPrefs->mPassiveSyncPort = lab.text();
            changed = true;
        }
        autoStart = autostart.isChecked();
        if (mPrefs->mPassiveSyncWithDesktop != syncdesktop.isChecked() ) {
            changed = true;
            mPrefs->mPassiveSyncWithDesktop = syncdesktop.isChecked();
        }
    }
    else
        autoStart = mPrefs->mPassiveSyncAutoStart;
    if ( autoStart != mPrefs->mPassiveSyncAutoStart )
        changed =  true;
    bool ok;
    mPrefs->mPassiveSyncAutoStart = false;
    Q_UINT32 port_t = mPrefs->mPassiveSyncPort.toUInt(&ok);
    qDebug("%d ", port_t);
    if ( ! ok || port_t > 65535 ) {
        KMessageBox::information( 0, i18n("No valid port number:\n%1").arg ( mPrefs->mPassiveSyncPort ), i18n("Pi-Sync Port Error"));
        return;
    }
    Q_UINT16 port = port_t;
    //qDebug("port %d ", port);
    mServerSocket = new KServerSocket ( mPrefs->mPassiveSyncPw, port ,1 );
    mServerSocket->setFileName( defaultFileName() );//bbb
    if ( !mServerSocket->ok() ) {
        QTimer::singleShot( 2000, this, SLOT ( displayErrorPort() ) );
        delete mServerSocket;
        mServerSocket = 0;
        return;
    }
    mPrefs->mPassiveSyncAutoStart = autoStart;
    if ( changed ) {
        mPrefs->writeConfig();
    }
    connect( mServerSocket, SIGNAL ( request_file() ),this, SIGNAL  ( request_file() ) );
    connect( mServerSocket, SIGNAL ( file_received( bool ) ), this,  SIGNAL  ( getFile( bool ) ) );
 }
 void KSyncManager::displayErrorPort()
 {
    KMessageBox::information( 0, i18n("<b>Enabling Pi-Sync failed!</b> Failed to bind or listen to the port %1! Is another instance already listening to that port?").arg( mPrefs->mPassiveSyncPort) , i18n("Pi-Sync Port Error"));
 }
 void KSyncManager::syncLocalFile()
 {
    QString fn =mPrefs->mLastSyncedLocalFile;
    QString ext;
    switch(mTargetApp)
        {
            case (KAPI):
            ext = "(*.vcf)";
            break;
            case (KOPI):
            ext = "(*.ics/*.vcs)";
            break;
            case (PWMPI):
            ext = "(*.pwm)";
            break;
            default:
            qDebug("KSM::syncLocalFile: invalid apptype selected");
            break;
              
        }
    fn =KFileDialog:: getOpenFileName( fn, i18n("Sync filename"+ext), mParent );
    if ( fn == "" )
        return;
    if (  syncWithFile(  fn, false ) ) {
        qDebug("KSM::syncLocalFile() successful ");
    }
 }
 bool  KSyncManager::syncWithFile( QString fn , bool quick )
 {
    bool ret = false;
    QFileInfo info;
    info.setFile( fn );
    QString mess;
    if ( !info. exists() ) {
        mess =  i18n( "Sync file \n...%1\ndoes not exist!\nNothing synced!\n").arg(fn.right( 30) );
        QMessageBox::warning( mParent, i18n("Warning!"),
                                           mess );
        return ret;
    }
    int result = 0;
    if ( !quick ) {
        mess =  i18n("Sync with file \n...%1\nfrom:\n%2\n").arg(fn.right( 25)).arg(KGlobal::locale()->formatDateTime(info.lastModified (), true, false ));
        result = QMessageBox::warning( mParent, i18n("Warning!"),
                                       mess,
                                       i18n("Sync"), i18n("Cancel"), 0,
                                       0, 1 );
        if ( result )
            return false;
    }
    if ( mAskForPreferences )
        if ( !edit_sync_options()) {
            mParent->topLevelWidget()->setCaption( i18n("Syncing aborted. Nothing synced.") );
            return false;
        }
    if ( result == 0 ) {
        //qDebug("Now sycing ... ");
-        if ( ret = mImplementation->sync( this, fn, mSyncAlgoPrefs ) )
+        if ( ret = mImplementation->sync( this, fn, mSyncAlgoPrefs ,mCurrentResourceLocal ) )
            mParent->topLevelWidget()->setCaption( i18n("Synchronization successful") );
        else
            mParent->topLevelWidget()->setCaption( i18n("Sync cancelled or failed.") );
        if ( ! quick )
            mPrefs->mLastSyncedLocalFile = fn;
    }
    return ret;
 }
 void KSyncManager::quickSyncLocalFile()
 {
    
    if ( syncWithFile( mPrefs->mLastSyncedLocalFile, true ) ) {
        qDebug("KSM::quick syncLocalFile() successful ");
      
    }
 }
 void KSyncManager::multiSync( bool askforPrefs  )
 {
    if (blockSave())
        return;
    setBlockSave(true);
+    mCurrentResourceLocal = "";
    if ( askforPrefs ) {
        QString question = i18n("Do you really want\nto multiple sync\nwith all checked profiles?\nSyncing takes some\ntime - all profiles\nare synced twice!");
        if ( QMessageBox::information( mParent, i18n("KDE-Pim Sync"),
                                       question,
                                       i18n("Yes"), i18n("No"),
                                       0, 0 ) != 0 ) {
            setBlockSave(false);
            mParent->topLevelWidget()->setCaption(i18n("Aborted! Nothing synced!"));
            return;
        }
    }
    mCurrentSyncDevice = i18n("Multiple profiles") ;
    mSyncAlgoPrefs = mPrefs->mRingSyncAlgoPrefs;
    if ( askforPrefs ) {
        if ( !edit_sync_options()) {
            mParent->topLevelWidget()->setCaption( i18n("Syncing aborted.") );
            return;
        }
        mPrefs->mRingSyncAlgoPrefs = mSyncAlgoPrefs;
    }
    mParent->topLevelWidget()->setCaption(i18n("Multiple sync started.") );
    qApp->processEvents();
    int num = ringSync() ;
    if (  num > 1 )
        ringSync();
    setBlockSave(false);
    if ( num )
        emit save();
    if ( num )
        mParent->topLevelWidget()->setCaption(i18n("%1 profiles synced. Multiple sync complete!").arg(num) );
    else
        mParent->topLevelWidget()->setCaption(i18n("Nothing synced! No profiles defined for multisync!"));
    return;
 }
 int KSyncManager::ringSync()
 {
   
    int syncedProfiles = 0;
    unsigned int i;
    QTime timer;
    KConfig config ( locateLocal( "config","ksyncprofilesrc"  ) );
    QStringList syncProfileNames = mSyncProfileNames;
    KSyncProfile* temp = new KSyncProfile ();
    mAskForPreferences = false;
+    mCurrentResourceLocal = "";
    for ( i = 0; i < syncProfileNames.count(); ++i ) {
        mCurrentSyncProfile = i;
        temp->setName(syncProfileNames[mCurrentSyncProfile]);
        temp->readConfig(&config);
        bool includeInRingSync = false;
        switch(mTargetApp)
            {
            case (KAPI):
                includeInRingSync = temp->getIncludeInRingSyncAB();
                break;
            case (KOPI):
                includeInRingSync = temp->getIncludeInRingSync();
                break;
            case (PWMPI):
                includeInRingSync = temp->getIncludeInRingSyncPWM();
                break;
            default:
                qDebug("KSM::ringSync: invalid apptype selected");
                break;
              
            }
        
        
        if ( includeInRingSync && ( i < 1 || i > 2  )) {
            mParent->topLevelWidget()->setCaption(i18n("Profile ")+syncProfileNames[mCurrentSyncProfile]+ i18n(" is synced ... "));
            ++syncedProfiles; 
            mSyncWithDesktop = false; 
            // mAskForPreferences = temp->getAskForPreferences();
            mWriteBackFile = temp->getWriteBackFile();
            mWriteBackExistingOnly = temp->getWriteBackExisting();
            mIsKapiFile = temp->getIsKapiFile();
            mWriteBackInFuture = 0;
            if ( temp->getWriteBackFuture() ) {
                mWriteBackInFuture =  temp->getWriteBackFutureWeeks( );
                mWriteBackInPast =  temp->getWriteBackPastWeeks( );
            }
            mFilterInCal = temp->getFilterInCal();
            mFilterOutCal = temp->getFilterOutCal();
            mFilterInAB = temp->getFilterInAB();
            mFilterOutAB = temp->getFilterOutAB();
            mShowSyncSummary = false;
            mCurrentSyncDevice = syncProfileNames[i] ;
            mCurrentSyncName = mLocalMachineName;
            if ( i == 0 ) {
                mIsKapiFile = false; 
 #ifdef DESKTOP_VERSION
                syncKDE();
 #else
                syncSharp();
 #endif
            } else {
                if ( temp->getIsLocalFileSync() ) {
                    switch(mTargetApp)
                        {
                        case (KAPI):
                            if ( syncWithFile( temp->getRemoteFileNameAB( ), false ) )
                                mPrefs->mLastSyncedLocalFile = temp->getRemoteFileNameAB();
                            break;
                        case (KOPI):
                            if ( syncWithFile( temp->getRemoteFileName( ), false ) )
                                mPrefs->mLastSyncedLocalFile = temp->getRemoteFileName();
                            break;
                        case (PWMPI):
                            if ( syncWithFile( temp->getRemoteFileNamePWM( ), false ) )
                                mPrefs->mLastSyncedLocalFile = temp->getRemoteFileNamePWM();
                            break;
                        default:
                            qDebug("KSM: invalid apptype selected");
                            break;
                        }
                } else {
                    if (  temp->getIsPhoneSync() ) {
                        mPhoneDevice = temp->getPhoneDevice( ) ;
                        mPhoneConnection = temp->getPhoneConnection( );
                        mPhoneModel = temp->getPhoneModel( );
                        syncPhone();
-                    } else if (  temp->getIsPiSync() ) {
+                    } else if (  temp->getIsPiSync() || temp->getIsPiSyncSpec()) {
+                        mSpecificResources.clear();
                        if ( mTargetApp == KAPI ) {
                            mPassWordPiSync = temp->getRemotePwAB();
                            mActiveSyncPort = temp->getRemotePortAB();
                            mActiveSyncIP = temp->getRemoteIPAB();
                        } else if ( mTargetApp == KOPI ) {
+                            mSpecificResources = QStringList::split( ":", temp->getResSpecKopi() );
                            mPassWordPiSync = temp->getRemotePw();
                            mActiveSyncPort = temp->getRemotePort();
                            mActiveSyncIP = temp->getRemoteIP();
                        } else  {
                            mPassWordPiSync = temp->getRemotePwPWM();
                            mActiveSyncPort = temp->getRemotePortPWM();
                            mActiveSyncIP = temp->getRemoteIPPWM();
                        } 
                        syncPi();
                        while ( !mPisyncFinished ) {
                            //qDebug("waiting ");
                            qApp->processEvents();
                        }
                        timer.start(); 
                        while ( timer.elapsed () < 2000 ) {
                            qApp->processEvents();
                        }
                    } else
                        syncRemote( temp, false );
                }
            }
            timer.start();
            mParent->topLevelWidget()->setCaption(i18n("Multiple sync in progress ... please wait!") );
            while ( timer.elapsed () < 2000 ) {
                qApp->processEvents();
 #ifndef _WIN32_
                sleep (1);
 #endif
            }
        }
    }
    delete temp;
    return syncedProfiles;
 }
 void KSyncManager::syncRemote( KSyncProfile* prof,  bool ask)
 {
    QString question;
    if ( ask ) {
        question = i18n("Do you really want\nto remote sync\nwith profile \n")+ prof->getName()+" ?\n";
        if ( QMessageBox::information( mParent, i18n("Sync"),
                                       question,
                                       i18n("Yes"), i18n("No"),
                                       0, 0 ) != 0 )
            return;
    }
    QString preCommand;
    QString localTempFile;
    QString postCommand;
    switch(mTargetApp)
        {
        case (KAPI):
            preCommand = prof->getPreSyncCommandAB();
            postCommand = prof->getPostSyncCommandAB();
            localTempFile = prof->getLocalTempFileAB();
            break;
        case (KOPI):
            preCommand = prof->getPreSyncCommand();
            postCommand = prof->getPostSyncCommand();
            localTempFile = prof->getLocalTempFile();
            break;
        case (PWMPI):
            preCommand = prof->getPreSyncCommandPWM();
            postCommand = prof->getPostSyncCommandPWM();
            localTempFile = prof->getLocalTempFilePWM();
            break;
        default:
            qDebug("KSM::syncRemote: invalid apptype selected");
            break;
        }
    int fi;
    if ( (fi = preCommand.find("$PWD$")) > 0 ) {
        QString pwd = getPassword();
        preCommand = preCommand.left( fi )+ pwd + preCommand.mid( fi+5 );
    }
    int maxlen = 30;
    if ( QApplication::desktop()->width() > 320 )
        maxlen += 25;
    mParent->topLevelWidget()->setCaption ( i18n( "Copy remote file to local machine..." ) );
    int fileSize = 0;
    int result = system ( preCommand );
    // 0 : okay
    // 256: no such file or dir
    //
    qDebug("KSM::Sync: Remote copy result(0 = okay): %d ",result );
    if ( result != 0 ) {
        unsigned int len = maxlen;
        while ( len <  preCommand.length() ) {
@@ -1034,257 +1042,277 @@ bool KSyncManager::syncExternalApplication(QString  resource)
    if ( mAskForPreferences )  
        if ( !edit_sync_options()) {
            mParent->topLevelWidget()->setCaption( i18n("Syncing aborted. Nothing synced.") );
            return false;
        }
    qDebug("KSM::Sync extern %s", resource.latin1());
    bool syncOK = mImplementation->syncExternal(this, resource);
    return syncOK;
 }
 void KSyncManager::syncPhone()
 {
    syncExternalApplication("phone");
 }
 void KSyncManager::showProgressBar(int percentage, QString caption, int total)
 {
    if (!bar->isVisible())
        {
            int w = 300;
            if ( QApplication::desktop()->width() < 320 )
                w = 220;
            int h = bar->sizeHint().height() ;
            int dw = QApplication::desktop()->width();
            int dh = QApplication::desktop()->height();
            bar->setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
            bar->setCaption (caption); 
            bar->setTotalSteps (  total  ) ;
            bar->show();
        }
    bar->raise();
    bar->setProgress( percentage );
    qApp->processEvents();
 }
 void KSyncManager::hideProgressBar()
 {
    bar->hide();
    qApp->processEvents();
 }
 bool KSyncManager::isProgressBarCanceled()
 {
    return !bar->isVisible();
 }
 QString KSyncManager::syncFileName()
 {
    QString fn = "tempfile";
    switch(mTargetApp)
        {
        case (KAPI):
            fn = "tempsyncab.vcf";
            break;
        case (KOPI):
            fn = "tempsynccal.ics";
            break;
        case (PWMPI):
            fn = "tempsyncpw.pwm";
            break;
        default:
            break;
        }
 #ifdef DESKTOP_VERSION
    return  locateLocal( "tmp", fn );
 #else
    return (QString( "/tmp/" )+ fn );
 #endif
 }
 void KSyncManager::syncPi()
 {
    mIsKapiFile = true; 
    mPisyncFinished = false;
    qApp->processEvents();
    if ( mAskForPreferences )
        if ( !edit_pisync_options()) {
            mParent->topLevelWidget()->setCaption( i18n("Syncing aborted. Nothing synced.") );
            mPisyncFinished = true;
            return;
        }
    bool ok;
    Q_UINT16 port = mActiveSyncPort.toUInt(&ok);
    if ( ! ok ) {
        mParent->topLevelWidget()->setCaption( i18n("Sorry, no valid port.Syncing cancelled.") );
        mPisyncFinished = true;
        return;
    }
-    KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, port, mActiveSyncIP, this, mParent->topLevelWidget() );
+    mCurrentResourceLocal = "";
-    connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) );
+    mCurrentResourceRemote = "";
-    commandSocket->readFile(  syncFileName() );
+    if ( mSpecificResources.count() ) {
+        int startLocal = 0;
+        int startRemote = mSpecificResources.count()/2;
+        while ( startLocal < mSpecificResources.count()/2 ) {
+            mPisyncFinished = false;
+            mCurrentResourceLocal = mSpecificResources[ startLocal ];
+            mCurrentResourceRemote = mSpecificResources[ startRemote ];
+            KCommandSocket* commandSocket = new KCommandSocket( mCurrentResourceRemote, mPassWordPiSync, port, mActiveSyncIP, this, mParent->topLevelWidget() );
+            connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) );
+            commandSocket->readFile(  syncFileName() );
+            while ( !mPisyncFinished ) {
+                //qDebug("waiting ");
+                qApp->processEvents();
+            }
+            ++startLocal;
+        }
+    } else {
+        KCommandSocket* commandSocket = new KCommandSocket( "", mPassWordPiSync, port, mActiveSyncIP, this, mParent->topLevelWidget() );
+        connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) );
+        commandSocket->readFile(  syncFileName() );
+    }
 }
 void KSyncManager::deleteCommandSocket(KCommandSocket*s, int state)
 {
    //enum { success, errorW, errorR, quiet };
    if ( state == KCommandSocket::errorR ||state == KCommandSocket::errorTO ||state == KCommandSocket::errorPW ||
         state == KCommandSocket::errorCA ||state == KCommandSocket::errorFI ||state == KCommandSocket::errorUN||state == KCommandSocket::errorED ) {
        if ( state == KCommandSocket::errorPW )
            mParent->topLevelWidget()->setCaption( i18n("Wrong password: Receiving remote file failed.") );
        else if ( state == KCommandSocket::errorR ||state == KCommandSocket::errorTO )
            mParent->topLevelWidget()->setCaption( i18n("ERROR: Receiving remote file failed.") );
        else if ( state == KCommandSocket::errorCA )
            mParent->topLevelWidget()->setCaption( i18n("Sync cancelled from remote.") );
        else if ( state == KCommandSocket::errorFI )
            mParent->topLevelWidget()->setCaption( i18n("File error on remote.") );
        else if ( state == KCommandSocket::errorED )
            mParent->topLevelWidget()->setCaption( i18n("Please close error dialog on remote.") );
        else if ( state == KCommandSocket::errorUN )
            mParent->topLevelWidget()->setCaption( i18n("Unknown error on remote.") );
        delete s;
        if ( state == KCommandSocket::errorR ) {
-            KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this, mParent->topLevelWidget());
+            KCommandSocket* commandSocket = new KCommandSocket( "",mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this, mParent->topLevelWidget());
            connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) );
            commandSocket->sendStop();
        }
        mPisyncFinished = true;
        return;
        
    } else  if ( state == KCommandSocket::errorW ) {
        mParent->topLevelWidget()->setCaption( i18n("ERROR:Writing back file failed.") );
        mPisyncFinished = true;
    } else  if ( state == KCommandSocket::successR ) {
        QTimer::singleShot( 1, this , SLOT ( readFileFromSocket()));
    } else  if ( state == KCommandSocket::successW ) {
        mParent->topLevelWidget()->setCaption( i18n("Pi-Sync successful!") );
        mPisyncFinished = true;
    } else  if ( state == KCommandSocket::quiet ){
        qDebug("KSS: quiet ");
        mPisyncFinished = true;
    } else {
        qDebug("KSS: Error: unknown state: %d ", state);
        mPisyncFinished = true;
    }
    delete s;
 }
 void KSyncManager::readFileFromSocket()
 {
    QString fileName = syncFileName();
    bool syncOK = true;
    mParent->topLevelWidget()->setCaption( i18n("Remote file saved to temp file.") );
    if ( ! syncWithFile( fileName , true ) ) {
        mParent->topLevelWidget()->setCaption( i18n("Syncing failed.") );
        syncOK = false;
    }
-    KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this, mParent->topLevelWidget() );
+    KCommandSocket* commandSocket = new KCommandSocket( "",mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this, mParent->topLevelWidget() );
    connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) );
    if ( mWriteBackFile && syncOK  ) {
        mParent->topLevelWidget()->setCaption( i18n("Sending back file ...") );
        commandSocket->writeFile(  fileName );
    }
    else {
        commandSocket->sendStop();
        if ( syncOK ) 
            mParent->topLevelWidget()->setCaption( i18n("Pi-Sync succesful!") );
        mPisyncFinished = true;
    }
 }
 KServerSocket:: KServerSocket ( QString pw, Q_UINT16 port, int backlog, QObject * parent, const char * name ) : QServerSocket( port, backlog, parent, name )
 {
    mPassWord = pw;
    mSocket = 0;
    mSyncActionDialog = 0;
    blockRC = false;
    mErrorMessage = 0;
 }
 void KServerSocket::newConnection ( int socket ) 
 {
    // qDebug("KServerSocket:New connection %d ", socket); 
    if ( mSocket ) {
        qDebug("KSS::newConnection Socket deleted! ");
        delete mSocket;
        mSocket = 0;
    }
    mSocket = new QSocket( this );
    connect( mSocket , SIGNAL(readyRead()), this, SLOT(readClient()) );
    connect( mSocket , SIGNAL(delayedCloseFinished()), this, SLOT(discardClient()) );
    mSocket->setSocket( socket );
 }
 void KServerSocket::discardClient()
 {
    QTimer::singleShot( 10, this , SLOT ( deleteSocket()));
 }
 void KServerSocket::deleteSocket()
 {
    qDebug("KSS::deleteSocket");
    if ( mSocket ) {
        delete mSocket;
        mSocket = 0;
    }
    if ( mErrorMessage )
        QTimer::singleShot( 10, this , SLOT ( displayErrorMessage()));
 }
 void KServerSocket::readClient()
 {
    if ( blockRC )
        return;
    if ( mSocket == 0 ) {
        qDebug("ERROR::KSS::readClient(): mSocket == 0  ");
        return;
    }
    if ( mErrorMessage ) {
        mErrorMessage = 999;
        error_connect("ERROR_ED\r\n\r\n");
        return;
    }
    mErrorMessage = 0;
    //qDebug("KServerSocket::readClient()");
    if ( mSocket->canReadLine() ) {
        QString line = mSocket->readLine();
        //qDebug("KServerSocket readline: %s ", line.latin1());
        QStringList tokens = QStringList::split( QRegExp("[ \r\n][ \r\n]*"), line );
        if ( tokens[0] == "GET" ) {
            if (  tokens[1] == mPassWord ) {
                //emit sendFile( mSocket );
                bool ok = false;
                QDateTime dt = KGlobal::locale()->readDateTime( tokens[2], KLocale::ISODate, &ok);
                if ( ok ) {
                    KSyncManager::mRequestedSyncEvent = dt; 
                }
                else
                    KSyncManager::mRequestedSyncEvent = QDateTime();
                send_file();
            }
            else {
                mErrorMessage = 1;
                error_connect("ERROR_PW\r\n\r\n");
            }
        } 
        if ( tokens[0] == "PUT" ) {
            if (  tokens[1] == mPassWord ) {
                //emit getFile( mSocket );
                blockRC = true;
                get_file();
            }
            else {
                mErrorMessage = 2;
                error_connect("ERROR_PW\r\n\r\n");
                end_connect();
@@ -1369,221 +1397,224 @@ void KServerSocket::send_file()
                        lay->addWidget( label);
                        mSyncActionDialog->setFixedSize( 230, 300);
                    } else {
                    mSyncActionDialog->setFixedSize( 230, 200);
                }
            } else {
            mSyncActionDialog->setFixedSize( 230, 120);
        }
    } else
        mSyncActionDialog->setFixedSize( 230, 120);
    mSyncActionDialog->show();
    mSyncActionDialog->raise();
    emit request_file();
    qApp->processEvents();
    QString fileName = mFileName;
    QFile file( fileName );
    if (!file.open( IO_ReadOnly ) ) {
        mErrorMessage = 0;
        end_connect();
        error_connect("ERROR_FI\r\n\r\n");
        return ;   
    } 
    mSyncActionDialog->setCaption( i18n("Sending file...") );
    QTextStream ts( &file );
    ts.setEncoding( QTextStream::Latin1 );
    QTextStream os( mSocket );
    os.setEncoding( QTextStream::Latin1 );
    while ( ! ts.atEnd() ) {
        os << ts.readLine() << "\r\n";
    }
    os  << "\r\n";
    //os << ts.read();
    file.close();
    mSyncActionDialog->setCaption( i18n("Waiting for synced file...") );
    mSocket->close();
    if ( mSocket->state() == QSocket::Idle )
        QTimer::singleShot( 10, this , SLOT ( discardClient()));
 }
 void KServerSocket::get_file()
 {
    mSyncActionDialog->setCaption( i18n("Receiving synced file...") );
   
    piTime.start();
    piFileString = "";
    QTimer::singleShot( 1, this , SLOT (readBackFileFromSocket( ) ));
 }
 void KServerSocket::readBackFileFromSocket()
 {
    //qDebug("readBackFileFromSocket() %d ", piTime.elapsed ());
    while ( mSocket->canReadLine ()  ) {
        piTime.restart();
        QString line = mSocket->readLine ();
        piFileString += line;
        //qDebug("readline: %s ", line.latin1());
        mSyncActionDialog->setCaption( i18n("Received %1 bytes").arg( piFileString.length()  ) );
    }
    if ( piTime.elapsed () < 3000 ) {
        // wait for more 
        //qDebug("waitformore ");
        QTimer::singleShot( 100, this , SLOT (readBackFileFromSocket( ) ));
        return;
    }
    QString fileName = mFileName;
    QFile file ( fileName );
    if (!file.open( IO_WriteOnly ) ) {
        delete mSyncActionDialog;
        mSyncActionDialog = 0;
        qDebug("KSS:Error open read back file ");
        piFileString = "";
        emit file_received( false );
        blockRC = false;
        return ;
                    
    } 
    // mView->setLoadedFileVersion(QDateTime::currentDateTime().addSecs( -1));
    QTextStream ts ( &file );
    ts.setEncoding( QTextStream::Latin1 );
    mSyncActionDialog->setCaption( i18n("Writing file to disk...") );
    ts << piFileString;
    mSocket->close();
    if ( mSocket->state() == QSocket::Idle )
        QTimer::singleShot( 10, this , SLOT ( discardClient()));
    file.close(); 
    piFileString = "";
    emit file_received( true );
    delete mSyncActionDialog;
    mSyncActionDialog = 0;
    blockRC = false;
 }
-KCommandSocket::KCommandSocket (  QString password, Q_UINT16 port, QString host, QObject * parent, QWidget * cap,  const char * name ): QObject( parent, name )
+KCommandSocket::KCommandSocket ( QString remres, QString password, Q_UINT16 port, QString host, QObject * parent, QWidget * cap,  const char * name ): QObject( parent, name )
 {
+    mRemoteResource = remres;
+    if ( mRemoteResource.isEmpty() )
+        mRemoteResource = "ALL";
    mPassWord = password;
    mSocket = 0;
    mFirst = false;
    mFirstLine = true;
    mPort = port;
    mHost = host;
    tlw = cap;
    mRetVal = quiet;
    mTimerSocket = new QTimer ( this );
    connect( mTimerSocket, SIGNAL ( timeout () ), this, SLOT ( updateConnectDialog() ) );
    mConnectProgress.setCaption( i18n("Pi-Sync") );
    connect( &mConnectProgress, SIGNAL ( cancelled () ), this, SLOT ( deleteSocket() ) );
    mConnectCount = -1;
 }
 void KCommandSocket::sendFileRequest()
 {
    if ( tlw )
        tlw->setCaption( i18n("Connected! Sending request for remote file ...") );
    mConnectProgress.hide();
    mConnectCount = 300;mConnectMax = 300;
    mConnectProgress.setCaption( i18n("Pi-Sync: Connected!") );
    mTimerSocket->start( 100, true );
    QTextStream os( mSocket );
    os.setEncoding( QTextStream::Latin1 );
    QString curDt = " " +KGlobal::locale()->formatDateTime(QDateTime::currentDateTime().addSecs(-1),true, true,KLocale::ISODate );
-    os << "GET " << mPassWord << curDt <<"\r\n\r\n";
+    os << "GET " << mPassWord << curDt << mRemoteResource  << "\r\n\r\n";
 }
 void KCommandSocket::readFile( QString fn )
 {
    if ( !mSocket ) {
        mSocket = new QSocket( this );
        connect( mSocket, SIGNAL(readyRead()), this, SLOT(startReadFileFromSocket()) );
        connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) );
        connect( mSocket, SIGNAL(connected ()), this, SLOT(sendFileRequest() ));
    }
    mFileString = "";
    mFileName = fn;
    mFirst = true;
    if ( tlw )
        tlw->setCaption( i18n("Trying to connect to remote...") );
    mConnectCount = 30;mConnectMax = 30;
    mTimerSocket->start( 1000, true );
    mSocket->connectToHost( mHost, mPort ); 
    qDebug("KSS: Waiting for connection");
 }
 void KCommandSocket::updateConnectDialog()
 {
    
    if ( mConnectCount == mConnectMax  ) {
        //qDebug("MAXX %d", mConnectMax);
        mConnectProgress.setTotalSteps ( 30 );
        mConnectProgress.show();
        mConnectProgress.setLabelText( i18n("Trying to connect to remote...") );
    }
    //qDebug("updateConnectDialog() %d", mConnectCount);
    mConnectProgress.raise();
    mConnectProgress.setProgress( (mConnectMax - mConnectCount)%30 );
    --mConnectCount;
    if ( mConnectCount > 0 )
        mTimerSocket->start( 1000, true );
    else
        deleteSocket(); 
    
 }
 void KCommandSocket::writeFile( QString fileName  )
 {
    if ( !mSocket ) {
        mSocket = new QSocket( this );
        connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) );
        connect( mSocket, SIGNAL(connected ()), this, SLOT(writeFileToSocket()) );
    }
    mFileName = fileName ;
    mConnectCount = 30;mConnectMax = 30;
    mTimerSocket->start( 1000, true );
    mSocket->connectToHost( mHost, mPort ); 
 }
 void KCommandSocket::writeFileToSocket()
 {
    mTimerSocket->stop();
    QFile file2( mFileName );
    if (!file2.open( IO_ReadOnly ) ) {
        mConnectProgress.hide();
        mConnectCount = -1;
        mRetVal= errorW;
        mSocket->close();
        if ( mSocket->state() == QSocket::Idle )
            QTimer::singleShot( 10, this , SLOT ( deleteSocket()));
        return ;
    }  
    mConnectProgress.setTotalSteps ( file2.size() );
    mConnectProgress.show();
    int count = 0;
    mConnectProgress.setLabelText( i18n("Sending back synced file...") );
    mConnectProgress.setProgress( count );
    mConnectProgress.blockSignals( true );
    QTextStream ts2( &file2 );
    ts2.setEncoding( QTextStream::Latin1 );
    QTextStream os2( mSocket );
    os2.setEncoding( QTextStream::Latin1 );
    os2 << "PUT " << mPassWord << "\r\n\r\n";;
    int byteCount = 0;
    int byteMax = file2.size()/53;
    while ( ! ts2.atEnd() ) {
        qApp->processEvents();
        if ( byteCount > byteMax ) {
            byteCount = 0;
            mConnectProgress.setProgress( count );
        }
        QString temp = ts2.readLine();
        count += temp.length();
        byteCount += temp.length();
        os2 << temp << "\r\n";
    }
    file2.close();
    mConnectProgress.hide();
    mConnectCount = -1;
    os2 << "\r\n";
    mRetVal= successW;
    mSocket->close();
    if ( mSocket->state() == QSocket::Idle )
        QTimer::singleShot( 10, this , SLOT ( deleteSocket()));
diff --git a/libkdepim/ksyncmanager.h b/libkdepim/ksyncmanager.h
index d3734da..f4654ce 100644
--- a/libkdepim/ksyncmanager.h
+++ b/libkdepim/ksyncmanager.h
@@ -1,237 +1,241 @@
 /*
  This file is part of KDE-Pim/Pi.
  Copyright (c) 2004 Ulf Schenk
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Library General Public
  License as published by the Free Software Foundation; either
  version 2 of the License, or (at your option) any later version.
  This library is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Library General Public License for more details.
  You should have received a copy of the GNU Library General Public License
  along with this library; see the file COPYING.LIB.  If not, write to
  the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  Boston, MA 02111-1307, USA.
  $Id$
 */
 #ifndef _KSYNCMANAGER_H
 #define _KSYNCMANAGER_H
 #include <qobject.h>
 #include <qstring.h>
 #include <qsocket.h>
 #include <qdatetime.h>
 #include <qserversocket.h> 
 #include <qtextstream.h>
 #include <qregexp.h>
 #include <qprogressdialog.h>
 #include <kdialog.h>
 class QPopupMenu;
 class KSyncProfile;
 class KPimPrefs;
 class QWidget;
 class KSyncManager;
 class KSyncInterface;
 class QProgressBar;
 class KServerSocket : public QServerSocket
 {
    Q_OBJECT
        public:
    KServerSocket ( QString password, Q_UINT16 port, int backlog = 0, QObject * parent=0, const char * name=0 );
    void newConnection ( int socket ) ;
    void setFileName( QString fn  ) {mFileName = fn;};
 signals:
    void file_received( bool );
    void request_file();
    void saveFile();
    void endConnect();
    private slots:
    void discardClient();
    void deleteSocket();
    void readClient();
    void displayErrorMessage();
    void readBackFileFromSocket();
 private :
    int mErrorMessage;
    bool blockRC;
    void send_file();
    void get_file();
    void end_connect();
    void error_connect( QString );
    QDialog* mSyncActionDialog;
    QSocket* mSocket; 
    QString mPassWord;
    QString mFileName; 
    QTime piTime;
    QString piFileString;
 };
 class KCommandSocket : public QObject
 {
    Q_OBJECT
        public:
    enum state { successR, errorR, successW, errorW, errorTO, errorPW, errorCA, errorFI, errorUN, errorED,quiet };
-    KCommandSocket ( QString password, Q_UINT16 port, QString host, QObject * parent=0, QWidget*  cap = 0, const char * name=0 );
+    KCommandSocket (QString remoteResource, QString password, Q_UINT16 port, QString host, QObject * parent=0, QWidget*  cap = 0, const char * name=0 );
    void readFile( QString );
    void writeFile( QString );
    void sendStop();
 private slots :
    void sendFileRequest();
    void updateConnectDialog();
       
 signals:
    void commandFinished( KCommandSocket*, int );
    private slots:
    void startReadFileFromSocket();
    void readFileFromSocket();
    void deleteSocket();
    void writeFileToSocket();
 private :
+    QString mRemoteResource;
    int mConnectCount;
    int mConnectMax;
    KProgressDialog mConnectProgress;
    QWidget* tlw;
    QSocket* mSocket; 
    QString mPassWord;
    Q_UINT16 mPort;
    QString mHost;
    QString mFileName;
    QTimer* mTimerSocket;
    int mRetVal;
    QTime mTime;
    QString mFileString;
    bool mFirst;
    bool mFirstLine;
 };
 class KSyncManager : public QObject
 {
    Q_OBJECT
        public:
    enum TargetApp {
        KOPI = 0,
        KAPI = 1,
        PWMPI = 2 };
  
    KSyncManager(QWidget* parent, KSyncInterface* implementation, TargetApp ta, KPimPrefs* prefs, QPopupMenu* syncmenu);
    ~KSyncManager() ;
    void multiSync( bool askforPrefs  );
    bool blockSave() { return mBlockSaveFlag; }
    void setBlockSave(bool sa) { mBlockSaveFlag = sa; }
    void setDefaultFileName( QString s) ;
    QString defaultFileName() { return mDefFileName ;}
    QString syncFileName();
    void enableQuick( bool ask = true);
    bool syncWithDesktop () { return mSyncWithDesktop;}
    QString getCurrentSyncDevice() { return mCurrentSyncDevice; }
    QString getCurrentSyncName() { return mCurrentSyncName; }
    void showProgressBar(int percentage, QString caption = QString::null, int total=100);
    void hideProgressBar();
    bool isProgressBarCanceled();
    // sync stuff
    QString mLocalMachineName;
    QStringList  mExternSyncProfiles;
    QStringList  mSyncProfileNames;
    bool mAskForPreferences;
    bool mShowSyncSummary;
    bool mIsKapiFile;
    bool mWriteBackExistingOnly;
    int mSyncAlgoPrefs;
    bool mWriteBackFile;
    int  mWriteBackInFuture;
    int  mWriteBackInPast;
    QString mPhoneDevice;
    QString mPhoneConnection;
    QString mPhoneModel;
    QString mPassWordPiSync;
    QString mActiveSyncPort;
    QString mActiveSyncIP ;
    QString mFilterInCal;
    QString mFilterOutCal;
    QString mFilterInAB;
    QString mFilterOutAB;
    static QDateTime mRequestedSyncEvent;
 signals:
    void save();
    void request_file();
    void getFile( bool );
    public slots:
    void slotSyncMenu( int );
    void slotClearMenu( int action );
    void deleteCommandSocket(KCommandSocket*s, int state);
    void readFileFromSocket();
    void fillSyncMenu();
 private:
    void syncPi();
    KServerSocket * mServerSocket;
    KPimPrefs* mPrefs;
    QString mDefFileName;
    QString mCurrentSyncDevice;
    QString mCurrentSyncName;
    void quickSyncLocalFile();
    bool syncWithFile( QString fn , bool quick );
    void syncLocalFile();
    void syncPhone();
    void syncSharp();
    void syncKDE();
    bool syncExternalApplication(QString);
    int mCurrentSyncProfile ;
    void syncRemote( KSyncProfile* prof,  bool ask = true);
    bool edit_sync_options();
    bool edit_pisync_options();
    int ringSync();
    QString  getPassword( );
    bool mPisyncFinished;
+    QStringList mSpecificResources;
+    QString mCurrentResourceLocal;
+    QString mCurrentResourceRemote;
    bool mBlockSaveFlag;
    QWidget* mParent;
    KSyncInterface* mImplementation;
    TargetApp mTargetApp; 
    QPopupMenu* mSyncMenu;
    QProgressBar* bar;
    bool mSyncWithDesktop;
 private slots:
    void displayErrorPort();
    void confSync();
 };
 class KSyncInterface 
 { 
 public :
    virtual void removeSyncInfo( QString syncProfile) = 0;
-    virtual bool sync(KSyncManager* manager, QString filename, int mode) = 0;
+    virtual bool sync(KSyncManager* manager, QString filename, int mode, QString resource) = 0;
    virtual bool syncExternal(KSyncManager* manager, QString resource)
    {
        // empty implementation, because some syncable applications do not 
        // have an external(sharpdtm)  syncmode, like pwmanager.
        return false;
    }
   
 };
 #endif
diff --git a/libkdepim/ksyncprefsdialog.cpp b/libkdepim/ksyncprefsdialog.cpp
index 292cde1..27f7932 100644
--- a/libkdepim/ksyncprefsdialog.cpp
+++ b/libkdepim/ksyncprefsdialog.cpp
@@ -499,353 +499,353 @@ void KSyncPrefsDialog::textChanged( const QString &  s )
    prof->setName( s );
    mSyncProfileNames[mProfileBox-> currentItem ()] = s;
 }
 void KSyncPrefsDialog::profileChanged( int item )
 {
  //qDebug("KSyncPrefsDialog::profileChanged before %d, count %d ", item, mProfileBox->count() ); 
    KSyncProfile* prof;
    saveProfile();
    readFilter();
    readResources();
    currentSelection = item;
    prof = mSyncProfiles.at(item) ;
    mRemotePw->setText(prof->getRemotePw());
    mRemoteIP->setText(prof->getRemoteIP());
    mRemotePort->setText(prof->getRemotePort());
    
    mRemotePwAB->setText(prof->getRemotePwAB());
    mRemoteIPAB->setText(prof->getRemoteIPAB());
    mRemotePortAB->setText(prof->getRemotePortAB());
    
    mRemotePwPWM->setText(prof->getRemotePwPWM());
    mRemoteIPPWM->setText(prof->getRemoteIPPWM());
    mRemotePortPWM->setText(prof->getRemotePortPWM());
    mRemotePrecommand->setText(prof->getPreSyncCommand());
    mRemotePostcommand->setText(prof->getPostSyncCommand());
    mLocalTempFile->setText(prof->getLocalTempFile());
    mRemoteFile->setText(prof->getRemoteFileName()) ;
    mRemotePrecommandAB->setText(prof->getPreSyncCommandAB());
    mRemotePostcommandAB->setText(prof->getPostSyncCommandAB());
    mLocalTempFileAB->setText(prof->getLocalTempFileAB());
    mRemoteFileAB->setText(prof->getRemoteFileNameAB()) ;
    mRemotePrecommandPWM->setText(prof->getPreSyncCommandPWM());
    mRemotePostcommandPWM->setText(prof->getPostSyncCommandPWM());
    mLocalTempFilePWM->setText(prof->getLocalTempFilePWM());
    mRemoteFilePWM->setText(prof->getRemoteFileNamePWM()) ;
    if ( mWriteContactToSIM )
        mWriteContactToSIM->setChecked( prof->getWriteContactToSIM());
    mPhoneDevice->setText(prof->getPhoneDevice());
    mPhoneConnection->setText(prof->getPhoneConnection());
    mPhoneModel->setText(prof->getPhoneModel());
    mShowSummaryAfterSync->setChecked( prof->getShowSummaryAfterSync());
    mAskForPreferences->setChecked( prof->getAskForPreferences());
    mWriteBackExisting->setChecked( prof->getWriteBackExisting() );
    mWriteBackFile->setChecked( prof->getWriteBackFile());
    mIncludeInRing->setChecked( prof->getIncludeInRingSync() );
    mIncludeInRingAB->setChecked( prof->getIncludeInRingSyncAB() );
    mIncludeInRingPWM->setChecked( prof->getIncludeInRingSyncPWM() );
    mWriteBackFuture->setChecked( prof->getWriteBackFuture());
    mWriteBackFutureWeeks->setValue( prof->getWriteBackFutureWeeks() );
    mWriteBackPastWeeks->setValue( prof->getWriteBackPastWeeks() );
    mFilterInCal->setCurrentItem( mFilterKopi.findIndex(prof->getFilterInCal () ) + 1 );
    mFilterOutCal->setCurrentItem( mFilterKopi.findIndex(prof->getFilterOutCal () ) + 1 );
    mFilterInAB->setCurrentItem( mFilterKapi.findIndex(prof->getFilterInAB () ) + 1 );
    mFilterOutAB->setCurrentItem( mFilterKapi.findIndex(prof->getFilterOutAB () ) + 1 );
    
    switch ( prof->getSyncPrefs() ) {
    case 0:
        loc->setChecked( true);
        break;
    case 1:
        rem->setChecked( true );
        break;
    case 2:
        newest->setChecked( true);
        break;
    case 3:
        ask->setChecked( true);
        break;
    case 4:
        f_loc->setChecked( true);
        break;
    case 5:
        f_rem->setChecked( true);
        break;
    case 6:
        //both->setChecked( true);
        break; 
    default:
        break;
    }
    mIsLocal->setChecked(prof->getIsLocalFileSync()) ;
    mIsPhone->setChecked(prof->getIsPhoneSync()) ;
    mIsPi->setChecked(prof->getIsPiSync()) ;
    mIsPiSpecific->setChecked(prof->getIsPiSyncSpec()) ;
    mIsKapiFileL->setChecked(prof->getIsKapiFile()) ;
    mIsKapiFileR->setChecked(prof->getIsKapiFile()) ;
    QStringList res = QStringList::split( ":",prof->getResSpecKopi());
-    int i;
+    int i= res.count()/2;
-    for ( i = 0;i < res.count(); ++i ) {
+    for ( ;i < res.count(); ++i ) {
        mResTableKopi->setText( i, 0, res[i] );
    } 
    res = QStringList::split( ":",prof->getResSpecKapi());
    for ( i = 0;i < res.count(); ++i ) {
        mResTableKapi->setText( i, 0, res[i] );
    }
    mIsNotLocal->setChecked(!prof->getIsLocalFileSync() && !prof->getIsPhoneSync() &&!prof->getIsPiSync() &&!prof->getIsPiSyncSpec());
    proGr->setEnabled( item > 2 );
    if ( item < 3 ) {
        localFileWidget->hide();
        remoteFileWidget->hide();
        phoneWidget->hide();
        piWidget->hide();
    } else
        kindChanged( prof->getIsLocalFileSync() );
 }
 void KSyncPrefsDialog::fillSSH()
 {
    mRemotePrecommand->setText("scp zaurus@192.168.0.65:/home/zaurus/kdepim/apps/korganizer/mycalendar.ics /tmp/mycalendar.ics" );
    mLocalTempFile->setText("/tmp/mycalendar.ics" );
    mRemotePostcommand->setText("scp /tmp/mycalendar.ics zaurus@192.168.0.65:/home/zaurus/kdepim/apps/korganizer/mycalendar.ics" );
    mRemotePrecommandAB->setText("scp zaurus@192.168.0.65:/home/zaurus/kdepim/apps/kabc/std.vcf /tmp/std.vcf" );
    mLocalTempFileAB->setText("/tmp/std.vcf" );
    mRemotePostcommandAB->setText("scp /tmp/std.vcf zaurus@192.168.0.65:/home/zaurus/kdepim/apps/kabc/std.vcf" );
    mRemotePrecommandPWM->setText("scp zaurus@192.168.0.65:/home/zaurus/kdepim/apps/pwmanager/passwords.pwm /tmp/passwords.pwm" );
    mLocalTempFilePWM->setText("/tmp/passwords.pwm" );
    mRemotePostcommandPWM->setText("scp /tmp/passwords.pwm zaurus@192.168.0.65:/home/zaurus/kdepim/apps/pwmanager/pwmanager.pwm" );
 }
 void KSyncPrefsDialog::fillFTP()
 {
    mRemotePrecommand->setText("cd /tmp;ftp ftp://zaurus:a@192.168.0.65/kdepim/apps/korganizer/mycalendar.ics" );
    mLocalTempFile->setText("/tmp/mycalendar.ics" );
    mRemotePostcommand->setText("ftp -u ftp://zaurus:a@192.168.0.65/kdepim/apps/korganizer/mycalendar.ics /tmp/mycalendar.ics" );
    mRemotePrecommandAB->setText("cd /tmp;ftp ftp://zaurus:a@192.168.0.65/kdepim/apps/kabc/std.vcf" );
    mLocalTempFileAB->setText("/tmp/std.vcf" );
    mRemotePostcommandAB->setText("ftp -u ftp://zaurus:a@192.168.0.65/kdepim/apps/kabc/std.vcf /tmp/std.vcf" );
    mRemotePrecommandPWM->setText("cd /tmp;ftp ftp://zaurus:a@192.168.0.65/kdepim/apps/pwmanager/passwords.pwm" );
    mLocalTempFilePWM->setText("/tmp/passwords.pwm" );
    mRemotePostcommandPWM->setText("ftp -u ftp://zaurus:a@192.168.0.65/kdepim/apps/pwmanager/passwords.pwm /tmp/passwords.pwm" );
   
 }
 void KSyncPrefsDialog::kindChanged( bool b )
 {
    if ( mIsLocal->isChecked () ) {
        mIsKapiFileL->setChecked( mIsKapiFileR->isChecked() );
    } else {
        mIsKapiFileR->setChecked( mIsKapiFileL->isChecked() );
    }
  
    if ( mIsLocal->isChecked () )
        localFileWidget->show();
    else
        localFileWidget->hide();
    if ( mIsNotLocal->isChecked () )
        remoteFileWidget->show();
    else
        remoteFileWidget->hide();
    if ( mIsPhone->isChecked () ) {
        phoneWidget->show();
    }
    else {
        phoneWidget->hide();
    } 
    
    if ( mIsPi->isChecked () || mIsPiSpecific->isChecked () ) {
        piWidget->show();
        if (mIsPiSpecific->isChecked () ) {
            mTableBox->show();
        }
        else {
            mTableBox->hide();
        } 
    }
    else {
        piWidget->hide();
    } 
   
   
 }
 void KSyncPrefsDialog::deleteProfile()
 {
    //qDebug("KSyncPrefsDialog::deleteProfile() "); 
    if ( currentSelection >= 0 ) {
        if ( currentSelection < 3 ) {
            KMessageBox::error(this,i18n("This profil cannot be deleted!\n"),i18n("KO/Pi config error"));
            return;
        }
        KSyncProfile* temp = mSyncProfiles.at(currentSelection);
        mSyncProfiles.remove( temp );
        mSyncProfileNames.remove( mSyncProfileNames.at( currentSelection ));
        insertProfiles();
    }
 }
 void KSyncPrefsDialog::saveProfile()
 {
    KSyncProfile* prof;
    if ( currentSelection >= 0 ) {
        prof = mSyncProfiles.at(currentSelection) ;
        prof->setRemotePw( mRemotePw->text());
        prof->setRemoteIP( mRemoteIP->text());
        prof->setRemotePort( mRemotePort->text());
        
        prof->setRemotePwAB( mRemotePwAB->text());
        prof->setRemoteIPAB( mRemoteIPAB->text());
        prof->setRemotePortAB( mRemotePortAB->text());
        
        prof->setRemotePwPWM( mRemotePwPWM->text());
        prof->setRemoteIPPWM( mRemoteIPPWM->text());
        prof->setRemotePortPWM( mRemotePortPWM->text());
        prof->setPreSyncCommand( mRemotePrecommand->text());
        prof->setPostSyncCommand( mRemotePostcommand->text() );
        prof->setLocalTempFile( mLocalTempFile->text());
        prof->setRemoteFileName( mRemoteFile->text() );
        prof->setPreSyncCommandAB( mRemotePrecommandAB->text());
        prof->setPostSyncCommandAB( mRemotePostcommandAB->text() );
        prof->setLocalTempFileAB( mLocalTempFileAB->text());
        prof->setRemoteFileNameAB( mRemoteFileAB->text() );
        prof->setPreSyncCommandPWM( mRemotePrecommandPWM->text());
        prof->setPostSyncCommandPWM( mRemotePostcommandPWM->text() );
        prof->setLocalTempFilePWM( mLocalTempFilePWM->text());
        prof->setRemoteFileNamePWM( mRemoteFilePWM->text() );
        prof->setShowSummaryAfterSync( mShowSummaryAfterSync->isChecked() );
        prof->setAskForPreferences( mAskForPreferences->isChecked());
        prof->setWriteBackExisting(mWriteBackExisting->isChecked() );
        prof->setWriteBackFile( mWriteBackFile->isChecked());
        prof->setIncludeInRingSync( mIncludeInRing->isChecked() );
        prof->setIncludeInRingSyncAB( mIncludeInRingAB->isChecked() );
        prof->setIncludeInRingSyncPWM( mIncludeInRingPWM->isChecked() );
        int syncprefs = rem->isChecked()*1+newest->isChecked()*2+  ask->isChecked()*3+  f_loc->isChecked()*4+  f_rem->isChecked()*5 ;//+  both->isChecked()*6 ;
        prof->setSyncPrefs( syncprefs);
        prof->setIsLocalFileSync( mIsLocal->isChecked() );
        prof->setIsPhoneSync( mIsPhone->isChecked() );
        prof->setIsPiSync( mIsPi->isChecked() );
        prof->setIsPiSyncSpec( mIsPiSpecific->isChecked() );
        prof->setIsKapiFile( mIsKapiFileL->isChecked() );
        prof->setWriteBackFuture(mWriteBackFuture->isChecked());
        prof->setWriteBackFutureWeeks(mWriteBackFutureWeeks->value());
        prof->setWriteBackPastWeeks(mWriteBackPastWeeks->value());
        if ( mWriteContactToSIM )
            prof->setWriteContactToSIM(mWriteContactToSIM->isChecked());
        prof->setPhoneDevice(  mPhoneDevice->text() );
        prof->setPhoneConnection(  mPhoneConnection->text() );
        prof->setPhoneModel(  mPhoneModel->text() );
        prof->setFilterInCal ( mFilterInCal->currentText ());
        prof->setFilterOutCal ( mFilterOutCal ->currentText ());
        prof->setFilterInAB ( mFilterInAB ->currentText ());
        prof->setFilterOutAB ( mFilterOutAB ->currentText ());
        if ( mIsPiSpecific->isChecked() ) {
-            QStringList res;
+            QStringList res = mResourcesKopi;
            int i;
            for ( i = 0;i < mResourcesKopi.count(); ++i ) {
                res.append( mResTableKopi->text( i, 0 ));
            }
            prof->setResSpecKopi( res.join(":"));
        }
    }
 }
 void KSyncPrefsDialog::insertProfiles()
 {
    int curItem = mProfileBox->currentItem();
    mProfileBox->blockSignals( true );
    mProfileBox->clear();
    mProfileBox->insertStringList (mSyncProfileNames ); 
    int item = mSyncProfileNames.count() -1; 
    if ( curItem >= 0 &&  mSyncProfileNames.count() > 0 && curItem < mSyncProfileNames.count() )
        mProfileBox->setCurrentItem( curItem );  
    else if ( item >= 0 ) {
        mProfileBox->setCurrentItem( item );
    }
    currentSelection = -1;
    if ( mSyncProfileNames.count() > 0 ) {
        //qDebug(" profileChanged( mProfileBox->currentItem()  ");
        profileChanged( mProfileBox->currentItem() );
        currentSelection = mProfileBox->currentItem();
    }
    mProfileBox->blockSignals( false );
 }
   
 void KSyncPrefsDialog::addProfile ( KSyncProfile* temp )
 {
    saveProfile();
    mSyncProfiles.append( temp );
    mSyncProfileNames << temp->getName();
    insertProfiles();
    int last = mProfileBox->count() -1;
    mProfileBox->blockSignals( true );
    mProfileBox->setCurrentItem( last );
    mProfileBox->blockSignals( false );
    profileChanged(last);
 }
 void KSyncPrefsDialog::newProfile()
 {
    addProfile ( new KSyncProfile () );
 }
 void KSyncPrefsDialog::cloneProfile()
 { 
    if ( currentSelection >= 0 ) 
        addProfile (mSyncProfiles.at(currentSelection)->clone()) ;
    else
        newProfile();
 }
 void KSyncPrefsDialog::setLocalMachineName ( const QString& name )
 {
    mMyMachineName->setText( name );
 }
 QString KSyncPrefsDialog::getLocalMachineName ( )
 {
    return mMyMachineName->text();
 }
 QStringList KSyncPrefsDialog::getSyncProfileNames()
 {
    return mSyncProfileNames;
 }
 void KSyncPrefsDialog::usrReadConfig()
 { 
    //KConfig *config = KOGlobals::config();
    KConfig config ( locateLocal( "config","ksyncprofilesrc"  ) ); 
    config.setGroup("General");
    mSyncProfileNames =config.readListEntry("SyncProfileNames");
    mMyMachineName->setText(config.readEntry("LocalMachineName","undefined"));
    int i;
    KSyncProfile* temp ;
    mSyncProfiles.clear();
    for ( i = 0; i < mSyncProfileNames.count();++i ) {
        temp = new KSyncProfile ();
        temp->setName( mSyncProfileNames[i] );
        temp->readConfig( &config );
        mSyncProfiles.append( temp );
    }
    insertProfiles();
    //mMyMachineName->setText(KOPrefs::instance()->mLocalMachineName );
 }
 void KSyncPrefsDialog::usrWriteConfig()
 {
    saveProfile();
    if ( currentSelection >= 0 ) 
        profileChanged(currentSelection);
    //KConfig *config = KOGlobals::config();
author	zautrix <zautrix>	2005-11-25 15:49:13 (UTC)
committer	zautrix <zautrix>	2005-11-25 15:49:13 (UTC)
commit	794a5204686ad9bfc16172b01db35f1f3b7683e5 (patch) (unidiff)
tree	29da2cb35a4d6a0cd6885436087fe0659b58a9f4
parent	90b62d1158d00f162a258541e24aaed4c967480b (diff)
download	kdepimpi-794a5204686ad9bfc16172b01db35f1f3b7683e5.zip kdepimpi-794a5204686ad9bfc16172b01db35f1f3b7683e5.tar.gz kdepimpi-794a5204686ad9bfc16172b01db35f1f3b7683e5.tar.bz2