1 files changed, 48 insertions, 88 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index ea9607d..b56f1f9 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -697,25 +697,13 @@ void CalendarView::createPrinter()
     }
 #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
 
@@ -874,13 +862,13 @@ Event* CalendarView::getLastSyncEvent()
     //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 );
@@ -1116,13 +1104,13 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
                 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 );
@@ -1132,30 +1120,30 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
                 } 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
@@ -1189,16 +1177,16 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
     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;
 }
@@ -1222,13 +1210,13 @@ bool CalendarView::syncCalendar(QString filename, int mode)
     // 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 );
@@ -1238,20 +1226,18 @@ bool CalendarView::syncCalendar(QString filename, int mode)
     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;
@@ -1262,26 +1248,26 @@ void CalendarView::syncExternal( int mode  )
         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);
@@ -1326,13 +1312,13 @@ void CalendarView::syncExternal( int mode  )
     updateView();
     return ;//syncOK;
 
 }
 void CalendarView::syncSharp()
 {
-    syncExternal( 0 );
+    //DELETE
 
 }
 
 
 bool CalendarView::importBday()
 {
@@ -1514,13 +1500,13 @@ bool CalendarView::importQtopia( const QString &categories,
     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;
@@ -1532,17 +1518,17 @@ bool CalendarView::importQtopia( const QString &categories,
         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 );
         }
@@ -1680,17 +1666,17 @@ bool CalendarView::checkFileVersion(QString fn)
    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;
 }
@@ -2195,59 +2181,13 @@ 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();
@@ -3765,9 +3705,29 @@ NavigatorBar *CalendarView::navigatorBar()
 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;
+}