many cleanups

11 files changed, 186 insertions, 746 deletions

diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 12502b0..c5406bf 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -2503,385 +2503,384 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
     addresseeLSync = getLastSyncAddressee();
     qDebug("Last Sync %s ", addresseeLSync.revision().toString().latin1());
     addresseeR = remote->findByUid("last-syncAddressee-"+mCurrentSyncName );
     if ( !addresseeR.isEmpty() ) {
         addresseeRSync = addresseeR;
         remote->removeAddressee(addresseeR );
 
     } else {
         if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
             addresseeRSync = addresseeLSync         ;
         } else {
             qDebug("FULLDATE 1");
             fullDateRange = true;
             Addressee newAdd;
             addresseeRSync = newAdd;
             addresseeRSync.setFamilyName(mCurrentSyncName + i18n(" - sync addressee"));
             addresseeRSync.setUid("last-syncAddressee-"+mCurrentSyncName ); 
             addresseeRSync.setRevision( mLastAddressbookSync );
             addresseeRSync.setCategories( i18n("SyncAddressee") );
         }
     }
     if ( addresseeLSync.revision() == mLastAddressbookSync ) {
             qDebug("FULLDATE 2");
         fullDateRange = true;
     }
     if ( ! fullDateRange  ) {
         if ( addresseeLSync.revision() != addresseeRSync.revision() ) {
             
             // qDebug("set fulldate to true %s %s" ,addresseeLSync->dtStart().toString().latin1(), addresseeRSync->dtStart().toString().latin1() ); 
             //qDebug("%d %d %d %d ", addresseeLSync->dtStart().time().second(), addresseeLSync->dtStart().time().msec() , addresseeRSync->dtStart().time().second(), addresseeRSync->dtStart().time().msec());
             fullDateRange = true;
             qDebug("FULLDATE 3 %s %s", addresseeLSync.revision().toString().latin1() , addresseeRSync.revision().toString().latin1() );
         } 
     }
     // fullDateRange = true; // debug only!
     if ( fullDateRange )
         mLastAddressbookSync = QDateTime::currentDateTime().addDays( -100*365);
     else
         mLastAddressbookSync = addresseeLSync.revision();
     // for resyncing if own file has changed
     // PENDING fixme later when implemented
 #if 0
     if ( mCurrentSyncDevice == "deleteaftersync" ) {
         mLastAddressbookSync = loadedFileVersion;
         qDebug("setting mLastAddressbookSync ");
     }
 #endif
 
     //qDebug("*************************** ");
     // qDebug("mLastAddressbookSync %s ",mLastAddressbookSync.toString().latin1() );
     QStringList er = remote->uidList(); 
     Addressee inR ;//= er.first();
     Addressee  inL;
 
     syncManager->showProgressBar(0, i18n("Syncing - close to abort!"), er.count());
 
     int modulo = (er.count()/10)+1;
     int incCounter = 0;
     while ( incCounter < er.count()) {
 	if (syncManager->isProgressBarCanceled())
             return false;
         if ( incCounter % modulo == 0 )
 	  syncManager->showProgressBar(incCounter);
 
         uid = er[ incCounter ]; 
         bool skipIncidence = false;
         if ( uid.left(19) == QString("last-syncAddressee-") )
             skipIncidence = true;
         QString idS,OidS;
         qApp->processEvents();
         if ( !skipIncidence ) {
             inL = local->findByUid( uid );
             inR = remote->findByUid( uid );
             //inL.setResource( 0 );
             //inR.setResource( 0 );
             if ( !inL.isEmpty() ) { // maybe conflict - same uid in both calendars
                 if ( take = takeAddressee( &inL, &inR, mode, fullDateRange ) ) {
                     //qDebug("take %d %s ", take, inL.summary().latin1());
                     if ( take == 3 )
                         return false;
                     if ( take == 1  ) {// take local
                         if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
                             inL.setCsum( mCurrentSyncDevice, inR.getCsum(mCurrentSyncDevice) );
                             inL.setID( mCurrentSyncDevice, inR.getID(mCurrentSyncDevice) );
                             local->insertAddressee(  inL, false );
                             idS = inR.externalUID();
                             OidS = inR.originalExternalUID();
                         }
                         else
                             idS = inR.IDStr();
                         remote->removeAddressee( inR );
                         inR = inL;
                         inR.setTempSyncStat( SYNC_TEMPSTATE_INITIAL );
                         if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
                             inR.setOriginalExternalUID( OidS );
                             inR.setExternalUID( idS );
                         } else {
                             inR.setIDStr( idS );
                         }
                         inR.setResource( 0 );
                         remote->insertAddressee(  inR , false);
                         ++changedRemote;
                     } else { // take == 2  take remote
                         if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
                             if ( inR.revision().date().year() < 2004 )
                                 inR.setRevision( modifiedCalendar );
                         }
                         idS = inL.IDStr();
                         local->removeAddressee( inL );
                         inL = inR;
                         inL.setIDStr( idS );
                         if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
                             inL.setCsum( mCurrentSyncDevice, inR.getCsum(mCurrentSyncDevice) );
                             inL.setID( mCurrentSyncDevice, inR.getID(mCurrentSyncDevice) );
                         }
                         inL.setResource( 0 );
                         local->insertAddressee(  inL , false );
                         ++changedLocal;
                     }
                 }
             } else { //  no conflict
                 if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
                     QString des = addresseeLSync.note(); 
                     if ( des.find( inR.getID(mCurrentSyncDevice)  +"," ) >= 0 && mode != 5) { // delete it
                         inR.setTempSyncStat( SYNC_TEMPSTATE_DELETE );
                         remote->insertAddressee( inR, false );
                         ++deletedAddresseeR; 
                     } else {
                         inR.setRevision( modifiedCalendar );
                         remote->insertAddressee( inR, false );
                         inL = inR;
                         inL.setResource( 0 );
                         local->insertAddressee( inL , false);
                         ++addedAddressee;
                     }
                 } else {
                     if ( inR.revision() > mLastAddressbookSync || mode == 5 ) {
                         inR.setRevision( modifiedCalendar );
                         remote->insertAddressee( inR, false );
                         inR.setResource( 0 );
                         local->insertAddressee( inR, false );
                         ++addedAddressee;
                     } else {
                         // pending checkExternSyncAddressee(addresseeRSyncSharp, inR);
                         remote->removeAddressee( inR );
                         ++deletedAddresseeR; 
                     }
                 }
             }
         }
         ++incCounter;
     }
     er.clear();
     QStringList el = local->uidList(); 
     modulo = (el.count()/10)+1;
 
     syncManager->showProgressBar(0, i18n("Add / remove addressees"), el.count());
     incCounter = 0;
     while ( incCounter < el.count()) {
         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 );
             inR = remote->findByUid( uid );
             if ( inR.isEmpty() ) { 
                 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 ) {
                         // pending checkExternSyncAddressee(addresseeLSyncSharp, inL);
                         local->removeAddressee( inL );
                         ++deletedAddresseeL; 
                     } else {
                         if ( ! syncManager->mWriteBackExistingOnly ) {
                             ++addedAddresseeR; 
                             inL.setRevision( modifiedCalendar );
                             local->insertAddressee( inL, false );
                             inR = inL;
                             inR.setResource( 0 );
                             remote->insertAddressee( inR, false );
                         }
                     }
                 }
             }
         }
         ++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"),addedAddressee, addedAddresseeR, changedLocal, changedRemote, deletedAddresseeL, deletedAddresseeR ); 
     if ( syncManager->mShowSyncSummary ) {
         KMessageBox::information(this, mes, i18n("KA/Pi Synchronization") );
     }
     qDebug( mes );
     return syncOK;
 }
 
 
 //this is a overwritten callbackmethods from the syncinterface
 bool KABCore::sync(KSyncManager* manager, QString filename, int mode)
 { 
 
     //pending prepare addresseeview for output
     //pending detect, if remote file has REV field. if not switch to external sync
     mGlobalSyncMode = SYNC_MODE_NORMAL;
     QString mCurrentSyncDevice = manager->getCurrentSyncDevice();
 
     AddressBook abLocal(filename,"syncContact");
     bool syncOK = false;
     if ( abLocal.load() ) {
         qDebug("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 );
         } else {
             Addressee lse =   mAddressBook->findByUid( "last-syncAddressee-"+mCurrentSyncDevice );
             if ( ! lse.isEmpty() ) {
                 if ( lse.familyName().left(4) == "!E: " )
                     external = true;
             } else {
                 bool found = false;
                 AddressBook::Iterator it;
                 for ( it = abLocal.begin(); it != abLocal.end(); ++it ) {
                     if ( (*it).revision().date().year() > 2003 ) {
                         found = true;
                         break;
                     }
                 }
                 external = ! found;
             }
 
             if ( external ) {
                 qDebug("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 );
         if (  syncOK ) {
             if ( syncManager->mWriteBackFile )
                 {
                     if ( external )
                         abLocal.removeSyncAddressees( !isXML);
                     qDebug("Saving remote AB ");
                     abLocal.saveAB();
                     if ( isXML ) {
                         // afterwrite processing
                         abLocal.postExternSync( mAddressBook,mCurrentSyncDevice );
                     }
                 }
         }
         setModified();
         
     }
     if ( syncOK )
         mViewManager->refreshView();
     return syncOK;
 #if 0
 
     if ( storage->load(KOPrefs::instance()->mUseQuicksave) ) {
         getEventViewerDialog()->setSyncMode( true );
         syncOK = synchronizeCalendar( mCalendar, calendar, mode );
         getEventViewerDialog()->setSyncMode( false );
         if (  syncOK ) {
            if ( KOPrefs::instance()->mWriteBackFile )
             {
                 storage->setSaveFormat( new ICalFormat( KOPrefs::instance()->mUseQuicksave) );
                 storage->save();
             }
         }
         setModified();
     }
   
 #endif
 }
 
 
 //this is a overwritten callbackmethods from the syncinterface
 bool KABCore::syncExternal(KSyncManager* manager, QString  resource)
 {
     QString mCurrentSyncDevice = manager->getCurrentSyncDevice();
 
     AddressBook abLocal( resource,"syncContact");
     bool syncOK = false;
     if ( abLocal.load() ) {
         qDebug("AB sharp loaded ,sync device %s",mCurrentSyncDevice.latin1());
         mGlobalSyncMode = SYNC_MODE_EXTERNAL;
         abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice );
         syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, syncManager->mSyncAlgoPrefs );
         if (  syncOK ) {
             if ( syncManager->mWriteBackFile ) {
                 abLocal.saveAB();
                 abLocal.postExternSync( mAddressBook,mCurrentSyncDevice );
             }
         }
         setModified();
     }
     if ( syncOK )
         mViewManager->refreshView();
     return syncOK;
 
 }
 
 void KABCore::getFile( bool success )
 {
     QTimer::singleShot( 15000, this , SLOT ( setCaptionBack()));
     if ( ! success ) {
         setCaption( i18n("Error receiving file. Nothing changed!") );
         return;
     }
     mAddressBook->importFromFile( sentSyncFile() );
     topLevelWidget()->setCaption( i18n("Pi-Sync successful!") );
     mViewManager->refreshView();
 }
 void KABCore::syncFileRequest()
 {
     mAddressBook->export2File( sentSyncFile() );
 }
 QString KABCore::sentSyncFile()
 {
 #ifdef _WIN32_
     return  locateLocal( "tmp", "copysyncab.vcf" );
 #else
     return QString( "/tmp/copysyncab.vcf" );
 #endif 
 }
 
 void KABCore::setCaptionBack()
 {
     topLevelWidget()->setCaption( i18n("KAddressbook/Pi") );
 }
-
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index ea9607d..b56f1f9 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -319,2313 +319,2253 @@ void CalendarView::init()
     } else {
         leftFrameLayout->addWidget(mTodoList,2 );
         leftFrameLayout->addWidget(mFilterView );
     } 
     mFilterView->hide();
     QWidget *rightBox = new QWidget( mainBox );
     mainBoxLayout->addWidget ( rightBox, 10 );
     QBoxLayout *rightLayout = new QVBoxLayout( rightBox );
     mNavigatorBar = new NavigatorBar( QDate::currentDate(), rightBox, "useBigPixmaps" );
     mRightFrame = new QWidgetStack( rightBox );
     rightLayout->addWidget( mNavigatorBar );
     rightLayout->addWidget( mRightFrame, 10 );
 
     mLeftFrame = leftFrame;
     if ( KOPrefs::instance()->mVerticalScreen ) {
         mTodoList->setFixedHeight( mDateNavigator->sizeHint().height() );
         leftFrame->setFixedHeight( mDateNavigator->sizeHint().height() );
     } else {
         mTodoList->setFixedWidth( mDateNavigator->sizeHint().width() );
         leftFrame->setFixedWidth( mDateNavigator->sizeHint().width() );
     }
  
     //qDebug("Calendarview Size %d %d ", width(), height());
 #endif
  
     connect( mNavigator, SIGNAL( datesSelected( const KCal::DateList & ) ),
              SLOT( showDates( const KCal::DateList & ) ) );
     connect( mNavigator, SIGNAL( datesSelected( const KCal::DateList & ) ),
              mDateNavigator, SLOT( selectDates( const KCal::DateList & ) ) );
 
     connect( mNavigatorBar, SIGNAL( goPrevYear() ),
              mNavigator, SLOT( selectPreviousYear() ) );
     connect( mNavigatorBar, SIGNAL( goNextYear() ),
              mNavigator, SLOT( selectNextYear() ) );
     connect( mNavigatorBar, SIGNAL( goPrevMonth() ),
              mNavigator, SLOT( selectPreviousMonth() ) );
     connect( mNavigatorBar, SIGNAL( goNextMonth() ),
              mNavigator, SLOT( selectNextMonth() ) );
 
     connect( mNavigator, SIGNAL( datesSelected( const KCal::DateList & ) ),
              mNavigatorBar, SLOT( selectDates( const KCal::DateList & ) ) );
 
     connect( mDateNavigator, SIGNAL( weekClicked( const QDate & ) ),
              mNavigator, SLOT( selectWeek( const QDate & ) ) );
 
     connect( mDateNavigator, SIGNAL( goPrevYear() ),
              mNavigator, SLOT( selectPreviousYear() ) );
     connect( mDateNavigator, SIGNAL( goNextYear() ),
              mNavigator, SLOT( selectNextYear() ) );
     connect( mDateNavigator, SIGNAL( goPrevMonth() ),
              mNavigator, SLOT( selectPreviousMonth() ) );
     connect( mDateNavigator, SIGNAL( goNextMonth() ),
              mNavigator, SLOT( selectNextMonth() ) );
 
     connect( mDateNavigator, SIGNAL( goPrevious() ),
              mNavigator, SLOT( selectPrevious() ) );
     connect( mDateNavigator, SIGNAL( goNext() ),
              mNavigator, SLOT( selectNext() ) );
     connect( mDateNavigator, SIGNAL( monthSelected ( int ) ),
              mNavigator, SLOT( slotMonthSelect( int ) ) );
     connect( mNavigatorBar, SIGNAL( monthSelected ( int ) ),
              mNavigator, SLOT( slotMonthSelect( int ) ) );
 
     connect( mDateNavigator, SIGNAL( datesSelected( const KCal::DateList & ) ),
              mNavigator, SLOT( selectDates( const KCal::DateList & ) ) );
 
     connect( mDateNavigator, SIGNAL( eventDropped( Event * ) ),
              SLOT( eventAdded( Event *) ) );
 
     connect(mDateNavigator,SIGNAL(dayPassed(QDate)),SLOT(updateView()));
 
     connect( this, SIGNAL( configChanged() ),
              mDateNavigator, SLOT( updateConfig() ) );
 
     connect( mTodoList, SIGNAL( newTodoSignal() ),
              SLOT( newTodo() ) );
     connect( mTodoList, SIGNAL( newSubTodoSignal( Todo *) ),
              SLOT( newSubTodo( Todo * ) ) );
     connect( mTodoList, SIGNAL( editTodoSignal( Todo * ) ),
              SLOT( editTodo( Todo * ) ) );
     connect( mTodoList, SIGNAL( showTodoSignal( Todo * ) ),
              SLOT( showTodo( Todo *) ) );
     connect( mTodoList, SIGNAL( deleteTodoSignal( Todo *) ),
              SLOT( deleteTodo( Todo *) ) );
     connect( this, SIGNAL( configChanged()), mTodoList, SLOT( updateConfig() ) );
     connect( mTodoList, SIGNAL( purgeCompletedSignal() ),
              SLOT( purgeCompleted() ) );
     connect( mTodoList, SIGNAL( todoModifiedSignal( Todo *, int ) ),
              SIGNAL( todoModified( Todo *, int ) ) );
 
     connect( mTodoList, SIGNAL( cloneTodoSignal( Incidence *  ) ),
              this, SLOT ( cloneIncidence( Incidence * ) ) );
     connect( mTodoList, SIGNAL( cancelTodoSignal( Incidence *  ) ),
              this, SLOT (cancelIncidence( Incidence * ) ) );
 
     connect( mTodoList, SIGNAL( moveTodoSignal( Incidence *  ) ),
              this, SLOT ( moveIncidence( Incidence * ) ) );
     connect( mTodoList, SIGNAL( beamTodoSignal( Incidence *  ) ),
             this, SLOT ( beamIncidence( Incidence * ) ) );
   
     connect( mTodoList, SIGNAL( unparentTodoSignal( Todo * ) ),
              this, SLOT ( todo_unsub( Todo * ) ) );
   
     connect( this, SIGNAL( todoModified( Todo *, int )), mTodoList,
              SLOT( updateTodo( Todo *, int ) ) );
     connect( this, SIGNAL( todoModified( Todo *, int )), this,
              SLOT( changeTodoDisplay( Todo *, int ) ) );
 
 
     connect( mFilterView, SIGNAL( filterChanged() ), SLOT( updateFilter() ) );
     connect( mFilterView, SIGNAL( editFilters() ), SLOT( editFilters() ) );
     connect( mCalendar, SIGNAL( addAlarm(const QDateTime &, const QString &  ) ), SLOT( addAlarm(const QDateTime &, const QString &  ) ) );
     connect( mCalendar, SIGNAL( removeAlarm(const QDateTime &, const QString &  ) ), SLOT( removeAlarm(const QDateTime &, const QString & ) ) );
   
 
 
 
 
     connect(QApplication::clipboard(),SIGNAL(dataChanged()),
             SLOT(checkClipboard()));
     connect( mTodoList,SIGNAL( incidenceSelected( Incidence * ) ),
              SLOT( processTodoListSelection( Incidence * ) ) );
     connect(mTodoList,SIGNAL(isModified(bool)),SLOT(setModified(bool)));
 
     // kdDebug() << "CalendarView::CalendarView() done" << endl; 
 
     mDateFrame = new QVBox(0,0,WType_Popup);
     //mDateFrame->setFrameStyle(QFrame::PopupPanel | QFrame::Raised);
     mDateFrame->setFrameStyle( QFrame::WinPanel |QFrame::Raised );
     mDateFrame->setLineWidth(3);
     mDateFrame->hide(); 
     mDateFrame->setCaption( i18n( "Pick a date to display"));
     mDatePicker = new KDatePicker ( mDateFrame , QDate::currentDate() );
  
     connect(mDatePicker,SIGNAL(dateSelected(QDate)),SLOT(slotSelectPickerDate(QDate)));
  
     mEventEditor = mDialogManager->getEventEditor();  
     mTodoEditor = mDialogManager->getTodoEditor();  
    
     mFlagEditDescription = false; 
 
     mSuspendTimer = new QTimer( this );
     mAlarmTimer = new QTimer( this );
     mRecheckAlarmTimer = new QTimer( this );
     connect( mRecheckAlarmTimer, SIGNAL(  timeout ()  ), SLOT( recheckTimerAlarm() ) );
     connect( mSuspendTimer, SIGNAL(  timeout ()  ), SLOT( suspendAlarm() ) );
     connect( mAlarmTimer, SIGNAL(  timeout ()  ), SLOT( timerAlarm() ) );
     mAlarmDialog = new AlarmDialog( this );
     connect( mAlarmDialog, SIGNAL( addAlarm(const QDateTime &, const QString &  ) ), SLOT( addSuspendAlarm(const QDateTime &, const QString &  ) ) );
     mAlarmDialog->setServerNotification( false );
     mAlarmDialog->setSuspendTime( KOPrefs::instance()->mAlarmSuspendTime );
 
 
 #ifndef DESKTOP_VERSION
 //US listen for arriving address resultsets
   connect(ExternalAppHandler::instance(), SIGNAL(receivedBirthdayListEvent(const QString&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&)),
           this, SLOT(insertBirthdays(const QString&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&)));
 #endif
 
 }
 
 
 CalendarView::~CalendarView()
 {
     // kdDebug() << "~CalendarView()" << endl;
     //qDebug("CalendarView::~CalendarView() ");
     delete mDialogManager;
     delete mViewManager;
     delete mStorage;
     delete mDateFrame ;
     delete beamDialog;
     //kdDebug() << "~CalendarView() done" << endl;
 }
 void CalendarView::timerAlarm()
 {
     //qDebug("CalendarView::timerAlarm() ");
     computeAlarm(mAlarmNotification );
 }
 
 void CalendarView::suspendAlarm()
 {
     //qDebug(" CalendarView::suspendAlarm() ");
     computeAlarm(mSuspendAlarmNotification );
 
 }
 
 void  CalendarView::startAlarm( QString mess , QString filename)
 {
     mAlarmDialog->eventNotification( mess, KOPrefs::instance()->mAlarmPlayBeeps, filename, true,KOPrefs::instance()->mAlarmBeepInterval ,KOPrefs::instance()->mAlarmSuspendCount );
     QTimer::singleShot( 3000, this, SLOT( checkNextTimerAlarm() ) );
 
 }
     
 void CalendarView::checkNextTimerAlarm()
 {
     mCalendar->checkAlarmForIncidence( 0, true );
 }
 
 void  CalendarView::computeAlarm( QString msg )
 {
 
  QString mess = msg; 
     QString  mAlarmMessage = mess.mid( 9 ); 
     QString filename =  MainWindow::resourcePath();
     filename += "koalarm.wav";
     QString tempfilename;
     if ( mess.left( 13 )  == "suspend_alarm") {  
         bool error = false;
         int len = mess.mid( 13 ).find("+++");
         if ( len < 2 )
             error = true;
         else {
             tempfilename = mess.mid( 13, len );
             if ( !QFile::exists( tempfilename  ) )
                 error = true;
         }
         if ( ! error ) {
             filename = tempfilename;
         }
         mAlarmMessage = mess.mid( 13+len+3 );
         //qDebug("suspend file %s ",tempfilename.latin1() );
         startAlarm( mAlarmMessage, filename);
         return;
     }
     if ( mess.left( 11 )  == "timer_alarm") {
         //mTimerTime = 0;
         startAlarm( mess.mid( 11 ), filename );
         return;
     } 
     if ( mess.left( 10 )  == "proc_alarm") {
         bool error = false;
         int len = mess.mid( 10 ).find("+++");
         if ( len < 2 )
             error = true;
         else {
             tempfilename = mess.mid( 10, len );
             if ( !QFile::exists( tempfilename  ) )
                 error = true;
         }
         if ( error ) {
             mAlarmMessage = "Procedure Alarm\nError - File not found\n";
             mAlarmMessage += mess.mid( 10+len+3+9 );
         } else {
             //QCopEnvelope e("QPE/Application/kopi", "-writeFileSilent");
             //qDebug("-----system command %s ",tempfilename.latin1() );
 #ifndef _WIN32_
             if ( vfork () == 0 ) {
                 execl ( tempfilename.latin1(), 0 );
                 return;
 	    }
 #else
 		QProcess* p = new QProcess();
 		p->addArgument(  tempfilename.latin1()  );
 		p->start();
 		return;
 #endif
             
             return;
         }
        
         //qDebug("+++++++system command %s ",tempfilename.latin1() );
     }  
     if ( mess.left( 11 )  == "audio_alarm") {
         bool error = false;
         int len = mess.mid( 11 ).find("+++");
         if ( len < 2 )
             error = true;
         else {
             tempfilename = mess.mid( 11, len );
             if ( !QFile::exists( tempfilename  ) )
                 error = true;
         }
         if ( ! error ) {
             filename = tempfilename;
         }
         mAlarmMessage = mess.mid( 11+len+3+9 );
         //qDebug("audio file command %s ",tempfilename.latin1() );
     } 
     if ( mess.left( 9 )  == "cal_alarm") {
         mAlarmMessage = mess.mid( 9 ) ;
     }
     
     startAlarm( mAlarmMessage, filename );
 
 
 }
 
 void CalendarView::addSuspendAlarm(const QDateTime &qdt, const QString &noti  )
 {
     //qDebug("+++++addSUSPENDAlarm %s %s ", qdt.toString().latin1() , noti.latin1() );
    
     mSuspendAlarmNotification = noti;
     int ms = QDateTime::currentDateTime().secsTo( qdt )*1000;
     //qDebug("Suspend Alarm timer started with secs: %d ", ms/1000);
     mSuspendTimer->start( ms , true );
 
 }
 
 void CalendarView::addAlarm(const QDateTime &qdt, const QString &noti  )
 {
     //qDebug("+++++addAlarm %s %s ", qdt.toString().latin1() , noti.latin1() );
     if ( ! KOPrefs::instance()->mUseInternalAlarmNotification ) {
 #ifndef DESKTOP_VERSION
         AlarmServer::addAlarm ( qdt,"koalarm", noti.latin1() );
 #endif     
         return;
     }
     int maxSec;
     //maxSec = 5; //testing only 
     maxSec = 86400+3600; // one day+1hour
     mAlarmNotification = noti;
     int sec = QDateTime::currentDateTime().secsTo( qdt );
     if ( sec > maxSec ) {
         mRecheckAlarmTimer->start( maxSec * 1000 );
         //  qDebug("recheck Alarm timer started with secs: %d next alarm in sec:%d", maxSec,sec  );
         return;
     } else {
         mRecheckAlarmTimer->stop();
     }
     //qDebug("Alarm timer started with secs: %d ", sec);
     mAlarmTimer->start( sec *1000 , true );
 
 }
 // called by mRecheckAlarmTimer to get next alarm
 // we need this, because a QTimer has only a max range of 25 days
 void CalendarView::recheckTimerAlarm()
 {
     mAlarmTimer->stop();
     mRecheckAlarmTimer->stop();
     mCalendar->checkAlarmForIncidence( 0, true );
 }
 void CalendarView::removeAlarm(const QDateTime &qdt, const QString &noti  )
 {
     //qDebug("-----removeAlarm %s %s ", qdt.toString().latin1() , noti.latin1() );
     if ( ! KOPrefs::instance()->mUseInternalAlarmNotification ) {
 #ifndef DESKTOP_VERSION
         AlarmServer::deleteAlarm (qdt ,"koalarm" ,noti.latin1() );
 #endif   
         return;
     }
     mAlarmTimer->stop();
 }
 void CalendarView::selectWeekNum ( int num  )
 {
     dateNavigator()->selectWeek( num );
     mViewManager->showWeekView();
 }
 KOViewManager *CalendarView::viewManager()
 {
     return mViewManager;
 }
 
 KODialogManager *CalendarView::dialogManager()
 {
     return mDialogManager;
 }
 
 QDate CalendarView::startDate()
 {
     DateList dates = mNavigator->selectedDates();
 
     return dates.first();
 }
 
 QDate CalendarView::endDate()
 {
     DateList dates = mNavigator->selectedDates();
 
     return dates.last();
 }
 
 
 void CalendarView::createPrinter()
 {
 #ifndef KORG_NOPRINTER
     if (!mCalPrinter) {
         mCalPrinter = new CalPrinter(this, mCalendar);
         connect(this, SIGNAL(configChanged()), mCalPrinter, SLOT(updateConfig()));
     }
 #endif
 }
 
 void CalendarView::confSync()
 {
-   static KSyncPrefsDialog* sp = 0;
-    if ( ! sp ) {
-        sp = new KSyncPrefsDialog( this, "syncprefs", true );
-    }
-    sp->usrReadConfig();
-#ifndef DESKTOP_VERSION
-    sp->showMaximized();
-#else
-    sp->show();
-#endif
-    sp->exec();
-    KOPrefs::instance()->mSyncProfileNames = sp->getSyncProfileNames();
-    KOPrefs::instance()->mLocalMachineName = sp->getLocalMachineName ();
+    //DELETE
 }
 
 
 //KOPrefs::instance()->mWriteBackFile
 //KOPrefs::instance()->mWriteBackExistingOnly
 
 //  0  syncPrefsGroup->addRadio(i18n("Take local entry on conflict"));
 //  1  syncPrefsGroup->addRadio(i18n("Take remote entry on conflict"));
 //  2  syncPrefsGroup->addRadio(i18n("Take newest entry on conflict"));
 //  3  syncPrefsGroup->addRadio(i18n("Ask for every entry on conflict"));
 //  4  syncPrefsGroup->addRadio(i18n("Force take local entry always"));
 //  5  syncPrefsGroup->addRadio(i18n("Force take remote entry always"));
 
 int  CalendarView::takeEvent( Incidence* local,  Incidence* remote, int mode , bool full )
 {
  
     //void setZaurusId(int id);
     // int zaurusId() const;
     //  void setZaurusUid(int id);
    // int zaurusUid() const;
    // void setZaurusStat(int id);
    // int zaurusStat() const;
     // 0 equal
     // 1 take local
     // 2 take remote
     // 3 cancel 
     QDateTime lastSync = mLastCalendarSync;
     QDateTime localMod = local->lastModified();
     QDateTime remoteMod = remote->lastModified();
     if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
         bool remCh, locCh;
         remCh = ( remote->getCsum(mCurrentSyncDevice) != local->getCsum(mCurrentSyncDevice) );
         //if ( remCh )        
             //qDebug("loc %s  rem %s", local->getCsum(mCurrentSyncDevice).latin1(), remote->getCsum(mCurrentSyncDevice).latin1() );
         locCh = ( localMod > mLastCalendarSync );
         if ( !remCh && ! locCh ) {
             //qDebug("both not changed ");
             lastSync = localMod.addDays(1);
             if ( mode <= SYNC_PREF_ASK )
                 return 0;
         } else {
             if ( locCh ) {
                 //qDebug("loc changed %d %s %s", local->revision() , localMod.toString().latin1(), mLastCalendarSync.toString().latin1());
                 lastSync = localMod.addDays( -1 );
                 if ( !remCh )
                     remoteMod = ( lastSync.addDays( -1 ) );
             } else {
                 //qDebug(" not loc changed ");
                 lastSync = localMod.addDays( 1 );
                 if ( remCh )
                     remoteMod =( lastSync.addDays( 1 ) );
                 
             }
         }
         full = true;  
         if ( mode < SYNC_PREF_ASK )
             mode = SYNC_PREF_ASK;
     } else {
           if ( localMod == remoteMod )
             if ( local->revision() == remote->revision() )
                 return 0;
         
     }
     // qDebug(" %d %d conflict on %s %s ", mode, full, local->summary().latin1(), remote->summary().latin1() );
 
     //qDebug("%s %d  %s %d", localMod.toString().latin1() , local->revision(), remoteMod.toString().latin1(), remote->revision());  
     //qDebug("%d %d %d %d ", localMod.time().second(), localMod.time().msec(),  remoteMod.time().second(), remoteMod.time().msec() );
     //full = true; //debug only
     if ( full ) {
         bool equ = false;
         if ( local->type() == "Event" ) {
             equ =  (*((Event*) local) == *((Event*) remote));
         }
         else if ( local->type() =="Todo" )
             equ =  (*((Todo*) local) == (*(Todo*) remote));
         else if ( local->type() =="Journal" )
             equ =  (*((Journal*) local) == *((Journal*) remote));
         if ( equ ) {
             //qDebug("equal ");
             if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
                 local->setCsum( mCurrentSyncDevice, remote->getCsum(mCurrentSyncDevice) );
             }
             if ( mode < SYNC_PREF_FORCE_LOCAL )
                 return 0;
               
         }//else //debug only
         //qDebug("not equal %s %s ", local->summary().latin1(), remote->summary().latin1());
     }
     int result;
     bool localIsNew;
     //qDebug("%s -- %s mLastCalendarSync %s lastsync %s --- local %s remote %s ",local->summary().latin1(), remote->summary().latin1(),mLastCalendarSync.toString().latin1() ,lastSync.toString().latin1()  ,  localMod.toString().latin1() , remoteMod.toString().latin1()  );
 
     if ( full && mode < SYNC_PREF_NEWEST )
         mode = SYNC_PREF_ASK;
 
     switch( mode ) {
     case SYNC_PREF_LOCAL:
         if ( lastSync > remoteMod )
             return 1;
         if ( lastSync > localMod )
             return 2;
         return 1;
         break;
     case SYNC_PREF_REMOTE:
         if ( lastSync > remoteMod )
             return 1;
         if ( lastSync > localMod )
             return 2;
         return 2;
         break;
     case SYNC_PREF_NEWEST:
         if ( localMod > remoteMod )
             return 1;
         else
             return 2;
         break;
     case SYNC_PREF_ASK: 
         //qDebug("lsy %s  ---  lo %s  --- re %s ", lastSync.toString().latin1(), localMod.toString().latin1(), remoteMod.toString().latin1()  );
         if ( lastSync > remoteMod )
             return 1;
         if ( lastSync > localMod )
             return 2;
         //qDebug("lsy %s  ---  lo %s  --- re %s ", lastSync.toString().latin1(), localMod.toString().latin1(), remoteMod.toString().latin1()  );
         localIsNew = localMod >= remoteMod;
         if ( localIsNew )
             getEventViewerDialog()->setColorMode( 1 );
          else 
             getEventViewerDialog()->setColorMode( 2 );
         getEventViewerDialog()->setIncidence(local);
         if ( localIsNew )
             getEventViewerDialog()->setColorMode( 2 );
          else 
             getEventViewerDialog()->setColorMode( 1 );
         getEventViewerDialog()->addIncidence(remote);
         getEventViewerDialog()->setColorMode( 0 );
         //qDebug("local %d remote %d ",local->relatedTo(),remote->relatedTo()  );
         getEventViewerDialog()->setCaption( mCurrentSyncDevice +i18n(" : Conflict! Please choose entry!"));
         getEventViewerDialog()->showMe();
         result = getEventViewerDialog()->executeS( localIsNew );
         return result;
           
         break;
     case SYNC_PREF_FORCE_LOCAL:
         return 1;
         break;
     case SYNC_PREF_FORCE_REMOTE:
         return 2;
         break;
        
     default:
         // SYNC_PREF_TAKE_BOTH not implemented
         break;
     }
     return 0;
 }
 Event* CalendarView::getLastSyncEvent()
 {
     Event* lse; 
     //qDebug("CurrentSyncDevice %s ",mCurrentSyncDevice .latin1() );
     lse =   mCalendar->event( "last-syncEvent-"+mCurrentSyncDevice );
     if (!lse) {
         lse = new Event();
         lse->setUid( "last-syncEvent-"+mCurrentSyncDevice ); 
         QString sum = "";
-        if ( KOPrefs::instance()->mExternSyncProfiles.contains( mCurrentSyncDevice ) )
+        if ( mSyncManager->mExternSyncProfiles.contains( mCurrentSyncDevice ) )
             sum = "E: ";
         lse->setSummary(sum+mCurrentSyncDevice + i18n(" - sync event"));
         lse->setDtStart( mLastCalendarSync );
         lse->setDtEnd( mLastCalendarSync.addSecs( 7200 ) );
         lse->setCategories( i18n("SyncEvent") );
         lse->setReadOnly( true );
         mCalendar->addEvent( lse );
     }
 
     return lse;
 
 }
 
 // we check, if the to delete event has a id for a profile
 //  if yes, we set this id in the profile to delete
 void CalendarView::checkExternSyncEvent( QPtrList<Event> lastSync , Incidence* toDelete )
 {
     if ( lastSync.count() == 0 ) {
         //qDebug(" lastSync.count() == 0");
         return;
     }
     if ( toDelete->type() == "Journal" )
         return;
 
     Event* eve = lastSync.first();
 
     while ( eve ) {
         QString id = toDelete->getID( eve->uid().mid( 15 ) ); // this is the sync profile name
         if ( !id.isEmpty() ) {
             QString des = eve->description();
             QString pref = "e";
             if ( toDelete->type() == "Todo" )
                 pref = "t";
             des += pref+  id  + ",";
             eve->setReadOnly( false );
             eve->setDescription( des );
             //qDebug("setdes %s ", des.latin1());
             eve->setReadOnly( true );
         }
         eve = lastSync.next();
     }
 
 }
 void CalendarView::checkExternalId( Incidence * inc )
 {
     QPtrList<Event> lastSync = mCalendar->getExternLastSyncEvents() ;
     checkExternSyncEvent( lastSync, inc );
 
 }
 bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int mode )
 {
     bool syncOK = true;
     int addedEvent = 0;
     int addedEventR = 0;
     int deletedEventR = 0;
     int deletedEventL = 0;
     int changedLocal = 0;
     int changedRemote = 0;
     //QPtrList<Event> el = local->rawEvents(); 
     Event* eventR;
     QString uid;
     int take;
     Event* eventL;
     Event* eventRSync;
     Event* eventLSync;
     QPtrList<Event>  eventRSyncSharp = remote->getExternLastSyncEvents();
     QPtrList<Event>  eventLSyncSharp = local->getExternLastSyncEvents();
     bool fullDateRange = false;
     local->resetTempSyncStat();
     mLastCalendarSync = QDateTime::currentDateTime();
     QDateTime modifiedCalendar = mLastCalendarSync;;
     eventLSync = getLastSyncEvent();
     eventR = remote->event("last-syncEvent-"+mCurrentSyncName );
     if ( eventR ) {
         eventRSync = (Event*) eventR->clone();
         remote->deleteEvent(eventR );
 
     } else {
         if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
             eventRSync = (Event*)eventLSync->clone();
         } else {
             fullDateRange = true;
             eventRSync = new Event();
             eventRSync->setSummary(mCurrentSyncName + i18n(" - sync event"));
             eventRSync->setUid("last-syncEvent-"+mCurrentSyncName ); 
             eventRSync->setDtStart( mLastCalendarSync );
             eventRSync->setDtEnd( mLastCalendarSync.addSecs( 7200 ) );
             eventRSync->setCategories( i18n("SyncEvent") );
         }
     }
     if ( eventLSync->dtStart() == mLastCalendarSync )
         fullDateRange = true;
    
     if ( ! fullDateRange  ) {
         if ( eventLSync->dtStart() != eventRSync->dtStart() ) {
             
             // qDebug("set fulldate to true %s %s" ,eventLSync->dtStart().toString().latin1(), eventRSync->dtStart().toString().latin1() ); 
             //qDebug("%d %d %d %d ", eventLSync->dtStart().time().second(), eventLSync->dtStart().time().msec() , eventRSync->dtStart().time().second(), eventRSync->dtStart().time().msec());
             fullDateRange = true;
         } 
     }
     if ( fullDateRange )
         mLastCalendarSync = QDateTime::currentDateTime().addDays( -100*365);
     else
         mLastCalendarSync = eventLSync->dtStart();
     // for resyncing if own file has changed
     if ( mCurrentSyncDevice == "deleteaftersync" ) {
         mLastCalendarSync = loadedFileVersion;
         qDebug("setting mLastCalendarSync ");
     }
     //qDebug("*************************** ");
     qDebug("mLastCalendarSync %s ",mLastCalendarSync.toString().latin1() );
     QPtrList<Incidence> er = remote->rawIncidences(); 
     Incidence* inR = er.first();
     Incidence* inL;
     QProgressBar bar( er.count(),0 );
     bar.setCaption (i18n("Syncing - close to abort!") );
     
     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.show();
     int modulo = (er.count()/10)+1;
     int incCounter = 0;
     while ( inR ) {
         if ( ! bar.isVisible() )
             return false;
         if ( incCounter % modulo == 0 )
             bar.setProgress( incCounter );
         ++incCounter;
         uid = inR->uid(); 
         bool skipIncidence = false;
         if ( uid.left(15) == QString("last-syncEvent-") )
             skipIncidence = true;
         QString idS;
         qApp->processEvents();
         if ( !skipIncidence ) {
             inL = local->incidence( uid );
             if ( inL ) { // maybe conflict - same uid in both calendars
                 int maxrev = inL->revision();
                 if ( maxrev < inR->revision() )
                     maxrev = inR->revision();
                 if ( (take = takeEvent( inL, inR, mode, fullDateRange )) > 0 ) {
                     //qDebug("take %d %s ", take, inL->summary().latin1());
                     if ( take == 3 )
                         return false;
                     if ( take == 1  ) {// take local
                         if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL )
                             inL->setCsum( mCurrentSyncDevice, inR->getCsum(mCurrentSyncDevice) );
                         else
                             idS = inR->IDStr();
                         remote->deleteIncidence( inR );
                         if ( inL->revision() < maxrev )
                             inL->setRevision( maxrev );
                         inR = inL->clone();
                         inR->setTempSyncStat( SYNC_TEMPSTATE_INITIAL );
                         if ( mGlobalSyncMode != SYNC_MODE_EXTERNAL )
                             inR->setIDStr( idS );
                         remote->addIncidence(  inR );
                         ++changedRemote;
                     } else {
                         if ( inR->revision() < maxrev )
                             inR->setRevision( maxrev );
                         idS = inL->IDStr();
                         local->deleteIncidence( inL );
                         inL = inR->clone();
                         inL->setIDStr( idS );
                         if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
                             inL->setCsum( mCurrentSyncDevice, inR->getCsum(mCurrentSyncDevice) );
                             inL->setID( mCurrentSyncDevice, inR->getID(mCurrentSyncDevice) );
                         }
                         local->addIncidence(  inL  );
                         ++changedLocal;
                     }
                 }
             } else { //  no conflict
                 if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
                     QString des = eventLSync->description(); 
                     QString pref = "e";
                     if ( inR->type() == "Todo" )
                         pref = "t";
                     if ( des.find(pref+ inR->getID(mCurrentSyncDevice)  +"," ) >= 0 && mode != 5) { // delete it
                         inR->setTempSyncStat( SYNC_TEMPSTATE_DELETE );
                         //remote->deleteIncidence( inR );
                         ++deletedEventR; 
                     } else {
                         inR->setLastModified( modifiedCalendar );
                         inL = inR->clone();
                         local->addIncidence( inL );
                         ++addedEvent;
                     }
                 } else {
                     if ( inR->lastModified() > mLastCalendarSync || mode == 5 ) {
                         inR->setLastModified( modifiedCalendar );
                         local->addIncidence( inR->clone() );
                         ++addedEvent;
                     } else {
                         checkExternSyncEvent(eventRSyncSharp, inR);
                         remote->deleteIncidence( inR );
                         ++deletedEventR; 
                     }
                 }
             }
         }
         inR =  er.next();
     }
     QPtrList<Incidence> el = local->rawIncidences(); 
     inL = el.first();
     modulo = (el.count()/10)+1;
     bar.setCaption (i18n("Add / remove events") ); 
     bar.setTotalSteps (  el.count()  ) ;
     bar.show();
     incCounter = 0;
    
     while ( inL ) {
            
         qApp->processEvents();
         if ( ! bar.isVisible() )
             return false;
         if ( incCounter % modulo == 0 )
             bar.setProgress( incCounter );
         ++incCounter;
         uid = inL->uid();
         bool skipIncidence = false;
         if ( uid.left(15) == QString("last-syncEvent-") )
             skipIncidence = true;
         if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL && inL->type() == "Journal" )
             skipIncidence = true;
         if ( !skipIncidence )  {
             inR = remote->incidence( uid );
             if ( ! inR ) { 
                 if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
                     if ( !inL->getID(mCurrentSyncDevice).isEmpty() && mode != 4 ) {
                         checkExternSyncEvent(eventLSyncSharp, inL);
                         local->deleteIncidence( inL );
                         ++deletedEventL; 
                     } else {
-                        if ( ! KOPrefs::instance()->mWriteBackExistingOnly ) {
+                        if ( ! mSyncManager->mWriteBackExistingOnly ) {
                             inL->removeID(mCurrentSyncDevice );
                             ++addedEventR; 
                             //qDebug("remote added Incidence %s ", inL->summary().latin1());
                             inL->setLastModified( modifiedCalendar );
                             inR = inL->clone();
                             inR->setTempSyncStat( SYNC_TEMPSTATE_INITIAL );
                             remote->addIncidence(  inR );
                         }
                     }
                 } else {
                     if ( inL->lastModified() < mLastCalendarSync && mode != 4 ) {
                         checkExternSyncEvent(eventLSyncSharp, inL);
                         local->deleteIncidence( inL );
                         ++deletedEventL; 
                     } else {
-                        if ( ! KOPrefs::instance()->mWriteBackExistingOnly ) {
+                        if ( ! mSyncManager->mWriteBackExistingOnly ) {
                             ++addedEventR; 
                             inL->setLastModified( modifiedCalendar );
                             remote->addIncidence(  inL->clone() );
                         }
                     }
                 }
             }
         }
         inL = el.next();
     }
     int delFut = 0;
-    if ( KOPrefs::instance()->mWriteBackInFuture ) {
+    if ( mSyncManager->mWriteBackInFuture ) {
         er = remote->rawIncidences(); 
         inR = er.first();
         QDateTime dt;
         QDateTime cur = QDateTime::currentDateTime().addDays( -7 );
-        QDateTime end = cur.addDays( (KOPrefs::instance()->mWriteBackInFuture +1 ) *7 );
+        QDateTime end = cur.addDays( (mSyncManager->mWriteBackInFuture +1 ) *7 );
         while ( inR ) {
             if ( inR->type() == "Todo" ) {
                 Todo * t = (Todo*)inR;
                 if ( t->hasDueDate() )
                     dt = t->dtDue();
                 else
                     dt = cur.addSecs( 62 );
             }
             else if (inR->type() == "Event" ) {
                 bool ok;
                 dt =  inR->getNextOccurence( cur, &ok );
                     if ( !ok )
                         dt = cur.addSecs( -62 );
                 }
             else
                 dt = inR->dtStart();
             if ( dt < cur || dt > end ) {
                 remote->deleteIncidence( inR );
                 ++delFut;
             }
             inR =  er.next();
         }
     }
     bar.hide();
     mLastCalendarSync = QDateTime::currentDateTime().addSecs( 1 );
     eventLSync->setReadOnly( false );
     eventLSync->setDtStart( mLastCalendarSync );
     eventRSync->setDtStart( mLastCalendarSync );
     eventLSync->setDtEnd( mLastCalendarSync.addSecs( 3600 ) );
     eventRSync->setDtEnd( mLastCalendarSync.addSecs( 3600 ) );
     eventRSync->setLocation( i18n("Remote from: ")+mCurrentSyncName ) ;
     eventLSync->setLocation(i18n("Local from: ") + mCurrentSyncName  );
     eventLSync->setReadOnly( true );
     if ( mGlobalSyncMode ==  SYNC_MODE_NORMAL)
         remote->addEvent( eventRSync );
     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"),addedEvent, addedEventR, changedLocal, changedRemote, deletedEventL, deletedEventR ); 
     QString delmess;
     if ( delFut  ) {
-        delmess.sprintf(  i18n("%d items skipped on remote,\nbecause they are in the past or\nmore than %d weeks in the future.\n"),delFut, KOPrefs::instance()->mWriteBackInFuture ); 
+        delmess.sprintf(  i18n("%d items skipped on remote,\nbecause they are in the past or\nmore than %d weeks in the future.\n"),delFut, mSyncManager->mWriteBackInFuture ); 
         mes += delmess;
     }
-    if ( KOPrefs::instance()->mShowSyncSummary ) {
+    if ( mSyncManager->mShowSyncSummary ) {
         KMessageBox::information(this, mes, i18n("KO/Pi Synchronization") );
     }
     qDebug( mes );
     mCalendar->checkAlarmForIncidence( 0, true );
     return syncOK;
 }
 
 void CalendarView::setSyncDevice( QString s )
 {
     mCurrentSyncDevice= s;
 }
 void CalendarView::setSyncName( QString s )
 {
     mCurrentSyncName= s;
 }
 bool CalendarView::syncCalendar(QString filename, int mode)
 {
     mGlobalSyncMode = SYNC_MODE_NORMAL;
     CalendarLocal* calendar = new CalendarLocal();
     calendar->setTimeZoneId(KOPrefs::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 ( KOPrefs::instance()->mWriteBackFile )
+           if ( mSyncManager->mWriteBackFile )
             {
                 storage->setSaveFormat( new ICalFormat() );
                 storage->save();
             }
         }
         setModified( true );
     }
     delete storage;
     delete calendar;
     if ( syncOK )
         updateView();
     return syncOK;
 }
 void CalendarView::syncPhone()
 {
-    syncExternal( 1 );
+    //DELETE
 }
 void CalendarView::syncExternal( int mode  )
 {
     mGlobalSyncMode = SYNC_MODE_EXTERNAL;
-    //mCurrentSyncDevice = "sharp-DTM";
-    if ( KOPrefs::instance()->mAskForPreferences )
-        edit_sync_options(); 
+   
     qApp->processEvents();
     CalendarLocal* calendar = new CalendarLocal();
     calendar->setTimeZoneId(KOPrefs::instance()->mTimeZoneId);
     bool syncOK = false;
     bool loadSuccess = false;
     PhoneFormat* phoneFormat = 0;
 #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,
-                                         KOPrefs::instance()->mPhoneDevice,
-                                         KOPrefs::instance()->mPhoneConnection,
-                                         KOPrefs::instance()->mPhoneModel);
+                                         mSyncManager->mPhoneDevice,
+                                         mSyncManager->mPhoneConnection,
+                                         mSyncManager->mPhoneModel);
         loadSuccess = phoneFormat->load( calendar,mCalendar); 
         
     } else 
         return;
     if ( loadSuccess ) {
         getEventViewerDialog()->setSyncMode( true );
-        syncOK = synchronizeCalendar( mCalendar, calendar, KOPrefs::instance()->mSyncAlgoPrefs );
+        syncOK = synchronizeCalendar( mCalendar, calendar, mSyncManager->mSyncAlgoPrefs );
         getEventViewerDialog()->setSyncMode( false );
         qApp->processEvents();
         if (  syncOK ) {
-            if ( KOPrefs::instance()->mWriteBackFile )
+            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 );
                 }
             }
         }
         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();
     return ;//syncOK;
 
 }
 void CalendarView::syncSharp()
 {
-    syncExternal( 0 );
+    //DELETE
 
 }
 
 
 bool CalendarView::importBday()
 {
 #ifndef KORG_NOKABC
 
 #ifdef DESKTOP_VERSION
     KABC::StdAddressBook* AddressBook = KABC::StdAddressBook::self( true );
     KABC::AddressBook::Iterator it;
     int count = 0;
     for( it = AddressBook->begin(); it != AddressBook->end(); ++it ) { 
         ++count;
     }
     QProgressBar bar(count,0 );
     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.show();
     bar.setCaption (i18n("Reading addressbook - close to abort!") );
     qApp->processEvents();
     count = 0;
     int addCount = 0;
     KCal::Attendee* a = 0;
     for( it = AddressBook->begin(); it != AddressBook->end(); ++it ) { 
         if ( ! bar.isVisible() )
             return false;
         bar.setProgress( count++ );
         qApp->processEvents();
         //qDebug("add BDay %s %s", (*it).realName().latin1(),(*it).birthday().date().toString().latin1() );
         if ( (*it).birthday().date().isValid() ){
             a = new KCal::Attendee( (*it).realName(), (*it).preferredEmail(),false,KCal::Attendee::NeedsAction,KCal::Attendee::ReqParticipant,(*it).uid()) ;
             if ( addAnniversary(  (*it).birthday().date(), (*it).assembledName(),  a, true ) )
             ++addCount;
         } 
         QDate anni = KGlobal::locale()->readDate( (*it).custom("KADDRESSBOOK", "X-Anniversary" ), "%Y-%m-%d"); 
         if ( anni.isValid() ){ 
             a = new KCal::Attendee( (*it).realName(), (*it).preferredEmail(),false,KCal::Attendee::NeedsAction,KCal::Attendee::ReqParticipant,(*it).uid()) ;
             if ( addAnniversary(  anni, (*it).assembledName(),  a, false ) )
             ++addCount;
         }
     }
     updateView(); 
     topLevelWidget()->setCaption(QString::number( addCount )+ i18n(" birthdays/anniversaries added!"));
 #else //DESKTOP_VERSION
 
   ExternalAppHandler::instance()->requestBirthdayListFromKAPI("QPE/Application/kopi", this->name() /* name is here the unique uid*/);
   // the result should now arrive through method insertBirthdays
 
 #endif //DESKTOP_VERSION
 
 #endif //KORG_NOKABC
 
 
     return true;
 }
  
 // This method will be called from Ka/Pi as a response to requestBirthdayListFromKAPI
 void CalendarView::insertBirthdays(const QString& uid, const QStringList& birthdayList, 
 				   const QStringList& anniversaryList, const QStringList& realNameList,
 				   const QStringList& emailList, const QStringList& assembledNameList, 
 				   const QStringList& uidList)
 {
   qDebug("CalendarView::insertBirthdays");
   if (uid == this->name())
   {
     int count = birthdayList.count();
     int addCount = 0;
     KCal::Attendee* a = 0;
 
     qDebug("CalView 1 %i", count);
 
     QProgressBar bar(count,0 );
     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.show();
     bar.setCaption (i18n("inserting birthdays - close to abort!") );
     qApp->processEvents();
 
     QDate birthday;
     QDate anniversary;
     QString realName;
     QString email;
     QString assembledName;
     QString uid;
     bool ok = true;
     for ( int i = 0; i < count; i++)
         {
             if ( ! bar.isVisible() )
                 return;
             bar.setProgress( i );
             qApp->processEvents();
 
             birthday = KGlobal::locale()->readDate(birthdayList[i], KLocale::ISODate, &ok);
             if (!ok) {
                 ;//qDebug("CalendarView::insertBirthdays found invalid birthday: %s",birthdayList[i].latin1());
             }
 
             anniversary = KGlobal::locale()->readDate(anniversaryList[i], KLocale::ISODate, &ok);
             if (!ok) {
                 ;//qDebug("CalendarView::insertBirthdays found invalid anniversary: %s",anniversaryList[i].latin1());
             }
             realName = realNameList[i]; 
             email = emailList[i];
             assembledName = assembledNameList[i];
             uid = uidList[i];
             //qDebug("insert birthday in KO/Pi: %s,%s,%s,%s: %s, %s", realName.latin1(), email.latin1(), assembledName.latin1(), uid.latin1(), birthdayList[i].latin1(), anniversaryList[i].latin1() );
 
             if ( birthday.isValid() ){
                 a = new KCal::Attendee( realName, email,false,KCal::Attendee::NeedsAction,
                                         KCal::Attendee::ReqParticipant,uid) ;
                 if ( addAnniversary(  birthday, assembledName,  a, true ) )
                     ++addCount;
             } 
 
             if ( anniversary.isValid() ){ 
                 a = new KCal::Attendee( realName, email,false,KCal::Attendee::NeedsAction,
                                         KCal::Attendee::ReqParticipant,uid) ;
                 if ( addAnniversary(  anniversary, assembledName,  a, false ) )
                     ++addCount;
             }
         }
 
     updateView(); 
     topLevelWidget()->setCaption(QString::number( addCount )+ i18n(" birthdays/anniversaries added!"));
 
   }
 
 }
 
 
 
 bool  CalendarView::addAnniversary(  QDate date, QString name, KCal::Attendee* a,  bool birthday)
 {
     //qDebug("addAnni ");
     Event * ev = new Event();
     if ( a ) {
         ev->addAttendee( a );
     }
     QString kind;
     if ( birthday )
         kind = i18n( "Birthday" );
     else
         kind = i18n( "Anniversary" );
     ev->setSummary( name + " - " + kind ); 
     ev->setOrganizer( "nobody@nowhere" );
     ev->setCategories( kind );
     ev->setDtStart( QDateTime(date) );
     ev->setDtEnd(  QDateTime(date) );
     ev->setFloats( true );
     Recurrence * rec = ev->recurrence();
     rec->setYearly(Recurrence::rYearlyMonth,1,-1);
     rec->addYearlyNum( date.month() );
     if ( !mCalendar->addAnniversaryNoDup( ev ) ) {
         delete ev;
         return false;
     }
     return true;
 
 }
 bool CalendarView::importQtopia( const QString &categories,
                                  const QString &datebook,
                                  const QString &todolist )
 {
     
    QtopiaFormat qtopiaFormat;
     qtopiaFormat.setCategoriesList (  &(KOPrefs::instance()->mCustomCategories));
     if ( !categories.isEmpty() ) qtopiaFormat.load( mCalendar, categories );
     if ( !datebook.isEmpty() ) qtopiaFormat.load( mCalendar, datebook );
     if ( !todolist.isEmpty() ) qtopiaFormat.load( mCalendar, todolist );
    
     updateView();
     return true;
 
 #if 0
  mGlobalSyncMode = SYNC_MODE_QTOPIA;
     mCurrentSyncDevice = "qtopia-XML";
-    if ( KOPrefs::instance()->mAskForPreferences )
+    if ( mSyncManager->mAskForPreferences )
         edit_sync_options(); 
     qApp->processEvents();
     CalendarLocal* calendar = new CalendarLocal();
     calendar->setTimeZoneId(KOPrefs::instance()->mTimeZoneId);
     bool syncOK = false;
  QtopiaFormat qtopiaFormat;
     qtopiaFormat.setCategoriesList (  &(KOPrefs::instance()->mCustomCategories));
     bool loadOk = true;
     if ( !categories.isEmpty() ) 
         loadOk = qtopiaFormat.load( calendar, categories );
     if ( loadOk && !datebook.isEmpty() ) 
         loadOk = qtopiaFormat.load( calendar, datebook );
     if ( loadOk && !todolist.isEmpty() ) 
         loadOk = qtopiaFormat.load( calendar, todolist );
 
     if ( loadOk  ) {
         getEventViewerDialog()->setSyncMode( true );
-        syncOK = synchronizeCalendar( mCalendar, calendar, KOPrefs::instance()->mSyncAlgoPrefs );
+        syncOK = synchronizeCalendar( mCalendar, calendar, mSyncManager->mSyncAlgoPrefs );
         getEventViewerDialog()->setSyncMode( false );
         qApp->processEvents();
         if (  syncOK ) {
-            if ( KOPrefs::instance()->mWriteBackFile )
+            if ( mSyncManager->mWriteBackFile )
             {
                 // write back XML file
 
             }
         setModified( true );
         }
     } else {
         QString question = i18n("Sorry, the file loading\ncommand failed!\n\nNothing synced!\n") ;
         QMessageBox::information( 0, i18n("KO/Pi Sync - ERROR"),
                                       question, i18n("Ok")) ;
     }
     delete calendar;
     updateView();
     return syncOK;
 
 
 #endif
 
 }
     
 void CalendarView::setSyncEventsReadOnly()
 {
     Event * ev;
     QPtrList<Event> eL = mCalendar->rawEvents(); 
     ev = eL.first();
     while ( ev ) {
         if ( ev->uid().left(15) == QString("last-syncEvent-") )
             ev->setReadOnly( true );
         ev =  eL.next();
     } 
 }
 bool CalendarView::openCalendar(QString filename, bool merge)
 {
 
     if (filename.isEmpty()) {
         return false;
     }
 
     if (!QFile::exists(filename)) {
         KMessageBox::error(this,i18n("File does not exist:\n '%1'.").arg(filename));
         return false;
     }
 
     globalFlagBlockAgenda = 1;
     if (!merge) mCalendar->close();
 
     mStorage->setFileName( filename );
 
     if ( mStorage->load() ) {
         if ( merge ) ;//setModified( true );
         else {
             //setModified( true );
             mViewManager->setDocumentId( filename );
             mDialogManager->setDocumentId( filename );
             mTodoList->setDocumentId( filename );
         }
         globalFlagBlockAgenda = 2;
         // if ( getLastSyncEvent() )
         //  getLastSyncEvent()->setReadOnly( true );
         mCalendar->reInitAlarmSettings();
         setSyncEventsReadOnly();
         updateUnmanagedViews();
         updateView();
         setLoadedFileVersion( QDateTime::currentDateTime().addSecs( -1 ));
         if (  filename != MainWindow::defaultFileName() ) {
             saveCalendar( MainWindow::defaultFileName() );
             watchSavedFile();
         }
         return true;
     } else {
         // while failing to load, the calendar object could
         // have become partially populated.  Clear it out.
         if ( !merge ) {
             mCalendar->close();
             mViewManager->setDocumentId( filename );
             mDialogManager->setDocumentId( filename );
             mTodoList->setDocumentId( filename );
         }
 
         //KMessageBox::error(this,i18n("Couldn't load calendar\n '%1'.").arg(filename));
 
         QTimer::singleShot ( 1, this, SLOT ( showOpenError() ) ); 
         globalFlagBlockAgenda = 2;
         mCalendar->reInitAlarmSettings();
         setSyncEventsReadOnly();
         updateUnmanagedViews();
         updateView();
     }
     return false;
 }
 void CalendarView::showOpenError()
 {
    KMessageBox::error(this,i18n("Couldn't load calendar\n."));
 }
 void CalendarView::setLoadedFileVersion(QDateTime dt)
 {
     loadedFileVersion = dt;
 }
 bool CalendarView::checkFileChanged(QString fn)
 {
     QFileInfo finf ( fn ); 
     if ( !finf.exists() )
         return true;
     QDateTime dt = finf.lastModified ();
     if ( dt <= loadedFileVersion )
         return false;
     return true;
 
 }
 void CalendarView::watchSavedFile()
 {
   QFileInfo finf ( MainWindow::defaultFileName());   
   if ( !finf.exists() )
     return;
   QDateTime dt = finf.lastModified ();
   if ( dt < loadedFileVersion ) {
       //qDebug("watch %s %s ",  dt.toString().latin1(), loadedFileVersion.toString().latin1());
     QTimer::singleShot( 1000 , this, SLOT ( watchSavedFile()  ) );
     return;
   }
   loadedFileVersion = dt;
 }
 
 bool CalendarView::checkFileVersion(QString fn)
 {
     QFileInfo finf ( fn );  
     if ( !finf.exists() )
         return true;
     QDateTime dt = finf.lastModified ();
     //qDebug("loaded file version %s",loadedFileVersion.toString().latin1());
     //qDebug("file on disk version  %s",dt.toString().latin1());
     if ( dt <= loadedFileVersion )
         return true;
    int km = KMessageBox::warningYesNoCancel(this, i18n("\nThe file on disk has changed!\nFile size: %1 bytes.\nLast modified: %2\nDo you want to:\n\n - Save and overwrite file?\n - Sync with file, then save?\n - Cancel without saving? \n").arg( QString::number( finf.size())).arg( KGlobal::locale()->formatDateTime(finf.lastModified (), true, true)) ,
                                                  i18n("KO/Pi Warning"),i18n("Overwrite"),
                                                  i18n("Sync+save"));
    
    if ( km ==  KMessageBox::Cancel )
        return false;
    if ( km ==  KMessageBox::Yes )
        return true;
 
     setSyncDevice("deleteaftersync" );
-    KOPrefs::instance()->mAskForPreferences = true;
-    KOPrefs::instance()->mSyncAlgoPrefs = 3;
-    KOPrefs::instance()->mWriteBackFile = false;
-    KOPrefs::instance()->mWriteBackExistingOnly = false;
-    KOPrefs::instance()->mShowSyncSummary = false;
+    mSyncManager->mAskForPreferences = true;
+    mSyncManager->mSyncAlgoPrefs = 3;
+    mSyncManager->mWriteBackFile = false;
+    mSyncManager->mWriteBackExistingOnly = false;
+    mSyncManager->mShowSyncSummary = false;
     syncCalendar( fn, 3 );
     Event * e = getLastSyncEvent();
     mCalendar->deleteEvent ( e );
     updateView();
     return true;
 }
 
 bool CalendarView::saveCalendar( QString filename )
 {
  
     // Store back all unsaved data into calendar object
     // qDebug("file %s %d ",  filename.latin1()           , mViewManager->currentView()         );
     if ( mViewManager->currentView() )
         mViewManager->currentView()->flushView();
 
     //mStorage->setFileName( filename );
 
     mStorage->setSaveFormat( new ICalFormat() );
     mStorage->setFileName( filename );
     bool success;
     success = mStorage->save();
     if ( !success ) {
         return false;
     }
 
     return true;
 }
 
 void CalendarView::closeCalendar()
 {
  
     // child windows no longer valid
     emit closingDown();
 
     mCalendar->close();
     setModified(false);
     updateView();
 }
 
 void CalendarView::archiveCalendar()
 {
     mDialogManager->showArchiveDialog();
 }
 
 
 void CalendarView::readSettings()
 {
  
   
     // mViewManager->showAgendaView();
     QString str;
     //qDebug("CalendarView::readSettings() ");
     // read settings from the KConfig, supplying reasonable
     // defaults where none are to be found
     KConfig *config = KOGlobals::config();
 #ifndef KORG_NOSPLITTER
     config->setGroup("KOrganizer Geometry");
 
     QValueList<int> sizes = config->readIntListEntry("Separator1");
     if (sizes.count() != 2) {
         sizes << mDateNavigator->minimumSizeHint().width();
         sizes << 300;
     }
     mPanner->setSizes(sizes);
 
     sizes = config->readIntListEntry("Separator2");
     if ( ( mResourceView && sizes.count() == 4 ) ||
          ( !mResourceView && sizes.count() == 3 ) ) {
         mLeftSplitter->setSizes(sizes);
     }
 #endif
     globalFlagBlockAgenda = 1;
     mViewManager->showAgendaView();
     //mViewManager->readSettings( config );
     mTodoList->restoreLayout(config,QString("Todo Layout"));
     readFilterSettings(config);
     config->setGroup( "Views" );
     int dateCount = config->readNumEntry( "ShownDatesCount", 7 );
     if ( dateCount == 5 ) mNavigator->selectWorkWeek();
     else if ( dateCount == 7 ) mNavigator->selectWeek();
     else mNavigator->selectDates( dateCount );
     // mViewManager->readSettings( config );
     updateConfig(); 
     globalFlagBlockAgenda = 2;
     mViewManager->readSettings( config );
 #ifdef DESKTOP_VERSION
     config->setGroup("WidgetLayout");
     QStringList list;
     list = config->readListEntry("MainLayout");
     int x,y,w,h;
     if ( ! list.isEmpty() ) {
         x = list[0].toInt();
         y = list[1].toInt();
         w = list[2].toInt();
         h = list[3].toInt();
         topLevelWidget()->setGeometry(x,y,w,h);
 
     } else {
         topLevelWidget()->setGeometry( 40 ,40 , 640, 440);
     }
     list = config->readListEntry("EditEventLayout");
     if ( ! list.isEmpty() ) {
         x = list[0].toInt();
         y = list[1].toInt();
         w = list[2].toInt();
         h = list[3].toInt();
         mEventEditor->setGeometry(x,y,w,h);
 
     }
     list = config->readListEntry("EditTodoLayout");
     if ( ! list.isEmpty() ) {
         x = list[0].toInt();
         y = list[1].toInt();
         w = list[2].toInt();
         h = list[3].toInt();
         mTodoEditor->setGeometry(x,y,w,h);
 
     }
     list = config->readListEntry("ViewerLayout");
     if ( ! list.isEmpty() ) {
         x = list[0].toInt();
         y = list[1].toInt();
         w = list[2].toInt();
         h = list[3].toInt();
         getEventViewerDialog()->setGeometry(x,y,w,h);
     }
 #endif
 
 }
 
 
 void CalendarView::writeSettings()
 {
     //  kdDebug() << "CalendarView::writeSettings" << endl;
 
     KConfig *config = KOGlobals::config();
 
 #ifndef KORG_NOSPLITTER
     config->setGroup("KOrganizer Geometry");
 
     QValueList<int> list = mPanner->sizes();
     config->writeEntry("Separator1",list);
 
     list = mLeftSplitter->sizes();
     config->writeEntry("Separator2",list);
 #endif
 
     mViewManager->writeSettings( config );
     mTodoList->saveLayout(config,QString("Todo Layout"));
     mDialogManager->writeSettings( config );
     //KOPrefs::instance()->usrWriteConfig();
     KOPrefs::instance()->writeConfig();
 
     writeFilterSettings(config);
 
     config->setGroup( "Views" );
     config->writeEntry( "ShownDatesCount", mNavigator->selectedDates().count() );
 
 #ifdef DESKTOP_VERSION
     config->setGroup("WidgetLayout");
     QStringList list ;//= config->readListEntry("MainLayout");
     int x,y,w,h;
     QWidget* wid;
     wid = topLevelWidget();
     x = wid->geometry().x();
     y = wid->geometry().y();
     w = wid->width();
     h = wid->height();
     list.clear();
     list << QString::number( x );
     list << QString::number( y );
     list << QString::number( w );
     list << QString::number( h );
     config->writeEntry("MainLayout",list );
     
     wid = mEventEditor;
     x = wid->geometry().x();
     y = wid->geometry().y();
     w = wid->width();
     h = wid->height();
     list.clear();
     list << QString::number( x );
     list << QString::number( y );
     list << QString::number( w );
     list << QString::number( h );
     config->writeEntry("EditEventLayout",list );
  
     wid = mTodoEditor;
     x = wid->geometry().x();
     y = wid->geometry().y();
     w = wid->width();
     h = wid->height();
     list.clear();
     list << QString::number( x );
     list << QString::number( y );
     list << QString::number( w );
     list << QString::number( h );
     config->writeEntry("EditTodoLayout",list ); 
     wid = getEventViewerDialog();
     x = wid->geometry().x();
     y = wid->geometry().y();
     w = wid->width();
     h = wid->height();
     list.clear();
     list << QString::number( x );
     list << QString::number( y );
     list << QString::number( w );
     list << QString::number( h );
     config->writeEntry("ViewerLayout",list ); 
     wid = mDialogManager->getSearchDialog();
     if ( wid ) {
         x = wid->geometry().x();
         y = wid->geometry().y();
         w = wid->width();
         h = wid->height();
         list.clear();
         list << QString::number( x );
         list << QString::number( y );
         list << QString::number( w );
         list << QString::number( h );
         config->writeEntry("SearchLayout",list );
     }
 #endif
 
 
     config->sync();
 }
 
 void CalendarView::readFilterSettings(KConfig *config)
 {
     //  kdDebug() << "CalendarView::readFilterSettings()" << endl;
 
     mFilters.clear();
 
     config->setGroup("General");
     QStringList filterList = config->readListEntry("CalendarFilters");
 
     QStringList::ConstIterator it = filterList.begin();
     QStringList::ConstIterator end = filterList.end();
     while(it != end) {
         //    kdDebug() << "  filter: " << (*it) << endl;
 
         CalFilter *filter;
         filter = new CalFilter(*it);
         config->setGroup("Filter_" + (*it));
         //qDebug("readFilterSettings %d ",config->readNumEntry("Criteria",0) );
         filter->setCriteria(config->readNumEntry("Criteria",0));
         filter->setCategoryList(config->readListEntry("CategoryList"));
         mFilters.append(filter);
 
         ++it;
     }
 
     if (mFilters.count() == 0) {
         CalFilter *filter = new CalFilter(i18n("Default"));
         mFilters.append(filter);
     }
     mFilterView->updateFilters();
     config->setGroup("FilterView");
 
     mFilterView->blockSignals(true);
     mFilterView->setFiltersEnabled(config->readBoolEntry("FilterEnabled"));
     mFilterView->setSelectedFilter(config->readEntry("Current Filter"));
     mFilterView->blockSignals(false);
     // We do it manually to avoid it being done twice by the above calls
     updateFilter();
 }
 
 void CalendarView::writeFilterSettings(KConfig *config)
 {
     //  kdDebug() << "CalendarView::writeFilterSettings()" << endl;
 
     QStringList filterList;
 
     CalFilter *filter = mFilters.first();
     while(filter) {
         //    kdDebug() << " fn: " << filter->name() << endl;
         filterList << filter->name();
         config->setGroup("Filter_" + filter->name());
         config->writeEntry("Criteria",filter->criteria());
         config->writeEntry("CategoryList",filter->categoryList());
         filter = mFilters.next();
     }
     config->setGroup("General");
     config->writeEntry("CalendarFilters",filterList);
 
     config->setGroup("FilterView");
     config->writeEntry("FilterEnabled",mFilterView->filtersEnabled());
     config->writeEntry("Current Filter",mFilterView->selectedFilter()->name());
 }
 
 
 void CalendarView::goToday()
 {
     mNavigator->selectToday();
 }
 
 void CalendarView::goNext()
 {
     mNavigator->selectNext();
 }
 
 void CalendarView::goPrevious()
 {
     mNavigator->selectPrevious();
 }
 void CalendarView::goNextMonth()
 {
     mNavigator->selectNextMonth();
 }
 
 void CalendarView::goPreviousMonth()
 {
     mNavigator->selectPreviousMonth();
 }
 void CalendarView::writeLocale() 
 {
     //KPimGlobalPrefs::instance()->setGlobalConfig();
 #if 0
     KGlobal::locale()->setHore24Format( !KOPrefs::instance()->mPreferredTime );
     KGlobal::locale()->setWeekStartMonday( !KOPrefs::instance()->mWeekStartsOnSunday );
     KGlobal::locale()->setIntDateFormat( (KLocale::IntDateFormat)KOPrefs::instance()->mPreferredDate );
     KGlobal::locale()->setLanguage( KOPrefs::instance()->mPreferredLanguage );
     QString dummy = KOPrefs::instance()->mUserDateFormatLong;
     KGlobal::locale()->setDateFormat(dummy.replace( QRegExp("K"), QString(",") ));
     dummy = KOPrefs::instance()->mUserDateFormatShort;
     KGlobal::locale()->setDateFormatShort(dummy.replace( QRegExp("K"), QString(",") ));
     KGlobal::locale()->setDaylightSaving( KOPrefs::instance()->mUseDaylightsaving,
                                           KOPrefs::instance()->mDaylightsavingStart,
                                           KOPrefs::instance()->mDaylightsavingEnd );
     KGlobal::locale()->setTimezone( KOPrefs::instance()->mTimeZoneId );
 #endif
 }
 void CalendarView::updateConfig()
 {
     writeLocale();
     if ( KOPrefs::instance()->mUseAppColors )
         QApplication::setPalette( QPalette (KOPrefs::instance()->mAppColor1, KOPrefs::instance()->mAppColor2), true );
     emit configChanged();
     mTodoList->updateConfig();
     // mDateNavigator->setFont ( KOPrefs::instance()->mDateNavigatorFont);
     mCalendar->setTimeZoneId(KOPrefs::instance()->mTimeZoneId);
     // To make the "fill window" configurations work
     //mViewManager->raiseCurrentView();
 }
 
 
 void CalendarView::eventChanged(Event *event)
 {
     changeEventDisplay(event,KOGlobals::EVENTEDITED);
     //updateUnmanagedViews();
 }
 
 void CalendarView::eventAdded(Event *event)
 {
     changeEventDisplay(event,KOGlobals::EVENTADDED);
 }
 
 void CalendarView::eventToBeDeleted(Event *)
 {
     kdDebug() << "CalendarView::eventToBeDeleted(): to be implemented" << endl;
 }
 
 void CalendarView::eventDeleted()
 {
     changeEventDisplay(0,KOGlobals::EVENTDELETED);
 }
 void CalendarView::changeTodoDisplay(Todo *which, int action)
 {
     changeIncidenceDisplay((Incidence *)which,  action);
     mDateNavigator->updateView(); //LR
     //mDialogManager->updateSearchDialog();
 
     if (which) {
         mViewManager->updateWNview();
         //mTodoList->updateView();
     }
    
 }
 
 void CalendarView::changeIncidenceDisplay(Incidence *which, int action)
 {
     updateUnmanagedViews();
     //qDebug(" CalendarView::changeIncidenceDisplay++++++++++++++++++++++++++  %d  %d ",which, action );
     if ( action == KOGlobals::EVENTDELETED ) { //delete
         mCalendar->checkAlarmForIncidence( 0, true );
         if ( mEventViewerDialog )
             mEventViewerDialog->hide();
     } 
     else
         mCalendar->checkAlarmForIncidence( which , false );
 }
 
 // most of the changeEventDisplays() right now just call the view's
 // total update mode, but they SHOULD be recoded to be more refresh-efficient.
 void CalendarView::changeEventDisplay(Event *which, int action)
 {
     //  kdDebug() << "CalendarView::changeEventDisplay" << endl;
     changeIncidenceDisplay((Incidence *)which,  action);
     mDateNavigator->updateView();
     //mDialogManager->updateSearchDialog();
 
     if (which) {
         // If there is an event view visible update the display
         mViewManager->currentView()->changeEventDisplay(which,action);
         // TODO: check, if update needed
         //    if (which->getTodoStatus()) {
         mTodoList->updateView();
         //    }
     } else {
         mViewManager->currentView()->updateView();
     }
 }
 
 
 void CalendarView::updateTodoViews()
 {
    
     mTodoList->updateView();
     mViewManager->currentView()->updateView();
  
 }
 
 
 void CalendarView::updateView(const QDate &start, const QDate &end)
 {
     mTodoList->updateView();
     mViewManager->updateView(start, end);
     //mDateNavigator->updateView();
 }
 
 void CalendarView::updateView()
 {
     DateList tmpList = mNavigator->selectedDates();
 
     // We assume that the navigator only selects consecutive days.
     updateView( tmpList.first(), tmpList.last() );
 }
 
 void CalendarView::updateUnmanagedViews()
 {
     mDateNavigator->updateDayMatrix();
 }
 
 int CalendarView::msgItemDelete()
 {
     return KMessageBox::warningContinueCancel(this,
                                               i18n("This item will be\npermanently deleted."),
                                               i18n("KO/Pi Confirmation"),i18n("Delete"));
 }
 
 
 void CalendarView::edit_cut()
 {
     Event *anEvent=0;
 
     Incidence *incidence = mViewManager->currentView()->selectedIncidences().first();
 
     if (mViewManager->currentView()->isEventView()) {
         if ( incidence && incidence->type() == "Event" ) {
             anEvent = static_cast<Event *>(incidence);
         }
     }
 
     if (!anEvent) {
         KNotifyClient::beep();
         return;
     }
     DndFactory factory( mCalendar );
     factory.cutEvent(anEvent);
     changeEventDisplay(anEvent, KOGlobals::EVENTDELETED);
 }
 
 void CalendarView::edit_copy()
 {
     Event *anEvent=0;
 
     Incidence *incidence = mViewManager->currentView()->selectedIncidences().first();
 
     if (mViewManager->currentView()->isEventView()) {
         if ( incidence && incidence->type() == "Event" ) {
             anEvent = static_cast<Event *>(incidence);
         }
     }
 
     if (!anEvent) {
         KNotifyClient::beep();
         return;
     }
     DndFactory factory( mCalendar );
     factory.copyEvent(anEvent);
 }
 
 void CalendarView::edit_paste()
 {
     QDate date = mNavigator->selectedDates().first();
 
     DndFactory factory( mCalendar );
     Event *pastedEvent = factory.pasteEvent( date );
 
     changeEventDisplay( pastedEvent, KOGlobals::EVENTADDED );
 }
 
 void CalendarView::edit_options()
 {
     mDialogManager->showOptionsDialog();
     //writeSettings();
 }
 void CalendarView::edit_sync_options()
 {
-    //mDialogManager->showSyncOptions();
-    //KOPrefs::instance()->mSyncAlgoPrefs 
-    QDialog dia( this, "dia", true );
-    dia.setCaption( i18n("Device: " ) +mCurrentSyncDevice );
-    QButtonGroup gr ( 1,  Qt::Horizontal, i18n("Sync preferences"), &dia);
-    QVBoxLayout lay ( &dia );
-    lay.setSpacing( 2 );
-    lay.setMargin( 3 );
-    lay.addWidget(&gr);
-    QRadioButton loc ( i18n("Take local entry on conflict"), &gr );
-    QRadioButton rem ( i18n("Take remote entry on conflict"), &gr );
-    QRadioButton newest( i18n("Take newest entry on conflict"), &gr );
-    QRadioButton ask( i18n("Ask for every entry on conflict"), &gr );
-    QRadioButton f_loc( i18n("Force: Take local entry always"), &gr );
-    QRadioButton f_rem( i18n("Force: Take remote entry always"), &gr );
-    //QRadioButton both( i18n("Take both on conflict"), &gr );
-    QPushButton pb ( "OK",  &dia); 
-    lay.addWidget( &pb );
-    connect(&pb, SIGNAL( clicked() ), &dia, SLOT ( accept() ) ); 
-    switch ( KOPrefs::instance()->mSyncAlgoPrefs ) {
-    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;
-    }
-    if ( dia.exec() ) {
-        KOPrefs::instance()->mSyncAlgoPrefs = rem.isChecked()*1+newest.isChecked()*2+  ask.isChecked()*3+  f_loc.isChecked()*4+  f_rem.isChecked()*5;//+  both.isChecked()*6 ;
-    }
+    // DELETE
    
 }
 
 void  CalendarView::slotSelectPickerDate( QDate  d)
 {
     mDateFrame->hide();
     if ( mDatePickerMode == 1 ) {
         mNavigator->slotDaySelect( d );
     } else  if ( mDatePickerMode == 2 ) {
         if ( mMoveIncidence->type() == "Todo" ) {
             Todo * to = (Todo *) mMoveIncidence;
             QTime tim;
             if ( to->hasDueDate() ) 
                 tim = to->dtDue().time();
             else {
                 tim = QTime ( 0,0,0 );
                 to->setFloats( true );
                 to->setHasDueDate( true );
             }
             QDateTime dt ( d,tim );
             to->setDtDue( dt );
             todoChanged( to );
         } else { 
             QTime tim = mMoveIncidence->dtStart().time(); 
             int secs = mMoveIncidence->dtStart().secsTo(  mMoveIncidence->dtEnd());
             QDateTime dt ( d,tim );
             mMoveIncidence->setDtStart( dt );
             ((Event*)mMoveIncidence)->setDtEnd( dt.addSecs( secs ) );
             changeEventDisplay((Event*)mMoveIncidence, KOGlobals::EVENTEDITED);
         }
         
         mMoveIncidence->setRevision( mMoveIncidence->revision()+1  );
     }
 }
 
 void CalendarView::removeCategories()
 {
     QPtrList<Incidence> incList  = mCalendar->rawIncidences(); 
     QStringList catList = KOPrefs::instance()->mCustomCategories;
     QStringList catIncList;
     QStringList newCatList;
     Incidence* inc = incList.first();
     int i;
     int count = 0;
     while ( inc ) {
         newCatList.clear();
         catIncList =  inc->categories() ;
         for( i = 0; i<   catIncList.count(); ++i ) {
             if ( catList.contains (catIncList[i]))
                 newCatList.append( catIncList[i] );
         }
         newCatList.sort();
         inc->setCategories( newCatList.join(",") );
         inc = incList.next();
     }
 }
 
 int CalendarView::addCategories()
 { 
     QPtrList<Incidence> incList  = mCalendar->rawIncidences(); 
     QStringList catList = KOPrefs::instance()->mCustomCategories;
     QStringList catIncList;
     Incidence* inc = incList.first();
     int i;
     int count = 0;
      while ( inc ) {
         catIncList = inc->categories() ;
         for( i = 0; i<   catIncList.count(); ++i ) {
             if ( !catList.contains (catIncList[i])) {
                 catList.append( catIncList[i] );
                 //qDebug("add cat %s ",  catIncList[i].latin1());
                 ++count;
             }
         }
         inc = incList.next();
     }
     catList.sort();
     KOPrefs::instance()->mCustomCategories = catList;
     return count;
 }
 
 void CalendarView::manageCategories()
 {
     KOCatPrefs* cp = new KOCatPrefs(); 
     cp->show();
     int w =cp->sizeHint().width() ;
     int h = cp->sizeHint().height() ;
     int dw = QApplication::desktop()->width();
     int dh = QApplication::desktop()->height();
     cp->setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
     if ( !cp->exec() ) {
         delete cp;
         return;
     }
     int count = 0;
     if ( cp->addCat() ) {
         count = addCategories();
         if ( count ) {
             topLevelWidget()->setCaption(QString::number( count )+ i18n(" Categories added to list! "));
             writeSettings();
         }
     } else {
         removeCategories();
         updateView();
     }
     delete cp;
 }
 
 void CalendarView::beamIncidence(Incidence * Inc) 
 {
     QPtrList<Incidence> delSel ;
     delSel.append(Inc);
     beamIncidenceList( delSel );
 } 
 void CalendarView::beamCalendar() 
 {
     QPtrList<Incidence> delSel  = mCalendar->rawIncidences(); 
     //qDebug("beamCalendar()  ");
     beamIncidenceList( delSel );
 }
 void CalendarView::beamFilteredCalendar() 
 {
     QPtrList<Incidence> delSel  = mCalendar->incidences(); 
     //qDebug("beamFilteredCalendar()  ");
     beamIncidenceList( delSel );
 }
 void  CalendarView::beamIncidenceList(QPtrList<Incidence> delSel )
 {
     if ( beamDialog->exec () == QDialog::Rejected ) 
         return;
   
     QString fn = "/tmp/kopibeamfile";
     QString mes;
     bool createbup = true;
     if ( createbup ) {
         QString description = "\n";
         CalendarLocal* cal = new CalendarLocal();
         if ( beamDialog->beamLocal() )
             cal->setLocalTime();
         else
             cal->setTimeZoneId(KOPrefs::instance()->mTimeZoneId);
         Incidence *incidence = delSel.first();
         bool addText = false;
         if ( delSel.count() < 10 )
             addText = true;
         else {
             description.sprintf(i18n("  %d items?"),delSel.count() );
         }
         while ( incidence ) {
             Incidence *in = incidence->clone();
             if ( addText )
                 description += in->summary() + "\n";
             cal->addIncidence( in );
             incidence = delSel.next();
         }
         if ( beamDialog->beamVcal() ) {
             fn += ".vcs";
             FileStorage storage( cal, fn, new VCalFormat );
             storage.save();
         } else {
             fn += ".ics";
             FileStorage storage( cal, fn, new ICalFormat( ) );
             storage.save();
         }
         delete cal;
         mes = i18n("KO/Pi: Ready for beaming");
         setCaption(mes); 
         
 #ifndef DESKTOP_VERSION
         Ir *ir = new Ir( this ); 
         connect( ir, SIGNAL( done( Ir * ) ), this, SLOT( beamDone( Ir * ) ) );
         ir->send( fn, description, "text/x-vCalendar" );
 #endif
     }
 }
 void  CalendarView::beamDone( Ir *ir )
 {
 #ifndef DESKTOP_VERSION
     delete ir;
 #endif
 }
 
 void CalendarView::moveIncidence(Incidence * inc ) 
 {
     if ( !inc ) return;
     // qDebug("showDatePickerForIncidence( ) ");
     if ( mDateFrame->isVisible() )
         mDateFrame->hide();
     else {
         int w =mDatePicker->sizeHint().width()+2*mDateFrame->lineWidth() ;
         int h = mDatePicker->sizeHint().height()+2*mDateFrame->lineWidth() ;
         int dw = QApplication::desktop()->width();
         int dh = QApplication::desktop()->height();
         mDateFrame->setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
         mDateFrame->show();
     }
     mDatePickerMode = 2;
     mMoveIncidence = inc ;
     QDate da;
     if ( mMoveIncidence->type() == "Todo" ) {
         Todo * to = (Todo *) mMoveIncidence;
             if ( to->hasDueDate() ) 
                 da = to->dtDue().date();
             else
                 da = QDate::currentDate();
     } else {
         da = mMoveIncidence->dtStart().date();
     }
     mDatePicker->setDate( da );
 }
 void CalendarView::showDatePicker( ) 
 {
     //qDebug("CalendarView::showDatePicker( )  ");
     if ( mDateFrame->isVisible() )
         mDateFrame->hide();
     else {
         int w =mDatePicker->sizeHint().width() ;
         int h = mDatePicker->sizeHint().height() ;
         int dw = QApplication::desktop()->width();
         int dh = QApplication::desktop()->height();
         mDateFrame->setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
         mDateFrame->show();
     }
     mDatePickerMode = 1;
     mDatePicker->setDate( mNavigator->selectedDates().first() );
 }
 
 void CalendarView::showEventEditor()
 {
 #ifdef DESKTOP_VERSION
     mEventEditor->show();
 #else
     mEventEditor->showMaximized();
 #endif
 }
 void CalendarView::showTodoEditor()
 {
 #ifdef DESKTOP_VERSION
     mTodoEditor->show();
 #else
     mTodoEditor->showMaximized();
 #endif
 }
 
 void CalendarView::cloneIncidence()
 {
     Incidence *incidence = currentSelection();
     if ( !incidence ) incidence = mTodoList->selectedIncidences().first();
     if ( incidence ) {
         cloneIncidence(incidence);
     }
 }
 void CalendarView::moveIncidence()
 {
   Incidence *incidence = currentSelection();
     if ( !incidence ) incidence = mTodoList->selectedIncidences().first();
     if ( incidence ) {
         moveIncidence(incidence);
     }
 }
 void CalendarView::beamIncidence()
 {
   Incidence *incidence = currentSelection();
     if ( !incidence ) incidence = mTodoList->selectedIncidences().first();
     if ( incidence ) {
         beamIncidence(incidence);
     }
 }
 void CalendarView::toggleCancelIncidence()
 {
   Incidence *incidence = currentSelection();
     if ( !incidence ) incidence = mTodoList->selectedIncidences().first();
     if ( incidence ) {
         cancelIncidence(incidence);
     }
 }
 
 
 void CalendarView::cancelIncidence(Incidence * inc )
 {
     inc->setCancelled( ! inc->cancelled() );
     changeIncidenceDisplay( inc,KOGlobals::EVENTEDITED );
     updateView();
 }
 void CalendarView::cloneIncidence(Incidence * orgInc )
 { 
     Incidence * newInc = orgInc->clone();
     newInc->recreate();
  
     if ( newInc->type() == "Todo" ) {
         Todo* t = (Todo*) newInc; 
         mTodoEditor->editTodo( t );
         showTodoEditor();
         if ( mTodoEditor->exec() ) {
             mCalendar->addTodo( t );
             updateView();
         } else {
             delete t;
         }
     }
     else {
         Event*  e = (Event*)  newInc;
         mEventEditor->editEvent( e );
         showEventEditor();
         if ( mEventEditor->exec() ) {
             mCalendar->addEvent( e );
             updateView();
         } else {
             delete e;
         }
     }
 }
 
 void CalendarView::newEvent()
 {
     // TODO: Replace this code by a common eventDurationHint of KOBaseView.
     KOAgendaView *aView = mViewManager->agendaView();
     if (aView) {
         if (aView->selectionStart().isValid()) {
             if (aView->selectedIsAllDay()) {
                 newEvent(aView->selectionStart(),aView->selectionEnd(),true);
             } else {
                 newEvent(aView->selectionStart(),aView->selectionEnd());
             }
             return;
         }
     }
 
     QDate date = mNavigator->selectedDates().first();
     QDateTime current =  QDateTime::currentDateTime();
     if ( date <= current.date() ) {
         int hour = current.time().hour() +1;
         newEvent( QDateTime(  current.date(), QTime( hour, 0, 0 ) ),
                   QDateTime( current.date(), QTime( hour+ KOPrefs::instance()->mDefaultDuration, 0, 0 ) ) );
     } else
         newEvent( QDateTime( date, QTime( KOPrefs::instance()->mStartTime, 0, 0 ) ),
                   QDateTime( date, QTime( KOPrefs::instance()->mStartTime +
                                           KOPrefs::instance()->mDefaultDuration, 0, 0 ) ) );
 }
 
 void CalendarView::newEvent(QDateTime fh)
 {
     newEvent(fh,
              QDateTime(fh.addSecs(3600*KOPrefs::instance()->mDefaultDuration)));
 }
 
 void CalendarView::newEvent(QDate dt)
 {
     newEvent(QDateTime(dt, QTime(0,0,0)),
              QDateTime(dt, QTime(0,0,0)), true);
 }
 
 void CalendarView::newEvent(QDateTime fromHint, QDateTime toHint, bool allDay)
 {
   
     mEventEditor->newEvent(fromHint,toHint,allDay);
     if ( mFilterView->filtersEnabled() ) {
         CalFilter *filter = mFilterView->selectedFilter();
         if (filter && filter->showCategories()) {
             mEventEditor->setCategories(filter->categoryList().join(",") );
         }
         if ( filter )
             mEventEditor->setSecrecy( filter->getSecrecy() );
     }
     showEventEditor();
 }
 void  CalendarView::todoAdded(Todo * t)
 {
   
     changeTodoDisplay ( t ,KOGlobals::EVENTADDED);
     updateTodoViews();
 }
 void  CalendarView::todoChanged(Todo * t)
 {
     emit todoModified( t, 4 );
     // updateTodoViews();
 }
 void  CalendarView::todoToBeDeleted(Todo *)
 {
     //qDebug("todoToBeDeleted(Todo *) ");
     updateTodoViews();
 }
 void  CalendarView::todoDeleted()
 {
@@ -3387,387 +3327,407 @@ void CalendarView::processIncidenceSelection( Incidence *incidence )
         return;
     }
 
     /*  if  ( incidence && incidence->type() == "Todo" ) {
         emit todoSelected( true );
         } else {
         emit todoSelected( false );
         }*/
 }
 
 
 void CalendarView::checkClipboard()
 {
 #ifndef KORG_NODND
     if (ICalDrag::canDecode(QApplication::clipboard()->data())) {
         emit pasteEnabled(true);
     } else {
         emit pasteEnabled(false);
     }
 #endif
 }
 
 void CalendarView::showDates(const DateList &selectedDates)
 {
     //  kdDebug() << "CalendarView::selectDates()" << endl;
   
     if ( mViewManager->currentView() ) {
         updateView( selectedDates.first(), selectedDates.last() );
     } else {
         mViewManager->showAgendaView();
     }
 
     QString selDates;
     selDates = KGlobal::locale()->formatDate( selectedDates.first(), true);
     if  (selectedDates.first() < selectedDates.last() )
         selDates += " - " + KGlobal::locale()->formatDate( selectedDates.last(),true);
     topLevelWidget()->setCaption( i18n("Dates: ") + selDates );
   
 }
 
 QPtrList<CalFilter> CalendarView::filters()
 {
     return mFilters;
 
 }
 void CalendarView::editFilters()
 {
     //  kdDebug() << "CalendarView::editFilters()" << endl;
 
     CalFilter *filter = mFilters.first();
     while(filter) {
         kdDebug() << " Filter: " << filter->name() << endl;
         filter = mFilters.next();
     }
 
     mDialogManager->showFilterEditDialog(&mFilters);
 }
 void CalendarView::toggleFilter()
 {
     showFilter(! mFilterView->isVisible());
 }
 
 KOFilterView *CalendarView::filterView()
 {
     return mFilterView;
 }
 void CalendarView::selectFilter( int fil )
 {
     mFilterView->setSelectedFilter( fil );
 }
 void CalendarView::showFilter(bool visible)
 {
     if (visible) mFilterView->show();
     else mFilterView->hide();
 }
 void CalendarView::toggleFilerEnabled( )
 {
     mFilterView->setFiltersEnabled ( !mFilterView->filtersEnabled()  );
     if ( !mFilterView->filtersEnabled()   ) 
         topLevelWidget()->setCaption( i18n("Filter disabled ") );
         
 }
 void CalendarView::updateFilter()
 {
     CalFilter *filter = mFilterView->selectedFilter();
     if (filter) {
         if (mFilterView->filtersEnabled()) {
             topLevelWidget()->setCaption( i18n("Filter selected: ")+filter->name() );
             filter->setEnabled(true);
         }
         else filter->setEnabled(false);
         mCalendar->setFilter(filter);
         updateView();
     }
 }
 
 void CalendarView::filterEdited()
 {
     mFilterView->updateFilters();
     updateFilter();
     writeSettings();
 }
 
 
 void CalendarView::takeOverEvent()
 {
     Incidence *incidence = currentSelection();
 
     if (!incidence) return;
 
     incidence->setOrganizer(KOPrefs::instance()->email());
     incidence->recreate();
     incidence->setReadOnly(false);
 
     updateView();
 }
 
 void CalendarView::takeOverCalendar()
 {
     // TODO: Create Calendar::allIncidences() function and use it here
 
     QPtrList<Event> events = mCalendar->events();
     for(uint i=0; i<events.count(); ++i) {
         events.at(i)->setOrganizer(KOPrefs::instance()->email());
         events.at(i)->recreate();
         events.at(i)->setReadOnly(false);
     }
 
     QPtrList<Todo> todos = mCalendar->todos();
     for(uint i=0; i<todos.count(); ++i) {
         todos.at(i)->setOrganizer(KOPrefs::instance()->email());
         todos.at(i)->recreate();
         todos.at(i)->setReadOnly(false);
     }
 
     QPtrList<Journal> journals = mCalendar->journals();
     for(uint i=0; i<journals.count(); ++i) {
         journals.at(i)->setOrganizer(KOPrefs::instance()->email());
         journals.at(i)->recreate();
         journals.at(i)->setReadOnly(false);
     }
 
     updateView();
 }
 
 void CalendarView::showIntro()
 {
     kdDebug() << "To be implemented." << endl;
 }
 
 QWidgetStack *CalendarView::viewStack()
 {
     return mRightFrame;
 }
 
 QWidget *CalendarView::leftFrame()
 {
     return mLeftFrame;
 }
 
 DateNavigator *CalendarView::dateNavigator()
 {
     return mNavigator;
 }
 
 KDateNavigator* CalendarView::dateNavigatorWidget()
 {
     return mDateNavigator;
 }
 void CalendarView::toggleDateNavigatorWidget()
 {
     if (mDateNavigator->isVisible())
         mDateNavigator->hide();
     else
         mDateNavigator->show();
 }
 void CalendarView::addView(KOrg::BaseView *view)
 {
     mViewManager->addView(view);
 }
 
 void CalendarView::showView(KOrg::BaseView *view)
 {
     mViewManager->showView(view, mLeftFrame->isVisible());
 }
 
 Incidence *CalendarView::currentSelection()
 {
     return mViewManager->currentSelection();
 }
 void CalendarView::toggleAllDaySize()
 {
     /*
     if ( KOPrefs::instance()->mAllDaySize > 47 )
         KOPrefs::instance()->mAllDaySize = KOPrefs::instance()->mAllDaySize /2;
     else
         KOPrefs::instance()->mAllDaySize = KOPrefs::instance()->mAllDaySize *2;
     */
     viewManager()->agendaView()->toggleAllDay();
 }
 void CalendarView::toggleExpand()
 {
     //  if ( mLeftFrame->isHidden() ) {
     //     mLeftFrame->show(); 
     //     emit calendarViewExpanded( false );
     //   } else {
     //     mLeftFrame->hide();
     //     emit calendarViewExpanded( true );
     //   }
 
     globalFlagBlockAgenda = 1;
     emit calendarViewExpanded( !mLeftFrame->isHidden() );
     globalFlagBlockAgenda = 5;
     mViewManager->raiseCurrentView( !mLeftFrame->isHidden() );
     //mViewManager->showView( 0, true );
 }
 
 void CalendarView::calendarModified( bool modified, Calendar * )
 {
     setModified( modified );
 }
 
 Todo *CalendarView::selectedTodo()
 {
     Incidence *incidence = currentSelection();
     if ( incidence && incidence->type() == "Todo" ) {
         return static_cast<Todo *>( incidence );
     }
 
     incidence = mTodoList->selectedIncidences().first();
     if ( incidence && incidence->type() == "Todo" ) {
         return static_cast<Todo *>( incidence );
     }
 
     return 0;
 }
 
 void CalendarView::dialogClosing(Incidence *in)
 {
     // mDialogList.remove(in);
 }
 
 void CalendarView::showIncidence()
 {
     Incidence *incidence = currentSelection();
     if ( !incidence ) incidence = mTodoList->selectedIncidences().first();
     if ( incidence ) {
         ShowIncidenceVisitor v;
         v.act( incidence, this );
     }
 }
 void CalendarView::editIncidenceDescription()
 { 
     mFlagEditDescription = true;
     editIncidence();
     mFlagEditDescription = false;
 }
 void CalendarView::editIncidence()
 {
     // qDebug("editIncidence() ");
     Incidence *incidence = currentSelection();
     if ( !incidence ) incidence = mTodoList->selectedIncidences().first();
     if ( incidence ) {
         EditIncidenceVisitor v;
         v.act( incidence, this );
     }
 }
 
 void CalendarView::deleteIncidence()
 {
     Incidence *incidence = currentSelection();
     if ( !incidence ) incidence = mTodoList->selectedIncidences().first();
     if ( incidence ) {
         deleteIncidence(incidence);
     }
 }
 
 void CalendarView::showIncidence(Incidence *incidence)
 {
     if ( incidence ) {
         ShowIncidenceVisitor v;
         v.act( incidence, this );
     }
 }
 
 void CalendarView::editIncidence(Incidence *incidence)
 { 
     if ( incidence ) {
        
         EditIncidenceVisitor v;
         v.act( incidence, this );
         
     }
 }
 
 void CalendarView::deleteIncidence(Incidence *incidence)
 {
     //qDebug(" CalendarView::deleteIncidence ");
     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() ) {
             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\ncompleted To-Dos?"),i18n("Purge To-Dos"),i18n("Purge"));
 
     if (result == KMessageBox::Continue) {
 
         QPtrList<Todo> todoCal;
         QPtrList<Todo> rootTodos;
         //QPtrList<Incidence> rel;
         Todo *aTodo;//, *rTodo;
         Incidence *rIncidence;
         bool childDelete = false;
         bool deletedOne = true;
         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()
 {
    ; 
 }
 
 NavigatorBar *CalendarView::navigatorBar()
 {
     return mNavigatorBar;
 }
 
 
 
 void CalendarView::keyPressEvent ( QKeyEvent *e) 
 {
     //qDebug(" alendarView::keyPressEvent ");
     e->ignore();
 }
 
-//#include "calendarview.moc"
 
-//#include "calendarviewbase.moc"
+bool CalendarView::sync(KSyncManager* manager, QString filename, int mode)
+{
+    // mSyncManager = manager;
+    mCurrentSyncDevice = mSyncManager->getCurrentSyncDevice();
+    mCurrentSyncName = mSyncManager->getCurrentSyncName();
+    return syncCalendar( filename, mode );
+}
+bool CalendarView::syncExternal(KSyncManager* manager, QString resource)
+{
+    //mSyncManager = manager;
+    mCurrentSyncDevice = mSyncManager->getCurrentSyncDevice();
+    mCurrentSyncName = mSyncManager->getCurrentSyncName();
+    if ( resource == "sharp" )
+        syncExternal( 0 );
+    if ( resource == "phone" )
+         syncExternal( 1 );  
+    // pending setmodified
+}
+void CalendarView::setSyncManager(KSyncManager* manager)
+{
+   mSyncManager = manager;
+}
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index 8d329a9..751b8d9 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -1,599 +1,606 @@
 /*
     This file is part of KOrganizer.
     Copyright (c) 2000, 2001
     Cornelius Schumacher <schumacher@kde.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program 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 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 CALENDARVIEW_H
 #define CALENDARVIEW_H
 
 #include <qframe.h>
 #include <qlayout.h>
 #include <qwidget.h>
 #include <qptrlist.h>
 #include <qvbox.h>
 #include <qmap.h>
 #ifndef DESKTOP_VERSION
 #include <qtopia/ir.h> 
 #else
 #define Ir char
 #endif
 #include <libkcal/calendar.h>
 #include <libkcal/scheduler.h>
 #include <libkcal/calendarresources.h>
 #include <libkcal/resourcecalendar.h>
 
 #include <korganizer/calendarviewbase.h>
 
+#include <ksyncmanager.h>
+
 class QWidgetStack;
 class QSplitter;
 
 class CalPrinter;
 class KOFilterView;
 class KOViewManager;
 class KODialogManager;
 class KOTodoView;
 class KDateNavigator;
 class DateNavigator;
 class KOIncidenceEditor;
 class KDatePicker;
 class ResourceView;
 class NavigatorBar; 
 class KOEventEditor;
 class KOTodoEditor ;
 class KOEventViewerDialog;
 class KOBeamPrefs;
 class KSyncProfile;
 class AlarmDialog;
 class KCal::Attendee;
 
 namespace KCal { class FileStorage; }
 
 using namespace KCal;
 
 /**
   This is the main calendar widget. It provides the different vies on t he
   calendar data as well as the date navigator. It also handles synchronisation
   of the different views and controls the different dialogs like preferences,
   event editor, search dialog etc.
   
   @short main calendar view widget
   @author Cornelius Schumacher
 */
-class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Observer
+class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Observer, public KSyncInterface
 {
     Q_OBJECT
   public:
     /**
       Constructs a new calendar view widget.
 
       @param calendar calendar document
       @param parent   parent window
       @param name     Qt internal widget object name
     */
     CalendarView( CalendarResources *calendar, QWidget *parent = 0,
                   const char *name = 0 );
     CalendarView( Calendar *calendar, QWidget *parent = 0,
                   const char *name = 0 );
     virtual ~CalendarView();
   
     Calendar *calendar() { return mCalendar; }
 
     KOViewManager *viewManager();
     KODialogManager *dialogManager();
 
     QDate startDate();
     QDate endDate();
 
     QWidgetStack *viewStack();
     QWidget *leftFrame();
     NavigatorBar *navigatorBar();
 
     DateNavigator *dateNavigator();
     KDateNavigator *dateNavigatorWidget();
 
     void addView(KOrg::BaseView *);
     void showView(KOrg::BaseView *);
     KOEventViewerDialog* getEventViewerDialog();
     Incidence *currentSelection();
 
   signals:
     /** This todo has been modified */
     void todoModified(Todo *, int);
   
     /** when change is made to options dialog, the topwidget will catch this
      *  and emit this signal which notifies all widgets which have registered 
      *  for notification to update their settings. */
     void configChanged();
     /** emitted when the topwidget is closing down, so that any attached
         child windows can also close. */
     void closingDown();
     /** emitted right before we die */
     void closed(QWidget *);
     
     /** Emitted when state of modified flag changes */
     void modifiedChanged(bool);
     void signalmodified();
   
     /** Emitted when state of read-only flag changes */
     void readOnlyChanged(bool);
   
     /** Emitted when the unit of navigation changes */
     void changeNavStringPrev(const QString &);
     void changeNavStringNext(const QString &);
   
     /** Emitted when state of events selection has changed and user is organizer*/
     void organizerEventsSelected(bool);
     /** Emitted when state of events selection has changed and user is attendee*/
     void groupEventsSelected(bool);
     /**
       Emitted when an incidence gets selected. If the selection is cleared the
       signal is emitted with 0 as argument.
     */
     void incidenceSelected( Incidence * );
     /** Emitted, when a todoitem is selected or deselected. */
     void todoSelected( bool );
 
     /**
       Emitted, when clipboard content changes. Parameter indicates if paste
       is possible or not.
     */
     void pasteEnabled(bool);
     
     /** Emitted, when the number of incoming messages has changed. */
     void numIncomingChanged(int);
 
     /** Emitted, when the number of outgoing messages has changed. */
     void numOutgoingChanged(int);
 
     /** Send status message, which can e.g. be displayed in the status bar. */
     void statusMessage(const QString &);
     
     void calendarViewExpanded( bool );
     void updateSearchDialog();
 
 
   public slots:
     void showOpenError();
     void watchSavedFile();
     void recheckTimerAlarm();
     void checkNextTimerAlarm();
     void addAlarm(const QDateTime &qdt, const QString &noti  );
     void addSuspendAlarm(const QDateTime &qdt, const QString &noti  );
     void removeAlarm(const QDateTime &qdt, const QString &noti  );
 
     /** options dialog made a changed to the configuration. we catch this
      *  and notify all widgets which need to update their configuration. */
     void updateConfig();
 
     void insertBirthdays(const QString& uid, const QStringList& birthdayList, 
 			 const QStringList& anniversaryList, const QStringList& realNameList,
 			 const QStringList& emailList, const QStringList& assembledNameList,
 			 const QStringList& uidList);
 
     /**
       Load calendar from file \a filename. If \a merge is true, load 
       calendar into existing one, if it is false, clear calendar, before
       loading. Return true, if calendar could be successfully loaded.
     */
     bool openCalendar(QString filename, bool merge=false);
     bool syncCalendar(QString filename,int mode = 0 );
 
     /**
       Save calendar data to file. Return true if calendar could be
       successfully saved.
     */
     bool saveCalendar(QString filename);
   
     /**
       Close calendar. Clear calendar data and reset views to display an empty
       calendar.
     */
     void closeCalendar();
   
     /** Archive old events of calendar */
     void archiveCalendar();
 
     void showIncidence();
     void editIncidence();
     void editIncidenceDescription();
     void deleteIncidence();
     void cloneIncidence();
     void moveIncidence();
     void beamIncidence();
     void toggleCancelIncidence();
   
     /** create an editeventwin with supplied date/time, and if bool is true,
      * make the event take all day. */
     void newEvent(QDateTime, QDateTime, bool allDay = false);
     void newEvent(QDateTime fh);
     void newEvent(QDate dt);
     /** create new event without having a date hint. Takes current date as
      default hint. */ 
     void newEvent();
     void newFloatingEvent();
 
     /** Create a read-only viewer dialog for the supplied incidence. It calls the correct showXXX method*/
     void showIncidence(Incidence *);
     /** Create an editor for the supplied incidence. It calls the correct editXXX method*/
     void editIncidence(Incidence *);
     /** Delete the supplied incidence. It calls the correct deleteXXX method*/
     void deleteIncidence(Incidence *);
     void cloneIncidence(Incidence *);
     void cancelIncidence(Incidence *);
     /** Create an editor for the supplied event. */
     void editEvent(Event *);
     /** Delete the supplied event. */
     void deleteEvent(Event *);
     /** Delete the event with the given unique ID. Returns false, if event wasn't
     found. */
     bool deleteEvent(const QString &uid);
     /** Create a read-only viewer dialog for the supplied event. */
     void showEvent(Event *);
 
     void editJournal(Journal *);
     void showJournal(Journal *);
     void deleteJournal(Journal *);
     /** Create an editor dialog for a todo */
     void editTodo(Todo *);
     /** Create a read-only viewer dialog for the supplied todo */
     void showTodo(Todo *);
     /** create new todo */
     void newTodo();
     /** create new todo with a parent todo */
     void newSubTodo();
     /** create new todo with a parent todo */
     void newSubTodo(Todo *);
     /** Delete todo */
     void deleteTodo(Todo *);
 
             
     /** Check if clipboard contains vCalendar event. The signal pasteEnabled() is
      * emitted as result. */
     void checkClipboard();
     
     /** using the KConfig associated with the kapp variable, read in the
      * settings from the config file. 
      */
     void readSettings();
     
     /** write current state to config file. */
     void writeSettings();
 
     /** read settings for calendar filters */
     void readFilterSettings(KConfig *config);
     
     /** write settings for calendar filters */
     void writeFilterSettings(KConfig *config);
 
     /** passes on the message that an event has changed to the currently
      * activated view so that it can make appropriate display changes. */
     void changeEventDisplay(Event *, int);
     void changeIncidenceDisplay(Incidence *, int);
     void changeTodoDisplay(Todo *, int);
   
     void eventAdded(Event *);
     void eventChanged(Event *);
     void eventToBeDeleted(Event *);
     void eventDeleted();
   
     void todoAdded(Todo *);
     void todoChanged(Todo *);
     void todoToBeDeleted(Todo *);
     void todoDeleted();
 
     void updateView(const QDate &start, const QDate &end);
     void updateView();
   
     /** Full update of visible todo views */
     void updateTodoViews();
 
     void updateUnmanagedViews();
   
     /** cut the current appointment to the clipboard */
     void edit_cut();
   
     /** copy the current appointment(s) to the clipboard */
     void edit_copy();
 
     /** paste the current vobject(s) in the clipboard buffer into calendar */
     void edit_paste();
   
     /** edit viewing and configuration options. */
     void edit_options();
     void edit_sync_options();
     /**
       Functions for printing, previewing a print, and setting up printing
       parameters.
     */
     void print();
     void printSetup();
     void printPreview();
 
     /** Export as iCalendar file */
     void exportICalendar();
   
     /** Export as vCalendar file */
     bool exportVCalendar( QString fn);
   
     /** pop up a dialog to show an existing appointment. */
     void appointment_show();
     /**
      * pop up an Appointment Dialog to edit an existing appointment.	Get
      * information on the appointment from the list of unique IDs that is
      * currently in the View, called currIds.
      */
     void appointment_edit();
     /**
      * pop up dialog confirming deletion of currently selected event in the
      * View.
      */
     void appointment_delete();
 
     /** mails the currently selected event to a particular user as a vCalendar
       attachment. */
     void action_mail();
 
     /* frees a subtodo from it's relation */
     void todo_unsub( Todo * );
 
     /** Take ownership of selected event. */
     void takeOverEvent();
 
     /** Take ownership of all events in calendar. */
     void takeOverCalendar();
   
     /** query whether or not the calendar is "dirty". */
     bool isModified();
     /** set the state of calendar. Modified means "dirty", i.e. needing a save. */
     void setModified(bool modified=true);
 
     /** query if the calendar is read-only. */
     bool isReadOnly();
     /** set state of calendar to read-only */
     void setReadOnly(bool readOnly=true);
 
     void eventUpdated(Incidence *);
 
     /* 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();
     void dialogClosing(Incidence *);
   
     /** 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 syncSharp( );
     void syncPhone( );
     void syncExternal( int mode );
     void slotSelectPickerDate( QDate ) ;
     void showDatePicker( ) ;
     void moveIncidence(Incidence *) ;
     void beamIncidence(Incidence *) ;
     void beamCalendar() ;
     void beamFilteredCalendar() ;
     void beamIncidenceList(QPtrList<Incidence>) ;
     void manageCategories();
     int addCategories();
     void removeCategories();
     void setSyncDevice( QString );
     void setSyncName( QString );
   protected slots:
     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 );
   
   public:
     // show a standard warning
     // returns KMsgBox::yesNoCancel()
-    int msgCalModified();
+    int msgCalModified(); 
+    virtual bool sync(KSyncManager* manager, QString filename, int mode);
+
+    virtual bool syncExternal(KSyncManager* manager, QString resource);
     void confSync();
+    void setSyncManager(KSyncManager* manager);
     void setLoadedFileVersion(QDateTime);
     bool checkFileVersion(QString fn);
     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);
   protected:
     void schedule(Scheduler::Method, Incidence *incidence = 0);
     
     // returns KMsgBox::OKCandel()
     int msgItemDelete();
     void showEventEditor();
     void showTodoEditor();
     void writeLocale();
     Todo *selectedTodo();
 
   private:
+    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;
     KOBeamPrefs* beamDialog;
     void init();
     int mDatePickerMode;
     bool mFlagEditDescription;
     QDateTime mLastCalendarSync;
     void createPrinter();
 
     void calendarModified( bool, Calendar * );
 
     CalPrinter *mCalPrinter;
 
     QSplitter    *mPanner;
     QSplitter    *mLeftSplitter;
     QWidget      *mLeftFrame;
     QWidgetStack *mRightFrame;
 
     KDatePicker* mDatePicker;
     QVBox* mDateFrame;
     NavigatorBar *mNavigatorBar;
 
     KDateNavigator *mDateNavigator;       // widget showing small month view.
 
     KOFilterView *mFilterView;
 
     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;
 
     // various housekeeping variables.
     bool            mModified;	   // flag indicating if calendar is modified
     bool            mReadOnly; // flag indicating if calendar is read-only
     QDate mSaveSingleDate;
 
     Incidence *mSelectedIncidence;
     Incidence *mMoveIncidence;
     KOTodoView *mTodoList;
     KOEventEditor * mEventEditor;
     KOTodoEditor  * mTodoEditor;
     KOEventViewerDialog * mEventViewerDialog;
     void keyPressEvent ( QKeyEvent *e) ;
     //QMap<Incidence*,KOIncidenceEditor*> mDialogList;
 };
 
 
 class CalendarViewVisitor : public Incidence::Visitor
 {
   public:
     CalendarViewVisitor() : mView( 0 ) {}
 
     bool act( Incidence *incidence, CalendarView *view )
     {
       mView = view;
       return incidence->accept( *this );
     }
     
   protected:
     CalendarView *mView;
 };
 
 class ShowIncidenceVisitor : public CalendarViewVisitor
 {
   protected:
     bool visit( Event *event ) { mView->showEvent( event ); return true; }  
     bool visit( Todo *todo ) { mView->showTodo( todo ); return true; }  
     bool visit( Journal * j ) { mView->showJournal( j );return true; }
 };
 
 class EditIncidenceVisitor : public CalendarViewVisitor
 {
   protected:
     bool visit( Event *event ) { mView->editEvent( event ); return true; }  
     bool visit( Todo *todo ) { mView->editTodo( todo ); return true; }  
     bool visit( Journal *j ) {  mView->editJournal( j); return true; }
 };
 
 class DeleteIncidenceVisitor : public CalendarViewVisitor
 {
   protected:
     bool visit( Event *event ) { mView->deleteEvent( event ); return true; }  
     bool visit( Todo *todo ) { mView->deleteTodo( todo ); return true; }  
     bool visit( Journal * j) {mView->deleteJournal( j ); return true; }
 };
 
 #endif
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index 1210094..13035e0 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -1,573 +1,570 @@
 /*
     This file is part of KOrganizer.
     Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program 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 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.
 */
 
 #include <time.h>
 #ifndef _WIN32_
 #include <unistd.h>
 #endif
 #include <qdir.h>
 #include <qtextstream.h>
 #include <qtextcodec.h>
 #include <qstring.h>
 #include <qregexp.h>
 #include <qfont.h>
 #include <qcolor.h>
 #include <qstringlist.h>
 #include <stdlib.h>
 
 #include <kglobal.h>
 #include <kconfig.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kemailsettings.h>
 #include <kstaticdeleter.h>
 #include <libkdepim/kpimglobalprefs.h>
 
 #include "koprefs.h"
 #include "mainwindow.h"
 
 const char *germanwords[][2] = { 
 #include "wordsgerman.h"
   "", ""
 };
 
 KOPrefs *KOPrefs::mInstance = 0;
 static KStaticDeleter<KOPrefs> insd;
 
 KOPrefs::KOPrefs() :
   KPimPrefs("korganizerrc")
 {
   mCategoryColors.setAutoDelete(true);
   mLocaleDict = 0;
   fillMailDefaults();
   mDefaultCategoryColor           = QColor(175,210,255);//196,196,196);
   QColor defaultHolidayColor      = QColor(255,0,0);
   QColor defaultHighlightColor    = QColor(129,112,255);//64,64,255);
   QColor defaultAgendaBgColor     = QColor(239,241,169);//128,128,128);
   QColor defaultWorkingHoursColor = QColor(170,223,150);//160,160,160);
   QColor defaultTodoDueTodayColor = QColor(255,220,100);
   QColor defaultTodoOverdueColor  = QColor(255,153,125);
 
   mTimeBarFont = QFont("helvetica",10);//,QFont::Bold);
   mDefaultViewFont = QFont("helvetica",10);
   mDefaultMonthViewFont = QFont("helvetica",8);
   mMarcusBainsFont= QFont("helvetica",10);
   mDateNavigatorFont= QFont("helvetica",10, QFont::Bold);
   mEditBoxFont = QFont("helvetica",12);
   mJornalViewFont = QFont("helvetica",12);
 
   KPrefs::setCurrentGroup("General");
 
 
   addItemBool("Enable Group Scheduling",&mEnableGroupScheduling,false);
 
   addItemBool("ShowIconNewTodo",&mShowIconNewTodo,true);
   addItemBool("ShowIconNewEvent",&mShowIconNewEvent,true);
   addItemBool("ShowIconSearch",&mShowIconSearch,true);
   addItemBool("ShowIconList",&mShowIconList,true);
   addItemBool("ShowIconDay1",&mShowIconDay1,true);
   addItemBool("ShowIconDay5",&mShowIconDay5,true);
   addItemBool("ShowIconDay7",&mShowIconDay7,true);
   addItemBool("ShowIconMonth",&mShowIconMonth,true);
   addItemBool("ShowIconTodoview",&mShowIconTodoview,true);
   addItemBool("ShowIconBackFast",&mShowIconBackFast,true);
   addItemBool("ShowIconBack",&mShowIconBack,true);
   addItemBool("ShowIconToday",&mShowIconToday,true);
   addItemBool("ShowIconForward",&mShowIconForward,true);
   addItemBool("ShowIconForwardFast",&mShowIconForwardFast,true);
   addItemBool("ShowIconWhatsThis",&mShowIconWhatsThis,false);
   addItemBool("ShowIconNextDays",&mShowIconNextDays,true);
   addItemBool("ShowIconNext",&mShowIconNext,true);
   addItemBool("ShowIconJournal",&mShowIconJournal,true); 
   addItemBool("ShowIconStretch",&mShowIconStretch,true); 
   addItemBool("LanguageChanged",&mLanguageChanged,false); 
 
   addItemBool("AskForQuit",&mAskForQuit,false); 
 
 #ifndef DESKTOP_VERSION
   addItemBool("ShowFullMenu",&mShowFullMenu,false); 
 #else
   addItemBool("ShowFullMenu",&mShowFullMenu,true); 
 #endif
   addItemBool("ToolBarHor",&mToolBarHor, true );
   addItemBool("ToolBarUp",&mToolBarUp, false );
   addItemBool("ToolBarMiniIcons",&mToolBarMiniIcons, false );
   addItemInt("Whats Next Days",&mWhatsNextDays,3);
   addItemInt("Whats Next Prios",&mWhatsNextPrios,1);
 
   addItemBool("ShowTodoInAgenda",&mShowTodoInAgenda,true);
   addItemBool("ShowCompletedTodo",&mShowCompletedTodo,true);
   addItemInt("AllDay Size",&mAllDaySize,28);
   QString defAlarm = KGlobal::iconLoader()->iconPath()+"koalarm.wav";
   addItemString("DefaultAlarmFile",&mDefaultAlarmFile,defAlarm );
 
   addItemStringList("LocationDefaults",&mLocationDefaults );
   addItemStringList("EventSummary User",&mEventSummaryUser);
   addItemStringList("TodoSummary User",&mTodoSummaryUser);
 
   addItemBool("Enable Group Scheduling",&mEnableGroupScheduling,false);
   addItemBool("Enable Project View",&mEnableProjectView,false);
   addItemBool("Auto Save",&mAutoSave,false);
   addItemInt("Auto Save Interval",&mAutoSaveInterval,3);
   addItemBool("Confirm Deletes",&mConfirm,true);
   addItemString("Archive File",&mArchiveFile);
   addItemString("Html Export File",&mHtmlExportFile,
       QDir::homeDirPath() + "/" + i18n("Default export file", "calendar.html"));
   addItemBool("Html With Save",&mHtmlWithSave,false);
 
   KPrefs::setCurrentGroup("Personal Settings");
 
   addItemInt("Mail Client",&mMailClient,MailClientKMail);
   addItemBool("Use Control Center Email",&mEmailControlCenter,false);
   addItemBool("Bcc",&mBcc,false);
 
   KPrefs::setCurrentGroup("Time & Date");
 
   // addItemString("Time Zone",&mTimeZone,"+0100");
   addItemString("TimeZoneName",&mTimeZoneId,i18n ("+01:00 Europe/Oslo(CET)") );
   // addItemInt("TimeZoneOffset",&mTimeZoneOffset,60);
   addItemBool("UseDaylightsaving",&mUseDaylightsaving,true);
   addItemInt("DaylightsavingStart",&mDaylightsavingStart,90);
   addItemInt("DaylightsavingEnd",&mDaylightsavingEnd,304);
 
 
   addItemInt("Default Start Time",&mStartTime,10);
   addItemInt("Default Duration",&mDefaultDuration,2);
   addItemInt("Default Alarm Time",&mAlarmTime,3);
   addItemInt("Daylight Savings",&mDaylightSavings,0);
   KPrefs::setCurrentGroup("AlarmSettings");
   addItemInt("AlarmPlayBeeps",&mAlarmPlayBeeps,20);
   addItemInt("AlarmSuspendTime",&mAlarmSuspendTime,7);
   addItemInt("AlarmSuspendCount",&mAlarmSuspendCount,5);
   addItemInt("AlarmBeepInterval",&mAlarmBeepInterval,3);
 
 
   KPrefs::setCurrentGroup("Calendar");
 
   addItemInt("Default Calendar Format",&mDefaultFormat,FormatICalendar);
 
   KPrefs::setCurrentGroup("Fonts");
   // qDebug(" KPrefs::setCurrentGroup(Fonts); ");
   addItemFont("TimeBar Font",&mTimeBarFont);
   addItemFont("MonthView Font",&mMonthViewFont);
   addItemFont("AgendaView Font",&mAgendaViewFont);
   addItemFont("MarcusBains Font",&mMarcusBainsFont);
   addItemFont("TimeLabels Font",&mTimeLabelsFont);
   addItemFont("TodoView Font",&mTodoViewFont);
   addItemFont("ListView Font",&mListViewFont);
   addItemFont("DateNavigator Font",&mDateNavigatorFont);
   addItemFont("EditBox Font",&mEditBoxFont);
   addItemFont("JournalView Font",&mJornalViewFont);
   addItemFont("WhatsNextView Font",&mWhatsNextFont);
   addItemFont("EventView Font",&mEventViewFont);
 
 //   KPrefs::setCurrentGroup("SyncProfiles");
 //   addItemString("LocalMachineName",&mLocalMachineName, "undefined");
 //   addItemStringList("SyncProfileNames",&mSyncProfileNames);
 //   addItemStringList("ExternSyncProfiles",&mExternSyncProfileNames);
 
   KPrefs::setCurrentGroup("RemoteSyncing");
 //   addItemBool("UsePasswd",&mUsePassWd,false); 
 //   addItemBool("WriteBackFile",&mWriteBackFile,true);
 //   addItemBool("WriteBackExistingOnly",&mWriteBackExistingOnly,false);
 //   addItemBool("AskForPreferences",&mAskForPreferences,true); 
 //   addItemBool("ShowSyncSummary",&mShowSyncSummary,true);
   addItemString("ActiveSyncPort",&mActiveSyncPort,"9197" );  
   addItemString("ActiveSyncIP",&mActiveSyncIP,"192.168.0.40" ); 
   addItemBool("ShowSyncEvents",&mShowSyncEvents,false); 
   addItemInt("LastSyncTime",&mLastSyncTime,0); 
-  addItemInt("SyncAlgoPrefs",&mSyncAlgoPrefs,3); 
-  addItemInt("RingSyncAlgoPrefs",&mRingSyncAlgoPrefs,3);
 
 #ifdef _WIN32_
   QString hdp= locateLocal("data","korganizer")+"\\\\";
 #else
   QString hdp= locateLocal("data","korganizer")+"/";
 #endif
 //   addItemString("RemoteIP",&mRemoteIP, "192.168.0.65");
 //   addItemString("RemoteUser",&mRemoteUser, "zaurus");
 //   addItemString("RemotePassWd",&mRemotePassWd, "");
 //   addItemString("RemoteFile", &mRemoteFile, hdp+"mycalendar.ics");
 //   addItemString("LocalTempFile",&mLocalTempFile, "/tmp/tempsyncfile.ics" );
 
 
   KPrefs::setCurrentGroup("LoadSaveFileNames");
 
   addItemString("LastImportFile", &mLastImportFile ,hdp +"import.ics" );
   addItemString("LastVcalFile", &mLastVcalFile ,hdp +"export.vcs" );
   addItemString("LastSaveFile", &mLastSaveFile ,hdp +"mybackup.ics" );
   addItemString("LastLoadFile", &mLastLoadFile ,hdp +"mybackup.ics" );
-  addItemString("LastSyncedLocalFile", &mLastSyncedLocalFile ,hdp +"lastsync.ics" );
  
 
   KPrefs::setCurrentGroup("Locale");
   addItemInt("PreferredLanguage",&mPreferredLanguage,0);
   addItemInt("PreferredTime",&mPreferredTime,0);
   addItemInt("PreferredDate",&mPreferredDate,0);
   addItemBool("WeekStartsOnSunday",&mWeekStartsOnSunday,false); 
   addItemBool("ShortDateInViewer",&mShortDateInViewer,false); 
   addItemString("UserDateFormatLong", &mUserDateFormatLong, "%A %d %b %y");
   addItemString("UserDateFormatShort", &mUserDateFormatShort, "%aK %d.%m.%y");
 
 
   KPrefs::setCurrentGroup("Colors");
   addItemColor("Holiday Color",&mHolidayColor,defaultHolidayColor);
   addItemColor("Highlight Color",&mHighlightColor,defaultHighlightColor);
   addItemColor("Event Color",&mEventColor,mDefaultCategoryColor);
   addItemColor("Agenda Background Color",&mAgendaBgColor,defaultAgendaBgColor);
   addItemColor("WorkingHours Color",&mWorkingHoursColor,defaultWorkingHoursColor);
   addItemColor("Todo due today Color",&mTodoDueTodayColor,defaultTodoDueTodayColor);
   addItemColor("Todo overdue Color",&mTodoOverdueColor,defaultTodoOverdueColor);
   addItemColor("MonthViewEvenColor",&mMonthViewEvenColor,QColor( 160,160,255 ));
   addItemColor("MonthViewOddColor",&mMonthViewOddColor,QColor( 160,255,160 ));
   addItemColor("MonthViewHolidayColor",&mMonthViewHolidayColor,QColor( 255,160,160 ));
   addItemBool("MonthViewUsesDayColors",&mMonthViewUsesDayColors,true); 
   addItemBool("MonthViewSatSunTog",&mMonthViewSatSunTog,true);
   addItemBool("HightlightDateTimeEdit",&mHightlightDateTimeEdit,false); 
   addItemColor("AppColor1",&mAppColor1,QColor( 130,170,255 ));
   addItemColor("AppColor2",&mAppColor2,QColor(  174,216,255 ));
   addItemBool("UseAppColors",&mUseAppColors,false); 
 
   
 
   KPrefs::setCurrentGroup("Views");
   addItemInt("Hour Size",&mHourSize,8);
   addItemBool("Show Daily Recurrences",&mDailyRecur,true);
   addItemBool("Show Weekly Recurrences",&mWeeklyRecur,true);
   addItemBool("Show Month Daily Recurrences",&mMonthDailyRecur,true);
   addItemBool("Show Month Weekly Recurrences",&mMonthWeeklyRecur,true);
   addItemBool("ShowShortMonthName",&mMonthShowShort,false);
   addItemBool("ShowIconsInMonthCell",&mMonthShowIcons,true);
   addItemBool("Enable ToolTips",&mEnableToolTips,false);
   addItemBool("Enable MonthView ScrollBars",&mEnableMonthScroll,false);
   addItemBool("Marcus Bains shows seconds",&mMarcusBainsShowSeconds,false);
   addItemBool("Show Marcus Bains",&mMarcusBainsEnabled,true);
   addItemBool("EditOnDoubleClick",&mEditOnDoubleClick,true);
   addItemBool("ViewChangeHoldFullscreen",&mViewChangeHoldFullscreen,false);
   addItemBool("ViewChangeHoldNonFullscreen",&mViewChangeHoldNonFullscreen,false);
   addItemBool("CenterOnCurrentTime",&mCenterOnCurrentTime,false);
   addItemBool("SetTimeToDayStartAt",&mSetTimeToDayStartAt,true);
   addItemBool("HighlightCurrentDay",&mHighlightCurrentDay,true);
   addItemBool("WNViewShowsParents",&mWNViewShowsParents,true);
   addItemBool("WNViewShowLocation",&mWNViewShowLocation,false);
   addItemBool("UseHighlightLightColor",&mUseHighlightLightColor,false);
   addItemBool("ListViewMonthTimespan",&mListViewMonthTimespan,true);
   addItemBool("TodoViewUsesCatColors",&mTodoViewUsesCatColors,false);
   addItemBool("TodoViewShowsPercentage",&mTodoViewShowsPercentage,false);
   addItemBool("TodoViewUsesSmallFont",&mTodoViewUsesSmallFont,false);
   addItemBool("TodoViewUsesForegroundColor",&mTodoViewUsesForegroundColor,false);
   addItemBool("MonthViewUsesForegroundColor",&mMonthViewUsesForegroundColor,false);
 #ifdef DESKTOP_VERSION
   addItemBool("UseInternalAlarmNotification",&mUseInternalAlarmNotification,true);
 #else
   addItemBool("UseInternalAlarmNotification",&mUseInternalAlarmNotification,false);
 #endif
   addItemInt("Day Begins",&mDayBegins,7);
   addItemInt("Working Hours Start",&mWorkingHoursStart,8);
   addItemInt("Working Hours End",&mWorkingHoursEnd,17);
   addItemBool("Exclude Holidays",&mExcludeHolidays,true);
   addItemBool("Exclude Saturdays",&mExcludeSaturdays,true);
 
   addItemBool("Month View Uses Category Color",&mMonthViewUsesCategoryColor,false);
   addItemBool("Full View Month",&mFullViewMonth,true);
   addItemBool("Full View Todo",&mFullViewTodo,true);
   addItemBool("Quick Todo",&mEnableQuickTodo,false);
 
   addItemInt("Next X Days",&mNextXDays,3);
 
   KPrefs::setCurrentGroup("Printer");
 
   KPrefs::setCurrentGroup("Layout");
 
   addItemBool("CompactDialogs",&mCompactDialogs,false);
   addItemBool("VerticalScreen",&mVerticalScreen,true);
 
   KPrefs::setCurrentGroup("KOrganizer Plugins");
 
   addItemStringList("SelectedPlugins",&mSelectedPlugins,"holidays");
 
   KPrefs::setCurrentGroup("Group Scheduling");
 
   addItemInt("IMIPScheduler",&mIMIPScheduler,IMIPKMail);
   addItemInt("IMIPSend",&mIMIPSend,IMIPdirectsend);
   addItemStringList("AdditionalMails",&mAdditionalMails,"");
   addItemInt("IMIP auto refresh",&mIMIPAutoRefresh,neverAuto);
   addItemInt("IMIP auto insert request",&mIMIPAutoInsertRequest,neverAuto);
   addItemInt("IMIP auto insert reply",&mIMIPAutoInsertReply,neverAuto);
   addItemInt("IMIP auto FreeBusy",&mIMIPAutoFreeBusy,neverAuto);
   addItemInt("IMIP auto save FreeBusy",&mIMIPAutoFreeBusyReply,neverAuto);
 
   KPrefs::setCurrentGroup( "Editors" );
 
   addItemStringList( "EventTemplates", &mEventTemplates );
   addItemStringList( "TodoTemplates", &mTodoTemplates );
 
   addItemInt("DestinationPolicy",&mDestination,standardDestination);
 
 
 
 }
 
 
 KOPrefs::~KOPrefs()
 {
   if (mInstance == this)
       mInstance = insd.setObject(0); 
   setLocaleDict( 0 );
   if ( mLocaleDict )
       delete mLocaleDict;
   //qDebug("KOPrefs::~KOPrefs() ");
 }
 
 
 KOPrefs *KOPrefs::instance()
 {
   if (!mInstance) {
       mInstance = insd.setObject(new KOPrefs());
       mInstance->readConfig();
   }
 
   return mInstance;
 }
 
 void KOPrefs::usrSetDefaults()
 {
    
 }
 
 void KOPrefs::fillMailDefaults()
 {
   if (mName.isEmpty()) mName = i18n("Anonymous");
   if (mEmail.isEmpty()) mEmail = i18n("nobody@nowhere");
 }
 
 void KOPrefs::setTimeZoneIdDefault()
 {
   mTimeZoneId = i18n("+01:00 Europe/Oslo(CET)");
 }
 
 void KOPrefs::setCategoryDefaults()
 {
   mCustomCategories.clear();
   mCustomCategories = getDefaultList();
 
   QStringList::Iterator it;
   for (it = mCustomCategories.begin();it != mCustomCategories.end();++it ) {
     setCategoryColor(*it,mDefaultCategoryColor);
   }
 }
 
 QStringList KOPrefs::getDefaultList()
 {
     QStringList retval ;
     retval << i18n("Anniversary") << i18n("Appointment") << i18n("Birthday") << i18n("Business") << i18n("Business Travel") << i18n("Cinema")  << i18n("Customer")
            << i18n("Break")<< i18n("Breakfast")<< i18n("Competition")<< i18n("Dinner")
            << i18n("Education")<< i18n("Family")  << i18n("Favorites")  << i18n("Festival")<< i18n("Fishing")<< i18n("Flight") << i18n("Gifts")  
            << i18n("Holiday") << i18n("Holiday Cards")<< i18n("Hot Contacts") << i18n("Hiking") << i18n("Hunting") << i18n("Key Customer") << i18n("Kids") 
                     << i18n("Lunch")  << i18n("Meeting") << i18n("Miscellaneous") << i18n("Partner")<< i18n("Party") << i18n("Personal") << i18n("Personal Travel")
            << i18n("PHB") << i18n("Phone Calls") << i18n("Projects") << i18n("Recurring") << i18n("School") << i18n("Shopping")
            << i18n("Speach")  << i18n("Special Occasion") << i18n("Sports") << i18n("Talk") << i18n("Travel") << i18n("TV")<< i18n("University")
            << i18n("Vacation") << i18n("VIP") << i18n("SyncEvent")  ;
     retval.sort();
     return retval; 
 }
 
 void KOPrefs::usrReadConfig()
 {
     mPreferredLanguage = KPimGlobalPrefs::instance()->mPreferredLanguage;
     mLocaleDict = 0;
     // pending LR fix translation
     // qDebug("KOPrefs::usrReadConfig() fix translation ");
     if ( mPreferredLanguage > 0 && mPreferredLanguage < 4 ) {
         if ( mPreferredLanguage == 1 ) {
             mLocaleDict = new QDict<QString>;
             int i = 0;
             QString fw ( germanwords[i] [0]);
             while ( !fw.isEmpty() ) {
                 mLocaleDict->insert( fw, new QString (germanwords[i] [1] ));
                 ++i;
                 fw = germanwords[i] [0];
             }
         
             setLocaleDict( mLocaleDict );
         } else {
             QString fileName ;
             if ( mPreferredLanguage == 3 ) 
                 fileName = MainWindow::resourcePath()+"usertranslation.txt"; 
             else if ( mPreferredLanguage == 2 ) 
                 fileName = MainWindow::resourcePath()+"frenchtranslation.txt";
             QFile file( fileName );
             if (file.open( IO_ReadOnly ) ) {
                 QTextStream ts( &file );
                 ts.setEncoding( QTextStream::Latin1 );
                 //ts.setCodec( QTextCodec::latin1 );
                 QString  text = ts.read();
                 file.close();  
                 text.replace( QRegExp("\\\\n"), "\n" );
                 QString line;
                 QString we;
                 QString wt;
                 int br = 0;
                 int nbr;
                 nbr = text.find ( "},", br );
                 line = text.mid( br, nbr - br );
                 br = nbr+1;
                 int se, ee, st, et;
                 mLocaleDict = new QDict<QString>;
                 QString end = "{ \"\",\"\" }";
                 while ( (line != end) && (br > 1)  ) {
                     //qDebug("%d *%s* ", br, line.latin1());
                     se = line.find("\"")+1;
                     et = line.findRev("\"",-1);
                     ee = line.find("\",\"");
                     st = ee+3;
                     we = line.mid( se, ee-se );
                     wt = line.mid( st, et-st );
                     //qDebug("*%s* *%s* ", we.latin1(), wt.latin1());
                     mLocaleDict->insert( we, new QString (wt) );
                     nbr = text.find ( "}", br );
                     line = text.mid( br, nbr - br );
                     br = nbr+1;
                 }
                 //qDebug("end *%s* ", end.latin1());
 
                 setLocaleDict( mLocaleDict );
             } else {
                 qDebug("KO: Cannot find translation file %s",fileName.latin1() );
             }
     
         }
     }
     config()->setGroup("General");
     
     mCustomCategories = config()->readListEntry("Custom Categories");
     if ( KOPrefs::instance()->mLanguageChanged ) {
         mLocationDefaults.clear();
         mEventSummaryUser.clear();
         mTodoSummaryUser.clear();
     }
    if (mLocationDefaults.isEmpty()) {
        mLocationDefaults << i18n("Home") << i18n("Office") << i18n("Library") << i18n("School") << i18n("Doctor") << i18n("Beach") 
                          << i18n("University") << i18n("Restaurant")  << i18n("Bar") << i18n("Conference room") << i18n("Cinema")  << i18n("Lake") << i18n("Kindergarten")
                          << i18n("Germany") << i18n("Sweden") << i18n("Forest") << i18n("Desert") << i18n("Kitchen") ;
        // << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") << i18n("")
        mLocationDefaults.sort();
     }
        
    if (mEventSummaryUser.isEmpty()) {
         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));
    
   }
   
   if (mTimeZoneId.isEmpty()) {
     setTimeZoneIdDefault();
   }
   KPimPrefs::usrReadConfig();
 }
 
 
 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;
   }
 
 
   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) {
     KEMailSettings settings;
     return settings.getSetting(KEMailSettings::EmailAddress);
   } else {
     return mEmail;
   }
 }
 KConfig* KOPrefs::getConfig()
 {
     return config();
 }
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h
index ff09e19..03df59b 100644
--- a/korganizer/koprefs.h
+++ b/korganizer/koprefs.h
@@ -1,312 +1,292 @@
 /*
     This file is part of KOrganizer.
     Copyright (c) 2000,2001 Cornelius Schumacher <schumacher@kde.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program 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 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 <qdict.h>
 
 #include <libkdepim/kpimprefs.h>
 
 class KConfig;
 class QFont;
 class QColor;
 class QStringList;
 
 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();
 
   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;
     QDict<QString> *mLocaleDict;
     QStringList getDefaultList();
   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;
 
     QString mTimeZone;
     //QString mTimeZoneName; // e.g. +00:04:00 Indian/Mauritius
     //int     mTimeZoneOffset; // e.g. -240 min
     int     mStartTime;
     int     mDefaultDuration;
     int     mAlarmTime;
     int     mDaylightSavings;
 
     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  mAgendaBgColor;
     QColor  mWorkingHoursColor;
     QColor  mTodoDueTodayColor;
     QColor  mTodoOverdueColor;
     QColor  mMonthViewEvenColor;
     QColor  mMonthViewOddColor;
     QColor  mMonthViewHolidayColor;
     bool mMonthViewUsesDayColors;
     bool mMonthViewSatSunTog;
     QColor  mAppColor1;
     QColor  mAppColor2;
     bool mUseAppColors;
 
     int     mDayBegins;
     int     mHourSize;
     int     mAllDaySize;
     bool    mShowFullMenu;
     bool    mDailyRecur;
     bool    mWeeklyRecur;
     bool    mMonthDailyRecur;
     bool    mMonthWeeklyRecur;
     bool    mMonthShowIcons;
     bool    mMonthShowShort;
     bool    mEnableToolTips;
     bool    mEnableMonthScroll;
     bool    mFullViewMonth;
     bool    mMonthViewUsesCategoryColor;
     bool    mFullViewTodo;
     bool    mShowCompletedTodo;
     bool    mMarcusBainsEnabled;
     int     mNextXDays;
     int     mWhatsNextDays;
     int     mWhatsNextPrios;
     bool    mEnableQuickTodo;
     bool    mLanguageChanged;
 
     bool    mCompactDialogs;
     bool    mVerticalScreen;
 
     bool mShowIconNewTodo;
     bool mShowIconNewEvent;
     bool mShowIconSearch;
     bool mShowIconList;
     bool mShowIconDay1;
     bool mShowIconDay5;
     bool mShowIconDay7;
     bool mShowIconMonth;
     bool mShowIconTodoview;
     bool mShowIconBackFast;
     bool mShowIconBack;
     bool mShowIconToday;
     bool mShowIconForward;
     bool mShowIconForwardFast;
     bool mShowIconWhatsThis;
     bool mShowIconNextDays;
     bool mShowIconNext;
     bool mShowIconJournal;
     
     bool mShowIconStretch;
 
     bool mToolBarHor;
     bool mToolBarUp;
     bool mToolBarMiniIcons;
 
     bool mAskForQuit;
     bool mUsePassWd;
-    bool mWriteBackFile;
-    int  mWriteBackInFuture;
-    bool mAskForPreferences;
-    bool mShowSyncSummary;
     bool mShowSyncEvents;
     bool mShowTodoInAgenda;
-    bool mWriteBackExistingOnly;
-
-    QString mRemoteIP;
-    QString mRemoteUser;
-    QString mRemotePassWd;
-    QString mRemoteFile;
-    QString mLocalTempFile;
-    QString mPhoneDevice;
-    QString mPhoneConnection;
-    QString mPhoneModel;
 
     int mLastSyncTime;
-    int mSyncAlgoPrefs;
-    int mRingSyncAlgoPrefs;
-    QStringList mSyncProfileNames;
-    QStringList mExternSyncProfiles;
-    QString mLocalMachineName;
     void setCategoryColor(QString cat,const QColor & color);
     QColor *categoryColor(QString cat);
 
     QString mArchiveFile;
     QString mHtmlExportFile;
     bool    mHtmlWithSave;
 
     QStringList mSelectedPlugins;
   
     QString mLastImportFile;
     QString mLastVcalFile;
     QString mLastSaveFile;
     QString mLastLoadFile;
-    QString mLastSyncedLocalFile;
 
 
     QString mDefaultAlarmFile;
     int mIMIPScheduler;
     int mIMIPSend;
     QStringList mAdditionalMails;
     int mIMIPAutoRefresh;
     int mIMIPAutoInsertReply;
     int mIMIPAutoInsertRequest;
     int mIMIPAutoFreeBusy;
     int mIMIPAutoFreeBusyReply;
 
     QStringList mTodoTemplates;
     QStringList mEventTemplates;
 
     int mDestination;
 
 
     bool mEditOnDoubleClick;
     bool mViewChangeHoldFullscreen;
     bool mViewChangeHoldNonFullscreen;
     bool mCenterOnCurrentTime;
     bool mSetTimeToDayStartAt;
     bool mHighlightCurrentDay;
     bool mUseHighlightLightColor;
     bool mListViewMonthTimespan;
     bool mWNViewShowsParents;
     bool mWNViewShowLocation;
     bool mTodoViewShowsPercentage;
     bool mTodoViewUsesCatColors;
     bool mTodoViewUsesSmallFont;
     bool mTodoViewUsesForegroundColor;
     bool mMonthViewUsesForegroundColor;
 
     bool mHightlightDateTimeEdit;
     bool mShortDateInViewer;
 
     QStringList mLocationDefaults;
     QStringList mEventSummaryUser;
     QStringList mTodoSummaryUser;
 
     bool mUseInternalAlarmNotification;
     int mAlarmPlayBeeps;
     int mAlarmSuspendTime;
     int mAlarmSuspendCount;
     int mAlarmBeepInterval;
 
   
     QString mActiveSyncPort;
     QString mActiveSyncIP;
 
 
     //US I copied the following settings into KPimGlobalPrefs
     // that allows us later to easily remove the settings from here.
     int mPreferredDate;
     QString mUserDateFormatLong;
     QString mUserDateFormatShort;
     int mPreferredLanguage;
     int mPreferredTime;
     bool mWeekStartsOnSunday;
     QString mTimeZoneId;
     bool mUseDaylightsaving;
     int mDaylightsavingStart;
     int mDaylightsavingEnd;
 
 
   private:
     QDict<QColor> mCategoryColors;
     QColor mDefaultCategoryColor;
 
     QFont mDefaultTimeBarFont;
     QFont mDefaultViewFont;
     QFont mDefaultMonthViewFont;
 
     QString mName;
     QString mEmail;
 };
 
 #endif
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index e3324ee..f7766f8 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -1,2348 +1,1838 @@
 #include <stdlib.h>
 
 #include <qaction.h>
 #include <qpopupmenu.h>
 #include <qpainter.h>
 #include <qwhatsthis.h>
 #include <qpushbutton.h>
 #include <qmessagebox.h>
 #include <qlineedit.h>
 #include <qtextcodec.h>
 #include <qfile.h>
 #include <qdir.h>
 #include <qapp.h>
 #include <qfileinfo.h>
 #include <qlabel.h>
 #include <qspinbox.h>
 #include <qcheckbox.h>
 #include <qmap.h>
 #include <qwmatrix.h>
 #include <qtextbrowser.h>
 #include <qtextstream.h>
 #ifndef DESKTOP_VERSION
 #include <qpe/global.h>
 #include <qpe/qpemenubar.h>
 #include <qpe/qpetoolbar.h>
 #include <qpe/resource.h>
 #include <qpe/qpeapplication.h>
 #include <qtopia/alarmserver.h>
 #include <qtopia/qcopenvelope_qws.h>
 #include <unistd.h> // for sleep
 #else
 #include <qmenubar.h>
 #include <qtoolbar.h>
 #include <qapplication.h>
 //#include <resource.h>
 
 #endif
 #include <libkcal/calendarlocal.h>
 #include <libkcal/todo.h>
 #include <libkcal/phoneformat.h>
 #include <libkdepim/ksyncprofile.h>
 #include <libkdepim/phoneaccess.h>
 #include <libkcal/kincidenceformatter.h>
 #include <libkdepim/kpimglobalprefs.h>
 
 #include "calendarview.h"
 #include "koviewmanager.h"
 #include "datenavigator.h"
 #include "koagendaview.h"
 #include "koagenda.h"
 #include "kodialogmanager.h"
 #include "kdialogbase.h"
 #include "kapplication.h"
 #include "kofilterview.h"
 #include "kstandarddirs.h"
 #include "koprefs.h"
 #include "kfiledialog.h"
 #include "koglobals.h"
 #include "kglobal.h"
 #include "klocale.h"
 #include "kconfig.h"
 #include "simplealarmclient.h"
 #include "externalapphandler.h"
 
 using namespace KCal;
 #ifndef _WIN32_
 #include <unistd.h>
 #else
 #include "koimportoldialog.h"
 #endif
 #include "mainwindow.h"
 
 class KOex2phonePrefs : public QDialog
 {
   public:
     KOex2phonePrefs( QWidget *parent=0, const char *name=0 ) :
       QDialog( parent, name, true ) 
     {
         setCaption( i18n("Export to phone options") );
         QVBoxLayout* lay = new QVBoxLayout( this );
         lay->setSpacing( 3 );
         lay->setMargin( 3 );
         QLabel *lab;
         lay->addWidget(lab = new QLabel( i18n("Please read Help-Sync Howto\nto know what settings to use."), this ) );  
         lab->setAlignment (AlignHCenter  ); 
         QHBox* temphb;
         temphb = new QHBox( this );
         new QLabel( i18n("I/O device: "), temphb ); 
         mPhoneDevice = new QLineEdit( temphb);
         lay->addWidget( temphb );
         temphb = new QHBox( this );
         new QLabel( i18n("Connection: "), temphb ); 
         mPhoneConnection = new QLineEdit( temphb);
         lay->addWidget( temphb );
         temphb = new QHBox( this );
         new QLabel( i18n("Model(opt.): "), temphb ); 
         mPhoneModel = new QLineEdit( temphb);
         lay->addWidget( temphb );
         mWriteBackFuture= new QCheckBox( i18n("Write back events in future only"), this );
         mWriteBackFuture->setChecked( true );
         lay->addWidget( mWriteBackFuture );
         temphb = new QHBox( this );
         new QLabel( i18n("Max. weeks in future: ") , temphb );
         mWriteBackFutureWeeks= new QSpinBox(1,104, 1, temphb);
         mWriteBackFutureWeeks->setValue( 8 );
         lay->addWidget( temphb );  
         lay->addWidget(lab = new QLabel( i18n("NOTE: This will remove all old\ntodo/calendar data on phone!"), this ) );  
         lab->setAlignment (AlignHCenter  ); 
         QPushButton * ok = new QPushButton( i18n("Export to mobile phone!"), this );
         lay->addWidget( ok );
         QPushButton * cancel = new QPushButton( i18n("Cancel"), this );
         lay->addWidget( cancel );
         connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() )  );
         connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject())  );
         resize( 220, 240 );
         
     }
    
 public:
     QLineEdit* mPhoneConnection, *mPhoneDevice, *mPhoneModel; 
     QCheckBox* mWriteBackFuture;
     QSpinBox* mWriteBackFutureWeeks;
 };
 
 int globalFlagBlockStartup;
 MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
     QMainWindow( parent, name )
 {
-    mPassWordPiSync = "abc";
+  
 #ifdef DESKTOP_VERSION
     setFont( QFont("Arial"), 14 );
 #endif
     mServerSocket = 0;
     mClosed = false;
     //QString confFile = KStandardDirs::appDir() + "config/korganizerrc";
     QString confFile = locateLocal("config","korganizerrc");
     QFileInfo finf ( confFile );
     bool showWarning =  !finf.exists();
     setIcon(SmallIcon( "ko24" )  );
     mBlockAtStartup = true;
     mFlagKeyPressed = false;
     setCaption("KOrganizer/Pi");
     KOPrefs *p = KOPrefs::instance();
     KPimGlobalPrefs::instance()->setGlobalConfig();
-   //  if ( QApplication::desktop()->height() > 480 ) {
-//         if ( p->mHourSize == 4 )
-//             p->mHourSize = 6;
-//     }
     if ( p->mHourSize >  18 )
         p->mHourSize = 18;
     QMainWindow::ToolBarDock tbd;
     if ( p->mToolBarHor ) {
         if ( p->mToolBarUp )
             tbd = Bottom;
         else
             tbd = Top;
     }
     else {
         if ( p->mToolBarUp )
             tbd = Right;
         else
             tbd = Left;
     }
     if ( KOPrefs::instance()->mUseAppColors )
         QApplication::setPalette( QPalette (KOPrefs::instance()->mAppColor1, KOPrefs::instance()->mAppColor2), true );
     globalFlagBlockStartup = 1;
     iconToolBar = new QPEToolBar( this );
     addToolBar (iconToolBar , tbd );
-    mBlockSaveFlag = false;
     mCalendarModifiedFlag = false;
 
     QLabel* splash  = new QLabel(i18n("KO/Pi is starting ... "), this );
     splash->setAlignment ( AlignCenter );
     setCentralWidget( splash );
 #ifndef DESKTOP_VERSION
     showMaximized();
 #endif
     //qDebug("Mainwidget x %d y %d w %d  h %d",  x(), y(), width(), height ());
     setDefaultPreferences();
     mCalendar = new CalendarLocal();
     mView = new CalendarView( mCalendar, this,"mCalendar " );
     mView->hide();
     //mView->resize(splash->size() );
-    initActions();
+    initActions(); 
+    mSyncManager = new KSyncManager((QWidget*)this, (KSyncInterface*)mView, KSyncManager::KOPI, KOPrefs::instance(), syncMenu);
+    mSyncManager->setBlockSave(false);
+    mView->setSyncManager(mSyncManager);
 #ifndef DESKTOP_VERSION
     iconToolBar->show();
     qApp->processEvents();
 #endif
     //qDebug("Splashwidget x %d y %d w %d  h %d", splash-> x(), splash->y(), splash->width(),splash-> height ());
     int vh = height() ;
     int vw = width();
     //qDebug("Toolbar hei %d ",iconToolBar->height() );
     if ( iconToolBar->orientation () == Qt:: Horizontal ) {
         vh -=  iconToolBar->height();
     } else {
         vw -= iconToolBar->height();
     }
     //mView->setMaximumSize( splash->size() );
     //mView->resize( splash->size() );
     //qDebug("MainView x %d y %d w %d  h %d",  mView->x(),mView-> y(), mView->width(), mView->height ());
     mView->readSettings();
     bool newFile = false;
     if( !QFile::exists( defaultFileName() ) ) {
         QFileInfo finfo ( defaultFileName() );
         QString oldFile = QDir::convertSeparators(  QDir::homeDirPath()+"/Applications/korganizer/mycalendar.ics");
         qDebug("oldfile %s ", oldFile.latin1());
         QString message = "You are starting KO/Pi for the\nfirst time after updating to a\nversion >= 1.9.1. The location of the\ndefault calendar file has changed.\nA mycalendar.ics file was detected\nat the old location.\nThis file will be loaded now\nand stored at the new location!\n(Config file location has changed, too!)\nPlease read menu Help-What's New!\n";
         finfo.setFile( oldFile );
         if (finfo.exists() ) {
             KMessageBox::information( this, message);
             mView->openCalendar( oldFile );
             qApp->processEvents();
         } else {
             oldFile = QDir::convertSeparators(  QDir::homeDirPath()+"/korganizer/mycalendar.ics");
             finfo.setFile( oldFile );
             if (finfo.exists() ) {
                 KMessageBox::information( this, message);
                 mView->openCalendar( oldFile );
                 qApp->processEvents();
             }
         }
         mView->saveCalendar( defaultFileName() );
         newFile = true;
     }
 
     QTime neededSaveTime = QDateTime::currentDateTime().time();
     mView->openCalendar( defaultFileName() );
     int msNeeded = neededSaveTime.msecsTo( QDateTime::currentDateTime().time() );
     qDebug("KO: Calendar loading time: %d ms",msNeeded );
 
     if ( KOPrefs::instance()->mLanguageChanged ) {
         KOPrefs::instance()->setCategoryDefaults();
         int count = mView->addCategories();
         KOPrefs::instance()->mLanguageChanged = false;
     }
     processIncidenceSelection( 0 );
     connect( mView, SIGNAL( incidenceSelected( Incidence * ) ),
              SLOT( processIncidenceSelection( Incidence * ) ) );
     connect( mView, SIGNAL( modifiedChanged( bool ) ),
              SLOT( slotModifiedChanged( bool ) ) );
 
 
     connect( &mSaveTimer, SIGNAL( timeout() ), SLOT( save() ) );
     mView->setModified( false );
     mBlockAtStartup = false;
     mView->setModified( false );
     setCentralWidget( mView );
     globalFlagBlockStartup = 0;
     mView->show();
     delete splash;
     if ( newFile )
         mView->updateConfig();
     // qApp->processEvents();
     //qDebug("MainView x %d y %d w %d  h %d",  mView->x(),mView-> y(), mView->width(), mView->height ());
-    fillSyncMenu();
+    //fillSyncMenu();
+   
+    
+    connect(mSyncManager , SIGNAL( save() ), this, SLOT( save() ) );
+    connect(mSyncManager , SIGNAL( request_file() ), this, SLOT( syncFileRequest() ) );
+    connect(mSyncManager , SIGNAL( getFile( bool )), this, SLOT(getFile( bool ) ) );
+    mSyncManager->setDefaultFileName( defaultFileName());
+    mSyncManager->fillSyncMenu();
+
+
+
     mView->viewManager()->agendaView()->setStartHour( KOPrefs::instance()->mDayBegins  );
     if ( showWarning ) {
         KMessageBox::information( this,
                          "You are starting KO/Pi for the first time.\nPlease read menu: Help-What's New,\nif you did an update!\nPlease choose your timezone in the \nConfigure Dialog TAB Time Zone!\nPlease choose your language\nin the TAB Locale!\nYou get the Configure Dialog\nvia Menu: Actions - Configure....\nClick OK to show the Configure Dialog!\n", "KO/Pi information");
         qApp->processEvents();
         mView->dialogManager()->showSyncOptions();
     }
 
   //US listen for result adressed from Ka/Pi
 #ifndef DESKTOP_VERSION
   connect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & )));
 #endif
 }
 MainWindow::~MainWindow()
 {
     //qDebug("MainWindow::~MainWindow() ");
     //save toolbar location
     delete mServerSocket;
     delete mCalendar;
     delete KOPrefs::instance();
     delete KIncidenceFormatter::instance();
 
 
 }
 void MainWindow::showMaximized () 
 {
 #ifndef DESKTOP_VERSION
     if ( ! globalFlagBlockStartup )
         if ( mClosed )
             mView->goToday();
 #endif
     QWidget::showMaximized () ;
     mClosed = false;
 }
 void MainWindow::closeEvent( QCloseEvent* ce )
 {
 
 
 
     if ( ! KOPrefs::instance()->mAskForQuit ) {
         saveOnClose();
         mClosed = true;
         ce->accept();
         return;
 
     }
 
     switch( QMessageBox::information( this, "KO/Pi",
                                       i18n("Do you really want\nto close KO/Pi?"),
                                       i18n("Close"), i18n("No"),
                                       0, 0 ) ) {
     case 0:
         saveOnClose();
         mClosed = true;
         ce->accept();
         break;
     case 1:
         ce->ignore();
         break;
     case 2:
 
     default:
         break;
     }
 
 
 }
 
 void MainWindow::recieve( const QCString& cmsg, const QByteArray& data )
 {
     QDataStream stream( data, IO_ReadOnly );
     // QMessageBox::about( this, "About KOrganizer/Pi", "*" +msg +"*" );
     //QString datamess;
     //qDebug("message ");
     qDebug("KO: QCOP message received: %s ", cmsg.data()  );
 
     if ( cmsg == "-writeFile" ) {
         // I made from the "-writeFile" an "-writeAlarm"
         mView->viewManager()->showWhatsNextView();
         mCalendar->checkAlarmForIncidence( 0, true);
         showMaximized();
         raise();
         return;
     }
 
     if ( cmsg == "-writeFile" ) {
         // I made from the "-writeFile" an "-writeAlarm"
         mView->viewManager()->showWhatsNextView();
         mCalendar->checkAlarmForIncidence( 0, true);
         showMaximized();
         raise();
         return;
 
     }
     if ( cmsg == "-writeFileSilent" ) {
         // I made from the "-writeFile" an "-writeAlarm"
         // mView->viewManager()->showWhatsNextView();
         mCalendar->checkAlarmForIncidence( 0, true);
         //showMaximized();
         //raise();
         hide();
         return;
     }
     if ( cmsg == "-newCountdown" ) {
         qDebug("newCountdown ");
 
     }
     QString msg ;
     QString allmsg = cmsg;
     while ( allmsg.length() > 0 ) {
         int nextC = allmsg.find( "-", 1 );
         if ( nextC == -1 ) {
             msg = allmsg;
             allmsg = "";
         } else{
             msg = allmsg.left( nextC );
             allmsg = allmsg.mid( nextC,  allmsg.length()-nextC );
         }
         //qDebug("msg: %s  all: %s ", msg.latin1(), allmsg.latin1() );
         if ( msg == "-newEvent" ) {
             mView->newEvent();
         }
         if ( msg == "-newTodo" ) {
             mView->newTodo();
 
         }
         if ( msg == "-showWN" ) {
             mView->viewManager()->showWhatsNextView();
         }
         if ( msg == "-showTodo" ) {
             mView->viewManager()->showTodoView();
         }
         if ( msg == "-showList"  ) {
             mView->viewManager()->showListView();
         }
         else if ( msg == "-showDay" ) {
             mView->viewManager()->showDayView();
         }
         else if ( msg == "-showWWeek"  ) {
             mView->viewManager()->showWorkWeekView();
         }
         else if ( msg == "-ringSync"  ) {
-            multiSync( false );
+            mSyncManager->multiSync( false );
         }
         else if ( msg == "-showWeek" ) {
             mView->viewManager()->showWeekView();
         }
         else if ( msg == "-showTodo" ) {
             mView->viewManager()->showTodoView();
         }
         else if ( msg == "-showJournal"  ) {
             mView->dateNavigator()->selectDates( 1 );
             mView->dateNavigator()->selectToday();
             mView->viewManager()->showJournalView();
         }
         else if ( msg == "-showKO" ) {
             mView->viewManager()->showNextXView();
         }
         else if ( msg == "-showWNext" || msg == "nextView()" ) {
             mView->viewManager()->showWhatsNextView();
         }
         else if ( msg == "-showNextXView" ) {
             mView->viewManager()->showNextXView();
         }
 
 
     }
 
     showMaximized();
     raise();
 }
 
 QPixmap MainWindow::loadPixmap( QString name )
 {
     return SmallIcon( name );
 
 }
 void MainWindow::initActions()
 {
     //KOPrefs::instance()->mShowFullMenu
     iconToolBar->clear();
     KOPrefs *p = KOPrefs::instance();
     //QPEMenuBar *menuBar1;// = new QPEMenuBar( iconToolBar );
 
     QPopupMenu *viewMenu = new QPopupMenu( this );
     QPopupMenu *actionMenu = new QPopupMenu( this );
     QPopupMenu *importMenu = new QPopupMenu( this );
     selectFilterMenu = new QPopupMenu( this );
     selectFilterMenu->setCheckable( true );
     syncMenu = new QPopupMenu( this );
     configureAgendaMenu = new QPopupMenu( this );
     configureToolBarMenu = new QPopupMenu( this );
     QPopupMenu *helpMenu = new QPopupMenu( this );
     if ( KOPrefs::instance()->mShowFullMenu ) {
         QMenuBar *menuBar1;
         menuBar1 = menuBar();
         menuBar1->insertItem( i18n("File"), importMenu );
         menuBar1->insertItem( i18n("View"), viewMenu );
         menuBar1->insertItem( i18n("Actions"), actionMenu );
         menuBar1->insertItem( i18n("Synchronize"), syncMenu );
         menuBar1->insertItem( i18n("AgendaSize"),configureAgendaMenu  );
         //menuBar1->insertItem( i18n("Toolbar"),configureToolBarMenu );
         menuBar1->insertItem( i18n("Filter"),selectFilterMenu  );
         menuBar1->insertItem( i18n("Help"), helpMenu );
     } else {
         QPEMenuBar *menuBar1;
         menuBar1 = new QPEMenuBar( iconToolBar );
         QPopupMenu *menuBar = new QPopupMenu( this );
         menuBar1->insertItem( i18n("ME"), menuBar);
         menuBar->insertItem( i18n("File"), importMenu );
         menuBar->insertItem( i18n("View"), viewMenu );
         menuBar->insertItem( i18n("Actions"), actionMenu );
         menuBar->insertItem( i18n("Synchronize"), syncMenu );
         menuBar->insertItem( i18n("AgendaSize"),configureAgendaMenu  );
         menuBar->insertItem( i18n("Toolbar"),configureToolBarMenu );
         menuBar->insertItem( i18n("Filter"),selectFilterMenu  );
         menuBar->insertItem( i18n("Help"), helpMenu );
         //menuBar1->setMaximumWidth( menuBar1->sizeHint().width() );
         menuBar1->setMaximumSize( menuBar1->sizeHint( ));
     }
     connect ( syncMenu, SIGNAL( activated ( int )  ), this, SLOT (slotSyncMenu( int ) ) );
     connect ( selectFilterMenu, SIGNAL( activated ( int )  ), this, SLOT (selectFilter( int ) ) );
     connect ( selectFilterMenu, SIGNAL( aboutToShow ()  ), this, SLOT (fillFilterMenu() ) );
 
     // ******************
     QAction *action;
     QIconSet icon;
     // QPopupMenu *configureMenu= new QPopupMenu( menuBar );
     configureToolBarMenu->setCheckable( true );
 
     QString pathString = "";
     if ( !p->mToolBarMiniIcons ) {
     if ( QApplication::desktop()->width() < 480 )
         pathString += "icons16/";
     } else
         pathString += "iconsmini/";
     configureAgendaMenu->setCheckable( true );
     configureAgendaMenu->insertItem(i18n("Toggle Allday"), 1 );
     configureAgendaMenu->insertSeparator();
     configureAgendaMenu->insertItem(i18n("Tiny"), 4 );
     configureAgendaMenu->insertItem(i18n("Small"), 6 );
     configureAgendaMenu->insertItem(i18n("Medium"), 8 );
     configureAgendaMenu->insertItem(i18n("Normal"), 10 );
     configureAgendaMenu->insertItem(i18n("Large"), 12 );
     configureAgendaMenu->insertItem(i18n("Big"), 14 );
     configureAgendaMenu->insertItem(i18n("Bigger"), 16 );
     configureAgendaMenu->insertItem(i18n("Biggest"), 18 );
     //configureMenu->insertItem( "AgendaSize",configureAgendaMenu  );
 
     icon = loadPixmap( pathString + "configure" );
     action = new QAction( i18n("Configure"),icon, i18n("Configure..."), 0, this );
     action->addTo( actionMenu );
     connect( action, SIGNAL( activated() ),
              mView, SLOT( edit_options() ) );
     actionMenu->insertSeparator();
     icon = loadPixmap( pathString + "newevent" );
     configureToolBarMenu->insertItem(i18n("Stretched TB"), 5 );
     configureToolBarMenu->insertSeparator();
     configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 );
     QAction* ne_action = new QAction( i18n("New Event..."), icon, i18n("New Event..."), 0, this );
     ne_action->addTo( actionMenu );
     connect( ne_action, SIGNAL( activated() ),
              mView, SLOT( newEvent() ) );
     icon = loadPixmap( pathString + "newtodo" );
     configureToolBarMenu->insertItem(icon, i18n("New Todo..."), 20 );
     QAction* nt_action = new QAction( i18n("New Todo..."), icon, i18n("New Todo..."), 0, this );
     nt_action->addTo( actionMenu );
     connect( nt_action, SIGNAL( activated() ),
              mView, SLOT( newTodo() ) );
     icon = loadPixmap( pathString + "navi" );
     action = new QAction( i18n("Toggle DateNavigator"), icon, i18n("Toggle DateNavigator"), 0, this );
     action->addTo( viewMenu );
     connect( action, SIGNAL( activated() ),
              mView, SLOT( toggleDateNavigatorWidget() ) );
     icon = loadPixmap( pathString + "filter" );
     action = new QAction( i18n("Toggle FilterView"), icon, i18n("Toggle FilterView"), 0, this );
     action->addTo( viewMenu );
     connect( action, SIGNAL( activated() ),
              mView, SLOT( toggleFilter() ) );
 
 
     viewMenu->insertSeparator();
     icon = loadPixmap( pathString + "picker" );
     action = new QAction( i18n("Date Picker"), icon, i18n("Date Picker"), 0, this );
     action->addTo( viewMenu );
     connect( action, SIGNAL( activated() ),
              mView, SLOT( showDatePicker() ) );
     action->addTo( iconToolBar  );
     viewMenu->insertSeparator();
     icon = loadPixmap( pathString + "list" );
     configureToolBarMenu->insertItem(icon, i18n("List View"), 30 );
     QAction* showlist_action = new QAction( i18n("List View"), icon, i18n("List View"), 0, this );
     showlist_action->addTo( viewMenu );
     connect( showlist_action, SIGNAL( activated() ),
              mView->viewManager(), SLOT( showListView() ) );
 
 
     icon = loadPixmap( pathString + "day" );
     configureToolBarMenu->insertItem(icon, i18n("Day View"), 40 );
     QAction* day1_action = new QAction( i18n("Day View"), icon, i18n("Day View"), 0, this );
     day1_action->addTo( viewMenu );
     //  action->addTo( toolBar );
     connect( day1_action, SIGNAL( activated() ),
              mView->viewManager(), SLOT( showDayView() ) );
 
     icon = loadPixmap( pathString + "workweek" );
     configureToolBarMenu->insertItem(icon, i18n("Work Week"), 50 );
     QAction* day5_action = new QAction( i18n("Work Week"), icon, i18n("Work Week"), 0, this );
     day5_action->addTo( viewMenu );
     connect( day5_action, SIGNAL( activated() ),
              mView->viewManager(), SLOT( showWorkWeekView() ) );
 
     icon = loadPixmap( pathString + "week" );
     configureToolBarMenu->insertItem(icon, i18n("Week"), 60 );
     QAction* day7_action = new QAction( i18n("Week"), icon, i18n("Week"), 0, this );
     day7_action->addTo( viewMenu );
     connect( day7_action, SIGNAL( activated() ),
              mView->viewManager(), SLOT( showWeekView() ) );
 
     icon = loadPixmap( pathString + "month" );
     configureToolBarMenu->insertItem(icon, i18n("Month"), 70 );
     QAction* month_action = new QAction( i18n("Month"), icon, i18n("Month"), 0, this );
     month_action->addTo( viewMenu );
     connect( month_action, SIGNAL( activated() ),
              mView->viewManager(), SLOT( showMonthView() ) );
 
     icon = loadPixmap( pathString + "todo" );
     configureToolBarMenu->insertItem(icon, i18n("Todo View"), 80 );
     QAction* todoview_action = new QAction( i18n("Todo View"), icon, i18n("Todo View"), 0, this );
     todoview_action->addTo( viewMenu );
     connect( todoview_action, SIGNAL( activated() ),
              mView->viewManager(), SLOT( showTodoView() ) );
 
     icon = loadPixmap( pathString + "journal" );
     configureToolBarMenu->insertItem(icon, i18n("Journal"), 90 );
     QAction* viewjournal_action = new QAction( i18n("Journal"), icon, i18n("Journal"), 0, this );
     viewjournal_action->addTo( viewMenu );
     connect( viewjournal_action, SIGNAL( activated() ),
              mView->viewManager(), SLOT( showJournalView() ) );
 
     icon = loadPixmap( pathString + "xdays" );
     configureToolBarMenu->insertItem(icon, i18n("Next days"), 100,4 );
     QAction* xdays_action = new QAction( i18n("Next days"), icon, i18n("Next days"), 0, this );
     xdays_action->addTo( viewMenu );
     connect( xdays_action, SIGNAL( activated() ),
              mView->viewManager(), SLOT( showNextXView() ) );
 
     icon = loadPixmap( pathString + "whatsnext" );
     configureToolBarMenu->insertItem(icon, i18n("What's Next"), 110, 4 );
     QAction* whatsnext_action = new QAction( i18n("What's Next"), icon, i18n("What's Next"), 0, this );
     whatsnext_action->addTo( viewMenu );
     connect( whatsnext_action, SIGNAL( activated() ),
              mView->viewManager(), SLOT( showWhatsNextView() ) );
 
 #if 0
     action = new QAction( "view_timespan", "Time Span", 0, this );
     action->addTo( viewMenu );
     connect( action, SIGNAL( activated() ),
              mView->viewManager(), SLOT( showTimeSpanView() ) );
 #endif
 
     mNewSubTodoAction = new QAction( "new_subtodo", i18n("New Sub-Todo..."), 0,
                                      this );
     mNewSubTodoAction->addTo( actionMenu );
     connect( mNewSubTodoAction, SIGNAL( activated() ),
              mView, SLOT( newSubTodo() ) );
 
     actionMenu->insertSeparator();
 
     mShowAction = new QAction( "show_incidence", i18n("Show..."), 0, this );
     mShowAction->addTo( actionMenu );
     connect( mShowAction, SIGNAL( activated() ),
              mView, SLOT( showIncidence() ) );
 
     mEditAction = new QAction( "edit_incidence", i18n("Edit..."), 0, this );
     mEditAction->addTo( actionMenu );
     connect( mEditAction, SIGNAL( activated() ),
              mView, SLOT( editIncidence() ) );
 
     mDeleteAction = new QAction( "delete_incidence", i18n("Delete..."), 0, this );
     mDeleteAction->addTo( actionMenu );
     connect( mDeleteAction, SIGNAL( activated() ),
              mView, SLOT( deleteIncidence() ) );
 
 
     mCloneAction = new QAction( "clone_incidence", i18n("Clone..."), 0, this );
     mCloneAction->addTo( actionMenu );
     connect( mCloneAction, SIGNAL( activated() ),
              mView, SLOT( cloneIncidence() ) );
     mMoveAction = new QAction( "Move_incidence", i18n("Move..."), 0, this );
     mMoveAction->addTo( actionMenu );
     connect( mMoveAction, SIGNAL( activated() ),
              mView, SLOT( moveIncidence() ) );
     mBeamAction = new QAction( "Beam_incidence", i18n("Beam..."), 0, this );
     mBeamAction->addTo( actionMenu );
     connect( mBeamAction, SIGNAL( activated() ),
              mView, SLOT( beamIncidence() ) );
     mCancelAction = new QAction( "Cancel_incidence", i18n("Toggle Cancel"), 0, this );
     mCancelAction->addTo( actionMenu );
     connect( mCancelAction, SIGNAL( activated() ),
              mView, SLOT( toggleCancelIncidence() ) );
 
     actionMenu->insertSeparator();
 
     action = new QAction( "purge_completed", i18n("Purge Completed"), 0,
                           this );
     action->addTo( actionMenu );
     connect( action, SIGNAL( activated() ), mView, SLOT( purgeCompleted() ) );
 
     icon = loadPixmap( pathString + "search" );
     QAction* search_action = new QAction( i18n("Search"), icon, i18n("Search..."), 0, this );
     configureToolBarMenu->insertItem(icon, i18n("Search"), 120 , 4);
     search_action->addTo( actionMenu );
     connect( search_action, SIGNAL( activated() ),
              mView->dialogManager(), SLOT( showSearchDialog() ) );
 
     icon = loadPixmap( pathString + "today" );
     configureToolBarMenu->insertItem(icon, i18n("Go to Today"), 130);
     QAction* today_action = new QAction( i18n("Go to Today"), icon, i18n("Go to Today"), 0, this );
     today_action->addTo( actionMenu );
     connect( today_action, SIGNAL( activated() ),
              mView, SLOT( goToday() ) );
 
     if ( KOPrefs::instance()->mShowFullMenu ) {
         actionMenu->insertSeparator();
         actionMenu->insertItem( i18n("Configure Toolbar"),configureToolBarMenu );
 
     }
     // actionMenu->insertSeparator();
     action = new QAction( "import_qtopia", i18n("Import (*.ics/*.vcs) file"), 0,
                           this );
     action->addTo( importMenu );
     connect( action, SIGNAL( activated() ), SLOT( importIcal() ) );
     action = new QAction( "import_quick", i18n("Import last file"), 0,
                           this );
     action->addTo( importMenu );
     connect( action, SIGNAL( activated() ), SLOT( quickImportIcal() ) );
     importMenu->insertSeparator();
     action = new QAction( "import_bday", i18n("Import Birthdays (KA/Pi)"), 0,
                           this );
     action->addTo( importMenu );
     connect( action, SIGNAL( activated() ), SLOT( importBday() ) );
 #ifndef DESKTOP_VERSION
     importMenu->insertSeparator();
     action = new QAction( "import_qtopia", i18n("Import Opie/Qtopia Cal."), 0,
                           this );
     action->addTo( importMenu );
     connect( action, SIGNAL( activated() ), SLOT( importQtopia() ) );
 #else
 #ifdef _WIN32_
     importMenu->insertSeparator();
     action = new QAction( "import_ol", i18n("Import from OL"), 0,
                           this );
     action->addTo( importMenu );
     connect( action, SIGNAL( activated() ), SLOT( importOL() ) );
 #endif
 #endif
 
     importMenu->insertSeparator();
     action = new QAction( "load_cal", i18n("Load Calendar Backup"), 0,
                           this );
     action->addTo( importMenu );
     connect( action, SIGNAL( activated() ), SLOT( loadCalendar() ) );
 
     action = new QAction( "save_cal", i18n("Save Calendar Backup"), 0,
                           this );
     action->addTo( importMenu );
     connect( action, SIGNAL( activated() ), SLOT( saveCalendar() ) );
 
     importMenu->insertSeparator();
     action = new QAction( "import_qtopia", i18n("Export VCalendar"), 0,
                           this );
     action->addTo( importMenu );    connect( action, SIGNAL( activated() ), SLOT( exportVCalendar() ) );
 
 
     //LR
     QPopupMenu *ex2phone = new QPopupMenu( this );
     ex2phone->insertItem(i18n("Complete calendar..."), 1 );
     ex2phone->insertItem(i18n("Filtered calendar..."), 2 );
     connect( ex2phone, SIGNAL( activated(int) ), this, SLOT( exportToPhone( int)) );
     importMenu->insertItem( i18n("Export to phone"), ex2phone );
 
     importMenu->insertSeparator();
     action = new QAction( "manage cat", i18n("Manage new categories..."), 0,
                           this );
     action->addTo( importMenu );
     connect( action, SIGNAL( activated() ), mView, SLOT( manageCategories() ) );
 #ifndef DESKTOP_VERSION
     importMenu->insertSeparator();
     action = new QAction( "beam all", i18n("Beam complete calendar..."), 0,
                           this );
     action->addTo( importMenu );
     connect( action, SIGNAL( activated() ), mView, SLOT( beamCalendar() ) );
 
     action = new QAction( "beam all", i18n("Beam filtered calendar..."), 0,
                           this );
     action->addTo( importMenu );
     connect( action, SIGNAL( activated() ), mView, SLOT( beamFilteredCalendar()) );
 #else
  importMenu->insertSeparator();
  icon = loadPixmap( pathString + "print" );
     action = new QAction( i18n("Print calendar..."),icon,i18n("Print calendar..."), 0, this );
     action->addTo( importMenu );
     connect( action, SIGNAL( activated() ),
              this, SLOT( printCal() ) );
 
     icon = loadPixmap( pathString + "print" );
     action = new QAction( i18n("Print agenda selection..."),icon,i18n("Print agenda selection..."), 0, this );
     action->addTo( importMenu );
     connect( action, SIGNAL( activated() ),
              this, SLOT( printSel() ) );
 #endif
     importMenu->insertSeparator();
     action = new QAction( "beam all", i18n("Save"), 0,
                           this );
     action->addTo( importMenu );
     connect( action, SIGNAL( activated() ), this, SLOT( save() ) );
     action = new QAction( "beam all", i18n("Exit (+save)"), 0,
                           this );
     action->addTo( importMenu );
     connect( action, SIGNAL( activated() ), this, SLOT( close() ) );
 
     //menuBar->insertItem( "Configure",configureMenu );
     //configureMenu->insertItem( "Toolbar",configureToolBarMenu  );
     icon = loadPixmap( "korganizer/korganizer" );
     action = new QAction( "Keys + Colors", i18n("Keys + Colors..."), 0, this );
     action->addTo( helpMenu );
     connect( action, SIGNAL( activated() ),
              SLOT( keyBindings() ) );
     action = new QAction( "featureHowto", i18n("Features + hints..."), 0,this );
     action->addTo( helpMenu );
     connect( action, SIGNAL( activated() ),
              SLOT( features() ) );
     action = new QAction( "Auto saving", i18n("Auto saving..."), 0, this );
     action->addTo( helpMenu );
     connect( action, SIGNAL( activated() ),
              SLOT( aboutAutoSaving() ) );
     action = new QAction( "Problemd", i18n("Known Problems..."), 0,this );
     action->addTo( helpMenu );
     connect( action, SIGNAL( activated() ),
              SLOT( aboutKnownBugs() ) );
     action = new QAction( "Translate Howto", i18n("User translation..."), 0,this );
     action->addTo( helpMenu );
     connect( action, SIGNAL( activated() ),
              SLOT( usertrans() ) );
     action = new QAction( "Sync Howto", i18n("Sync HowTo..."), 0,this );
     action->addTo( helpMenu );
     connect( action, SIGNAL( activated() ),
              SLOT( synchowto() ) );
     action = new QAction( "Whats New", i18n("What's new?"), 0,this );
     action->addTo( helpMenu );
     connect( action, SIGNAL( activated() ),
              SLOT( whatsNew() ) );
     action = new QAction( "Frequently asked questions", i18n("FAQ..."), 0,this );
     action->addTo( helpMenu );
     connect( action, SIGNAL( activated() ),
              SLOT( faq() ) );
 
 
     action = new QAction( "about", i18n("About..."), 0, this );
     action->addTo( helpMenu );
     connect( action, SIGNAL( activated() ),
              SLOT( about() ) );
     action = new QAction( "licence", i18n("Licence..."), 0, this );
     action->addTo( helpMenu );
     connect( action, SIGNAL( activated() ),
              SLOT( licence() ) );
     //menuBar->insertSeparator();
 
     // ******************************************************
     // menubar icons
 
 
     iconToolBar->setHorizontalStretchable (true );
     //menuBar->insertItem( iconToolBar );
     //xdays_action
     if (p-> mShowIconNewEvent)
         ne_action->addTo( iconToolBar  );
     if (p->mShowIconNewTodo )
         nt_action->addTo( iconToolBar  );
     if (p-> mShowIconSearch)
         search_action->addTo( iconToolBar  );
     if (p-> mShowIconNext)
         whatsnext_action->addTo( iconToolBar  );
     if (p-> mShowIconNextDays)
         xdays_action->addTo( iconToolBar  );
     if (p-> mShowIconList)
         showlist_action->addTo( iconToolBar  );
     if (p-> mShowIconDay1)
         day1_action->addTo( iconToolBar  );
     if (p-> mShowIconDay5)
         day5_action->addTo( iconToolBar  );
     if (p-> mShowIconDay7)
         day7_action->addTo( iconToolBar  );
     if (p-> mShowIconMonth)
         month_action->addTo( iconToolBar  );
     if (p-> mShowIconTodoview)
         todoview_action->addTo( iconToolBar  );
     if (p-> mShowIconJournal)
         viewjournal_action->addTo( iconToolBar  );
     icon = loadPixmap( pathString + "2leftarrowB" );
     configureToolBarMenu->insertItem(icon, i18n("Prev. month"), 200, 14);
     if (p-> mShowIconBackFast) {
         action = new QAction( i18n("Prev. month"), icon, i18n("Prev. month"),0 , this );
         connect( action, SIGNAL( activated() ),
                  mView, SLOT( goPreviousMonth() ) );
         action->addTo( iconToolBar  );
     }
     icon = loadPixmap( pathString + "1leftarrowB" );
     configureToolBarMenu->insertItem(icon, i18n("Go backward"), 210,15);
     if (p-> mShowIconBack) {
         action = new QAction( i18n("Go backward"), icon, i18n("Go backward"),0 , this );
         connect( action, SIGNAL( activated() ),
                  mView, SLOT( goPrevious() ) );
         action->addTo( iconToolBar  );
     }
     if (p-> mShowIconToday)
         today_action->addTo( iconToolBar  );
     icon = loadPixmap( pathString + "1rightarrowB" );
     configureToolBarMenu->insertItem(icon, i18n("Go forward"), 220);
     if (p-> mShowIconForward) {
         action = new QAction( i18n("Go forward"), icon, i18n("Go forward"),0 , this );
         connect( action, SIGNAL( activated() ),
                  mView, SLOT( goNext() ) );
         action->addTo( iconToolBar  );
     }
     icon = loadPixmap( pathString + "2rightarrowB" );
     configureToolBarMenu->insertItem(icon, i18n("Next month"), 230);
     if (p-> mShowIconForwardFast) {
         action = new QAction( i18n("Next month"), icon, i18n("Next month"),0 , this );
         connect( action, SIGNAL( activated() ),
                  mView, SLOT( goNextMonth() ) );
         action->addTo( iconToolBar  );
     }
 
 
     configureToolBarMenu->insertItem(i18n("What's This?"), 300);
 
     if (p-> mShowIconNewEvent)
         configureToolBarMenu->setItemChecked( 10, true );
     if (p->mShowIconNewTodo )
         configureToolBarMenu->setItemChecked( 20, true );
     if (p-> mShowIconSearch)
         configureToolBarMenu->setItemChecked( 120, true );
     if (p-> mShowIconList)
         configureToolBarMenu->setItemChecked( 30, true );
     if (p-> mShowIconDay1)
         configureToolBarMenu->setItemChecked( 40, true );
     if (p-> mShowIconDay5)
         configureToolBarMenu->setItemChecked( 50, true );
     if (p-> mShowIconDay7)
         configureToolBarMenu->setItemChecked( 60, true );
     if (p-> mShowIconMonth)
         configureToolBarMenu->setItemChecked( 70, true );
     if (p-> mShowIconTodoview)
         configureToolBarMenu->setItemChecked( 80, true );
     if (p-> mShowIconBackFast)
         configureToolBarMenu->setItemChecked( 200, true );
     if (p-> mShowIconBack)
         configureToolBarMenu->setItemChecked( 210, true );
     if (p-> mShowIconToday)
         configureToolBarMenu->setItemChecked( 130, true );
     if (p-> mShowIconForward)
         configureToolBarMenu->setItemChecked( 220, true );
     if (p-> mShowIconForwardFast)
         configureToolBarMenu->setItemChecked( 230, true );
     if (p-> mShowIconNextDays)
         configureToolBarMenu->setItemChecked( 100, true );
     if (p-> mShowIconNext)
         configureToolBarMenu->setItemChecked( 110, true );
     if (p-> mShowIconJournal)
         configureToolBarMenu->setItemChecked( 90, true );
     if (p-> mShowIconWhatsThis)
         configureToolBarMenu->setItemChecked( 300, true );
 
     QLabel* dummy = new QLabel( iconToolBar );
     dummy->setBackgroundColor( iconToolBar->backgroundColor() );
     if (!p-> mShowIconStretch)
         iconToolBar->setStretchableWidget ( dummy ) ;
     else
         configureToolBarMenu->setItemChecked( 5, true );
     if (p-> mShowIconWhatsThis)
         QWhatsThis::whatsThisButton (  iconToolBar );
     connect( configureToolBarMenu, SIGNAL( activated( int ) ),this,  SLOT(configureToolBar( int ) ) );
     configureAgenda( p->mHourSize );
     connect( configureAgendaMenu, SIGNAL( activated( int ) ),this,  SLOT(configureAgenda( int ) ) );
 }
-void MainWindow::fillSyncMenu()
-{
-    if ( syncMenu->count() )
-        syncMenu->clear();
-    syncMenu->insertItem( i18n("Configure..."), 0 );
-    syncMenu->insertSeparator();
-    if ( mServerSocket == 0 ) {
-        syncMenu->insertItem( i18n("Enable Pi-Sync"), 2 );
-    } else {
-        syncMenu->insertItem( i18n("Disable Pi-Sync"), 3 );
-    }
-    syncMenu->insertSeparator();
-    syncMenu->insertItem( i18n("Multiple sync"), 1 );
-    syncMenu->insertSeparator();
-    KConfig config ( locateLocal( "config","ksyncprofilesrc"  ) );
-    config.setGroup("General");
-    QStringList prof = config.readListEntry("SyncProfileNames");
-    KOPrefs::instance()->mLocalMachineName = config.readEntry("LocalMachineName","undefined");
-    if ( prof.count() < 3 ) {
-        prof.clear();
-        prof << i18n("Sharp_DTM");
-        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","Sharp_DTM");
-        config.sync();
-        delete temp;
-    }
-    KOPrefs::instance()->mExternSyncProfiles = config.readListEntry("ExternSyncProfiles");
-    KOPrefs::instance()->mSyncProfileNames = prof;
-    int i;
-    for ( i = 0; i < prof.count(); ++i ) {
-
-        syncMenu->insertItem(  prof[i], 1000+i );
-        if ( i == 2 )
-            syncMenu->insertSeparator();
-    }
-    QDir app_dir;
-    if ( !app_dir.exists(QDir::homeDirPath()+"/Applications/dtm" ) ) {
-        syncMenu->setItemEnabled( false , 1000 );
-    }
-}
-
-int MainWindow::ringSync()
-{
-    int syncedProfiles = 0;
-    int i;
-    QTime timer;
-    KConfig config ( locateLocal( "config","ksyncprofilesrc"  ) );
-    QStringList syncProfileNames = KOPrefs::instance()->mSyncProfileNames;
-    KSyncProfile* temp = new KSyncProfile ();
-    KOPrefs::instance()->mAskForPreferences = false;
-    for ( i = 0; i < syncProfileNames.count(); ++i ) {
-        mCurrentSyncProfile = i;
-        temp->setName(syncProfileNames[mCurrentSyncProfile]);
-        temp->readConfig(&config);
-        if ( temp->getIncludeInRingSync() && ( i < 1 || i > 2  )) {
-            setCaption(i18n("Profile ")+syncProfileNames[mCurrentSyncProfile]+ i18n(" is synced ... "));
-            ++syncedProfiles;
-            // KOPrefs::instance()->mAskForPreferences = temp->getAskForPreferences();
-            KOPrefs::instance()->mWriteBackFile = temp->getWriteBackFile();
-            KOPrefs::instance()->mWriteBackExistingOnly = temp->getWriteBackExisting();
-            KOPrefs::instance()->mWriteBackInFuture = 0;
-            if ( temp->getWriteBackFuture() )
-                KOPrefs::instance()->mWriteBackInFuture =  temp->getWriteBackFutureWeeks( );
-            KOPrefs::instance()->mShowSyncSummary = false;
-            mView->setSyncDevice(syncProfileNames[i] );
-            mView->setSyncName( KOPrefs::instance()->mLocalMachineName );
-            if ( i == 0 ) {
-                syncSharp();
-            } else {
-                if ( temp->getIsLocalFileSync() ) {
-                    if ( syncWithFile( temp->getRemoteFileName( ), true ) )
-                        KOPrefs::instance()->mLastSyncedLocalFile = temp->getRemoteFileName();
-                } else {
-                    if (  temp->getIsPhoneSync() ) {
-                        KOPrefs::instance()->mPhoneDevice = temp->getPhoneDevice( ) ;
-                        KOPrefs::instance()->mPhoneConnection = temp->getPhoneConnection( );
-                        KOPrefs::instance()->mPhoneModel = temp->getPhoneModel( );
-                        syncPhone();
-                    } else if (  temp->getIsPiSync() ) {
-                        mPassWordPiSync = temp->getRemotePw();
-                        KOPrefs::instance()->mActiveSyncPort = temp->getRemotePort();
-                        KOPrefs::instance()->mActiveSyncIP = temp->getRemoteIP();
-                        syncPi();
-                    } else 
-                        syncRemote( temp, false );
-
-                }
-            }
-            timer.start();
-            setCaption(i18n("Multiple sync in progress ... please wait!") );
-            while ( timer.elapsed () < 2000 ) {
-                qApp->processEvents();
-#ifndef _WIN32_
-                sleep (1);
-#endif
-            }
-
-        }
-
-    }
-    delete temp;
-    return syncedProfiles;
-}
-
-void MainWindow::multiSync( bool askforPrefs  )
-{
-    if (mBlockSaveFlag)
-        return;
-    mBlockSaveFlag = true;
-    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( this, i18n("KO/Pi Sync"),
-                                   question,
-                                   i18n("Yes"), i18n("No"),
-                                   0, 0 ) != 0 ) {
-        mBlockSaveFlag = false;
-        setCaption(i18n("Aborted! Nothing synced!"));
-        return;
-    }
-    mView->setSyncDevice(i18n("Multiple profiles") );
-    KOPrefs::instance()->mSyncAlgoPrefs = KOPrefs::instance()->mRingSyncAlgoPrefs;
-    if ( askforPrefs ) {
-        mView->edit_sync_options();
-        KOPrefs::instance()->mRingSyncAlgoPrefs = KOPrefs::instance()->mSyncAlgoPrefs;
-    }
-    setCaption(i18n("Multiple sync started.") );
-    qApp->processEvents();
-    int num = ringSync() ;
-    if (  num > 1 )
-        ringSync();
-    mBlockSaveFlag = false;
-    if ( num )
-        save();
-    if ( num )
-        setCaption(i18n("%1 profiles synced. Multiple sync completed!").arg(num) );
-    else
-        setCaption(i18n("Nothing synced! No profiles defined for multisync!"));
-    return;
-}
-void MainWindow::slotSyncMenu( int action )
-{
-    qDebug("syncaction %d ", action);
-    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 (mBlockSaveFlag)
-        return;
-    mBlockSaveFlag = true;
-    mCurrentSyncProfile = action - 1000 ;
-    mView->setSyncDevice(KOPrefs::instance()->mSyncProfileNames[mCurrentSyncProfile] );
-    mView->setSyncName( KOPrefs::instance()->mLocalMachineName );
-    KConfig config ( locateLocal( "config","ksyncprofilesrc"  ) );
-    KSyncProfile* temp = new KSyncProfile ();
-    temp->setName(KOPrefs::instance()->mSyncProfileNames[mCurrentSyncProfile]);
-    temp->readConfig(&config);
-    KOPrefs::instance()->mAskForPreferences = temp->getAskForPreferences();
-    KOPrefs::instance()->mSyncAlgoPrefs = temp->getSyncPrefs();
-    KOPrefs::instance()->mWriteBackFile = temp->getWriteBackFile();
-    KOPrefs::instance()->mWriteBackExistingOnly = temp->getWriteBackExisting();
-    KOPrefs::instance()->mWriteBackInFuture = 0;
-    if ( temp->getWriteBackFuture() )
-        KOPrefs::instance()->mWriteBackInFuture =  temp->getWriteBackFutureWeeks( );
-    KOPrefs::instance()->mShowSyncSummary = temp->getShowSummaryAfterSync();
-    if ( action == 1000  ) {
-        syncSharp();
-
-    } else if ( action == 1001 ) {
-        syncLocalFile();
-
-    } else if ( action == 1002 ) {
-        quickSyncLocalFile();
-
-    } else if ( action >= 1003  ) {
-        if ( temp->getIsLocalFileSync() ) {
-            if ( syncWithFile( temp->getRemoteFileName( ), false ) )
-                KOPrefs::instance()->mLastSyncedLocalFile = temp->getRemoteFileName();
-        } else {
-            if (  temp->getIsPhoneSync() ) {
-                KOPrefs::instance()->mPhoneDevice = temp->getPhoneDevice( ) ;
-                KOPrefs::instance()->mPhoneConnection = temp->getPhoneConnection( );
-                KOPrefs::instance()->mPhoneModel = temp->getPhoneModel( );
-                syncPhone();
-            } else  if (  temp->getIsPiSync() ) {
-                mPassWordPiSync = temp->getRemotePw();
-                KOPrefs::instance()->mActiveSyncPort = temp->getRemotePort();
-                KOPrefs::instance()->mActiveSyncIP = temp->getRemoteIP();
-                syncPi();
-            } else 
-                syncRemote( temp );
-
-        }
-    }
-    delete temp;
-    mBlockSaveFlag = false;
-}
 void MainWindow::exportToPhone( int mode )
 {
 
     //ex2phone->insertItem(i18n("Complete calendar..."), 1 );
     //ex2phone->insertItem(i18n("Filtered calendar..."), 2 );
     KOex2phonePrefs ex2phone; 
 
     ex2phone.mPhoneConnection->setText( KPimGlobalPrefs::instance()->mEx2PhoneConnection );
     ex2phone.mPhoneDevice->setText( KPimGlobalPrefs::instance()->mEx2PhoneDevice );
     ex2phone.mPhoneModel->setText( KPimGlobalPrefs::instance()->mEx2PhoneModel );
     if ( mode == 1 )
         ex2phone.setCaption(i18n("Export complete calendar")); 
     if ( mode == 2 )
         ex2phone.setCaption(i18n("Export filtered calendar")); 
 
     if ( !ex2phone.exec() ) {
         return;
     }
     KPimGlobalPrefs::instance()->mEx2PhoneConnection  = ex2phone.mPhoneConnection->text();
     KPimGlobalPrefs::instance()->mEx2PhoneDevice = ex2phone.mPhoneDevice->text();
     KPimGlobalPrefs::instance()->mEx2PhoneModel = ex2phone.mPhoneModel->text();
 
     int inFuture = 0;
     if ( ex2phone.mWriteBackFuture->isChecked() )
         inFuture =  ex2phone.mWriteBackFutureWeeks->value();
     QPtrList<Incidence> delSel;
     if ( mode == 1 )
         delSel  = mCalendar->rawIncidences(); 
     if ( mode == 2 )
         delSel  = mCalendar->incidences(); 
     CalendarLocal* cal = new CalendarLocal();
     cal->setLocalTime();
     Incidence *incidence = delSel.first();
     QDateTime cur = QDateTime::currentDateTime().addDays( -7 );
     QDateTime end = cur.addDays( ( inFuture +1 ) *7 );
     while ( incidence ) {
         if ( incidence->type() != "Journal" ) {
             bool add = true;
             if ( inFuture ) {
                 QDateTime dt;
                 if ( incidence->type() == "Todo" ) {
                     Todo * t = (Todo*)incidence;
                     if ( t->hasDueDate() )
                         dt = t->dtDue();
                     else
                         dt = cur.addSecs( 62 );
                 }
                 else  {
                     bool ok;
                     dt =  incidence->getNextOccurence( cur, &ok );
                     if ( !ok )
                         dt = cur.addSecs( -62 );
                 }
                 if ( dt < cur || dt > end ) {
                     add = false;
                 }
             }
             if ( add ) {
                 Incidence *in = incidence->clone();
                 cal->addIncidence( in );
             }
         }
         incidence = delSel.next();
     } 
     PhoneAccess::writeConfig( KPimGlobalPrefs::instance()->mEx2PhoneDevice,
                               KPimGlobalPrefs::instance()->mEx2PhoneConnection,
                               KPimGlobalPrefs::instance()->mEx2PhoneModel );
 
     setCaption( i18n("Writing to phone..."));
     if ( PhoneFormat::writeToPhone( cal ) )
         setCaption( i18n("Export to phone successful!"));
     else
         setCaption( i18n("Error exporting to phone!"));
     delete cal;
 }
 
 
 void MainWindow::setDefaultPreferences()
 {
     KOPrefs *p = KOPrefs::instance();
 
     p->mCompactDialogs = true;
     p->mConfirm = true;
     // p->mEnableQuickTodo = false;
 
 }
 
 QString MainWindow::resourcePath()
 {
     return KGlobal::iconLoader()->iconPath();
 }
 
 void MainWindow::displayText( QString text ,QString cap  )
 {
     QDialog dia( this, "name", true ); ;
     dia.setCaption( cap );
     QVBoxLayout* lay = new QVBoxLayout( &dia );
     lay->setSpacing( 3 );
     lay->setMargin( 3 );
     QTextBrowser tb ( &dia );
     lay->addWidget( &tb );
     tb.setText( text );
 #ifdef DESKTOP_VERSION
     dia.resize( 640, 480);
 #else
     dia.showMaximized();
 #endif
     dia.exec();
 }
 void MainWindow::displayFile( QString fn, QString cap )
 {
  QString fileName =  resourcePath() + fn;
  QString text;
     QFile file( fileName );
     if (!file.open( IO_ReadOnly ) ) {
         return ;
 
     }
     QTextStream ts( &file );
     text = ts.read();
     file.close();
     displayText( text, cap);
 }
 void MainWindow::features()
 {
 
     displayFile( "featuresKOPI.txt",i18n("KO/Pi Features and hints") );
 }
 
 void MainWindow::usertrans()
 {
 
     displayFile( "usertranslationHOWTO.txt",i18n("KO/Pi User translation HowTo") );
 }
 
 void MainWindow::synchowto()
 {
 #if 0
     QPtrList<Incidence> er = mCalendar->rawIncidences();
     Incidence* inR = er.first();
     VCalFormat vf;
     QString strout;
     while ( inR ) {
         if ( inR->type() == "Todo" )
             strout = vf.todoToString( (Todo *)  inR );
         if ( inR->type() == "Event" )
             strout = vf.eventToString( (Event *)  inR );
         qDebug("incidence: \n%s\n ente\n\n",strout.latin1() );
         inR =  er.next();
     }
 #endif
     displayFile( "howtoSYNC.txt",i18n("KO/Pi Synchronization HowTo") );
 }
 void  MainWindow::faq()
 {
     displayFile( "kopiFAQ.txt",i18n("KO/Pi FAQ") );
 
 }
 void  MainWindow::whatsNew()
 {
     displayFile( "kopiWhatsNew.txt",i18n("KO/Pi Version Info") );
 
 }
 void  MainWindow::licence()
 {
     KApplication::showLicence();
 
 }
 void MainWindow::about()
 {
     QString version;
 #include <../version>
     QMessageBox::about( this, i18n("About KOrganizer/Pi"),
                         i18n("KOrganizer/Platform-independent\n") +
                         "(KO/Pi) " + version + " - " +
 
 #ifdef DESKTOP_VERSION
                         i18n("Desktop Edition\n") +
 #else
                         i18n("PDA-Edition\nfor: Zaurus 5x00 / 7x0 / 8x0\n") +
 #endif
                         i18n("(c) 2004 Lutz Rogowski\nEmail:lutz@pi-sync.net\nKO/Pi is based on KOrganizer\n(c) 2002,2003 Cornelius Schumacher\nEmail: schumacher@kde.org\nKOrganizer/Pi is licensed\nunder the GPL.\nKO/Pi can be compiled for\nLinux, Zaurus-PDA and Windows\nwww.korganizer.org\nwww.pi-sync.net\n") );
 }
 void MainWindow::keyBindings()
 {
     QString cap = i18n("Key bindings  KOrganizer/Pi");
     QString text =  i18n("<p><h2>KO/Pi key shortcuts:</h2></p>\n") +
         i18n("<p><b>H</b>: This help dialog | <b>S</b>: Search dialog</p>\n")+
         i18n("<p><b>I</b>: Show info for selected event/todo</p>\n") +
         i18n("<p><b>Space</b>: Toggle fullscreen | <b>P</b>: Date picker</p>\n")+
         i18n("<p><b>F</b>: Toggle filterview |<b>F+ctrl</b>: Edit filter </p>\n")+
         i18n("<p><b>O</b>: Filter On/Off | <b>J</b>: Journal view</p>\n")+
         i18n("<p><b>1-0</b> (+<b>ctrl</b>): Select filter 1-10 (11-20)</p>\n")+
         i18n("<p><b>N</b>: Next days view| <b>W</b>: What's next view\n ")+
         i18n("<p><b>V</b>: Todo view | <b>L</b>: Event list view</p>\n")+
         i18n("<p><b>Z,Y</b>: Work week view | <b>U</b>: Week view</p>\n")+
         i18n("<p><b>D</b>: One day view | <b>M</b>: Month view</p>\n")+
         i18n("<p><b>E</b>: Edit selected item |<b> E+ctrl</b>: New Event</p>\n")+
         i18n("<p><b>T</b>: Goto today | <b>T+ctrl</b>: New Todo</p>\n")+
         i18n("<p><b>S+ctrl</b>: Add sub-todo | <b>X</b>: Toggle datenavigator</p>\n")+
         i18n("<p><b>+,-</b> : Zoom in/out agenda | <b>A</b>: Toggle allday agenda height</p>\n")+
         i18n("<p><b>C</b>: Show current time in agenda view</p>\n")+
         i18n("<p><b>B</b>: Edit description (details) of selected item</p>\n")+
         i18n("<p><b>right</b>: Next week | <b>right+ctrl</b>: Next month</p>\n")+
         i18n("<p><b>left</b>: Prev. week | <b>left+ctrl</b>: Prev. month</p>\n")+
         i18n("<p><b>del,backspace</b>: Delete selected item</p>\n")+
         i18n("<p><h3>In agenda view:</h3></p>\n") +
         i18n("<p><b>up/down</b>: Scroll agenda view</p>\n")+
         i18n("<p><b>ctrl+up/down</b>: Scroll small todo view</p>\n")+
         i18n("<p><h3>In todo view:</h3></p>\n") +
         i18n("<p><b>Q</b>: Toggle quick todo line edit.</p>\n")+
         i18n("<p><b>I</b>: Show info of current item+one step down.</p>\n")+
         i18n("<p><b>return</b>: Mark item as completed+one step down.</p>\n")+
         i18n("<p><b>return+shift</b>:  Mark item as not completed+one step down</p>\n")+
         i18n("<p><h3>In list view:</h3></p>\n") +
         i18n("<p><b>I</b>: Show info of current item+one step down.</p>\n")+
         i18n("<p><b>return</b>: Select item+one step down</p>\n")+
         i18n("<p><b>return+shift</b>: Deselect item+one step down</p>\n")+
         i18n("<p><b>up/down</b>: Next/prev item</p>\n")+
         i18n("<p><b>ctrl+up/down</b>:  Goto up/down by 20% of items</p>\n")+
         i18n("<p><b>shift+up/down</b>: Goto first/last item</p>\n")+
         i18n("<p><h3>In event/todo viewer:</h3></p>\n") +
         i18n("<p><b>I,C</b>: Close dialog.</p>\n")+
         i18n("<p><b>A</b>: Show agenda view.</p>\n")+
         i18n("<p><b>E</b>:  Edit item</p>\n") +
         i18n("<p><h2>KO/Pi icon colors:</h2></p>\n") +
         i18n("<p><b>(for square icons in agenda and month view)</b></p>\n") +
         i18n("<p><b>Cross</b>: Item cancelled.([c] in Whats'Next view)</p>\n")+
         i18n("<p><b>Red</b>: Alarm set.([a] in Whats'Next view)</p>\n")+
         i18n("<p><b>Blue</b>: Recurrent event.([r] in Whats'Next view)</p>\n")+
         i18n("<p><b>Dark green</b>: Information(description) available.([i] in WN view)</p>\n")+
         i18n("<p><b>Black</b>: Event/todo with attendees. You are the organizer!</p>\n")+
         i18n("<p><b>Dark yellow</b>:  Event/todo with attendees.</p>\n") +
         i18n("<p><b>White</b>: Item readonly</p>\n");
    displayText( text, cap);
 
 }
 void MainWindow::aboutAutoSaving()
 {
     QMessageBox* msg;
     msg = new QMessageBox(  i18n("Auto Saving in  KOrganizer/Pi"),
                             i18n("After changing something, the data is\nautomatically saved to the file\n~/kdepim/apps/korganizer/mycalendar.ics\nafter (configureable) three minutes.\nFor safety reasons there is  one autosaving\nafter 10 minutes (of idle time) again. The \ndata is saved automatically when closing KO/Pi\nYou can create a backup file \nwith: File - Save Calendar Backup\n"), QMessageBox::NoIcon,
                             QMessageBox::Ok,
                             QMessageBox::NoButton,
                             QMessageBox::NoButton);
     msg->exec();
     delete msg;
 
 
 }
 void MainWindow::aboutKnownBugs()
 {
     QMessageBox* msg;
     msg = new QMessageBox(  i18n("Known Problems in  KOrganizer/Pi"),
                             i18n("1) Importing *.vcs or *.ics files from\nother applications may not work properly,\nif there are events with properties\nKO/Pi does not support.\n")+
                             i18n("2) Audio alarm daemon\nfor Zaurus is available!\nas an additional small application\n")+
                             i18n("\nPlease report unexpected behaviour to\nlutz@pi-sync.net\n") +
                             i18n("\nor report them in the bugtracker on\n") +
                             i18n("\nhttp://sourceforge.net/projects/kdepimpi\n"),
                             QMessageBox::NoIcon,
                             QMessageBox::Ok,
                             QMessageBox::NoButton,
                             QMessageBox::NoButton);
     msg->exec();
     delete msg;
 
 }
 
 QString MainWindow::defaultFileName()
 {
     return locateLocal( "data", "korganizer/mycalendar.ics" );
 }
 QString MainWindow::syncFileName()
 {
 #ifdef _WIN32_
     return  locateLocal( "tmp", "synccalendar.ics" );
 #else
     return QString( "/tmp/kopitempfile.ics" );
 #endif
 }
 
 void MainWindow::processIncidenceSelection( Incidence *incidence )
 {
     if ( !incidence ) {
         enableIncidenceActions( false );
 
         mNewSubTodoAction->setEnabled( false );
         setCaptionToDates();
         return;
 
     }
 
     //KGlobal::locale()->formatDateTime(nextA, true);
     QString startString = "";
     if ( incidence->type() != "Todo" ) {
         if ( incidence->dtStart().date() < incidence->dtEnd().date()   ) {
             if ( incidence->doesFloat() ) {
             startString += ": "+incidence->dtStartDateStr( true );
             startString += " --- "+((Event*)incidence)->dtEndDateStr( true );
 
             } else {
             startString = ": "+incidence->dtStartStr(true);
             startString += " --- "+((Event*)incidence)->dtEndStr(true);
 
             }
 
         } else {
             if ( incidence->dtStart().time() != incidence->dtEnd().time() )
                 startString = ": "+KGlobal::locale()->formatTime(incidence->dtStart().time())+
                     "-"+KGlobal::locale()->formatTime(incidence->dtEnd().time());
             startString +=" "+KGlobal::locale()->formatDate( incidence->dtStart().date(), true);
         }
 
     }
     else
         startString = i18n(": (Prio ") +QString::number( (( KCal::Todo*)incidence)->priority() ) +") "+QString::number( (( KCal::Todo*)incidence)->percentComplete() ) +i18n("\% completed");
     if ( !incidence->location().isEmpty() )
         startString += " (" +incidence->location()+")";
     setCaption( incidence->summary()+startString);
 
     enableIncidenceActions( true );
 
     if ( incidence->type() == "Event" ) {
         mShowAction->setText( i18n("Show Event...") );
         mEditAction->setText( i18n("Edit Event...") );
         mDeleteAction->setText( i18n("Delete Event...") );
 
         mNewSubTodoAction->setEnabled( false );
     } else if ( incidence->type() == "Todo" ) {
         mShowAction->setText( i18n("Show Todo...") );
         mEditAction->setText( i18n("Edit Todo...") );
         mDeleteAction->setText( i18n("Delete Todo...") );
 
         mNewSubTodoAction->setEnabled( true );
     } else {
         mShowAction->setText( i18n("Show...") );
         mShowAction->setText( i18n("Edit...") );
         mShowAction->setText( i18n("Delete...") );
 
         mNewSubTodoAction->setEnabled( false );
     }
 }
 
 void MainWindow::enableIncidenceActions( bool enabled )
 {
     mShowAction->setEnabled( enabled );
     mEditAction->setEnabled( enabled );
     mDeleteAction->setEnabled( enabled );
 
     mCloneAction->setEnabled( enabled );
     mMoveAction->setEnabled( enabled );
     mBeamAction->setEnabled( enabled );
     mCancelAction->setEnabled( enabled );
 }
 
 void MainWindow::importOL()
 {
 #ifdef _WIN32_
       KOImportOLdialog *id = new KOImportOLdialog("Import from OL - select folder!" , mView->calendar(),this );
       id->exec();
       delete id;
       mView->updateView();
 #endif
 }
 void MainWindow::importBday()
 {
     int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),
                                        i18n("When importing birthdays twice\nduplicated events will be ignored,\nif the event has not been\nchanged in KO/Pi!\n"),
                                        i18n("Import!"), i18n("Cancel"), 0,
                                        0, 1 );
     if ( result == 0 ) {
         mView->importBday();
 
     }
 
 
 }
 void MainWindow::importQtopia()
 {
 #ifndef DESKTOP_VERSION
     int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),
                                        i18n("When importing a calendar twice\nduplicated events will be ignored!\nYou can create a backup file with\nFile - Save Calendar Backup\nto revert importing"),
                                        i18n("Import!"), i18n("Cancel"), 0,
                                        0, 1 );
     if ( result == 0 ) {
         QString datebook = Global::applicationFileName( "datebook", "datebook.xml");
         QString todolist = Global::applicationFileName( "todolist", "todolist.xml");
         QString categories = QString( getenv( "HOME" ) ) + "/Settings/Categories.xml";
         mView->importQtopia( categories, datebook, todolist );
     }
 #else
     int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),
                                        i18n("Not supported \non desktop!\n"),
                                        i18n("Ok"), i18n("Cancel"), 0,
                                        0, 1 );
 
 #endif
 }
 
 void MainWindow::saveOnClose()
 {
     KOPrefs *p = KOPrefs::instance();
     p->mToolBarHor = ( iconToolBar->orientation () == Qt:: Horizontal );
     p->mToolBarUp = iconToolBar->x() > width()/2 ||
         iconToolBar->y() > height()/2;
     mView->writeSettings();
     if ( mCalendarModifiedFlag || mView->checkFileChanged( defaultFileName()))
         save();
 }
 void MainWindow::slotModifiedChanged( bool changed )
 {
     if ( mBlockAtStartup )
         return;
     int msec;
     // we store the changes after 1 minute,
     // and for safety reasons after 10 minutes again
-    if ( !mBlockSaveFlag )
+    if ( !mSyncManager->blockSave() )
         msec = (1000 * 60*KOPrefs::instance()->mAutoSaveInterval) +1000;
     else
         msec = 1000 * 600;
     mSaveTimer.start( msec, true ); // 1 minute
     qDebug("KO: Saving File in %d secs!", msec/1000);
     mCalendarModifiedFlag = true;
 }
 void MainWindow::save()
 {
-    if ( mBlockSaveFlag )
+    if ( mSyncManager->blockSave() )
         return;
-    bool store = mBlockSaveFlag;
-    mBlockSaveFlag = true;
+    mSyncManager->setBlockSave(true);
     if ( mView->checkFileVersion( defaultFileName()) ) {
 
         QTime neededSaveTime = QDateTime::currentDateTime().time();
         setCaption(i18n("KO/Pi:Saving Data to File ..." ));
         qDebug("KO: Start saving data to file!");
         mView->setLoadedFileVersion(QDateTime::currentDateTime().addSecs( -1));
         mView->saveCalendar( defaultFileName() );
 
         int msNeeded = neededSaveTime.msecsTo( QDateTime::currentDateTime().time() );
         mView->watchSavedFile();
         qDebug("KO: Needed %d ms for saving.",msNeeded );
         QString savemes;
         savemes.sprintf(i18n("KO/Pi:File Saved. Needed %d sec, %d ms"),(msNeeded/1000)%100,msNeeded%1000  );
         setCaption(savemes);
     } else
         setCaption(i18n("Saving cancelled!"));
     mCalendarModifiedFlag = false;
-    mBlockSaveFlag = store;
+    mSyncManager->setBlockSave( false );
 }
 
 void MainWindow::keyReleaseEvent ( QKeyEvent * e)
 {
     if ( !e->isAutoRepeat() ) {
         mFlagKeyPressed = false;
     }
 }
 void MainWindow::keyPressEvent ( QKeyEvent * e )
 {
     qApp->processEvents();
     if ( e->isAutoRepeat() && !mFlagKeyPressed ) {
         e->ignore();
         // qDebug("  ignore  %d",e->isAutoRepeat()  );
         return;
     }
     if (! e->isAutoRepeat() )
         mFlagKeyPressed = true;
     KOPrefs *p = KOPrefs::instance();
     bool showSelectedDates = false;
     int size;
     int pro = 0;
     //qDebug("MainWindow::keyPressEvent ");
     switch ( e->key() ) {
     case Qt::Key_Right:
         if ( e->state() == Qt::ControlButton ||  e->state() == Qt::ShiftButton)
             mView->goNextMonth();
         else
             mView->goNext();
         showSelectedDates = true;
         break;
     case Qt::Key_Left:
         if ( e->state() == Qt::ControlButton||  e->state() == Qt::ShiftButton )
             mView->goPreviousMonth();
         else
             mView->goPrevious();
         showSelectedDates = true;
         break;
     case Qt::Key_Down:
         mView->viewManager()->agendaView()->scrollOneHourDown();
         break;
     case Qt::Key_Up:
         mView->viewManager()->agendaView()->scrollOneHourUp();
         break;
     case Qt::Key_I:
         mView->showIncidence();
         break;
     case Qt::Key_Delete:
     case Qt::Key_Backspace:
         mView->deleteIncidence();
         break;
     case Qt::Key_D:
         mView->viewManager()->showDayView();
         showSelectedDates = true;
         break;
     case Qt::Key_O:
         mView->toggleFilerEnabled( );
         break;
     case Qt::Key_0:
     case Qt::Key_1:
     case Qt::Key_2:
     case Qt::Key_3:
     case Qt::Key_4:
     case Qt::Key_5:
     case Qt::Key_6:
     case Qt::Key_7:
     case Qt::Key_8:
     case Qt::Key_9:
         pro =  e->key()-48;
         if ( pro == 0 )
             pro = 10;
         if ( e->state() == Qt::ControlButton)
             pro += 10;
         break;
     case Qt::Key_M:
         mView->viewManager()->showMonthView();
         showSelectedDates = true;
         break;
     case Qt::Key_Insert:
         mView->newEvent();
         break;
     case Qt::Key_S :
         if ( e->state() == Qt::ControlButton ||  e->state() == Qt::ShiftButton)
             mView->newSubTodo();
         else
             mView->dialogManager()->showSearchDialog();
         break;
     case Qt::Key_Y :
     case Qt::Key_Z :
         mView->viewManager()->showWorkWeekView();
         showSelectedDates = true;
         break;
     case Qt::Key_U :
         mView->viewManager()->showWeekView();
         showSelectedDates = true;
         break;
     case Qt::Key_H :
         keyBindings();
         break;
     case Qt::Key_W:
         mView->viewManager()->showWhatsNextView();
         break;
     case Qt::Key_L:
         mView->viewManager()->showListView();
         break;
     case Qt::Key_N:
         mView->viewManager()->showNextXView();
         showSelectedDates = true;
         break;
     case Qt::Key_V:
         mView->viewManager()->showTodoView();
         break;
     case Qt::Key_C:
         mView->viewManager()->agendaView()->setStartHour( QTime::currentTime ().hour() );
         break;
     case Qt::Key_P:
         mView->showDatePicker( );
         break;
     case Qt::Key_F:
         if ( e->state() == Qt::ControlButton||  e->state() == Qt::ShiftButton )
             mView->editFilters();
         else
             mView->toggleFilter();
         break;
     case Qt::Key_X:
         mView->toggleDateNavigatorWidget();
         break;
     case Qt::Key_Space:
         mView->toggleExpand();
         break;
     case Qt::Key_A:
         mView->toggleAllDaySize();
         break;
     case Qt::Key_T:
         if ( e->state() == Qt::ControlButton||  e->state() == Qt::ShiftButton )
             mView->newTodo();
         else {
             mView->goToday();
             showSelectedDates = true;
         }
         break;
     case Qt::Key_J:
         mView->viewManager()->showJournalView();
         break;
     case Qt::Key_B:
         mView->editIncidenceDescription();;
         break;
         // case Qt::Key_Return:
     case Qt::Key_E:
         if ( e->state() == Qt::ControlButton||  e->state() == Qt::ShiftButton )
             mView->newEvent();
         else
             mView->editIncidence();
         break;
     case Qt::Key_Plus:
         size = p->mHourSize +2;
         if ( size <= 18 )
             configureAgenda( size );
         break;
     case Qt::Key_Minus:
         size = p->mHourSize - 2;
         if ( size >= 4 )
             configureAgenda( size );
         break;
 
 
     default:
         e->ignore();
     }
     if ( pro > 0 ) {
         mView->selectFilter(  pro-1 );
     }
     if ( showSelectedDates ) {
         ;//  setCaptionToDates();
     }
 
 }
 
 void MainWindow::fillFilterMenu()
 {
     selectFilterMenu->clear();
     bool disable = false;
     if ( mView->filterView()->filtersEnabled()   ) {
         selectFilterMenu->insertItem(i18n ( "Turn filter off" ),  0 );
     }
     else {
         selectFilterMenu->insertItem(i18n ( "Turn filter on" ),  0 );
         disable = true;
     }
     selectFilterMenu->insertSeparator();
     QPtrList<CalFilter> fili = mView->filters();
     CalFilter *curfilter = mView->filterView()->selectedFilter();
     CalFilter *filter = fili.first();
     int iii = 1;
     while(filter) {
         selectFilterMenu->insertItem( filter->name(),  iii );
         if ( filter == curfilter)
             selectFilterMenu->setItemChecked( iii, true );
         if ( disable )
             selectFilterMenu->setItemEnabled( iii, false );
         filter = fili.next();
         ++iii;
     }
 }
 void MainWindow::selectFilter( int fil )
 {
     if ( fil == 0 ) {
         mView->toggleFilerEnabled( );
     } else {
         mView->selectFilter(  fil-1 );
     }
 }
 void MainWindow::configureToolBar( int item  )
 {
 
     configureToolBarMenu->setItemChecked( item, !configureToolBarMenu-> isItemChecked ( item ) );
     KOPrefs *p = KOPrefs::instance();
     p-> mShowIconStretch= configureToolBarMenu->isItemChecked( 5 );
     p-> mShowIconNewEvent= configureToolBarMenu->isItemChecked( 10 );
     p->mShowIconNewTodo = configureToolBarMenu->isItemChecked( 20 );
     p-> mShowIconSearch= configureToolBarMenu->isItemChecked( 120 );
     p-> mShowIconList= configureToolBarMenu->isItemChecked( 30 );
     p-> mShowIconDay1= configureToolBarMenu->isItemChecked( 40 );
     p-> mShowIconDay5= configureToolBarMenu->isItemChecked( 50 );
     p-> mShowIconDay7= configureToolBarMenu->isItemChecked( 60 );
     p-> mShowIconMonth= configureToolBarMenu->isItemChecked( 70 );
     p-> mShowIconTodoview= configureToolBarMenu->isItemChecked( 80 );
     p-> mShowIconBackFast= configureToolBarMenu->isItemChecked( 200 );
     p-> mShowIconBack = configureToolBarMenu->isItemChecked( 210 );
     p-> mShowIconToday= configureToolBarMenu->isItemChecked( 130 );
     p-> mShowIconForward= configureToolBarMenu->isItemChecked( 220 );
     p-> mShowIconForwardFast= configureToolBarMenu->isItemChecked( 230 );
     p-> mShowIconNextDays= configureToolBarMenu->isItemChecked( 100 );
     p-> mShowIconNext= configureToolBarMenu->isItemChecked( 110 );
     p-> mShowIconJournal= configureToolBarMenu->isItemChecked( 90 );
     p-> mShowIconWhatsThis= configureToolBarMenu->isItemChecked( 300 );
     // initActions();
 }
 
 void MainWindow::setCaptionToDates()
 {
     QString selDates;
     selDates = KGlobal::locale()->formatDate(mView->startDate(), true);
     if  (mView->startDate() < mView->endDate() )
         selDates += " - " + KGlobal::locale()->formatDate(mView->endDate(), true);
     setCaption( i18n("Dates: ") + selDates );
 
 }
 // parameter item == 0: reinit
 void MainWindow::configureAgenda( int item )
 {
 
     KOPrefs *p = KOPrefs::instance();
 
     int i;
     if ( item == 1 ) {
         mView->toggleAllDaySize();
         return;
     }
     // do not allow 4 for widgets higher than 480
  //    if ( QApplication::desktop()->height() > 480 ) {
 //         if ( item == 4 )
 //             item = 6;
 //     }
     for ( i = 4; i <= 18; i= i+2 )
         configureAgendaMenu->setItemChecked( i, false );
     configureAgendaMenu->setItemChecked( item, true );
     if ( p->mHourSize == item )
         return;
     p->mHourSize=item;
     mView->viewManager()->agendaView()->updateConfig();
 }
 
 void  MainWindow::saveCalendar()
 {
     QString fn =  KOPrefs::instance()->mLastSaveFile;
     fn =  KFileDialog::getSaveFileName( fn, i18n("Save backup filename"), this );
 
     if ( fn == "" )
         return;
     QFileInfo info;
     info.setFile( fn );
     QString mes;
     bool createbup = true;
     if ( info. exists() ) {
         mes =  i18n("Backup file\nalready exists!\nOld backup file from:\n%1\nOverwrite?\n").arg(KGlobal::locale()->formatDateTime(info.lastModified (), true, false )) ;
         int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),mes,
                                            i18n("Overwrite!"), i18n("Cancel"), 0,
                                            0, 1 );
         if ( result != 0 ) {
             createbup = false;
         }
     }
     if ( createbup ) {
         mView->saveCalendar( fn );
         mes = i18n("KO/Pi:Saved %1").arg(fn);
         KOPrefs::instance()->mLastSaveFile = fn;
         setCaption(mes);
     }
 }
 void  MainWindow::loadCalendar()
 {
 
     QString fn =   KOPrefs::instance()->mLastLoadFile;
     fn =  KFileDialog::getOpenFileName( fn, i18n("Load backup filename"), this );
 
     if ( fn == "" )
         return;
     QFileInfo info;
     info.setFile( fn );
     QString mess;
     bool loadbup = true;
     if ( info. exists() ) {
         mess =   i18n("Backup file from:\n%1\nLoading  backup\nfile will delete\nyour current Data!\n").arg(KGlobal::locale()->formatDateTime(info.lastModified (), true, false ));
         int result = QMessageBox::warning( this, "KO/Pi: Warning!",
                                            mess,
                                            i18n("Load!"), i18n("Cancel"), 0,
                                            0, 1 );
         if ( result != 0 ) {
             loadbup = false;
         }
     } else {
         QMessageBox::warning( this, i18n("KO/Pi: Warning!"),
                               i18n("Backup file\ndoes not exist!\nNothing loaded!"), 0, 0,
                               0, 1 );
 
         return;
     }
     if ( loadbup ) {
         mView->openCalendar( fn );
         KOPrefs::instance()->mLastLoadFile = fn;
         mess = i18n("KO/Pi:Loaded %1").arg(fn) ;
         setCaption(mess);
     }
 
 }
 void  MainWindow::quickImportIcal()
 {
     importFile( KOPrefs::instance()->mLastImportFile, false );
 }
 void MainWindow::importFile( QString  fn, bool quick )
 {
     QFileInfo info;
     info.setFile( fn );
     QString mess;
     bool loadbup = true;
     if ( !info. exists() ) {
         mess =  i18n("Import file \n...%1\ndoes not exist!\nNothing imported!\n").arg(fn.right( 30));
         int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),
                                            mess );
         return;
     }
     int result = 0;
     if ( !quick ) {
         mess = i18n(  "Import file \n...%1\nfrom:\n%2\nDuplicated entries\nwill not be imported!\n").arg(fn.right( 25)).arg(KGlobal::locale()->formatDateTime(info.lastModified (), true, false ));
         result = QMessageBox::warning( this, "KO/Pi: Warning!",
                                        mess,
                                        "Import", "Cancel", 0,
                                        0, 1 );
     }
     if ( result == 0 ) {
         if ( mView->openCalendar( fn, true )) {
             KOPrefs::instance()->mLastImportFile = fn;
             setCaption(i18n("Imported file successfully"));
         } else {
             setCaption(i18n("Error importing file"));
         }
     }
 }
 
 void   MainWindow::importIcal()
 {
 
     QString fn =KOPrefs::instance()->mLastImportFile;
 
     fn =KFileDialog:: getOpenFileName( fn, i18n("Import filename(*.ics/*.vcs)"), this );
     if ( fn == "" )
         return;
     importFile(  fn, true );
 
 }
 
 void MainWindow::exportVCalendar()
 {
     QString fn =  KOPrefs::instance()->mLastVcalFile;
     fn =  KFileDialog::getSaveFileName( fn, i18n("Export vcal filename(*.vcs)"), this );
     if ( fn == "" )
         return;
     QFileInfo info;
     info.setFile( fn );
     QString mes;
     bool createbup = true;
     if ( info. exists() ) {
         mes = i18n("Save file\nalready exists!\nOld save file from:\n%1\nOverwrite?\n").arg (KGlobal::locale()->formatDateTime(info.lastModified (), true, false ) );
         int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),mes,
                                            i18n("Overwrite!"), i18n("Cancel"), 0,
                                            0, 1 );
         if ( result != 0 ) {
             createbup = false;
         }
     }
     if ( createbup ) {
         if ( mView->exportVCalendar( fn ) ) {
             KOPrefs::instance()->mLastVcalFile = fn;
             if ( fn.length() > 20 )
                 mes = i18n("KO/Pi:Exported to ...%1").arg(fn.right(20)) ;
             else
                 mes = i18n("KO/Pi:Exported to %1").arg(fn );
             setCaption(mes);
         }
     }
 
 }
-QString  MainWindow::getPassword( )
-{
-    QString retfile = "";
-    QDialog dia ( this, "input-dialog", true );
-    QLineEdit lab ( &dia );
-    lab.setEchoMode( QLineEdit::Password );
-    QVBoxLayout lay( &dia );
-    lay.setMargin(7);
-    lay.setSpacing(7);
-    lay.addWidget( &lab);
-    dia.setFixedSize( 230,50 );
-    dia.setCaption( i18n("Enter password") );
-    QPushButton pb ( "OK",  &dia);
-    lay.addWidget( &pb );
-    connect(&pb, SIGNAL( clicked() ), &dia, SLOT ( accept() ) );
-    dia.show();
-    int res = dia.exec();
-    if ( res )
-        retfile = lab.text();
-    dia.hide();
-    qApp->processEvents();
-    return retfile;
-
-}
 
-void MainWindow::enableQuick()
+void MainWindow::syncFileRequest()
 {
-    QDialog dia ( this, "input-dialog", true );
-    QLineEdit lab ( &dia );
-    QVBoxLayout lay( &dia );
-    lab.setText( KOPrefs::instance()->mPassiveSyncPort );
-    lay.setMargin(7);
-    lay.setSpacing(7);
-    QLabel label ( i18n("Port number (Default: 9197)"), &dia );
-    lay.addWidget( &label);
-    lay.addWidget( &lab);
-
-    QLineEdit lepw ( &dia );
-    lepw.setText( KOPrefs::instance()->mPassiveSyncPw );
-    QLabel label2 ( i18n("Password to enable\naccess from remote:"), &dia );
-    lay.addWidget( &label2);
-    lay.addWidget( &lepw);
-    dia.setFixedSize( 230,80 );
-    dia.setCaption( i18n("Enter port for Pi-Sync") );
-    QPushButton pb ( "OK",  &dia);
-    lay.addWidget( &pb );
-    connect(&pb, SIGNAL( clicked() ), &dia, SLOT ( accept() ) );
-    dia.show();
-    if ( ! dia.exec() )
-        return;
-    dia.hide();
-    qApp->processEvents();
-    KOPrefs::instance()->mPassiveSyncPw = lepw.text();
-    KOPrefs::instance()->mPassiveSyncPort = lab.text();
-    bool ok;
-    Q_UINT16 port = KOPrefs::instance()->mPassiveSyncPort.toUInt(&ok);
-    if ( ! ok ) {
-        KMessageBox::information( this, i18n("No valid port"));
-        return;
-    }
-    //qDebug("port %d ", port);
-    mServerSocket = new KServerSocket ( KOPrefs::instance()->mPassiveSyncPw, port ,1 );
-    mServerSocket->setFileName( defaultFileName() );
-    //qDebug("connected ");
-    if ( !mServerSocket->ok() ) {
-        KMessageBox::information( this, i18n("Failed to bind or\nlisten to the port!"));
-        delete mServerSocket;
-        mServerSocket = 0;
-        return;
-    }
-    connect( mServerSocket, SIGNAL ( saveFile() ), this, SLOT  ( save() ) );
-    connect( mServerSocket, SIGNAL ( file_received( bool ) ), this, SLOT  ( getFile( bool ) ) );
+    save();
 }
-
 void MainWindow::getFile( bool success )
 {
     if ( ! success ) {
         setCaption( i18n("Error receiving file. Nothing changed!") );
         return;
     }
     mView->watchSavedFile();
     mView->openCalendar( defaultFileName() );
     setCaption( i18n("Pi-Sync successful!") );
 
 } 
 
-
-void MainWindow::syncPi()
-{
-    qApp->processEvents();
-    bool ok;
-    Q_UINT16 port = KOPrefs::instance()->mActiveSyncPort.toUInt(&ok);
-    if ( ! ok ) {
-        setCaption( i18n("Sorry, no valid port.Syncing cancelled.") );
-        return;
-    }
-    KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, port, KOPrefs::instance()->mActiveSyncIP, this );
-    connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) );
-    setCaption( i18n("Sending request for remote file ...") );
-    commandSocket->readFile(  syncFileName() );
-}
-
-void MainWindow::deleteCommandSocket(KCommandSocket*s, int state)
-{
-    qDebug("MainWindow::deleteCommandSocket %d", state);
-    
-    //enum { success, errorW, errorR, quiet };
-    if ( state == KCommandSocket::errorR ) {
-        setCaption( i18n("ERROR: Receiving remote file failed.") );
-        delete s;
-        KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, KOPrefs::instance()->mActiveSyncPort.toUInt(), KOPrefs::instance()->mActiveSyncIP, this );
-        connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) );
-        commandSocket->sendStop();
-        return;
-        
-    } else  if ( state == KCommandSocket::errorW ) {
-        setCaption( i18n("ERROR:Writing back file failed.") );
-
-    } else  if ( state == KCommandSocket::successR ) {
-        QTimer::singleShot( 1, this , SLOT ( readFileFromSocket()));
-
-    } else  if ( state == KCommandSocket::successW ) {
-        setCaption( i18n("Pi-Sync succesful!") );
-    }
-
-    delete s;
-}
-
-void MainWindow::readFileFromSocket()
-{
-    QString fileName = syncFileName();
-    setCaption( i18n("Remote file saved to temp file.") );
-    if ( ! syncWithFile( fileName , true ) ) {
-        setCaption( i18n("Syncing failed.") );
-        qDebug("Syncing failed ");
-        return;
-    }
-    KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, KOPrefs::instance()->mActiveSyncPort.toUInt(), KOPrefs::instance()->mActiveSyncIP, this );
-    connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) );
-    if ( KOPrefs::instance()->mWriteBackFile ) 
-        commandSocket->writeFile(  fileName );
-    else {
-        commandSocket->sendStop();
-        setCaption( i18n("Pi-Sync succesful!") );
-    }
-}
-
-void MainWindow::syncLocalFile()
-{
-
-    QString fn =KOPrefs::instance()->mLastSyncedLocalFile;
-
-    fn =KFileDialog:: getOpenFileName( fn, i18n("Sync filename(*.ics/*.vcs)"), this );
-    if ( fn == "" )
-        return;
-    //mView->setSyncDevice("local-file" );
-    if (  syncWithFile(  fn, false ) ) {
-       //  Event* e = mView->getLastSyncEvent();
-//         e->setReadOnly( false );
-//         e->setLocation( i18n("Local file: ")+ KOPrefs::instance()->mLastSyncedLocalFile);
-//         e->setReadOnly( true );
-    }
-
-}
-
-bool  MainWindow::syncWithFile( QString fn , bool quick )
-{
-    bool ret = false;
-    QFileInfo info;
-    info.setFile( fn );
-    QString mess;
-    bool loadbup = true;
-    if ( !info. exists() ) {
-        mess =  i18n( "Sync file \n...%1\ndoes not exist!\nNothing synced!\n").arg(fn.right( 30) );
-        int result = QMessageBox::warning( this, i18n("KO/Pi: 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( this, i18n("KO/Pi: Warning!"),
-                                       mess,
-                                       i18n("Sync"), i18n("Cancel"), 0,
-                                       0, 1 );
-        if ( result )
-            return false;
-    }
-    if ( KOPrefs::instance()->mAskForPreferences )
-        mView->edit_sync_options();
-    if ( result == 0 ) {
-        //qDebug("Now sycing ... ");
-        if ( ret = mView->syncCalendar( fn, KOPrefs::instance()->mSyncAlgoPrefs ) )
-            setCaption( i18n("Synchronization successful") );
-        else
-            setCaption( i18n("Sync cancelled or failed. Nothing synced.") );
-        if ( ! quick )
-            KOPrefs::instance()->mLastSyncedLocalFile = fn;
-        slotModifiedChanged( true );
-    }
-    return ret;
-}
-void MainWindow::quickSyncLocalFile()
-{
-    //mView->setSyncDevice("local-file" );
-    //qDebug("quickSyncLocalFile() ");
-    if ( syncWithFile( KOPrefs::instance()->mLastSyncedLocalFile, false ) ) {
-       //  Event* e = mView->getLastSyncEvent();
-//         e->setReadOnly( false );
-//         e->setLocation( i18n("Quick with file: ")+ KOPrefs::instance()->mLastSyncedLocalFile);
-//         e->setReadOnly( true );
-
-    }
-}
-
-void MainWindow::confSync()
-{
-    mView->confSync();
-    fillSyncMenu();
-}
-void MainWindow::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( this, i18n("KO/Pi Sync"),
-                                   question,
-                                   i18n("Yes"), i18n("No"),
-                                   0, 0 ) != 0 )
-        return;
-    }
-    QString command = prof->getPreSyncCommand();
-    int fi;
-    if ( (fi = command.find("$PWD$")) > 0 ) {
-        QString pwd = getPassword();
-        command = command.left( fi )+ pwd + command.mid( fi+5 );
-
-    }
-    int maxlen = 30;
-    if ( QApplication::desktop()->width() > 320 )
-        maxlen += 25;
-    setCaption ( i18n( "Copy remote file to local machine..." ) );
-    int fileSize = 0;
-    int result = system ( command );
-    // 0 : okay
-    // 256: no such file or dir
-    //
-    qDebug("KO: Remote copy result(0 = okay): %d ",result );
-    if ( result != 0 ) {
-        int len = maxlen;
-        while ( len <  command.length() ) {
-            command.insert( len , "\n" );
-            len += maxlen +2;
-        }
-        question = i18n("Sorry, the copy command failed!\nCommand was:\n%1\n \nTry command on console to get more\ndetailed info about the reason.\n").arg (command) ;
-        QMessageBox::information( this, i18n("KO/Pi Sync - ERROR"),
-                                  question,
-                                  i18n("Okay!")) ;
-        setCaption ("KO/Pi");
-        return;
-    }
-    setCaption ( i18n( "Copying succeed." ) );
-    //qDebug(" file **%s** ",prof->getLocalTempFile().latin1() );
-    if ( syncWithFile( prof->getLocalTempFile(), true ) ) {
-//         Event* e = mView->getLastSyncEvent();
-//         e->setReadOnly( false );
-//         e->setLocation( KOPrefs::instance()->mSyncProfileNames[mCurrentSyncProfile]);
-//         e->setReadOnly( true );
-        if ( KOPrefs::instance()->mWriteBackFile ) {
-            command =  prof->getPostSyncCommand(); 
-            int fi;
-            if ( (fi = command.find("$PWD$")) > 0 ) {
-                QString pwd = getPassword();
-                command = command.left( fi )+ pwd + command.mid( fi+5 );
-                
-            }
-            setCaption ( i18n( "Writing back file ..." ) );
-            result = system ( command );
-            qDebug("KO: Writing back file result: %d ", result);
-            if ( result != 0 ) {
-                setCaption ( i18n( "Writing back file result: " )+QString::number( result ) );
-                return;
-            } else {
-                setCaption ( i18n( "Syncronization sucessfully completed" ) );
-            }
-        }
-    }
-    return;
-}
-
-void MainWindow::syncSharp()
-{
-    if ( mCalendarModifiedFlag )
-        save();
-    mView->syncSharp();
-    slotModifiedChanged( true );
-
-}
-void MainWindow::syncPhone()
-{
-    if ( mCalendarModifiedFlag )
-        save();
-    mView->syncPhone();
-    slotModifiedChanged( true );
-
-}
-
 void MainWindow::printSel( )
 {
     mView->viewManager()->agendaView()->agenda()->printSelection();
 }
 
 void MainWindow::printCal()
 {
     mView->print();//mCp->showDialog();
 }
 
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h
index 0da0be0..ee7bd87 100644
--- a/korganizer/mainwindow.h
+++ b/korganizer/mainwindow.h
@@ -1,148 +1,130 @@
 #ifndef KORGE_MAINWINDOW_H
 #define KORGE_MAINWINDOW_H
 
 #include <qmainwindow.h>
 #include <qtimer.h>
 #include <qdict.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qregexp.h>
 
 #include <libkcal/incidence.h>
 #include "simplealarmclient.h"
 #include <ksyncmanager.h>
 
 class QAction;
 class CalendarView;
 class KSyncProfile;
 #ifdef DESKTOP_VERSION
 
 #define QPEToolBar QToolBar
 #define QPEMenuBar QMenuBar
 #endif
 class QPEToolBar;
 
 
 namespace KCal {
 class CalendarLocal;
 }
 
 using namespace KCal;
 
 class MainWindow : public QMainWindow
 {
     Q_OBJECT
   public:
     MainWindow( QWidget *parent = 0, const char *name = 0, QString command = "");
     ~MainWindow();
  public  slots:  
     virtual void showMaximized (); 
      void configureAgenda( int );
     void recieve( const QCString& msg, const QByteArray& data );
     static  QString defaultFileName();
     static  QString syncFileName();
     static QString resourcePath();
     protected slots:  
     void setCaptionToDates();
-    int ringSync();
-    void multiSync( bool askforPrefs = false );
     void about(); 
     void licence(); 
     void faq(); 
     void usertrans(); 
     void features(); 
     void synchowto();   
     void whatsNew();    
     void keyBindings();
     void aboutAutoSaving();;
     void aboutKnownBugs();
 
     void processIncidenceSelection( Incidence * );
 
     void importQtopia();
     void importBday();
     void importOL();
     void importIcal();
     void importFile( QString, bool );
     void quickImportIcal();
     
     void slotModifiedChanged( bool );
     
     void save();
     void configureToolBar( int );
     void printSel();
     void printCal();
     void saveCalendar();
     void loadCalendar();
     void exportVCalendar();
     void fillFilterMenu();
     void selectFilter( int );
     void exportToPhone( int );
 
-    void slotSyncMenu( int );
-    void confSync();
-    void syncSharp();
-    void syncPhone();
-    void syncPi();
-    void syncLocalFile();
-    bool syncWithFile( QString, bool );
-    void quickSyncLocalFile();
-    
     
   protected:
     void displayText( QString, QString);
     void displayFile( QString, QString);
     
     void enableIncidenceActions( bool );
     
   private slots:
     QSocket* piSocket;
     QString  piFileString;
     QTime piTime;
-    void deleteCommandSocket(KCommandSocket* s, int state );
-    void fillSyncMenu();
     void getFile( bool );
-    void readFileFromSocket();
+    void syncFileRequest();
   private:
+    KSyncManager* mSyncManager;
     //QTimer* mTimerCommandSocket;
-    QString mPassWordPiSync;
     KServerSocket * mServerSocket;
     bool mClosed;
     void saveOnClose();
-    int mCurrentSyncProfile;
-    void enableQuick();
-    void syncRemote( KSyncProfile* , bool ask = true);
     bool  mFlagKeyPressed;
     bool  mBlockAtStartup;
     QPEToolBar *iconToolBar;
     void initActions();
     void setDefaultPreferences(); 
     void keyPressEvent ( QKeyEvent * ) ;
     void keyReleaseEvent ( QKeyEvent * ) ;
     QPopupMenu *configureToolBarMenu;
     QPopupMenu *selectFilterMenu;
     QPopupMenu *configureAgendaMenu, *syncMenu;
     CalendarLocal *mCalendar;
     CalendarView *mView;
-    QString  getPassword();
     QAction *mNewSubTodoAction;
     
     QAction *mShowAction;
     QAction *mEditAction;
     QAction *mDeleteAction;
     QAction *mCloneAction;
     QAction *mMoveAction;
     QAction *mBeamAction;
     QAction *mCancelAction;
 
-
     void closeEvent( QCloseEvent* ce );
     SimpleAlarmClient mAlarmClient;
     QTimer mSaveTimer;
-    bool mBlockSaveFlag;
+    //bool mBlockSaveFlag;
     bool mCalendarModifiedFlag;
     QPixmap loadPixmap( QString );
 };
 
 
 #endif
diff --git a/libkdepim/kpimprefs.cpp b/libkdepim/kpimprefs.cpp
index 0a2f5f1..c21ebaa 100644
--- a/libkdepim/kpimprefs.cpp
+++ b/libkdepim/kpimprefs.cpp
@@ -1,75 +1,82 @@
 /*
     This file is part of libkdepim.
     Copyright (c) 2002 Cornelius Schumacher <schumacher@kde.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program 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 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.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #include <kglobal.h>
 #include <kconfig.h>
 #include <klocale.h>
 #include <kdebug.h>
 
 #include "kpimprefs.h"
 
 KPimPrefs::KPimPrefs( const QString &name ) :
   KPrefs( name )
 {
-  config()->setGroup("General");
+#ifdef _WIN32_
+  QString hdp= locateLocal("data","korganizer")+"\\\\";
+#else
+  QString hdp= locateLocal("data","korganizer")+"/";
+#endif
+  config()->setGroup("SyncOptions");
   addItemString("PassiveSyncPort",&mPassiveSyncPort,"9197" ); 
   addItemString("PassiveSyncPw",&mPassiveSyncPw,"abc" ); 
+  addItemString("LastSyncedLocalFile", &mLastSyncedLocalFile ,hdp +"lastsync.ics" );
+  addItemInt("RingSyncAlgoPrefs",&mRingSyncAlgoPrefs,3);
 }
 
 KPimPrefs::~KPimPrefs()
 {
 }
 
 void KPimPrefs::usrSetDefaults()
 {
   setCategoryDefaults();
 }
 
 void KPimPrefs::usrReadConfig()
 {
   kdDebug(5300) << "KPimPrefs::usrReadConfig()" << endl;
 
   config()->setGroup("General");
   mCustomCategories = config()->readListEntry("Custom Categories");
   if (mCustomCategories.isEmpty()) setCategoryDefaults();
 }
 
 
 void KPimPrefs::usrWriteConfig()
 {
   config()->setGroup("General");
   config()->writeEntry("Custom Categories",mCustomCategories);
 }
 
 void KPimPrefs::setCategoryDefaults()
 {
   // empty implementation
 }
 
diff --git a/libkdepim/kpimprefs.h b/libkdepim/kpimprefs.h
index fde8093..9346f7d 100644
--- a/libkdepim/kpimprefs.h
+++ b/libkdepim/kpimprefs.h
@@ -1,70 +1,71 @@
 /*
     This file is part of libkdepim.
     Copyright (c) 2002 Cornelius Schumacher <schumacher@kde.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program 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 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.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #ifndef KPIMPREFS_H
 #define KPIMPREFS_H
 
 #include <qstringlist.h>
 
 #include "kprefs.h"
 
 class KPimPrefs : public KPrefs
 {
   public:
 
     KPimPrefs( const QString &name = QString::null );
 
     virtual ~KPimPrefs();
 
     /** Set preferences to default values */
     void usrSetDefaults();
 
     /** Read preferences from config file */
     void usrReadConfig();
 
     /** Write preferences to config file */
     void usrWriteConfig();
 
 
   public:
     QStringList mCustomCategories;
     QString mPassiveSyncPort;
     QString mPassiveSyncPw;
-  
+    int mRingSyncAlgoPrefs;
+    QString mLastSyncedLocalFile;
 
 
   protected:
     virtual void setCategoryDefaults();
 
 
 
 };
 
 #endif
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index fad9a76..568c2a9 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -1,1156 +1,1174 @@
 /*
     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$
 
 #include "ksyncmanager.h"
 
 #include <stdlib.h>
 
 #ifndef _WIN32_
 #include <unistd.h>
 #endif
 
 
 #include "ksyncprofile.h"
 #include "ksyncprefsdialog.h"
 #include "kpimprefs.h"
 #include <kmessagebox.h>
 
 #include <qdir.h>
 #include <qprogressbar.h>
 #include <qpopupmenu.h>
 #include <qpushbutton.h>
 #include <qradiobutton.h>
 #include <qbuttongroup.h>
 #include <qtimer.h>
 #include <qmessagebox.h>
 #include <qapplication.h>
 #include <qlineedit.h>
 #include <qdialog.h>
 #include <qlayout.h>
 #include <qtextcodec.h>
 #include <qlabel.h>
 
 #include <klocale.h>
 #include <kglobal.h>
 #include <kconfig.h>
 #include <kfiledialog.h>
 
 KSyncManager::KSyncManager(QWidget* parent, KSyncInterface* implementation, TargetApp ta, KPimPrefs* prefs, QPopupMenu* syncmenu)
     : QObject(), mParent(parent), mImplementation(implementation), mTargetApp(ta), mPrefs(prefs ),mSyncMenu(syncmenu)
 {
     mServerSocket = 0;
     bar = new QProgressBar ( 1, 0 );
     bar->setCaption ("");
     
     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 );
 
 }
 
 KSyncManager::~KSyncManager()
 {
   delete bar;
 }
 
-//LR ok
+
 void KSyncManager::fillSyncMenu()
 {
     if ( mSyncMenu->count() )
         mSyncMenu->clear();
     
     mSyncMenu->insertItem( i18n("Configure..."), 0 );
     mSyncMenu->insertSeparator();
     if ( mServerSocket == 0 ) {
         mSyncMenu->insertItem( i18n("Enable Pi-Sync"), 2 );
     } else {
         mSyncMenu->insertItem( i18n("Disable Pi-Sync"), 3 );
     }
     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();
         prof << i18n("Sharp_DTM");
         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","Sharp_DTM");
         config.sync();
         delete temp;
     }
     mExternSyncProfiles = config.readListEntry("ExternSyncProfiles");
     mSyncProfileNames = prof;
     unsigned int i;
     for ( i = 0; i < prof.count(); ++i ) {
         mSyncMenu->insertItem(  prof[i], 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 );
     }
     else if (!app_dir.exists(QDir::homeDirPath()+"/Applications/dtm" ) ) {
-        mSyncMenu->setItemEnabled( 1000, false );
+        mSyncMenu->removeItem( 1000 );
     }
+    mSyncMenu->removeItem( 1002 );
 }
 
 void KSyncManager::slotSyncMenu( int action )
 {
     //qDebug("syncaction %d ", action);
     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);
 
     mCurrentSyncProfile = action - 1000 ;
     mCurrentSyncDevice = mSyncProfileNames[mCurrentSyncProfile] ;
     mCurrentSyncName =  mLocalMachineName ;
     KConfig config ( locateLocal( "config","ksyncprofilesrc"  ) );
     KSyncProfile* temp = new KSyncProfile ();
     temp->setName(mSyncProfileNames[mCurrentSyncProfile]);
     temp->readConfig(&config);
     mAskForPreferences = temp->getAskForPreferences();
     mSyncAlgoPrefs = temp->getSyncPrefs();
     mWriteBackFile = temp->getWriteBackFile();
     mWriteBackExistingOnly = temp->getWriteBackExisting();
     mWriteBackInFuture = 0;
     if ( temp->getWriteBackFuture() )
         mWriteBackInFuture =  temp->getWriteBackFutureWeeks( );
     mShowSyncSummary = temp->getShowSummaryAfterSync();
     if ( action == 1000  ) {
         syncSharp();
     
     } else if ( action == 1001 ) {
         syncLocalFile();
 
     } else if ( action == 1002 ) {
         quickSyncLocalFile();
 
     } else if ( action >= 1003  ) {
         if ( temp->getIsLocalFileSync() ) {
-	  switch(mTargetApp)
-	  {
-	    case (KAPI):
-	      if ( syncWithFile( temp->getRemoteFileNameAB( ), false ) )
-                mLastSyncedLocalFile = temp->getRemoteFileNameAB();
-	      break;
-	    case (KOPI):
-	      if ( syncWithFile( temp->getRemoteFileName( ), false ) )
-                mLastSyncedLocalFile = temp->getRemoteFileName();
-	      break;
-	    case (PWMPI):
-	      if ( syncWithFile( temp->getRemoteFileNamePWM( ), false ) )
-                mLastSyncedLocalFile = temp->getRemoteFileNamePWM();
-	      break;
-	    default:
-	      qDebug("KSyncManager::slotSyncMenu: invalid apptype selected");
-	      break;
+            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("KSyncManager::slotSyncMenu: invalid apptype selected");
+                    break;
 	      
-	  }
+                }
         } else {
             if (  temp->getIsPhoneSync() ) {
                 mPhoneDevice = temp->getPhoneDevice( ) ;
                 mPhoneConnection = temp->getPhoneConnection( );
                 mPhoneModel = temp->getPhoneModel( );
                 syncPhone();
             } else if (  temp->getIsPiSync() ) {
                 if ( mTargetApp == KAPI ) {
                     mPassWordPiSync = temp->getRemotePwAB();
                     mActiveSyncPort = temp->getRemotePortAB();
                     mActiveSyncIP = temp->getRemoteIPAB();
                 } else if ( mTargetApp == KOPI ) {
                     mPassWordPiSync = temp->getRemotePw();
                     mActiveSyncPort = temp->getRemotePort();
                     mActiveSyncIP = temp->getRemoteIP();
                 } else  {
                     mPassWordPiSync = temp->getRemotePwPWM();
                     mActiveSyncPort = temp->getRemotePortPWM();
                     mActiveSyncIP = temp->getRemoteIPPWM();
                 } 
                 syncPi();
             } else
                 syncRemote( temp );
 
         }
     }
     delete temp;
     setBlockSave(false);
 }
+
 void KSyncManager::enableQuick()
 {
     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)").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);
     dia.setFixedSize( 230,80 );
     dia.setCaption( i18n("Enter port for Pi-Sync") );
     QPushButton pb ( "OK",  &dia);
     lay.addWidget( &pb );
     connect(&pb, SIGNAL( clicked() ), &dia, SLOT ( accept() ) );
     dia.show();
     if ( ! dia.exec() )
         return;
     dia.hide();
     qApp->processEvents();
     mPrefs->mPassiveSyncPw = lepw.text();
     mPrefs->mPassiveSyncPort = lab.text();
     bool ok;
     Q_UINT16 port = mPrefs->mPassiveSyncPort.toUInt(&ok);
     if ( ! ok ) {
         KMessageBox::information( 0, i18n("No valid port"));
         return;
     }
     //qDebug("port %d ", port);
     mServerSocket = new KServerSocket ( mPrefs->mPassiveSyncPw, port ,1 );
     mServerSocket->setFileName( defaultFileName() );
     //qDebug("connected ");
     if ( !mServerSocket->ok() ) {
         KMessageBox::information( 0, i18n("Failed to bind or\nlisten to the port!"));
         delete mServerSocket;
         mServerSocket = 0;
         return;
     }
-    //connect( mServerSocket, SIGNAL ( saveFile() ),this, SIGNAL  ( save() ) );
     connect( mServerSocket, SIGNAL ( request_file() ),this, SIGNAL  ( request_file() ) );
     connect( mServerSocket, SIGNAL ( file_received( bool ) ), this,  SIGNAL  ( getFile( bool ) ) );
 }
 
 void KSyncManager::syncLocalFile()
 {
 
-    QString fn =mLastSyncedLocalFile;
+    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("KSyncManager::syncLocalFile: invalid apptype selected");
 	      break;
 	      
 	  }
 
     fn =KFileDialog:: getOpenFileName( fn, i18n("Sync filename"+ext), mParent );
     if ( fn == "" )
         return;
     if (  syncWithFile(  fn, false ) ) {
         qDebug("syncLocalFile() successful ");
     }
 
 }
+
 bool  KSyncManager::syncWithFile( QString fn , bool quick )
 {
     bool ret = false;
     QFileInfo info;
     info.setFile( fn );
     QString mess;
     bool loadbup = true;
     if ( !info. exists() ) {
         mess =  i18n( "Sync file \n...%1\ndoes not exist!\nNothing synced!\n").arg(fn.right( 30) );
         int result = 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 )
         edit_sync_options();
     if ( result == 0 ) {
         //qDebug("Now sycing ... ");
         if ( ret = mImplementation->sync( this, fn, mSyncAlgoPrefs ) )
             mParent->topLevelWidget()->setCaption( i18n("Synchronization successful") );
         else
             mParent->topLevelWidget()->setCaption( i18n("Sync cancelled or failed. Nothing synced.") );
         if ( ! quick )
-            mLastSyncedLocalFile = fn;
+            mPrefs->mLastSyncedLocalFile = fn;
     }
     return ret;
 }
+
 void KSyncManager::quickSyncLocalFile()
 {
     
-    if ( syncWithFile( mLastSyncedLocalFile, false ) ) {
+    if ( syncWithFile( mPrefs->mLastSyncedLocalFile, false ) ) {
         qDebug("quick syncLocalFile() successful ");
       
     }
 }
+
 void KSyncManager::multiSync( bool askforPrefs  )
 {
     if (blockSave())
         return;
     setBlockSave(true);
     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("Sync"),
+    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 = mRingSyncAlgoPrefs;
+    mSyncAlgoPrefs = mPrefs->mRingSyncAlgoPrefs;
     if ( askforPrefs ) {
         edit_sync_options();
         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 completed!").arg(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;
     for ( i = 0; i < syncProfileNames.count(); ++i ) {
         mCurrentSyncProfile = i;
         temp->setName(syncProfileNames[mCurrentSyncProfile]);
         temp->readConfig(&config);
 
-	QString includeInRingSync;
-	switch(mTargetApp)
-	  {
-	  case (KAPI):
-	    includeInRingSync = temp->getIncludeInRingSyncAB();
-	      break;
-	  case (KOPI):
-	    includeInRingSync = temp->getIncludeInRingSync();
-	      break;
-	  case (PWMPI):
-	    includeInRingSync = temp->getIncludeInRingSyncPWM();
-	      break;
-	    default:
-	      qDebug("KSyncManager::ringSync: invalid apptype selected");
-	      break;
+        QString includeInRingSync;
+        switch(mTargetApp)
+            {
+            case (KAPI):
+                includeInRingSync = temp->getIncludeInRingSyncAB();
+                break;
+            case (KOPI):
+                includeInRingSync = temp->getIncludeInRingSync();
+                break;
+            case (PWMPI):
+                includeInRingSync = temp->getIncludeInRingSyncPWM();
+                break;
+            default:
+                qDebug("KSyncManager::ringSync: invalid apptype selected");
+                break;
 	      
-	  }
+            }
         
 	
-	if ( includeInRingSync && ( i < 1 || i > 2  )) {
+        if ( includeInRingSync && ( i < 1 || i > 2  )) {
             mParent->topLevelWidget()->setCaption(i18n("Profile ")+syncProfileNames[mCurrentSyncProfile]+ i18n(" is synced ... "));
             ++syncedProfiles;
             // mAskForPreferences = temp->getAskForPreferences();
             mWriteBackFile = temp->getWriteBackFile();
             mWriteBackExistingOnly = temp->getWriteBackExisting();
             mWriteBackInFuture = 0;
             if ( temp->getWriteBackFuture() )
                 mWriteBackInFuture =  temp->getWriteBackFutureWeeks( );
             mShowSyncSummary = false;
             mCurrentSyncDevice = syncProfileNames[i] ;
             mCurrentSyncName = mLocalMachineName;
             if ( i == 0 ) {
                 syncSharp();
             } else {
                 if ( temp->getIsLocalFileSync() ) {
-		  switch(mTargetApp)
-		    {
-		    case (KAPI):
-		      if ( syncWithFile( temp->getRemoteFileNameAB( ), false ) )
-			mLastSyncedLocalFile = temp->getRemoteFileNameAB();
-		      break;
-		    case (KOPI):
-		      if ( syncWithFile( temp->getRemoteFileName( ), false ) )
-			mLastSyncedLocalFile = temp->getRemoteFileName();
-		      break;
-		    case (PWMPI):
-		      if ( syncWithFile( temp->getRemoteFileNamePWM( ), false ) )
-			mLastSyncedLocalFile = temp->getRemoteFileNamePWM();
-		      break;
-		    default:
-		      qDebug("KSyncManager::slotSyncMenu: invalid apptype selected");
-		      break;
-		    }
+                    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("KSyncManager::slotSyncMenu: invalid apptype selected");
+                            break;
+                        }
                 } else {
                     if (  temp->getIsPhoneSync() ) {
                         mPhoneDevice = temp->getPhoneDevice( ) ;
                         mPhoneConnection = temp->getPhoneConnection( );
                         mPhoneModel = temp->getPhoneModel( );
                         syncPhone();
+                    } else if (  temp->getIsPiSync() ) {
+                        if ( mTargetApp == KAPI ) {
+                            mPassWordPiSync = temp->getRemotePwAB();
+                            mActiveSyncPort = temp->getRemotePortAB();
+                            mActiveSyncIP = temp->getRemoteIPAB();
+                        } else if ( mTargetApp == KOPI ) {
+                            mPassWordPiSync = temp->getRemotePw();
+                            mActiveSyncPort = temp->getRemotePort();
+                            mActiveSyncIP = temp->getRemoteIP();
+                        } else  {
+                            mPassWordPiSync = temp->getRemotePwPWM();
+                            mActiveSyncPort = temp->getRemotePortPWM();
+                            mActiveSyncIP = temp->getRemoteIPPWM();
+                        } 
+                        syncPi();
                     } 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("KSyncManager::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("KO: Remote copy result(0 = okay): %d ",result );
     if ( result != 0 ) {
         unsigned int len = maxlen;
         while ( len <  preCommand.length() ) {
             preCommand.insert( len , "\n" );
             len += maxlen +2;
         }
         question = i18n("Sorry, the copy command failed!\nCommand was:\n%1\n \nTry command on console to get more\ndetailed info about the reason.\n").arg (preCommand) ;
         QMessageBox::information( mParent, i18n("Sync - ERROR"),
                                   question,
                                   i18n("Okay!")) ;
-        mParent->topLevelWidget()->setCaption ("");
+        mParent->topLevelWidget()->setCaption ("KDE-Pim");
         return;
     }
     mParent->topLevelWidget()->setCaption ( i18n( "Copying succeed." ) );
     //qDebug(" file **%s** ",prof->getLocalTempFile().latin1() );
 
-
-
     if ( syncWithFile( localTempFile, true ) ) {
-//         Event* e = mView->getLastSyncEvent();
-//         e->setReadOnly( false );
-//         e->setLocation( KOPrefs::instance()->mSyncProfileNames[mCurrentSyncProfile]);
-//         e->setReadOnly( true );
+
         if ( mWriteBackFile ) {
             int fi;
             if ( (fi = postCommand.find("$PWD$")) > 0 ) {
                 QString pwd = getPassword();
                 postCommand = postCommand.left( fi )+ pwd + postCommand.mid( fi+5 );
                 
             }
             mParent->topLevelWidget()->setCaption ( i18n( "Writing back file ..." ) );
             result = system ( postCommand );
             qDebug("Writing back file result: %d ", result);
             if ( result != 0 ) {
                 mParent->topLevelWidget()->setCaption ( i18n( "Writing back file result: " )+QString::number( result ) );
                 return;
             } else {
                 mParent->topLevelWidget()->setCaption ( i18n( "Syncronization sucessfully completed" ) );
             }
         }
     }
     return;
 }
 
 void KSyncManager::edit_sync_options()
 {
     //mDialogManager->showSyncOptions();
     //mSyncAlgoPrefs 
     QDialog dia( mParent, "dia", true );
     dia.setCaption( i18n("Device: " ) +mCurrentSyncDevice );
     QButtonGroup gr ( 1,  Qt::Horizontal, i18n("Sync preferences"), &dia);
     QVBoxLayout lay ( &dia );
     lay.setSpacing( 2 );
     lay.setMargin( 3 );
     lay.addWidget(&gr);
     QRadioButton loc ( i18n("Take local entry on conflict"), &gr );
     QRadioButton rem ( i18n("Take remote entry on conflict"), &gr );
     QRadioButton newest( i18n("Take newest entry on conflict"), &gr );
     QRadioButton ask( i18n("Ask for every entry on conflict"), &gr );
     QRadioButton f_loc( i18n("Force: Take local entry always"), &gr );
     QRadioButton f_rem( i18n("Force: Take remote entry always"), &gr );
     //QRadioButton both( i18n("Take both on conflict"), &gr );
     QPushButton pb ( "OK",  &dia); 
     lay.addWidget( &pb );
     connect(&pb, SIGNAL( clicked() ), &dia, SLOT ( accept() ) ); 
     switch ( mSyncAlgoPrefs ) {
     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;
     }
     if ( dia.exec() ) {
         mSyncAlgoPrefs = rem.isChecked()*1+newest.isChecked()*2+  ask.isChecked()*3+  f_loc.isChecked()*4+  f_rem.isChecked()*5;//+  both.isChecked()*6 ;
     }
    
 
 }
+
 QString  KSyncManager::getPassword( )
 {
     QString retfile = "";
     QDialog dia ( mParent, "input-dialog", true );
     QLineEdit lab ( &dia );
     lab.setEchoMode( QLineEdit::Password );
     QVBoxLayout lay( &dia );
     lay.setMargin(7);
     lay.setSpacing(7);
     lay.addWidget( &lab);
     dia.setFixedSize( 230,50 );
     dia.setCaption( i18n("Enter password") );
     QPushButton pb ( "OK",  &dia);
     lay.addWidget( &pb );
     connect(&pb, SIGNAL( clicked() ), &dia, SLOT ( accept() ) );
     dia.show();
     int res = dia.exec();
     if ( res )
         retfile = lab.text();
     dia.hide();
     qApp->processEvents();
     return retfile;
 
 }
 
 
 void KSyncManager::confSync()
 { 
     static KSyncPrefsDialog* sp = 0;
     if ( ! sp ) {
         sp = new KSyncPrefsDialog( mParent, "syncprefs", true );
     }
     sp->usrReadConfig();
 #ifndef DESKTOP_VERSION
     sp->showMaximized();
 #else
     sp->show();
 #endif
     sp->exec();
     mSyncProfileNames = sp->getSyncProfileNames();
     mLocalMachineName = sp->getLocalMachineName ();
-    fillSyncMenu();
+    QTimer::singleShot ( 1, this, SLOT ( fillSyncMenu() ) ); 
 }
 
 void KSyncManager::syncSharp()
 {
+
     if ( ! syncExternalApplication("sharp") )
         qDebug("ERROR sync sharp  ");;
 }
 
 bool KSyncManager::syncExternalApplication(QString  resource)
 {
    
     emit save();
 
     if ( mAskForPreferences )
         edit_sync_options();
 
     qDebug("sync %s", resource.latin1());
 
     bool syncOK = mImplementation->syncExternal(this, resource);
 
     return syncOK;
 
 }
 
 void KSyncManager::syncPhone()
 {
-    emit save();
 
-    qDebug("pending syncPhone(); ");
-    //mView->syncPhone();
+    syncExternalApplication("phone");
 
 }
 
 void KSyncManager::showProgressBar(int percentage, QString caption, int total)
 {
   if (!bar->isVisible())
   {
     bar->setCaption (caption); 
     bar->setTotalSteps (  total  ) ;
 
     bar->show();
   }
 
   bar->setProgress( percentage );
 }
 
 void KSyncManager::hideProgressBar()
 {
   bar->hide();
 }
 
 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 _WIN32_
     return  locateLocal( "tmp", fn );
 #else
     return (QString( "/tmp/" )+ fn );
 #endif
 }
 
+
 void KSyncManager::syncPi()
 {
     qApp->processEvents();
     bool ok;
     Q_UINT16 port = mActiveSyncPort.toUInt(&ok);
     if ( ! ok ) {
         mParent->topLevelWidget()->setCaption( i18n("Sorry, no valid port.Syncing cancelled.") );
         return;
     }
     KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, port, mActiveSyncIP, this );
     connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) );
     mParent->topLevelWidget()->setCaption( i18n("Sending request for remote file ...") );
     commandSocket->readFile(  syncFileName() );
 }
 
 void KSyncManager::deleteCommandSocket(KCommandSocket*s, int state)
 {
     qDebug("MainWindow::deleteCommandSocket %d", state);
     
     //enum { success, errorW, errorR, quiet };
     if ( state == KCommandSocket::errorR ||state == KCommandSocket::errorTO ) {
          mParent->topLevelWidget()->setCaption( i18n("ERROR: Receiving remote file failed.") );
         delete s;
 	if ( state == KCommandSocket::errorR ) {
         KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this );
         connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) );
         commandSocket->sendStop();
 	}
         return;
         
     } else  if ( state == KCommandSocket::errorW ) {
          mParent->topLevelWidget()->setCaption( i18n("ERROR:Writing back file failed.") );
 
     } else  if ( state == KCommandSocket::successR ) {
         QTimer::singleShot( 1, this , SLOT ( readFileFromSocket()));
 
     } else  if ( state == KCommandSocket::successW ) {
          mParent->topLevelWidget()->setCaption( i18n("Pi-Sync succesful!") );
     }
 
     delete s;
 }
 
 void KSyncManager::readFileFromSocket()
 {
     QString fileName = syncFileName();
     mParent->topLevelWidget()->setCaption( i18n("Remote file saved to temp file.") );
     if ( ! syncWithFile( fileName , true ) ) {
         mParent->topLevelWidget()->setCaption( i18n("Syncing failed.") );
         qDebug("Syncing failed ");
         return;
     }
     KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this );
     connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) );
     if ( mWriteBackFile ) 
         commandSocket->writeFile(  fileName );
     else {
         commandSocket->sendStop();
         mParent->topLevelWidget()->setCaption( i18n("Pi-Sync succesful!") );
     }
 }
 
 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;
 };
 
 void KServerSocket::newConnection ( int socket ) 
 {
     // qDebug("KServerSocket:New connection %d ", socket); 
     if ( mSocket ) {
         qDebug("KServerSocket::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()
 {
     //qDebug(" KServerSocket::discardClient()");
     if ( mSocket ) {
         delete mSocket;
         mSocket = 0;
     }
     //emit endConnect();
 }
 void KServerSocket::readClient()
 {
     if ( blockRC )
         return;
     if ( mSocket == 0 ) {
         qDebug("ERROR::KServerSocket::readClient(): mSocket == 0  ");
         return;
     }
     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 );
                 send_file();
             else {
                 KMessageBox::information( 0, i18n("ERROR:\nGot send file request\nwith invalid password"));
                 qDebug("password %s, invalid password %s ",mPassWord.latin1(), tokens[1].latin1() );
             }
         } 
         if ( tokens[0] == "PUT" ) {
             if (  tokens[1] == mPassWord ) {
                 //emit getFile( mSocket );
                 blockRC = true;
                 get_file();
             }
             else {
                 KMessageBox::information( 0, i18n("ERROR:\nGot receive file request\nwith invalid password"));
                 qDebug("password %s, invalid password %s ",mPassWord.latin1(), tokens[1].latin1() );
             }
         } 
         if ( tokens[0] == "STOP" ) {
             //emit endConnect();
             end_connect();
         }
     }
 }
 void KServerSocket::end_connect()
 {
     delete mSyncActionDialog;
     mSyncActionDialog = 0;
 }
 void KServerSocket::send_file()
 {
     //qDebug("MainWindow::sendFile(QSocket* s) ");
     if ( mSyncActionDialog )
         delete mSyncActionDialog;
     mSyncActionDialog = new QDialog ( 0, "input-dialog", true );
     mSyncActionDialog->setCaption(i18n("Received sync request"));
     QLabel* label = new QLabel( i18n("Synchronizing from remote ...\n\nDo not use this application!\n\nIf syncing fails\nyou can close this dialog."), mSyncActionDialog );
     QVBoxLayout* lay = new QVBoxLayout( mSyncActionDialog );
     lay->addWidget( label);
     lay->setMargin(7);
     lay->setSpacing(7);
     mSyncActionDialog->setFixedSize( 230, 120);
     mSyncActionDialog->show();
     mSyncActionDialog->raise();
     qDebug("KSS::saving ... ");
     emit request_file();
     qApp->processEvents();
     QString fileName = mFileName;
     QFile file( fileName );
     if (!file.open( IO_ReadOnly ) ) {
         delete mSyncActionDialog;
         mSyncActionDialog = 0;
         qDebug("KSS::error open file ");
         mSocket->close();
         if ( mSocket->state() == QSocket::Idle )
             QTimer::singleShot( 10, this , SLOT ( discardClient()));
         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() << "\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("error open cal 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(); 
     delete mSyncActionDialog;
     mSyncActionDialog = 0;
     piFileString = "";
     blockRC = false;
     emit file_received( true );
 
 }
 
 KCommandSocket::KCommandSocket (  QString password, Q_UINT16 port, QString host, QObject * parent, const char * name ): QObject( parent, name )
 {
     mPassWord = password;
     mSocket = 0;
     mPort = port;
     mHost = host;
 
     mRetVal = quiet;
     mTimerSocket = new QTimer ( this );
     connect( mTimerSocket, SIGNAL ( timeout () ), this, SLOT ( deleteSocket()  ) );
 }
 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()) );
     }
     mFileString = "";
     mFileName = fn;
     mFirst = true;
     mSocket->connectToHost( mHost, mPort ); 
     QTextStream os( mSocket );
     os.setEncoding( QTextStream::Latin1 );
     os << "GET " << mPassWord << "\r\n";
     mTimerSocket->start( 10000 );
 }
 
 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 ;
     mSocket->connectToHost( mHost, mPort ); 
 }
 void KCommandSocket::writeFileToSocket()
 {
     QFile file2( mFileName );
     if (!file2.open( IO_ReadOnly ) ) {
         mRetVal= errorW;
         mSocket->close();
         if ( mSocket->state() == QSocket::Idle )
             QTimer::singleShot( 10, this , SLOT ( deleteSocket()));
         return ;
     }  
     QTextStream ts2( &file2 );
     ts2.setEncoding( QTextStream::Latin1 );
     QTextStream os2( mSocket );
     os2.setEncoding( QTextStream::Latin1 );
     os2 << "PUT " << mPassWord << "\r\n";;
     while ( ! ts2.atEnd() ) {
         os2 << ts2.readLine() << "\n";
     }
     mRetVal= successW;
     file2.close();
     mSocket->close();
     if ( mSocket->state() == QSocket::Idle )
         QTimer::singleShot( 10, this , SLOT ( deleteSocket()));
 }
 void KCommandSocket::sendStop()
 {
     if ( !mSocket ) {
         mSocket = new QSocket( this );
         connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) );
     }
     mSocket->connectToHost( mHost, mPort ); 
     QTextStream os2( mSocket );
     os2.setEncoding( QTextStream::Latin1 );
     os2 << "STOP\r\n";
     mSocket->close();
     if ( mSocket->state() == QSocket::Idle )
         QTimer::singleShot( 10, this , SLOT ( deleteSocket()));
 }
 
 void KCommandSocket::startReadFileFromSocket()
 {
     if ( ! mFirst )
         return;
     mFirst = false;
     mTimerSocket->stop();
     mFileString = "";
     mTime.start();
     QTimer::singleShot( 1, this , SLOT (readFileFromSocket( ) ));
 
 }
 void KCommandSocket::readFileFromSocket()
 {
     //qDebug("readBackFileFromSocket() %d ", mTime.elapsed ());
     while ( mSocket->canReadLine ()  ) {
         mTime.restart();
         QString line = mSocket->readLine ();
         mFileString += line;
         //qDebug("readline: %s ", line.latin1());
     }
     if ( mTime.elapsed () < 3000 ) {
         // wait for more 
         //qDebug("waitformore ");
         QTimer::singleShot( 100, this , SLOT (readFileFromSocket( ) ));
         return;
     }
     QString fileName = mFileName;
     QFile file ( fileName );
     if (!file.open( IO_WriteOnly ) ) {
         mFileString = "";
         mRetVal = errorR;
         qDebug("Error open temp calender file for writing: %s",fileName.latin1() );
         deleteSocket();
         return ;
                     
     } 
     // mView->setLoadedFileVersion(QDateTime::currentDateTime().addSecs( -1));
     QTextStream ts ( &file );
     ts.setEncoding( QTextStream::Latin1 );
     ts << mFileString;
     file.close();  
     mFileString = "";
     mRetVal = successR;
     mSocket->close();
     // if state is not idle, deleteSocket(); is called via 
     //  connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) );
     if ( mSocket->state() == QSocket::Idle )
         deleteSocket();
 }
 
 void KCommandSocket::deleteSocket()
 {
     if ( mTimerSocket->isActive () ) {
       mTimerSocket->stop();
       KMessageBox::information( 0, i18n("ERROR:\nConnection to remote host timed out!\nDid you forgot to enable\nsyncing on remote host? "));
       mRetVal = errorTO;
       if ( mSocket ) {
 	mSocket->close();
 	if ( mSocket->state() == QSocket::Idle )
 	  deleteSocket();
 	return;
       }
     }
     //qDebug("KCommandSocket::deleteSocket() %d", mRetVal ); 
     if ( mSocket)
         delete mSocket;
     mSocket = 0; 
     emit commandFinished( this, mRetVal );
 }
-
diff --git a/libkdepim/ksyncmanager.h b/libkdepim/ksyncmanager.h
index 25892d8..7027894 100644
--- a/libkdepim/ksyncmanager.h
+++ b/libkdepim/ksyncmanager.h
@@ -1,227 +1,226 @@
 /*
     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>
 
 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 readClient();
     void readBackFileFromSocket();
  private :
     bool blockRC;
     void send_file();
     void get_file();
     void end_connect();
     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, quiet };
     KCommandSocket ( QString password, Q_UINT16 port, QString host, QObject * parent=0, const char * name=0 );
     void readFile( QString );
     void writeFile( QString );
     void sendStop();
     
    
 signals:
     void commandFinished( KCommandSocket*, int );
 private slots:
     void startReadFileFromSocket();
     void readFileFromSocket();
     void deleteSocket();
     void writeFileToSocket();
  private :
     QSocket* mSocket; 
     QString mPassWord;
     Q_UINT16 mPort;
     QString mHost;
     QString mFileName;
     QTimer* mTimerSocket;
     int mRetVal;
     QTime mTime;
     QString mFileString;
     bool mFirst;
 };
 
 
 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) { mDefFileName = s ;}
     QString defaultFileName() { return mDefFileName ;}
     QString syncFileName();
     void fillSyncMenu();
 
     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 mShowSyncEvents;
     bool mShowTodoInAgenda;
     bool mWriteBackExistingOnly;
     int mSyncAlgoPrefs;
     int mRingSyncAlgoPrefs;
     bool mWriteBackFile;
     int  mWriteBackInFuture;
     QString mPhoneDevice;
     QString mPhoneConnection;
     QString mPhoneModel;
-    QString mLastSyncedLocalFile; // save!
     QString mPassWordPiSync;
     QString mActiveSyncPort;
     QString mActiveSyncIP ;
 
  signals:
     void save();
     void request_file();
     void getFile( bool );
 
  public slots:
     void slotSyncMenu( int );
     void deleteCommandSocket(KCommandSocket*s, int state);
     void readFileFromSocket();
 
  private:
     // LR *******************************
     // sync stuff!
     void syncPi();
     KServerSocket * mServerSocket;
     void enableQuick();
     KPimPrefs* mPrefs;
     QString mDefFileName;
     QString mCurrentSyncDevice;
     QString mCurrentSyncName;
     void quickSyncLocalFile();
     bool  syncWithFile( QString fn , bool quick );
     void syncLocalFile();
     void syncPhone();
     void syncSharp();
     bool syncExternalApplication(QString);
-    void multiSync( bool askforPrefs  );
     int mCurrentSyncProfile ;
     void syncRemote( KSyncProfile* prof,  bool ask = true);
     void edit_sync_options();
     int ringSync();
     QString  getPassword( );
 
   private slots:
     void confSync();
     // *********************
 
  private:
     bool mBlockSaveFlag;
 
 
     QWidget* mParent;
     KSyncInterface* mImplementation;
     TargetApp mTargetApp; 
     QPopupMenu* mSyncMenu;
 
     QProgressBar* bar;
 
 
 
 
 
 };
 
 
 class KSyncInterface 
 { 
   
 
  public :
     virtual bool sync(KSyncManager* manager, QString filename, int mode) = 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