Made sync profile dialog korganizer independent

author: zautrix <zautrix> 2004-08-01 12:56:11 (UTC)
committer: zautrix <zautrix> 2004-08-01 12:56:11 (UTC)
commit: cc2643f4be54269db8c24f66fdcbbf6954d5f537 (patch) (unidiff)
tree: 3562598dac624305dfb9fd1911a4b314ae40945d
parent: c31e99f265dbe8762efca20667f8ccd973840f8f (diff)
download: kdepimpi-cc2643f4be54269db8c24f66fdcbbf6954d5f537.zip
kdepimpi-cc2643f4be54269db8c24f66fdcbbf6954d5f537.tar.gz
kdepimpi-cc2643f4be54269db8c24f66fdcbbf6954d5f537.tar.bz2
5 files changed, 47 insertions, 52 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index b543eca..c75d10e 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -47,385 +47,384 @@
 #include <qfile.h>
 #include <qdir.h>
 #ifndef KORG_NOSPLITTER
 #include <qsplitter.h>
 #endif
 #include <kglobal.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
 #include <kfiledialog.h>
 #include <kmessagebox.h>
 #include <knotifyclient.h>
 #include <kconfig.h>
 #include "kosyncprefsdialog.h"
 #include <krun.h>
 #include <kdirwatch.h>
 #include <libkdepim/kdatepicker.h>
 #include <libkdepim/ksyncprofile.h>
 #include <libkcal/vcaldrag.h>
 #include <libkcal/icaldrag.h>
 #include <libkcal/icalformat.h>
 #include <libkcal/vcalformat.h>
 #include <libkcal/scheduler.h>
 #include <libkcal/calendarlocal.h>
 #include <libkcal/journal.h>
 #include <libkcal/calfilter.h>
 #include <libkcal/attendee.h>
 #include <libkcal/dndfactory.h>
 #include <libkcal/freebusy.h>
 #include <libkcal/filestorage.h>
 #include <libkcal/calendarresources.h>
 #include <libkcal/qtopiaformat.h>
 #include "../kalarmd/alarmdialog.h"
 #ifndef DESKTOP_VERSION
 #include <libkcal/sharpformat.h>
 #endif
 #ifndef KORG_NOMAIL
 #include "komailclient.h"
 #endif
 #ifndef KORG_NOPRINTER
 #include "calprinter.h"
 #endif
 #ifndef KORG_NOPLUGINS
 #include "kocore.h"
 #endif
 #include "koeventeditor.h"
 #include "kotodoeditor.h"
 #include "koprefs.h"
 #include "koeventviewerdialog.h"
 #include "publishdialog.h"
 #include "kofilterview.h"
 #include "koglobals.h"
 #include "koviewmanager.h"
 #include "koagendaview.h"
 #include "kodialogmanager.h"
 #include "outgoingdialog.h"
 #include "incomingdialog.h"
 #include "statusdialog.h"
 #include "kdatenavigator.h"
 #include "kotodoview.h"
 #include "datenavigator.h"
 #include "resourceview.h"
 #include "navigatorbar.h"
 #include "searchdialog.h"
 #include "mainwindow.h"
 #include "calendarview.h"
 #ifndef DESKTOP_VERSION
 #include <qtopia/alarmserver.h> 
 #endif
 #ifndef _WIN32_
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
 #else
 #include <qprocess.h>
 #endif
 using namespace KOrg;
 using namespace KCal;
 extern int globalFlagBlockAgenda;
 extern int globalFlagBlockStartup;
 class KOBeamPrefs : public QDialog
 {
  public:
    KOBeamPrefs( QWidget *parent=0, const char *name=0 ) :
      QDialog( parent, name, true ) 
    {
        setCaption( i18n("Beam Options") );
        QVBoxLayout* lay = new QVBoxLayout( this );
        lay->setSpacing( 3 );
        lay->setMargin( 3 );
        QButtonGroup* format = new  QButtonGroup( 1, Horizontal, i18n("File format"), this );
        lay->addWidget( format ); 
        format->setExclusive ( true ) ;
        QButtonGroup* time = new  QButtonGroup(1, Horizontal, i18n("Time format"), this );
        lay->addWidget( time ); time->setExclusive ( true ) ;
        vcal = new QRadioButton(" vCalendar ", format );
        ical = new QRadioButton(" iCalendar ", format );
        vcal->setChecked( true );
        tz = new QRadioButton(i18n(" With timezone "), time );
        local = new QRadioButton(i18n(" Local time "), time );
        tz->setChecked( true );
        QPushButton * ok = new QPushButton( i18n("Beam via IR!"), 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( 200, 200 );
    }
      
    bool beamVcal() { return vcal->isChecked(); }
    bool beamLocal() { return local->isChecked(); }
 private:
    QRadioButton* vcal, *ical, *local, *tz;
 };
 class KOCatPrefs : public QDialog
 {
  public:
    KOCatPrefs( QWidget *parent=0, const char *name=0 ) :
      QDialog( parent, name, true ) 
    {
        setCaption( i18n("Manage new Categories") );
        QVBoxLayout* lay = new QVBoxLayout( this );
        lay->setSpacing( 3 );
        lay->setMargin( 3 );
        QLabel * lab = new QLabel( i18n("After importing/loading/syncing\nthere may be new categories in\nevents or todos\nwhich are not in the category list.\nPlease choose what to do:\n "), this );
        lay->addWidget( lab ); 
        QButtonGroup* format = new  QButtonGroup( 1, Horizontal, i18n("New categories not in list:"), this );
        lay->addWidget( format ); 
        format->setExclusive ( true ) ;
        addCatBut = new QRadioButton(i18n("Add to category list"), format );
        new QRadioButton(i18n("Remove from Events/Todos"), format );
        addCatBut->setChecked( true );
        QPushButton * ok = new QPushButton( i18n("OK"), 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( 200, 200 );
    }
      
    bool addCat() { return addCatBut->isChecked(); }
 private:
    QRadioButton* addCatBut;
 };
 CalendarView::CalendarView( CalendarResources *calendar,
                            QWidget *parent, const char *name )
    : CalendarViewBase( parent, name ),
      mCalendar( calendar ),
      mResourceManager( calendar->resourceManager() )
 {
    mEventEditor = 0;
    mTodoEditor = 0;
 
    init();
 }
 CalendarView::CalendarView( Calendar *calendar,
                            QWidget *parent, const char *name )
    : CalendarViewBase( parent, name ),
      mCalendar( calendar ),
      mResourceManager( 0 )
 {
 
    mEventEditor = 0;
    mTodoEditor = 0;
    init();}
 void CalendarView::init()
 { 
    beamDialog = new KOBeamPrefs();
    mDatePickerMode = 0;
    mCurrentSyncDevice = "";
    writeLocale();
    mViewManager = new KOViewManager( this );
    mDialogManager = new KODialogManager( this );
    mEventViewerDialog = 0;
    mModified = false;
    mReadOnly = false;
    mSelectedIncidence = 0;
-    mSyncProfiles.setAutoDelete(true);
    mCalPrinter = 0;
    mFilters.setAutoDelete(true);
    mCalendar->registerObserver( this );
    // TODO: Make sure that view is updated, when calendar is changed.
    mStorage = new FileStorage( mCalendar );
    mNavigator = new DateNavigator( this, "datevav", mViewManager );
    QBoxLayout *topLayout = (QBoxLayout*)layout();
 #ifndef KORG_NOSPLITTER
    // create the main layout frames.
    mPanner = new QSplitter(QSplitter::Horizontal,this,"CalendarView::Panner");
    topLayout->addWidget(mPanner);
    mLeftSplitter = new QSplitter(QSplitter::Vertical,mPanner,
                                  "CalendarView::LeftFrame");
    mPanner->setResizeMode(mLeftSplitter,QSplitter::KeepSize);
    mDateNavigator = new KDateNavigator(mLeftSplitter, mCalendar, TRUE,
                                        "CalendarView::DateNavigator", QDate::currentDate() );
    mLeftSplitter->setResizeMode(mDateNavigator,QSplitter::KeepSize);
    mTodoList = new KOTodoView(mCalendar, mLeftSplitter, "todolist_small2");
    mFilterView = new KOFilterView(&mFilters,mLeftSplitter,"CalendarView::FilterView");
 #ifdef KORG_NORESOURCEVIEW 
    mResourceView = 0;
 #else
    if ( mResourceManager ) {
        mResourceView = new ResourceView( mResourceManager, mLeftSplitter );
        mResourceView->updateView();
        connect( mResourceView, SIGNAL( resourcesChanged() ),
                 SLOT( updateView() ) );
    } else {
        mResourceView = 0;
    }
 #endif
    QWidget *rightBox = new QWidget( mPanner );
    QBoxLayout *rightLayout = new QVBoxLayout( rightBox );
    mNavigatorBar = new NavigatorBar( QDate::currentDate(), rightBox, "useBigPixmaps" );
    rightLayout->addWidget( mNavigatorBar );
    mRightFrame = new QWidgetStack( rightBox );
    rightLayout->addWidget( mRightFrame, 1 );
    mLeftFrame = mLeftSplitter;
 #else
    QWidget *mainBox = new QWidget( this );
    QWidget *leftFrame = new QWidget( mainBox );
    QBoxLayout * mainBoxLayout;
    QBoxLayout * leftFrameLayout;
    if ( KOPrefs::instance()->mVerticalScreen ) {
        mainBoxLayout  = new QVBoxLayout(mainBox); 
        leftFrameLayout = new QHBoxLayout(leftFrame ); 
    } else {
        mainBoxLayout  = new QHBoxLayout(mainBox);
        leftFrameLayout = new  QVBoxLayout(leftFrame ); 
    }
    topLayout->addWidget( mainBox );
    mainBoxLayout->addWidget (leftFrame);
    mDateNavigator = new KDateNavigator(leftFrame, mCalendar, TRUE,
                                        "CalendarView::DateNavigator", QDate::currentDate());
    // mDateNavigator->blockSignals( true );
    leftFrameLayout->addWidget( mDateNavigator  );
    mFilterView = new KOFilterView(&mFilters,leftFrame,"CalendarView::FilterView");
    mTodoList = new KOTodoView(mCalendar, leftFrame, "todolist");
    
    if (  QApplication::desktop()->width() < 480 ) {
        leftFrameLayout->addWidget(mFilterView);
        leftFrameLayout->addWidget(mTodoList, 2 );
      
    } 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()),
@@ -501,392 +500,394 @@ void CalendarView::checkNextTimerAlarm()
 }
 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 KOSyncPrefsDialog* sp = 0;
    if ( ! sp ) {
        sp = new KOSyncPrefsDialog( this, "syncprefs", true );
    }
+    sp->setLocalMachineName ( KOPrefs::instance()->mLocalMachineName );
    sp->usrReadConfig();
 #ifndef DESKTOP_VERSION
    sp->showMaximized();
 #else
    sp->show();
 #endif
    sp->exec();
+    KOPrefs::instance()->mSyncProfileNames = sp->getSyncProfileNames();
+    KOPrefs::instance()->mLocalMachineName = sp->getLocalMachineName ();
 }
 //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;
    if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
        bool remCh, locCh;
        remCh = ( remote->zaurusUid() != local->zaurusUid() );
        locCh = ( local->lastModified() > mLastCalendarSync );
        //qDebug("locCh %d remCh %d locuid %d remuid %d", locCh, remCh,local->zaurusUid(), remote->zaurusUid() );
        if ( !remCh && ! locCh ) {
            //qDebug("both not changed ");
            lastSync = local->lastModified().addDays(1);
        } else {
            if ( locCh ) {
                //qDebug("loc changed %d %d", local->zaurusStat(), local->revision() );
                lastSync = local->lastModified().addDays( -1 );
                if ( !remCh )
                    remote->setLastModified( lastSync.addDays( -1 ) );
            } else {
                //qDebug(" not loc changed ");
                lastSync = local->lastModified().addDays( 1 );
                if ( remCh )
                    remote->setLastModified( lastSync.addDays( 1 ) );
                
            }
        }
        full = true;  
        if ( mode < SYNC_PREF_ASK )
            mode = SYNC_PREF_ASK;
    } else {
          if ( local->lastModified() == remote->lastModified() )
            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", local->lastModified().toString().latin1() , local->revision(), remote->lastModified().toString().latin1(), remote->revision());  
    //qDebug("%d %d %d %d ", local->lastModified().time().second(), local->lastModified().time().msec(),  remote->lastModified().time().second(), remote->lastModified().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->setZaurusUid( remote->zaurusUid() );
            }
            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;
    if ( full && mode < SYNC_PREF_NEWEST )
        mode = SYNC_PREF_ASK;
    switch( mode ) {
    case SYNC_PREF_LOCAL:
        if ( lastSync > remote->lastModified() )
            return 1;
        if ( lastSync > local->lastModified() )
            return 2;
        return 1;
        break;
    case SYNC_PREF_REMOTE:
        if ( lastSync > remote->lastModified() )
            return 1;
        if ( lastSync > local->lastModified() )
            return 2;
        return 2;
        break;
    case SYNC_PREF_NEWEST:
        if ( local->lastModified() > remote->lastModified() )
            return 1;
        else
            return 2;
        break;
    case SYNC_PREF_ASK: 
        //qDebug("lsy %s  ---  lo %s  --- re %s ", lastSync.toString().latin1(), local->lastModified().toString().latin1(), remote->lastModified().toString().latin1()  );
        if ( lastSync > remote->lastModified() )
            return 1;
        if ( lastSync > local->lastModified() )
            return 2;
        //qDebug("lsy %s  ---  lo %s  --- re %s ", lastSync.toString().latin1(), local->lastModified().toString().latin1(), remote->lastModified().toString().latin1()  );
        localIsNew = local->lastModified() > remote->lastModified();
        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-device-"+mCurrentSyncDevice );
    if (!lse) {
        lse = new Event();
        lse->setUid( "last-syncEvent-device-"+mCurrentSyncDevice ); 
        lse->setSummary(mCurrentSyncDevice + i18n(" - sync event"));
        lse->setDtStart( mLastCalendarSync );
        lse->setDtEnd( mLastCalendarSync.addSecs( 7200 ) );
        lse->setCategories( i18n("SyncEvent") );
        lse->setReadOnly( true );
        mCalendar->addEvent( lse );
    }
    return lse;
 }
 void CalendarView::checkSharpEvent( Event* lastSync, Incidence* toDelete )
 {
    if ( ! lastSync )
        return;
    if ( toDelete->zaurusId() < 0 )
        return;
    if ( toDelete->type() == "Journal" )
        return;
    QString des = lastSync->description();
    QString pref = "e";
    if ( toDelete->type() == "Todo" )
        pref = "t";
    des += pref+ QString::number ( toDelete->zaurusId() ) + ",";
    lastSync->setReadOnly( false );
    lastSync->setDescription( des );
    lastSync->setReadOnly( true );
 }
 bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int mode )
 {
    bool syncOK = true;
    int addedEvent = 0;
    int addedEventR = 0;
    int deletedEventR = 0;
    int deletedEventL = 0;
@@ -1374,407 +1375,384 @@ bool CalendarView::openCalendar(QString filename, bool merge)
        }
        globalFlagBlockAgenda = 2;
        // if ( getLastSyncEvent() )
        //  getLastSyncEvent()->setReadOnly( true );
        mCalendar->reInitAlarmSettings();
        setSyncEventsReadOnly();
        updateUnmanagedViews();
        updateView();
        if (  filename != MainWindow::defaultFileName() )
            saveCalendar( MainWindow::defaultFileName() );
        loadedFileVersion = QDateTime::currentDateTime();
        return true;
    } else {
        // while failing to load, the calendar object could
        // have become partially populated.  Clear it out.
        if ( !merge ) mCalendar->close();
        KMessageBox::error(this,i18n("Couldn't load calendar\n '%1'.").arg(filename));
        globalFlagBlockAgenda = 2;
        updateView();
    }
    return false;
 }
 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;
 }
 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, false)) ,
                                                 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;
    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( KOPrefs::instance()->mUseQuicksave) );
    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
-    // pending read sync settings;
-    mSyncProfileNames.clear();
-    mSyncProfileNames << "Profile_1";
-    mSyncProfileNames << "Profile_2";
-    mSyncProfileNames << "Profile_3";
-    mSyncProfileNames << "Profile_4";
-    mSyncProfileNames << "Profile_5";
-    KSyncProfile* temp = new KSyncProfile ();
-    temp->setName("Profile_1" );
-    mSyncProfiles.append( temp );
-    temp = new KSyncProfile ();
-    temp->setName("Profile_2" );
-    mSyncProfiles.append( temp );
-   temp = new KSyncProfile ();
-    temp->setName("Profile_3" );
-    mSyncProfiles.append( temp );
-    temp = new KSyncProfile ();
-    temp->setName("Profile_4" );
-    mSyncProfiles.append( temp );
-    temp = new KSyncProfile ();
-    temp->setName("Profile_5" );
-    mSyncProfiles.append( temp );
 }
 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()
 {
    KGlobal::locale()->setHore24Format( !KOPrefs::instance()->mPreferredTime );
    KGlobal::locale()->setWeekStartMonday( !KOPrefs::instance()->mWeekStartsOnSunday );
    KGlobal::locale()->setIntDateFormat( (KLocale::IntDateFormat)KOPrefs::instance()->mPreferredDate );
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index fda02f7..8aa5e1c 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -293,296 +293,294 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
  
    /** 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();
    void toggleFilter();
    void showFilter(bool visible);
    void updateFilter();
    void filterEdited();
    void selectFilter( int );
    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 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();
    void confSync();
    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:
    AlarmDialog * mAlarmDialog;
    QString mAlarmNotification;
    QString mSuspendAlarmNotification;
    QTimer* mSuspendTimer;
    QTimer* mAlarmTimer;
    QTimer* mRecheckAlarmTimer;
    void computeAlarm( QString );
    void startAlarm( QString, QString );
    void setSyncEventsReadOnly();
    
    QDateTime loadedFileVersion;
    void checkSharpEvent( Event* lastSync, Incidence* toDelete );
-    QPtrList<KSyncProfile> mSyncProfiles;
-    QStringList mSyncProfileNames;
    void checkZaurusId( int id, bool todo = false );
    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/kosyncprefsdialog.cpp b/korganizer/kosyncprefsdialog.cpp
index b7e4265..7c838f5 100644
--- a/korganizer/kosyncprefsdialog.cpp
+++ b/korganizer/kosyncprefsdialog.cpp
@@ -1,452 +1,468 @@
 /*
    This file is part of KOrganizer.
    Copyright (c) 2004 Lutz Rogowski <rogowski@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 <qlayout.h>
 #include <qlabel.h>
 #include <qgroupbox.h>
 #include <qbuttongroup.h>
 #include <qlineedit.h>
 #include <qfont.h>
 #include <qslider.h>
 #include <qfile.h>
+#include <qdir.h>
 #include <qtextstream.h>
 #include <qcombobox.h>
 #include <qvbox.h>
 #include <qhbox.h>
 #include <qspinbox.h>
 #include <qdatetime.h>
 #include <qcheckbox.h>
 #include <qradiobutton.h>
 #include <qpushbutton.h>
 #include <qstrlist.h>
 #include <qapplication.h>
 #include <kcolorbutton.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kfontdialog.h>
 #include <kmessagebox.h>
 #include <kcolordialog.h>
 #include <kiconloader.h>
 #include <kemailsettings.h>
 #include <kstandarddirs.h>
 #include <kfiledialog.h>
 #include <kmessagebox.h>
 #include <kurlrequester.h>
 #include <klineedit.h>
 #include <libkdepim/ksyncprofile.h>
-#include "koprefs.h"
+//#include "koprefs.h"
 #include "kosyncprefsdialog.h"
-#include "koglobals.h"
+//#include "koglobals.h"
 KOSyncPrefsDialog::KOSyncPrefsDialog(QWidget *parent, char *name, bool modal) :
  KDialog(parent,name,true)
 {
  setCaption( i18n("Synchronization Preferences"));
  mSyncProfiles.setAutoDelete( true );
   setupSyncAlgTab();
 }
 KOSyncPrefsDialog::~KOSyncPrefsDialog()
 {
 }
  
 #include <qlayout.h>
 #include <qscrollview.h>
 void KOSyncPrefsDialog::setupSyncAlgTab()
 {
  QLabel * lab;
  //QFrame *page = addPage(i18n("Sync Prefs"),0,0);
  QVBox * mainbox = new QVBox( this );
   QScrollView* sv = new QScrollView( mainbox );
   QHBoxLayout * lay = new QHBoxLayout( this );
   lay->addWidget( mainbox );
   QHBox * b_box = new QHBox( mainbox );
   QPushButton* button = new QPushButton( i18n("Ok"), b_box );
   connect ( button, SIGNAL( clicked()), this, SLOT (slotOK() ) );
   button = new QPushButton( i18n("Cancel"), b_box );
   connect ( button, SIGNAL( clicked()), this, SLOT (reject() ) );
   //QBoxLayout * sl = new QVBoxLayout(this );
   //sl->addWidget ( sv );  
   sv->setResizePolicy ( QScrollView::AutoOneFit );
   QFrame *topFrame = new QFrame ( sv );
   sv->addChild( topFrame );
   mSetupSyncAlgTab = topFrame;
   QGridLayout *topLayout = new QGridLayout(topFrame,6,2);
   topLayout->setSpacing(spacingHint());
   topLayout->setMargin(marginHint());  
   //lab = new QLabel(i18n("Sync settings not yet implemented. DO NOT USE!"), topFrame);
   int iii = 0;
   //topLayout->addMultiCellWidget(lab , iii,iii,0,1);
   //++iii;
   mMyMachineName = new QLineEdit(topFrame);
   lab = new QLabel(mMyMachineName, i18n("Local device name:"), topFrame);
   topLayout->addWidget(lab ,iii,0);
   topLayout->addWidget(mMyMachineName,iii,1);
   ++iii;
  
   QHBox* buttonbox = new QHBox( topFrame);
   topLayout->addMultiCellWidget(buttonbox, iii,iii,0,1);
   ++iii;
   button = new QPushButton( i18n("New profile"), buttonbox );
   connect ( button, SIGNAL( clicked()), this, SLOT (newProfile() ) ); 
   button = new QPushButton( i18n("Clone profile"), buttonbox );
   connect ( button, SIGNAL( clicked()), this, SLOT ( cloneProfile() ) );
   button = new QPushButton( i18n("Delete profile"), buttonbox );
   connect ( button, SIGNAL( clicked()), this, SLOT (deleteProfile() ) );
   mProfileBox = new QComboBox(topFrame);
   mProfileBox->setEditable ( true ); 
   connect ( mProfileBox, SIGNAL(activated ( int ) ), this, SLOT (profileChanged( int ) ) );
   connect ( mProfileBox, SIGNAL(  textChanged ( const QString & ) ), this, SLOT (textChanged( const QString & ) ) );
  
   lab = new QLabel(mProfileBox, i18n("Profile:"), topFrame);
   topLayout->addWidget(lab ,iii,0);
   topLayout->addWidget(mProfileBox, iii,1); 
   ++iii;
   mIncludeInRing = new QCheckBox( i18n("Include in multiple sync"), topFrame   );
   topLayout->addMultiCellWidget(mIncludeInRing, iii,iii,0,1);
   ++iii;
   mAskForPreferences = new QCheckBox( i18n("Ask for preferences before sync"), topFrame   );
   topLayout->addMultiCellWidget(mAskForPreferences, iii,iii,0,1);
   ++iii;
    QButtonGroup* gr = new QButtonGroup ( 1,  Qt::Horizontal, i18n("Sync preferences"), topFrame);
   topLayout->addMultiCellWidget(gr, iii,iii,0,1);
   ++iii;
   loc = new QRadioButton ( i18n("Take local entry on conflict"), gr );
   rem = new QRadioButton ( i18n("Take remote entry on conflict"), gr );
   newest = new QRadioButton ( i18n("Take newest entry on conflict"), gr );
   ask = new QRadioButton ( i18n("Ask for every entry on conflict"), gr );
   f_loc= new QRadioButton ( i18n("Force: Take local entry always"), gr );
   f_rem = new QRadioButton ( i18n("Force: Take remote entry always"), gr );
   // both = new QRadioButton ( i18n("Take both on conflict"), gr );
   mShowSummaryAfterSync = new QCheckBox( i18n("Show summary after sync"), topFrame   );
   topLayout->addMultiCellWidget(mShowSummaryAfterSync, iii,iii,0,1);
   ++iii;
   
   mWriteBackExisting= new QCheckBox( i18n("Write back existing entries only"), topFrame   );
   topLayout->addMultiCellWidget(mWriteBackExisting, iii,iii,0,1);
   ++iii;
   
   mWriteBackFile = new QCheckBox( i18n("Write back file"), topFrame   );
   topLayout->addMultiCellWidget(mWriteBackFile, iii,iii,0,1);
   ++iii;
   proGr = new QButtonGroup ( 1,  Qt::Horizontal, i18n("Profile kind"), topFrame);
   gr = proGr;
   topLayout->addMultiCellWidget(gr, iii,iii,0,1);
   ++iii;
   mIsLocal = new QRadioButton ( i18n("Local file"), gr );
   mIsNotLocal = new QRadioButton ( i18n("Remote file (w down/upload command)"), gr );
   connect (mIsLocal, SIGNAL( toggled(bool)), this, SLOT (kindChanged(bool) ) ); 
   localFileWidget = new QVBox( topFrame);
   topLayout->addMultiCellWidget(localFileWidget, iii,iii,0,1);
   ++iii;
   QHBox* temphb = new QHBox( localFileWidget );
   lab = new QLabel( i18n("Local file:"), temphb);
   mRemoteFile = new QLineEdit(localFileWidget);
   button = new QPushButton( i18n("Choose..."), temphb );
   connect ( button, SIGNAL( clicked()), this, SLOT ( chooseFile() ) );
   remoteFileWidget = new QVBox( topFrame);
   topLayout->addMultiCellWidget(remoteFileWidget, iii,iii,0,1);
   ++iii;
   lab = new QLabel( i18n("Pre sync (download) command:"), remoteFileWidget);
   mRemotePrecommand = new QLineEdit(remoteFileWidget);
   lab = new QLabel( i18n("Local temp file:"), remoteFileWidget);
   mLocalTempFile = new QLineEdit(remoteFileWidget);
  
   lab = new QLabel( i18n("Post sync (upload) command:"), remoteFileWidget);
   mRemotePostcommand = new QLineEdit(remoteFileWidget);
   lab = new QLabel( i18n("Fill in default values for:"), remoteFileWidget);
   temphb = new QHBox( remoteFileWidget );
   button = new QPushButton( i18n("ssh/scp"), temphb );
   connect ( button, SIGNAL( clicked()), this, SLOT (fillSSH() ) );
   button = new QPushButton( i18n("ftp"), temphb );
   connect ( button, SIGNAL( clicked()), this, SLOT (fillFTP() ) );
   lab = new QLabel( i18n("Hint: Use $PWD$ for placeholder of password!"), remoteFileWidget);
   
 }
 void KOSyncPrefsDialog::slotOK()
 {
    if ( mMyMachineName->text() == "undefined" ) {
        KMessageBox::error(this,i18n("Local device name undefined!\nPlease define device name!"),i18n("KO/Pi config error"));
        return;
    }
    int i;
    for (i = 0; i < mSyncProfileNames.count(); ++ i) {
        if ( mSyncProfileNames.contains( mSyncProfileNames[i]) > 1  ) {
            KMessageBox::error(this,i18n("Multiple profiles with same name!\nPlease use unique profile names!"),i18n("KO/Pi config error"));
            return;
        }
    }
    usrWriteConfig();
    QDialog::accept();
 }
 void KOSyncPrefsDialog::accept()
 {
    slotOK();
 }
 void KOSyncPrefsDialog::chooseFile()
 {
-    QString fn =KOPrefs::instance()->mLastSyncedLocalFile;
+    QString fn = QDir::homeDirPath();
    fn =KFileDialog:: getOpenFileName( fn, i18n("Sync filename(*.ics/*.vcs)"), this );
    if ( fn == "" )
        return;
    mRemoteFile->setText( fn );
 }
 void KOSyncPrefsDialog::textChanged( const QString &  s )
 {
    if ( mProfileBox->count() == 0 )
        return;
    if ( currentSelection < 3 ) {
        //KMessageBox::error(this,i18n("This profil name\ncannot be edited!\n"),i18n("KO/Pi config error"));
        mProfileBox->blockSignals( true );
        mProfileBox->setCurrentItem(mProfileBox-> currentItem ());
        mProfileBox->blockSignals( false );
        return;
    }
    //qDebug("cur i %d ",mProfileBox-> currentItem () );
    mProfileBox->changeItem ( s, mProfileBox-> currentItem () ) ;
    KSyncProfile* prof = mSyncProfiles.at(mProfileBox-> currentItem ()) ;
    prof->setName( s );
    mSyncProfileNames[mProfileBox-> currentItem ()] = s;
 }
 void KOSyncPrefsDialog::profileChanged( int item )
 {
    //qDebug("KOSyncPrefsDialog::profileChanged %d ", item ); 
    KSyncProfile* prof;
    saveProfile();
    currentSelection = item;
    prof = mSyncProfiles.at(item) ;
    mRemotePrecommand->setText(prof->getPreSyncCommand());
    mRemotePostcommand->setText(prof->getPostSyncCommand());
    mLocalTempFile->setText(prof->getLocalTempFile());
    mRemoteFile->setText(prof->getRemoteFileName()) ;
    mShowSummaryAfterSync->setChecked( prof->getShowSummaryAfterSync());
    mAskForPreferences->setChecked( prof->getAskForPreferences());
    mWriteBackExisting->setChecked( prof->getWriteBackExisting() );
    mWriteBackFile->setChecked( prof->getWriteBackFile());
    mIncludeInRing->setChecked( prof->getIncludeInRingSync() );
    
    switch ( prof->getSyncPrefs() ) {
    case 0:
        loc->setChecked( true);
        break;
    case 1:
        rem->setChecked( true );
        break;
    case 2:
        newest->setChecked( true);
        break;
    case 3:
        ask->setChecked( true);
        break;
    case 4:
        f_loc->setChecked( true);
        break;
    case 5:
        f_rem->setChecked( true);
        break;
    case 6:
        //both->setChecked( true);
        break; 
    default:
        break;
    }
    mIsLocal->setChecked(prof->getIsLocalFileSync()) ;
    mIsNotLocal->setChecked(!prof->getIsLocalFileSync());
    proGr->setEnabled( item > 2 );
    if ( item < 3 ) {
        localFileWidget->setEnabled(false);
        remoteFileWidget->setEnabled(false);
    } else
        kindChanged( prof->getIsLocalFileSync() );
 }
 void KOSyncPrefsDialog::fillSSH()
 {
    mRemotePrecommand->setText("scp zaurus@192.168.0.65:/home/zaurus/kdepim/apps/korganizer/mycalendar.ics /tmp/mycalendar.ics" );
    mLocalTempFile->setText("/tmp/mycalendar.ics" );
    mRemotePostcommand->setText("scp /tmp/mycalendar.ics zaurus@192.168.0.65:/home/zaurus/kdepim/apps/korganizer/mycalendar.ics" );
 }
 void KOSyncPrefsDialog::fillFTP()
 {
    mRemotePrecommand->setText("cd /tmp;ftp ftp://zaurus:a@192.168.0.65/kdepim/apps/korganizer/mycalendar.ics" );
    mLocalTempFile->setText("/tmp/mycalendar.ics" );
    mRemotePostcommand->setText("ftp -u ftp://zaurus:a@192.168.0.65/kdepim/apps/korganizer/mycalendar.ics /tmp/mycalendar.ics" );
   
 }
 void KOSyncPrefsDialog::kindChanged( bool b )
 {
  
   localFileWidget->setEnabled(b);
   remoteFileWidget->setEnabled(!b);
   
 }
 void KOSyncPrefsDialog::deleteProfile()
 {
    //qDebug("KOSyncPrefsDialog::deleteProfile() "); 
    if ( currentSelection >= 0 ) {
        if ( currentSelection < 3 ) {
            KMessageBox::error(this,i18n("This profil cannot be deleted!\n"),i18n("KO/Pi config error"));
            return;
        }
        KSyncProfile* temp = mSyncProfiles.at(currentSelection);
        mSyncProfiles.remove( temp );
        mSyncProfileNames.remove( mSyncProfileNames.at( currentSelection ));
        insertProfiles();
    }
 }
 void KOSyncPrefsDialog::saveProfile()
 {
    KSyncProfile* prof;
    if ( currentSelection >= 0 ) {
        prof = mSyncProfiles.at(currentSelection) ;
        prof->setPreSyncCommand( mRemotePrecommand->text());
        prof->setPostSyncCommand( mRemotePostcommand->text() );
        prof->setLocalTempFile( mLocalTempFile->text());
        prof->setRemoteFileName( mRemoteFile->text() );
        prof->setShowSummaryAfterSync( mShowSummaryAfterSync->isChecked() );
        prof->setAskForPreferences( mAskForPreferences->isChecked());
        prof->setWriteBackExisting(mWriteBackExisting->isChecked() );
        prof->setWriteBackFile( mWriteBackFile->isChecked());
        prof->setIncludeInRingSync( mIncludeInRing->isChecked() );
        int syncprefs = rem->isChecked()*1+newest->isChecked()*2+  ask->isChecked()*3+  f_loc->isChecked()*4+  f_rem->isChecked()*5 ;//+  both->isChecked()*6 ;
        prof->setSyncPrefs( syncprefs);
        prof->setIsLocalFileSync( mIsLocal->isChecked() );
    }
 }
 void KOSyncPrefsDialog::insertProfiles()
 {
    int curItem = mProfileBox->currentItem();
    mProfileBox->blockSignals( true );
    mProfileBox->clear();
    mProfileBox->insertStringList (mSyncProfileNames ); 
    int item = mSyncProfileNames.count() -1; 
    if ( curItem >= 0 &&  mSyncProfileNames.count() > 0 && curItem < mSyncProfileNames.count() )
        mProfileBox->setCurrentItem( curItem );  
    else if ( item >= 0 ) {
        mProfileBox->setCurrentItem( item );
    }
    currentSelection = -1;
    if ( mSyncProfileNames.count() > 0 ) {
        //qDebug(" profileChanged( mProfileBox->currentItem()  ");
        profileChanged( mProfileBox->currentItem() );
        currentSelection = mProfileBox->currentItem();
    }
    mProfileBox->blockSignals( false );
 }
   
 void KOSyncPrefsDialog::addProfile ( KSyncProfile* temp )
 {
    saveProfile();
    mSyncProfiles.append( temp );
    mSyncProfileNames << temp->getName();
    insertProfiles();
    int last = mProfileBox->count() -1;
    mProfileBox->blockSignals( true );
    mProfileBox->setCurrentItem( last );
    mProfileBox->blockSignals( false );
    profileChanged(last);
 }
 void KOSyncPrefsDialog::newProfile()
 {
    addProfile ( new KSyncProfile () );
 }
 void KOSyncPrefsDialog::cloneProfile()
 { 
    if ( currentSelection >= 0 ) 
        addProfile (mSyncProfiles.at(currentSelection)->clone()) ;
    else
        newProfile();
 }
+void KOSyncPrefsDialog::setLocalMachineName ( const QString& name )
+{
+    mMyMachineName->setText( name );
+}
+QString KOSyncPrefsDialog::getLocalMachineName ( )
+{
+    return mMyMachineName->text();
+}
+QStringList KOSyncPrefsDialog::getSyncProfileNames()
+{
+    return mSyncProfileNames;
+}
 void KOSyncPrefsDialog::usrReadConfig()
 { 
-    KConfig *config = KOGlobals::config();
+    //KConfig *config = KOGlobals::config();
-    config->setGroup("SyncProfiles");
+    KConfig config ( locateLocal( "config","syncprofilesrc"  ) ); 
-    mSyncProfileNames = KOPrefs::instance()->mSyncProfileNames;
+    config.setGroup("SyncProfiles");
+    mSyncProfileNames =config.readListEntry("SyncProfileNames");
    int i;
    KSyncProfile* temp ;
    mSyncProfiles.clear();
    for ( i = 0; i < mSyncProfileNames.count();++i ) {
        temp = new KSyncProfile ();
        temp->setName( mSyncProfileNames[i] );
-        temp->readConfig( config );
+        temp->readConfig( &config );
        mSyncProfiles.append( temp );
    }
    insertProfiles();
-    mMyMachineName->setText(KOPrefs::instance()->mLocalMachineName );
+    //mMyMachineName->setText(KOPrefs::instance()->mLocalMachineName );
 }
 void KOSyncPrefsDialog::usrWriteConfig()
 {
    saveProfile();
    if ( currentSelection >= 0 ) 
        profileChanged(currentSelection);
-    KConfig *config = KOGlobals::config();
+    //KConfig *config = KOGlobals::config();
-    config->setGroup("SyncProfiles");
+    KConfig config ( locateLocal( "config","syncprofilesrc"  ) ); 
+    config.setGroup("SyncProfiles");
    KSyncProfile* prof = mSyncProfiles.first();
    while ( prof ) {
-        prof->writeConfig(config);
+        prof->writeConfig(&config);
        prof = mSyncProfiles.next();
    }
-    KOPrefs::instance()->mSyncProfileNames = mSyncProfileNames;
+    //KOPrefs::instance()->mSyncProfileNames = mSyncProfileNames;
-    KOPrefs::instance()->mLocalMachineName = mMyMachineName->text();
+    //KOPrefs::instance()->mLocalMachineName = mMyMachineName->text();
-    config->writeEntry("SyncProfileNames",&mSyncProfileNames);
+    config.writeEntry("SyncProfileNames",&mSyncProfileNames);
 }
diff --git a/korganizer/kosyncprefsdialog.h b/korganizer/kosyncprefsdialog.h
index d2d8c6f..541d18b 100644
--- a/korganizer/kosyncprefsdialog.h
+++ b/korganizer/kosyncprefsdialog.h
@@ -1,109 +1,113 @@
 /*
    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 _KOPREFSDIALOG_H
 #define _KOPREFSDIALOG_H
 //#include <qframe.h>
 //#include <qdict.h>
 #include <qvbox.h>
 #include <qhbox.h>
 //#include <qcolor.h>
 //#include <qlistview.h>
 #include <kdialogbase.h>
 #include <libkdepim/kprefsdialog.h>
 class KColorButton;
 class QSpinBox;;
 class QRadioButton;
 class QCheckBox;
 class QSlider;
 class KURLRequester;
 class QComboBox;
 class QLineEdit;
 class QStringList;
 class KSyncProfile;
 /** Dialog to change the korganizer configuration.
  */
 class KOSyncPrefsDialog : public KDialog
 {
    Q_OBJECT
  public:
    /** Initialize dialog and pages */
    KOSyncPrefsDialog(QWidget *parent=0,char *name=0,bool modal=false);
    ~KOSyncPrefsDialog();
    void usrReadConfig();
+    void setLocalMachineName ( const QString& name );
+    QString getLocalMachineName ( );
+    
+    QStringList getSyncProfileNames();
  public slots:
  protected slots:
      void accept();
      void deleteProfile();
      void newProfile();
      void cloneProfile();
      void kindChanged(bool);
      void fillSSH();
      void fillFTP();
      void textChanged( const QString & );
      void profileChanged( int );
      void chooseFile();
      void slotOK();
  protected:
    void usrWriteConfig();
    void setupSyncAlgTab();
  private:
    int currentSelection;
    QPtrList<KSyncProfile> mSyncProfiles;
    QStringList mSyncProfileNames;
    QLineEdit * mMyMachineName;
    QComboBox * mProfileBox;
    QRadioButton* mIsLocal;
    QRadioButton* mIsNotLocal;
    QCheckBox* mIncludeInRing;
    void addProfile ( KSyncProfile* );
    void insertProfiles();
    void saveProfile();
    QButtonGroup* proGr;
    QRadioButton* loc, *rem, *newest, *ask, *f_loc,* f_rem, *both;
    QLineEdit * mRemotePostcommand;
    QLineEdit * mRemotePrecommand;
    QLineEdit * mRemoteFile;
    QLineEdit * mLocalTempFile;
    QWidget* mSetupSyncAlgTab;
    QVBox* localFileWidget;
    QVBox* remoteFileWidget;
   QCheckBox* mWriteBackFile;
   QCheckBox* mWriteBackExisting;
   QCheckBox* mAskForPreferences;
   QCheckBox* mShowSummaryAfterSync;
 };
 #endif
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index a487f14..589ab2d 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -629,405 +629,404 @@ void MainWindow::initActions()
 #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() ) );
    //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()
 {
    syncMenu->clear();
    syncMenu->insertItem( i18n("Configure..."), 0 );
    syncMenu->insertSeparator();
    syncMenu->insertItem( i18n("Multiple sync"), 1 );
    syncMenu->insertSeparator();
+    KConfig config ( locateLocal( "config","syncprofilesrc"  ) );
-    QStringList prof = KOPrefs::instance()->mSyncProfileNames;
+    config.setGroup("SyncProfiles");
+    QStringList prof = config.readListEntry("SyncProfileNames");
+  
    if ( prof.count() < 3 ) {
-        KConfig *config = KOGlobals::config();
        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->writeConfig(&config);
        temp->setName( prof[1] );
-        temp->writeConfig(config);
+        temp->writeConfig(&config);
        temp->setName( prof[2] );
-        temp->writeConfig(config);
+        temp->writeConfig(&config);
-        config->sync();
+        config.sync();
        delete temp; 
-        KOPrefs::instance()->mSyncProfileNames = prof;
    }
+    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 = KOGlobals::config();
    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()->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 {
                    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 ) {
        confSync();
        return;
    } 
    if ( action == 1 ) { 
        multiSync( true );
        return;
    } 
    if (mBlockSaveFlag)
        return;
    mBlockSaveFlag = true;
    mCurrentSyncProfile = action - 1000 ;
    mView->setSyncDevice(KOPrefs::instance()->mSyncProfileNames[mCurrentSyncProfile] );
    mView->setSyncName( KOPrefs::instance()->mLocalMachineName );
    KConfig *config = KOGlobals::config();
    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()->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 {
            syncRemote( temp );
        }
    }
    delete temp;
    mBlockSaveFlag = false;
 }
 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()
@@ -1611,384 +1610,384 @@ void  MainWindow::loadCalendar()
            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);
        }
    }
 }
 #include <qpushbutton.h> 
 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::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();
-    mView->writeSettings();
+    //mView->writeSettings();
    
 }
 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();   
            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::syncSSH()
 {   
    // not used anymore
    QTime timer; 
    timer.start();
    //qDebug("MainWindow::syncssh() ");
    KOPrefs *p = KOPrefs::instance();
    QString localFile =  p->mLocalTempFile;
    QString remoteIP = p->mRemoteIP;
    QString remoteUser = p->mRemoteUser;
    QString remoteFile = p->mRemoteFile;
    if ( p->mUsePassWd &&  p->mRemotePassWd.length() > 0  )
        remoteUser += ":" + p->mRemotePassWd;
    QString question = i18n("Do you really want\nto remote sync?\n \n") +
        i18n("IP: " ) +remoteIP  +"\n" +
        i18n("User: " ) + remoteUser +"\n" ;
    int maxlen = 30;
    if ( QApplication::desktop()->width() > 320 ) 
        maxlen += 25;
    if ( remoteFile.length() > maxlen )
        question  +=   i18n("Remote file:\n..." ) + remoteFile.right(maxlen) +"\n";
    else
        question  +=   i18n("Remote file:\n " ) + remoteFile +"\n";
    if ( localFile.length() > maxlen )
        question  +=   i18n("Local temp file:\n..." ) + localFile.right(maxlen) +"\n";
    else
        question  +=   i18n("Local temp file:\n " ) + localFile +"\n";
        
    if ( QMessageBox::information( this, i18n("KO/Pi Sync"),
                                   question,
                                   i18n("Yes"), i18n("No"), 
                                   0, 0 ) != 0 )
        return;
    // if ( !p->mUsePassWd ) {
    //         QString pass = getPassword();
    //         if ( pass.length() > 0 )
    //             remoteUser += ":" + pass;
    // }
    QString command = "scp " + remoteUser + "@" + remoteIP +":" + remoteFile +"  " +localFile;
    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." ) );
    //mView->setSyncDevice("ssh-scp" );
    if ( syncWithFile(localFile , true ) ) {
 //         Event* e = mView->getLastSyncEvent();
 //         e->setReadOnly( false );
 //         e->setLocation( KOPrefs::instance()->mSyncProfileNames[mCurrentSyncProfile]);
 //         e->setReadOnly( true );
        if ( KOPrefs::instance()->mWriteBackFile ) {
            command = "scp " + localFile +" " +remoteUser + "@" + remoteIP +":" + remoteFile ;   
            setCaption ( i18n( "Writing back file ..." ) );
            result = system ( command );
            if ( result != 0 ) {
                int len = maxlen;
                while ( len <  command.length() ) {
                    command.insert( len , "\n" );
                    len += maxlen +2;
                }
                question = i18n("Sorry, the copy back 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;
            } else {
                setCaption ( i18n( "Syncronization sucessfully completed" ) );
            }
        }
    }
    return;
 #if 0
    system ("scp zaurus@192.168.0.65:/home/zaurus/Applications/korganizer/mycalendar.ics /home/polo/Applications/korganizer/z_sync.ics");
    while ( timer.elapsed() < 5000 )
        qApp->processEvents();
    qDebug("MainWindow::merging) ");
    mView->syncCalendar( "/home/polo/Applications/korganizer/z_sync.ics", 0 );
    while ( mBlockSaveFlag ) 
        qApp->processEvents();
    save();
    system ("scp /home/polo/Applications/korganizer/mycalendar.ics zaurus@192.168.0.65:/home/zaurus/Applications/korganizer/mycalendar.ics");
 #endif
 }
 void MainWindow::syncSharp()
 {
    if ( mCalendarModifiedFlag )
        save();
    mView->syncSharp();
    slotModifiedChanged( true );
   
 }
 void MainWindow::printSel( )
 {
    mView->viewManager()->agendaView()->agenda()->printSelection();
 }
 void MainWindow::printCal()
 {
    mView->print();//mCp->showDialog();
 }
author	zautrix <zautrix>	2004-08-01 12:56:11 (UTC)
committer	zautrix <zautrix>	2004-08-01 12:56:11 (UTC)
commit	cc2643f4be54269db8c24f66fdcbbf6954d5f537 (patch) (unidiff)
tree	3562598dac624305dfb9fd1911a4b314ae40945d
parent	c31e99f265dbe8762efca20667f8ccd973840f8f (diff)
download	kdepimpi-cc2643f4be54269db8c24f66fdcbbf6954d5f537.zip kdepimpi-cc2643f4be54269db8c24f66fdcbbf6954d5f537.tar.gz kdepimpi-cc2643f4be54269db8c24f66fdcbbf6954d5f537.tar.bz2