fixx

8 files changed, 141 insertions, 9 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index b3686aa..07ec459 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -78,768 +78,772 @@
 #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>
 #include <externalapphandler.h>
 #endif
 #include <libkcal/phoneformat.h>
 #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 "datenavigatorcontainer.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
 
 #ifdef DESKTOP_VERSION
 #include <kabc/stdaddressbook.h>
 #endif
 using namespace KOrg;
 using namespace KCal;
 extern int globalFlagBlockAgenda;
 extern int globalFlagBlockStartup;
 
 
 MissedAlarmTextBrowser::MissedAlarmTextBrowser(QWidget *parent, QPtrList<Incidence> alarms,QDateTime start ) : QTextBrowser(parent) 
 
 {
     mAlarms = alarms;
     viewport()->setBackgroundColor( QColor( 255, 255, 255 ) );
     QString mText = "<table width=\"100%\">\n";
     //mText += "<tr bgcolor=\"#3679AD\"><td><h2>"; 
 #ifdef DESKTOP_VERSION
     mText += "<tr bgcolor=\"#5699CD\"><td align=\"center\"><h2>";
 #else
     mText += "<tr bgcolor=\"#5699CD\"><td align=\"center\"><h3>";
 #endif
     //  mText += "<img src=\"";
     //   mText += ipath;
     //   mText += "\">";
     //mEventDate = QDate::currentDate();
 #ifdef DESKTOP_VERSION
     mText += "<font color=\"#FFFFFF\"> <em>" +  i18n("You missed the alarms for the following events or todos:")+"</em></font></h2>";
 #else
     mText += "<font color=\"#FFFFFF\"> <em>" +  i18n("You missed the alarms for the following events or todos:")+"</em></font></h3>";
 #endif
     //mText += "</td></tr>\n<tr  bgcolor=\"#FF997D\"><td>";
 
     Incidence * inc = getNextInc( start );
     int time = 0;
     //mText += "<table>";
     while ( inc ) {
         QDateTime dt ;
         QString tempText = "<a ";
         bool ok;
         dt = inc->getNextOccurence( start, &ok );
         if ( !ok ) continue;
         if ( inc->typeID() == eventID ) {
             tempText += "href=\"event:";
         } else if ( inc->typeID() == todoID ) {
             tempText += "href=\"todo:";
         }
         tempText += inc->uid() + "\">"; 
         if ( inc->typeID() == todoID )
             tempText += i18n("Todo: ");
         if ( inc->summary().length() > 0 )
             tempText += inc->summary();
         else
             tempText += i18n("-no summary-"); 
         QString timestr;
         if (!inc->doesFloat())
                 timestr = KGlobal::locale()->formatDateTime( dt, KOPrefs::instance()->mShortDateInViewer) +": ";
             else
                 timestr = KGlobal::locale()->formatDate( dt.date() , KOPrefs::instance()->mShortDateInViewer) +": ";
         if ( dt.date() < QDate::currentDate() && time == 0 ) {
             mText += "</td></tr>\n<tr  bgcolor=\"#FF997D\"><td>";
             mText += "<table>";
             time = 1;
         }
         if ( dt.date() == QDate::currentDate() && time <= 1 ) {
             if ( time > 0 )
                 mText +="</table>";
             mText += "</td></tr>\n<tr  bgcolor=\"#FFDC64\"><td>";
             mText += "<table>";
             time = 2;
             
         } 
         if ( dt.date() > QDate::currentDate() && time <= 2 ) {
             if ( time > 0 )
                 mText +="</table>";
             mText += "</td></tr>\n<tr  bgcolor=\"#6AFF6A\"><td>";
             mText += "<table>";
             time = 3;
         }
         mText +="<tr><td><b>";
         mText += timestr;
         mText += "</b></td><td>";
         mText += tempText;
         mText += "</td></tr>\n";
         inc = getNextInc( start );
     }
     mText +="</table>";
     setText( mText );
 }
 
 MissedAlarmTextBrowser::~MissedAlarmTextBrowser()
 {
     //qDebug("delete MissedAlarmTextBrowser::~MissedAlarmTextBrowser() ");
 }
 Incidence *  MissedAlarmTextBrowser::getNextInc( QDateTime start )
 {
     QDateTime dt ;
     Incidence * retInc;
     Incidence * inc = mAlarms.first();
     if ( inc == 0 )
         return 0;  
     bool ok;
     dt = inc->getNextOccurence( start, &ok );
     if ( ! ok ) return 0;
     QDateTime dtn ;
     retInc = inc;
     inc = mAlarms.next();
     while ( inc ) {
         dtn = inc->getNextOccurence( start, &ok );
         if ( ! ok ) return 0;
         if ( dtn < dt ) {
             dt = dtn;
             retInc = inc;
         }
         inc = mAlarms.next();
     }
     mAlarms.remove( retInc );
     return retInc;
     
 }
 void MissedAlarmTextBrowser::setSource(const QString & n)
 {
     if (n.startsWith("event:")) {
 #ifdef DESKTOP_VERSION
         emit showIncidence(n.mid(8));
 #else
         emit showIncidence(n.mid(6));
 #endif
         return;
     } else if (n.startsWith("todo:")) {
 #ifdef DESKTOP_VERSION
         emit showIncidence(n.mid(7));
 #else
         emit showIncidence(n.mid(5));
 #endif
         return;
     } 
 }
 
 
 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()
 { 
     mNextAlarmDateTime = QDateTime::currentDateTime();
     setFocusPolicy ( NoFocus  ); 
     mViewerCallerIsSearchDialog = false;
     mBlockShowDates = false;
     beamDialog = new KOBeamPrefs();
     mDatePickerMode = 0;
     mCurrentSyncDevice = "";
     writeLocale();
     mViewManager = new KOViewManager( this );
     mDialogManager = new KODialogManager( this );
     mEventViewerDialog = 0;
     mModified = false;
     mReadOnly = false;
     mSelectedIncidence = 0;
     mCalPrinter = 0;
     mFilters.setAutoDelete(true);
 
     mCalendar->registerObserver( this );
     // TODO: Make sure that view is updated, when calendar is changed.
 
     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 DateNavigatorContainer( mLeftSplitter,
                                                "CalendarView::DateNavigator" );
 
     mLeftSplitter->setResizeMode(mDateNavigator,QSplitter::KeepSize);
     mTodoList = new KOTodoView(mCalendar, mLeftSplitter, "todolist_small2");
     mTodoList->setNavigator( mNavigator );
     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 );
 
     mRightFrame = new QWidgetStack( rightBox );
     rightLayout->addWidget( mRightFrame, 1 );
 
     mLeftFrame = mLeftSplitter;
 #else
     //QWidget *mainBox = new QWidget( this );
     //QWidget *leftFrame = new QWidget( mainBox );
     //QBoxLayout * mainBoxLayout;
     if ( KOPrefs::instance()->mVerticalScreen ) {
         //mainBoxLayout  = new QVBoxLayout(mainBox); 
         //leftFrameLayout = new QHBoxLayout(leftFrame ); 
         mMainFrame = new KDGanttMinimizeSplitter( Qt::Vertical, this );
         mMainFrame->setMinimizeDirection ( KDGanttMinimizeSplitter::Up );
         mLeftFrame = new KDGanttMinimizeSplitter( Qt::Horizontal, mMainFrame);;
         mLeftFrame->setMinimizeDirection ( KDGanttMinimizeSplitter::Right );
     } else {
         //mainBoxLayout  = new QHBoxLayout(mainBox);
         //leftFrameLayout = new  QVBoxLayout(leftFrame ); 
         mMainFrame = new KDGanttMinimizeSplitter( Qt::Horizontal, this);
         mMainFrame->setMinimizeDirection ( KDGanttMinimizeSplitter::Left);
         mLeftFrame = new KDGanttMinimizeSplitter( Qt::Vertical, mMainFrame);
         mLeftFrame->setMinimizeDirection ( KDGanttMinimizeSplitter::Up );
     }
     mMainFrame->setSizePolicy( QSizePolicy (QSizePolicy::Expanding,QSizePolicy::Expanding)   ); 
     //QBoxLayout * leftFrameLayout;
     topLayout->addWidget( mMainFrame );
     //mainBoxLayout->addWidget (mLeftFrame);  
     mDateNavigator = new DateNavigatorContainer( mLeftFrame,
                                                "CalendarView::DateNavigator" );
 #if 0
     // FIXME
     mDateNavigator = new KDateNavigator(mLeftFrame, mCalendar, TRUE,
                                         "CalendarView::DateNavigator", QDate::currentDate());
 #endif
     // mDateNavigator->blockSignals( true );
     //leftFrameLayout->addWidget( mDateNavigator  );
     mTodoList = new KOTodoView(mCalendar, mLeftFrame, "todolistsmall");
     mFilterView = new KOFilterView(&mFilters,mLeftFrame,"CalendarView::FilterView"); 
     mCalEditView = new KOCalEditView(mLeftFrame,"CalendarView::CaleditView");
+    connect( mCalEditView, SIGNAL( calendarEnabled (int,bool) ),mCalendar, SLOT( setCalendarEnabled(int,bool)) );
+    connect( mCalEditView, SIGNAL( alarmEnabled(int,bool) ),mCalendar, SLOT( setAlarmEnabled(int,bool)) );
+    connect( mCalEditView, SIGNAL( calendarReadonly(int,bool) ),mCalendar, SLOT( setReadOnly(int,bool)) );
+    connect( mCalEditView, SIGNAL( setCalendarDefault(int) ),mCalendar, SLOT( setDefaultCalendar(int)) );
     mTodoList->setNavigator( mNavigator );
 #if 0
     if (  QApplication::desktop()->width() < 480 ) {
         leftFrameLayout->addWidget(mFilterView);
         leftFrameLayout->addWidget(mTodoList, 2 );
       
     } else {
         leftFrameLayout->addWidget(mTodoList,2 );
         leftFrameLayout->addWidget(mFilterView );
     } 
 #endif
     mFilterView->hide();
     mCalEditView->hide();
     QWidget *rightBox = new QWidget( mMainFrame );
     //mainBoxLayout->addWidget ( rightBox, 10 );
     QBoxLayout *rightLayout = new QVBoxLayout( rightBox );
     mRightFrame = new QWidgetStack( rightBox );
     rightLayout->addWidget( mRightFrame, 10 );
 
     //mLeftFrame = (QWidget *)leftFrame;
     if ( KOPrefs::instance()->mVerticalScreen ) {
         //mDateNavigator->setFixedHeight( mDateNavigator->sizeHint().height() );
         //mDateNavigator->setMinimumWidth( mDateNavigator->sizeHint().width() );
         //mTodoList->setFixedHeight( mDateNavigator->sizeHint().height() );
         //leftFrame->setFixedHeight( mDateNavigator->sizeHint().height() );
     } else {
         //mDateNavigator->setFixedWidth( mDateNavigator->sizeHint().width() );
         //mTodoList->setFixedWidth( mDateNavigator->sizeHint().width() );
         //leftFrame->setFixedWidth( mDateNavigator->sizeHint().width() );
     }
     if ( !KOPrefs::instance()->mShowDateNavigator)
         mDateNavigator->hide();
     //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( mDateNavigator, SIGNAL( showMonth( const QDate & ) ),
              mViewManager, SLOT(  showMonth( const QDate & ) ) );
 
     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( mDateNavigator, SIGNAL( datesSelected( const KCal::DateList & ) ),
              mNavigator, SLOT( selectDates( const KCal::DateList & ) ) );
 #if 0
     connect( mDateNavigator, SIGNAL( incidenceDropped( Incidence * ) ),
              SLOT( incidenceAdded(  Incidence *) ) );
 #endif
     // 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( mTodoList, SIGNAL( reparentTodoSignal( Todo *,Todo * ) ),
                  this, SLOT ( todo_resub( Todo *,Todo * ) ) );
     connect( this, SIGNAL( todoModified( Todo *, int )), mTodoList,
              SLOT( updateTodo( Todo *, int ) ) );
     connect( this, SIGNAL( todoModified( Todo *, int )), this,
              SLOT( changeTodoDisplay( Todo *, int ) ) );
 
 
     connect( mFilterView, SIGNAL( filterChanged() ), SLOT( updateFilter() ) );
     connect( mFilterView, SIGNAL( editFilters() ), SLOT( editFilters() ) );
     connect( mCalendar, SIGNAL( addAlarm(const QDateTime &, const QString &  ) ), SLOT( addAlarm(const QDateTime &, const QString &  ) ) );
     connect( mCalendar, SIGNAL( removeAlarm(const QDateTime &, const QString &  ) ), SLOT( removeAlarm(const QDateTime &, const QString & ) ) );
   
 
 
 
 
     connect(QApplication::clipboard(),SIGNAL(dataChanged()),
             SLOT(checkClipboard()));
     connect( mTodoList,SIGNAL( incidenceSelected( Incidence * ) ),
              SLOT( processTodoListSelection( Incidence * ) ) );
     connect(mTodoList,SIGNAL(isModified(bool)),SLOT(setModified(bool)));
 
     // kdDebug() << "CalendarView::CalendarView() done" << endl; 
 
     mDateFrame = new QVBox(0,0,WType_Popup);
     //mDateFrame->setFrameStyle(QFrame::PopupPanel | QFrame::Raised);
     mDateFrame->setFrameStyle( QFrame::WinPanel |QFrame::Raised );
     mDateFrame->setLineWidth(3);
     mDateFrame->hide(); 
     mDateFrame->setCaption( i18n( "Pick a date to display"));
     mDatePicker = new KDatePicker ( mDateFrame , QDate::currentDate() );
  
     connect(mDatePicker,SIGNAL(dateSelected(QDate)),SLOT(slotSelectPickerDate(QDate)));
  
     mEventEditor = mDialogManager->getEventEditor();  
     mTodoEditor = mDialogManager->getTodoEditor();  
    
     mFlagEditDescription = false; 
 
     mSuspendTimer = new QTimer( this );
     mAlarmTimer = new QTimer( this );
     mRecheckAlarmTimer = new QTimer( this );
     connect( mRecheckAlarmTimer, SIGNAL(  timeout ()  ), SLOT( recheckTimerAlarm() ) );
     connect( mSuspendTimer, SIGNAL(  timeout ()  ), SLOT( suspendAlarm() ) );
     connect( mAlarmTimer, SIGNAL(  timeout ()  ), SLOT( timerAlarm() ) );
     mAlarmDialog = new AlarmDialog( this );
     connect( mAlarmDialog, SIGNAL( addAlarm(const QDateTime &, const QString &  ) ), SLOT( addSuspendAlarm(const QDateTime &, const QString &  ) ) );
     mAlarmDialog->setServerNotification( false );
     mAlarmDialog->setSuspendTime( KOPrefs::instance()->mAlarmSuspendTime );
 
 
 #ifndef DESKTOP_VERSION
 //US listen for arriving address resultsets
   connect(ExternalAppHandler::instance(), SIGNAL(receivedBirthdayListEvent(const QString&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&)),
           this, SLOT(insertBirthdays(const QString&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&)));
 #endif
   mDateNavigator->setCalendar( mCalendar );
 }
 
 
 CalendarView::~CalendarView()
 {
     // kdDebug() << "~CalendarView()" << endl;
     //qDebug("CalendarView::~CalendarView() ");
     delete mDialogManager;
     delete mViewManager;
     delete mStorage;
     delete mDateFrame ;
     delete beamDialog;
     delete mEventViewerDialog;
     //kdDebug() << "~CalendarView() done" << endl;
 }
 void CalendarView::checkAlarms()
 {
     KConfig *config = KOGlobals::config();
     config->setGroup( "AppRun" );
     QDateTime dt ( QDate (2005,1,1), QTime( 0,0,0 ) );
     int daysto = dt.daysTo( QDate::currentDate() );
     int days = config->readNumEntry( "LatestProgramStopDays" , daysto);
     dt =  dt.addDays( days );
     int secto = dt.secsTo( QDateTime::currentDateTime() );
     int secs = config->readNumEntry( "LatestProgramStopSecs" , secto) - 30;
     //qDebug("KO: Reading program stop %d ", secs);
     //secs -= ( 3600 * 24*3 ); // debug only 
     QDateTime latest = dt.addSecs ( secs );
     qDebug("KO: Last termination on %s ", latest.toString().latin1());
     //qDebug("KO: Current Time %s ",QDateTime::currentDateTime().toString().latin1() );
     QPtrList<Incidence> el = mCalendar->rawIncidences(); 
     QPtrList<Incidence> al;
     Incidence* inL = el.first(); 
     QDateTime cur = QDateTime::currentDateTime().addSecs(-59);
     qDebug("KO: Checking alarm until %s ", cur.toString().latin1());
     while ( inL ) {  
         bool ok = false;
         int offset = 0;
         QDateTime next = inL->getNextAlarmDateTime(& ok, &offset, latest ) ;
         if ( ok ) {
             //qDebug("OK %s",next.toString().latin1());
             if ( next < cur ) {
                 al.append( inL );
                 //qDebug("found missed alarm: %s ", inL->summary().latin1() );
             }
         }
         inL = el.next();
     }
     if ( al.count() ) {
         QDialog* dia = new QDialog( this, "huhu", false, WDestructiveClose | WStyle_StaysOnTop  );
         dia->setCaption( i18n("KO/Pi: Missing alarms!") );
         QVBoxLayout* lay = new QVBoxLayout( dia );
         lay->setSpacing( 0 );
         lay->setMargin( 0 );
         MissedAlarmTextBrowser* matb = new MissedAlarmTextBrowser ( dia, al, latest );
         connect( matb, SIGNAL( showIncidence( QString ) ),SLOT( showIncidence( QString ) ));
         lay->addWidget( matb ); 
         if ( QApplication::desktop()->width() == 480 || QApplication::desktop()->width() == 640 ) {
             int wid = 210;
             int x = QApplication::desktop()->width() - wid - 7;
             int y = QApplication::desktop()->height() - wid - 70;
             dia->setGeometry ( x,y,wid,wid);
         } else {
             int si = 220;
             if ( QApplication::desktop()->width() > 470 )
                 si = 400;
             dia->resize(si,si/2);
         }
         dia->setBackgroundColor( QColor( 255, 255, 255 ) );
         dia->show();
 
     }
 }
 void CalendarView::showDay( QDate d )
 {
     dateNavigator()->blockSignals( true );
     dateNavigator()->selectDate( d );
     dateNavigator()->blockSignals( false );
     mViewManager->showDayView();
     //dateNavigator()->selectDate( d );
 }
 void CalendarView::timerAlarm()
 {
     //qDebug("CalendarView::timerAlarm() ");
     computeAlarm(mAlarmNotification );
 }
 
 void CalendarView::suspendAlarm()
 {
     //qDebug(" CalendarView::suspendAlarm() ");
     computeAlarm(mSuspendAlarmNotification );
 
 }
 
 void  CalendarView::startAlarm( QString mess , QString filename)
 {
 
     topLevelWidget()->showNormal();
     topLevelWidget()->setActiveWindow();
     topLevelWidget()->raise(); 
 
     mAlarmDialog->eventNotification( mess, KOPrefs::instance()->mAlarmPlayBeeps, filename, true,KOPrefs::instance()->mAlarmBeepInterval ,KOPrefs::instance()->mAlarmSuspendCount );
     QTimer::singleShot( 3000, this, SLOT( checkNextTimerAlarm() ) );
 
 }
     
 void CalendarView::checkNextTimerAlarm()
 {
     mCalendar->checkAlarmForIncidence( 0, true );
 }
 
 void  CalendarView::computeAlarm( QString msg )
 {
 
  QString mess = msg; 
     QString  mAlarmMessage = mess.mid( 9 ); 
     QString filename =  MainWindow::resourcePath();
     filename += "koalarm.wav";
     QString tempfilename;
     if ( mess.left( 13 )  == "suspend_alarm") {  
         bool error = false;
         int len = mess.mid( 13 ).find("+++");
         if ( len < 2 )
             error = true;
         else {
             tempfilename = mess.mid( 13, len );
             if ( !QFile::exists( tempfilename  ) )
                 error = true;
         }
         if ( ! error ) {
             filename = tempfilename;
         }
         mAlarmMessage = mess.mid( 13+len+3 );
         //qDebug("suspend file %s ",tempfilename.latin1() );
         startAlarm( mAlarmMessage, filename);
         return;
     }
     if ( mess.left( 11 )  == "timer_alarm") {
         //mTimerTime = 0;
         startAlarm( mess.mid( 11 ), filename );
         return;
     } 
     if ( mess.left( 10 )  == "proc_alarm") {
         bool error = false;
         int len = mess.mid( 10 ).find("+++");
         if ( len < 2 )
             error = true;
         else {
             tempfilename = mess.mid( 10, len );
             if ( !QFile::exists( tempfilename  ) )
                 error = true;
         }
         if ( error ) {
             mAlarmMessage = "Procedure Alarm\nError - File not found\n";
             mAlarmMessage += mess.mid( 10+len+3+9 );
         } else {
             //QCopEnvelope e("QPE/Application/kopi", "-writeFileSilent");
             //qDebug("-----system command %s ",tempfilename.latin1() );
 #ifndef _WIN32_
             if ( vfork () == 0 ) {
                 execl ( tempfilename.latin1(), 0 );
                 return;
 	    }
 #else
 		QProcess* p = new QProcess();
 		p->addArgument(  tempfilename.latin1()  );
 		p->start();
 		return;
 #endif
             
             return;
         }
        
         //qDebug("+++++++system command %s ",tempfilename.latin1() );
     }  
     if ( mess.left( 11 )  == "audio_alarm") {
         bool error = false;
         int len = mess.mid( 11 ).find("+++");
         if ( len < 2 )
             error = true;
         else {
             tempfilename = mess.mid( 11, len );
             if ( !QFile::exists( tempfilename  ) )
                 error = true;
         }
         if ( ! error ) {
             filename = tempfilename;
         }
         mAlarmMessage = mess.mid( 11+len+3+9 );
         //qDebug("audio file command %s ",tempfilename.latin1() );
     } 
     if ( mess.left( 9 )  == "cal_alarm") {
         mAlarmMessage = mess.mid( 9 ) ;
     }
     
     startAlarm( mAlarmMessage, filename );
 
 
 }
 
 void CalendarView::addSuspendAlarm(const QDateTime &qdt, const QString &noti  )
 {
     //qDebug("+++++addSUSPENDAlarm %s %s ", qdt.toString().latin1() , noti.latin1() );
    
     mSuspendAlarmNotification = noti;
     int ms = QDateTime::currentDateTime().secsTo( qdt )*1000;
     //qDebug("Suspend Alarm timer started with secs: %d ", ms/1000);
     mSuspendTimer->start( ms , true );
 
 }
 
 void CalendarView::addAlarm(const QDateTime &qdt, const QString &noti  )
 {
     mNextAlarmDateTime = qdt;
     //qDebug("+++++addAlarm %s %s ", qdt.toString().latin1() , noti.latin1() );
     if ( ! KOPrefs::instance()->mUseInternalAlarmNotification ) {
 #ifndef DESKTOP_VERSION
         AlarmServer::addAlarm ( qdt,"koalarm", noti.utf8() );
 #endif     
         return;
     }
@@ -1453,899 +1457,956 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
         delmess.sprintf(  i18n("%d items skipped on remote,\nbecause they are more\nthan %d weeks in the past or\nmore than %d weeks in the future.\nAfter skipping, remote has\n%d calendar/todo items."), delFut,mSyncManager->mWriteBackInPast,mSyncManager->mWriteBackInFuture, remRem-delFut); 
         mes += delmess;
     }
     mes = i18n("Local calendar changed!\n") +mes;
     mCalendar->checkAlarmForIncidence( 0, true );
     qDebug( mes );
     if ( mSyncManager->mShowSyncSummary ) {
         if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(this, mes,
                                                  i18n("KO/Pi  Synchronization"),i18n("Write back"))) {
             qDebug("KO: WB cancelled ");
             mSyncManager->mWriteBackFile = false;
             return syncOK;
         }
     }
     return syncOK;
 }
 
 void CalendarView::setSyncDevice( QString s )
 {
     mCurrentSyncDevice= s;
 }
 void CalendarView::setSyncName( QString s )
 {
     mCurrentSyncName= s;
 }
 bool CalendarView::syncCalendar(QString filename, int mode)
 {
     //qDebug("syncCalendar %s ", filename.latin1());
     mGlobalSyncMode = SYNC_MODE_NORMAL;
     CalendarLocal* calendar = new CalendarLocal();
     calendar->setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId);
     FileStorage* storage = new FileStorage( calendar );
     bool syncOK = false;
     storage->setFileName( filename );
     // qDebug("loading ... ");
     if ( storage->load() ) {
         getEventViewerDialog()->setSyncMode( true );
         syncOK = synchronizeCalendar( mCalendar, calendar, mode );
         getEventViewerDialog()->setSyncMode( false );
         if (  syncOK ) {
            if ( mSyncManager->mWriteBackFile )
             {
                 storage->setSaveFormat( new ICalFormat() );
                 storage->save();
             }
         }
         setModified( true );
     }
     delete storage;
     delete calendar;
     if ( syncOK )
         updateView();
     return syncOK;
 }
 
 void CalendarView::syncExternal( int mode  )
 {
     mGlobalSyncMode = SYNC_MODE_EXTERNAL;
    
     qApp->processEvents();
     CalendarLocal* calendar = new CalendarLocal();
     calendar->setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId);
     bool syncOK = false;
     bool loadSuccess = false;
     PhoneFormat* phoneFormat = 0;
     emit tempDisableBR(true);
 #ifndef DESKTOP_VERSION
     SharpFormat* sharpFormat = 0;
     if ( mode == 0 ) { // sharp
         sharpFormat = new SharpFormat () ;
         loadSuccess = sharpFormat->load( calendar, mCalendar ); 
 
     } else 
 #endif
         if ( mode == 1 ) { // phone 
         phoneFormat = new PhoneFormat (mCurrentSyncDevice,
                                          mSyncManager->mPhoneDevice,
                                          mSyncManager->mPhoneConnection,
                                          mSyncManager->mPhoneModel);
         loadSuccess = phoneFormat->load( calendar,mCalendar); 
         
         } else {
             emit tempDisableBR(false);
             return;
         }
     if ( loadSuccess ) {
         getEventViewerDialog()->setSyncMode( true );
         syncOK = synchronizeCalendar( mCalendar, calendar, mSyncManager->mSyncAlgoPrefs );
         getEventViewerDialog()->setSyncMode( false );
         qApp->processEvents();
         if (  syncOK ) {
             if ( mSyncManager->mWriteBackFile )
             {
                 QPtrList<Incidence> iL = mCalendar->rawIncidences(); 
                 Incidence* inc = iL.first();
                 if ( phoneFormat ) {
                     while ( inc ) {
                         inc->removeID(mCurrentSyncDevice);
                         inc =  iL.next();
                     }
                 }
 #ifndef DESKTOP_VERSION
                 if ( sharpFormat )
                     sharpFormat->save(calendar);
 #endif
                 if ( phoneFormat )
                     phoneFormat->save(calendar);
                 iL = calendar->rawIncidences(); 
                 inc = iL.first();
                 Incidence* loc;
                 while ( inc ) {
                     if ( inc->tempSyncStat() == SYNC_TEMPSTATE_NEW_ID ) {
                         loc = mCalendar->incidence(inc->uid() );
                         if ( loc ) {
                             loc->setID(mCurrentSyncDevice, inc->getID(mCurrentSyncDevice) );
                             loc->setCsum( mCurrentSyncDevice, inc->getCsum(mCurrentSyncDevice) );
                         }
                     }
                     inc =  iL.next();
                 }
                 Incidence* lse = getLastSyncEvent();
                 if ( lse ) {
                     lse->setReadOnly( false );
                     lse->setDescription( "" );
                     lse->setReadOnly( true );
                 }
             }
         } else {
             topLevelWidget()->setCaption( i18n("Sync cancelled or failed.") );
         }
         setModified( true );
     } else {
         QString question = i18n("Sorry, the database access\ncommand failed!\n\nNothing synced!\n") ;
         QMessageBox::information( 0, i18n("KO/Pi Import - ERROR"),
                                       question, i18n("Ok")) ;
 
     }
     delete calendar;
     updateView();
     emit tempDisableBR(false);
     return ;//syncOK;
 
 }
 
 bool CalendarView::importBday()
 {
 #ifndef KORG_NOKABC
 
 #ifdef DESKTOP_VERSION
     KABC::StdAddressBook* AddressBook = KABC::StdAddressBook::self( true );
     KABC::AddressBook::Iterator it;
     int count = 0;
     for( it = AddressBook->begin(); it != AddressBook->end(); ++it ) { 
         ++count;
     }
     QProgressBar bar(count,0 );
     int w = 300;
     if ( QApplication::desktop()->width() < 320 )
         w = 220;
     int h = bar.sizeHint().height() ;
     int dw = QApplication::desktop()->width();
     int dh = QApplication::desktop()->height();
     bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
     bar.show();
     bar.setCaption (i18n("Reading addressbook - close to abort!") );
     qApp->processEvents();
     count = 0;
     int addCount = 0;
     KCal::Attendee* a = 0;
     for( it = AddressBook->begin(); it != AddressBook->end(); ++it ) { 
         if ( ! bar.isVisible() )
             return false;
         bar.setProgress( count++ );
         qApp->processEvents();
         //qDebug("add BDay %s %s", (*it).realName().latin1(),(*it).birthday().date().toString().latin1() );
         if ( (*it).birthday().date().isValid() ){
             a = new KCal::Attendee( (*it).realName(), (*it).preferredEmail(),false,KCal::Attendee::NeedsAction,KCal::Attendee::ReqParticipant,(*it).uid()) ;
             if ( addAnniversary(  (*it).birthday().date(), (*it).assembledName(),  a, true ) )
             ++addCount;
         } 
         QDate anni = KGlobal::locale()->readDate( (*it).custom("KADDRESSBOOK", "X-Anniversary" ), "%Y-%m-%d"); 
         if ( anni.isValid() ){ 
             a = new KCal::Attendee( (*it).realName(), (*it).preferredEmail(),false,KCal::Attendee::NeedsAction,KCal::Attendee::ReqParticipant,(*it).uid()) ;
             if ( addAnniversary(  anni, (*it).assembledName(),  a, false ) )
             ++addCount;
         }
     }
     updateView(); 
     topLevelWidget()->setCaption(QString::number( addCount )+ i18n(" birthdays/anniversaries added!"));
 #else //DESKTOP_VERSION
 
   ExternalAppHandler::instance()->requestBirthdayListFromKAPI("QPE/Application/kopi", this->name() /* name is here the unique uid*/);
   // the result should now arrive through method insertBirthdays
 
 #endif //DESKTOP_VERSION
 
 #endif //KORG_NOKABC
 
 
     return true;
 }
  
 // This method will be called from Ka/Pi as a response to requestBirthdayListFromKAPI
 void CalendarView::insertBirthdays(const QString& uid, const QStringList& birthdayList, 
 				   const QStringList& anniversaryList, const QStringList& realNameList,
 				   const QStringList& emailList, const QStringList& assembledNameList, 
 				   const QStringList& uidList)
 {
     //qDebug("KO::CalendarView::insertBirthdays");
   if (uid == this->name())
   {
     int count = birthdayList.count();
     int addCount = 0;
     KCal::Attendee* a = 0;
 
     //qDebug("CalView 1 %i", count);
 
     QProgressBar bar(count,0 );
     int w = 300;
     if ( QApplication::desktop()->width() < 320 )
         w = 220;
     int h = bar.sizeHint().height() ;
     int dw = QApplication::desktop()->width();
     int dh = QApplication::desktop()->height();
     bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
     bar.show();
     bar.setCaption (i18n("inserting birthdays - close to abort!") );
     qApp->processEvents();
 
     QDate birthday;
     QDate anniversary;
     QString realName;
     QString email;
     QString assembledName;
     QString uid;
     bool ok = true;
     for ( int i = 0; i < count; i++)
         {
             if ( ! bar.isVisible() )
                 return;
             bar.setProgress( i );
             qApp->processEvents();
 
             birthday = KGlobal::locale()->readDate(birthdayList[i], KLocale::ISODate, &ok);
             if (!ok) {
                 ;//qDebug("CalendarView::insertBirthdays found invalid birthday: %s",birthdayList[i].latin1());
             }
 
             anniversary = KGlobal::locale()->readDate(anniversaryList[i], KLocale::ISODate, &ok);
             if (!ok) {
                 ;//qDebug("CalendarView::insertBirthdays found invalid anniversary: %s",anniversaryList[i].latin1());
             }
             realName = realNameList[i]; 
             email = emailList[i];
             assembledName = assembledNameList[i];
             uid = uidList[i];
             //qDebug("insert birthday in KO/Pi: %s,%s,%s,%s: %s, %s", realName.latin1(), email.latin1(), assembledName.latin1(), uid.latin1(), birthdayList[i].latin1(), anniversaryList[i].latin1() );
 
             if ( birthday.isValid() ){
                 a = new KCal::Attendee( realName, email,false,KCal::Attendee::NeedsAction,
                                         KCal::Attendee::ReqParticipant,uid) ;
                 if ( addAnniversary(  birthday, assembledName,  a, true ) )
                     ++addCount;
             } 
 
             if ( anniversary.isValid() ){ 
                 a = new KCal::Attendee( realName, email,false,KCal::Attendee::NeedsAction,
                                         KCal::Attendee::ReqParticipant,uid) ;
                 if ( addAnniversary(  anniversary, assembledName,  a, false ) )
                     ++addCount;
             }
         }
 
     updateView(); 
     topLevelWidget()->setCaption(QString::number( addCount )+ i18n(" birthdays/anniversaries added!"));
 
   }
 
 }
 
 
 
 bool  CalendarView::addAnniversary(  QDate date, QString name, KCal::Attendee* a,  bool birthday)
 {
     //qDebug("addAnni ");
     Event * ev = new Event();
     ev->setOrganizer(KOPrefs::instance()->email());
     if ( a ) {
         ev->addAttendee( a );
     }
     QString kind;
     if ( birthday ) {
         kind = i18n( "Birthday" );
         ev->setSummary( name + " (" + QString::number(date.year()) +")"); 
     }
     else {
         kind = i18n( "Anniversary" );
         ev->setSummary( name + " (" + QString::number(date.year()) +") " + kind ); 
     }
     ev->setCategories( kind );
     ev->setDtStart( QDateTime(date) );
     ev->setDtEnd(  QDateTime(date) );
     ev->setFloats( true );
     Recurrence * rec = ev->recurrence();
     rec->setYearly(Recurrence::rYearlyMonth,1,-1);
     rec->addYearlyNum( date.month() );
     if ( !mCalendar->addAnniversaryNoDup( ev ) ) {
         delete ev;
         return false;
     }
     return true;
 
 }
 bool CalendarView::importQtopia( const QString &categories,
                                  const QString &datebook,
                                  const QString &todolist )
 {
     
    QtopiaFormat qtopiaFormat;
     qtopiaFormat.setCategoriesList (  &(KOPrefs::instance()->mCustomCategories));
     if ( !categories.isEmpty() ) qtopiaFormat.load( mCalendar, categories );
     if ( !datebook.isEmpty() ) qtopiaFormat.load( mCalendar, datebook );
     if ( !todolist.isEmpty() ) qtopiaFormat.load( mCalendar, todolist );
    
     updateView();
     return true;
 
 #if 0
  mGlobalSyncMode = SYNC_MODE_QTOPIA;
     mCurrentSyncDevice = "qtopia-XML";
     if ( mSyncManager->mAskForPreferences )
         edit_sync_options(); 
     qApp->processEvents();
     CalendarLocal* calendar = new CalendarLocal();
     calendar->setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId);
     bool syncOK = false;
  QtopiaFormat qtopiaFormat;
     qtopiaFormat.setCategoriesList (  &(KOPrefs::instance()->mCustomCategories));
     bool loadOk = true;
     if ( !categories.isEmpty() ) 
         loadOk = qtopiaFormat.load( calendar, categories );
     if ( loadOk && !datebook.isEmpty() ) 
         loadOk = qtopiaFormat.load( calendar, datebook );
     if ( loadOk && !todolist.isEmpty() ) 
         loadOk = qtopiaFormat.load( calendar, todolist );
 
     if ( loadOk  ) {
         getEventViewerDialog()->setSyncMode( true );
         syncOK = synchronizeCalendar( mCalendar, calendar, mSyncManager->mSyncAlgoPrefs );
         getEventViewerDialog()->setSyncMode( false );
         qApp->processEvents();
         if (  syncOK ) {
             if ( mSyncManager->mWriteBackFile )
             {
                 // write back XML file
 
             }
         setModified( true );
         }
     } else {
         QString question = i18n("Sorry, the file loading\ncommand failed!\n\nNothing synced!\n") ;
         QMessageBox::information( 0, i18n("KO/Pi Sync - ERROR"),
                                       question, i18n("Ok")) ;
     }
     delete calendar;
     updateView();
     return syncOK;
 
 
 #endif
 
 }
     
 void CalendarView::setSyncEventsReadOnly()
 {
     Event * ev;
     QPtrList<Event> eL = mCalendar->rawEvents(); 
     ev = eL.first();
     while ( ev ) {
         if ( ev->uid().left(15) == QString("last-syncEvent-") )
             ev->setReadOnly( true );
         ev =  eL.next();
     } 
 }
+
+bool CalendarView::loadCalendars()
+{
+    QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
+    KopiCalendarFile * cal = calendars.first();
+    mCalendar->setDefaultCalendar( 1 );
+    openCalendar( MainWindow::defaultFileName(), false );
+    cal = calendars.next();
+    while ( cal ) {
+        addCalendar( cal );
+        cal = calendars.next();
+    }
+    restoreCalendarSettings();
+    mCalendar->reInitAlarmSettings();
+    setSyncEventsReadOnly();
+    updateUnmanagedViews();
+    updateView();
+}
+bool CalendarView::restoreCalendarSettings()
+{
+    QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
+    KopiCalendarFile * cal = calendars.first();
+    while ( cal ) {
+        mCalendar->setCalendarEnabled( cal->mCalNumber,cal->isEnabled );
+        mCalendar->setAlarmEnabled( cal->mCalNumber, cal->isAlarmEnabled );
+        mCalendar->setReadOnly( cal->mCalNumber, cal->isReadOnly );
+        if ( cal->isStandard )
+            mCalendar->setDefaultCalendar( cal->mCalNumber );
+        cal = calendars.next();
+    }
+}
+bool CalendarView::addCalendar( KopiCalendarFile * cal )
+{
+
+    if ( mCalendar->addCalendarFile( cal->mFileName, cal->mCalNumber ))
+        return true;
+    qDebug("KO: Error adding calendar file %1 ",cal->mFileName.latin1() );
+    KMessageBox::error(this,i18n("Error loading calendar file\n%1.").arg(cal->mFileName));
+    return false;
+}
 bool CalendarView::openCalendar(QString filename, bool merge)
 {
 
     if (filename.isEmpty()) {
         return false;
     }
 
     if (!QFile::exists(filename)) {
         KMessageBox::error(this,i18n("File does not exist:\n '%1'.").arg(filename));
         return false;
     }
 
     globalFlagBlockAgenda = 1;
     clearAllViews();
     if (!merge) {
       mViewManager->setDocumentId( filename );
       mCalendar->close();
     }
     mStorage->setFileName( filename );
 
     if ( mStorage->load() ) {
         if ( merge ) ;//setModified( true );
         else {
             //setModified( true );
             mViewManager->setDocumentId( filename );
             mDialogManager->setDocumentId( filename );
             mTodoList->setDocumentId( filename );
         }
         globalFlagBlockAgenda = 2;
         // if ( getLastSyncEvent() )
         //  getLastSyncEvent()->setReadOnly( true );
         mCalendar->reInitAlarmSettings();
         setSyncEventsReadOnly();
         updateUnmanagedViews();
         updateView();
         if (  filename != MainWindow::defaultFileName() ) {
             saveCalendar( MainWindow::defaultFileName() );
         } else {
             QFileInfo finf ( MainWindow::defaultFileName());   
             if ( finf.exists() ) {
                 setLoadedFileVersion( finf.lastModified () );
             }
         }
         return true;
     } else {
         // while failing to load, the calendar object could
         // have become partially populated.  Clear it out.
         if ( !merge ) {
             mCalendar->close();
             mViewManager->setDocumentId( filename );
             mDialogManager->setDocumentId( filename );
             mTodoList->setDocumentId( filename );
         }
 
         //KMessageBox::error(this,i18n("Couldn't load calendar\n '%1'.").arg(filename));
 
         QTimer::singleShot ( 1, this, SLOT ( showOpenError() ) ); 
         globalFlagBlockAgenda = 2;
         mCalendar->reInitAlarmSettings();
         setSyncEventsReadOnly();
         updateUnmanagedViews();
         updateView();
     }
     return false;
 }
 void CalendarView::showOpenError()
 {
    KMessageBox::error(this,i18n("Couldn't load calendar\n."));
 }
 void CalendarView::setLoadedFileVersion(QDateTime dt)
 {
     loadedFileVersion = dt;
 }
 bool CalendarView::checkFileChanged(QString fn)
 {
     QFileInfo finf ( fn ); 
     if ( !finf.exists() )
         return true;
     QDateTime dt = finf.lastModified ();
     if ( dt <= loadedFileVersion )
         return false;
     return true;
 
 }
 void CalendarView::watchSavedFile()
 {
   QFileInfo finf ( MainWindow::defaultFileName());   
   if ( !finf.exists() )
     return;
   QDateTime dt = finf.lastModified ();
   if ( dt < loadedFileVersion ) {
       //qDebug("watch %s %s ",  dt.toString().latin1(), loadedFileVersion.toString().latin1());
     QTimer::singleShot( 1000 , this, SLOT ( watchSavedFile()  ) );
     return;
   }
   loadedFileVersion = dt;
 }
 
 bool CalendarView::checkFileVersion(QString fn)
 {
     QFileInfo finf ( fn );  
     if ( !finf.exists() )
         return true;
     QDateTime dt = finf.lastModified ();
     //qDebug("loaded file version %s",loadedFileVersion.toString().latin1());
     //qDebug("file on disk version  %s",dt.toString().latin1());
     if ( dt <= loadedFileVersion )
         return true;
    int km = KMessageBox::warningYesNoCancel(this, i18n("\nThe file on disk has changed!\nFile size: %1 bytes.\nLast modified: %2\nDo you want to:\n\n - Save and overwrite file?\n - Sync with file, then save?\n - Cancel without saving? \n").arg( QString::number( finf.size())).arg( KGlobal::locale()->formatDateTime(finf.lastModified (), true, true)) ,
                                                  i18n("KO/Pi Warning"),i18n("Overwrite"),
                                                  i18n("Sync+save"));
    
    if ( km ==  KMessageBox::Cancel )
        return false;
    if ( km ==  KMessageBox::Yes )
        return true;
 
     setSyncDevice("deleteaftersync" );
     mSyncManager->mAskForPreferences = true;
     mSyncManager->mSyncAlgoPrefs = 3;
     mSyncManager->mWriteBackFile = false;
     mSyncManager->mWriteBackExistingOnly = false;
     mSyncManager->mShowSyncSummary = false;
     syncCalendar( fn, 3 );
     Event * e = getLastSyncEvent();
     if ( e )
         deleteEvent ( e );
     updateView();
     return true;
 }
-
+bool CalendarView::saveCalendars()
+{
+    QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
+    KopiCalendarFile * cal = calendars.first();
+    mCalendar->setDefaultCalendar( 1 ); 
+    mCalendar->setDefaultCalendarEnabledOnly();
+    saveCalendar( MainWindow::defaultFileName() );
+    cal = calendars.next();
+    while ( cal ) {
+        if ( !cal->isReadOnly ) {
+            mCalendar->setDefaultCalendar( cal->mCalNumber ); 
+            mCalendar->setDefaultCalendarEnabledOnly();
+            saveCalendar( cal->mFileName );
+        }
+        cal = calendars.next();
+    }
+    restoreCalendarSettings();
+}
 bool CalendarView::saveCalendar( QString filename )
 {
  
     // Store back all unsaved data into calendar object
     // qDebug("file %s %d ",  filename.latin1()           , mViewManager->currentView()         );
     if ( mViewManager->currentView() )
         mViewManager->currentView()->flushView();
 
     
     QDateTime lfv = QDateTime::currentDateTime().addSecs( -2);
     mStorage->setSaveFormat( new ICalFormat() );
     mStorage->setFileName( filename );
     bool success;
     success = mStorage->save();
     if ( !success ) {
         return false;
     }
     if ( filename == MainWindow::defaultFileName() ) {
         setLoadedFileVersion( lfv );
         watchSavedFile();
     }
     return true;
 }
 
 void CalendarView::closeCalendar()
 {
  
     // child windows no longer valid
     clearAllViews();
     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);
    
 #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(); 
         KApplication::testCoords( &x,&y,&w,&h );
         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();
         KApplication::testCoords( &x,&y,&w,&h );
         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();
         KApplication::testCoords( &x,&y,&w,&h );
         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();
         KApplication::testCoords( &x,&y,&w,&h );
         getEventViewerDialog()->setGeometry(x,y,w,h);
     }
 #endif
     config->setGroup( "Views" );
     int dateCount = config->readNumEntry( "ShownDatesCount", 7 );
 
     QValueList<int> sizes = config->readIntListEntry("Left Splitter Frame");
    
     int resetval = 0;
     int maxVal = 0;
     if (sizes.count() != 3) { 
         if ( KOPrefs::instance()->mVerticalScreen ) {
             resetval = mDateNavigator->sizeHint().width()+2;
         } else {
             resetval = mDateNavigator->sizeHint().height()+2;
         }
     }
     if ( resetval ) {
         sizes.clear();
         if ( KOPrefs::instance()->mVerticalScreen ) {
             maxVal = QApplication::desktop()->width() -10;
         } else {
             maxVal = QApplication::desktop()->height()-10;
         }
         sizes << resetval;
         if ( maxVal < resetval + resetval)
             resetval = maxVal - resetval;
         sizes << resetval;
         sizes << 100;
     }
     mLeftFrame->setSizes(sizes);
     sizes = config->readIntListEntry("Main Splitter Frame");
     resetval = 0;
     maxVal = 0;
     if (sizes.count() != 2) { 
         if ( !KOPrefs::instance()->mVerticalScreen ) {
             resetval = mDateNavigator->sizeHint().width()+2;
         } else {
             resetval = mDateNavigator->sizeHint().height()+2;
         }
     }
     if ( resetval ) {
         sizes.clear();
         if ( !KOPrefs::instance()->mVerticalScreen ) {
             maxVal = QApplication::desktop()->width() -10;
         } else {
             maxVal = QApplication::desktop()->height()-10;
         }
         sizes << resetval;
         if ( maxVal < resetval + resetval)
             resetval = maxVal - resetval;
         sizes << resetval;
     }
     mMainFrame->setSizes(sizes);
     if ( dateCount == 5 ) mNavigator->selectWorkWeek();
     else if ( dateCount == 7 ) mNavigator->selectWeek();
     else mNavigator->selectDates( dateCount );
     // mViewManager->readSettings( config );
     updateConfig(); 
     globalFlagBlockAgenda = 2;
     mViewManager->readSettings( config );
     QTimer::singleShot( 1, mDateNavigator, SLOT ( setResizeEnabled() ) );
 }
 
 
 void CalendarView::writeSettings()
 {
     //  kdDebug() << "CalendarView::writeSettings" << endl;
 
     KConfig *config = KOGlobals::config();
 
     mViewManager->writeSettings( config );
     mTodoList->saveLayout(config,QString("Todo Layout"));
     mDialogManager->writeSettings( config );
     //KOPrefs::instance()->usrWriteConfig();
     KOPrefs::instance()->writeConfig();
 
     writeFilterSettings(config);
     config->setGroup( "AppRun" );
     QDateTime dt ( QDate (2005,1,1), QTime( 0,0,0 ) );
     int days = dt.daysTo( QDate::currentDate() );
     dt =  dt.addDays( days );
     int secs = dt.secsTo( QDateTime::currentDateTime() );
     config->writeEntry( "LatestProgramStopDays", days );
     config->writeEntry( "LatestProgramStopSecs", secs );
     //qDebug("KO: Writing stop time: %d ", secs);
     //qDebug("KO: Current Time %s ",QDateTime::currentDateTime().toString().latin1() );
     //QDateTime latest = dt.addSecs ( secs );
     //qDebug("KO: Termination on %s ", latest.toString().latin1());
     config->setGroup( "Views" );
     config->writeEntry( "ShownDatesCount", mNavigator->selectedDates().count() );
 
 #if 0
     qDebug("********************* ");
     qDebug("Testcode secsto ");
     QDateTime dt_nodaylight ( QDate (2005,3,26), QTime( 0,0,0 ) );
     QDateTime dt_daylight ( QDate (2005,3,29), QTime( 0,0,0 ) );
     int secsto = dt_nodaylight.secsTo( dt_daylight );
     QDateTime dt_daylight_wrong = dt_nodaylight.addSecs( secsto );
     qDebug("dt nodaylight %s ",dt_nodaylight.toString().latin1() );
     qDebug("dt daylight %s ",dt_daylight.toString().latin1() );
     qDebug("dt daylight_wrong %s ",dt_daylight_wrong.toString().latin1() );
     qDebug("Computed secsTo %d . in minutes: %d . in hours: %d ", secsto, secsto/60, secsto/3600);
     qDebug("********************* testcode end");
 
 #endif
 
     QValueList<int> listINT = mLeftFrame->sizes();
     config->writeEntry("Left Splitter Frame",listINT);
     QValueList<int> listINT2 = mMainFrame->sizes();
     config->writeEntry("Main Splitter Frame",listINT2);
 #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).utf8());
         //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().utf8());
         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()
 {
     if ( mViewManager->currentView()->isMonthView() )
         mNavigator->selectTodayMonth();
     else
         mNavigator->selectToday();
 }
 
 void CalendarView::goNext()
 {
     mNavigator->selectNext();
 }
 
 void CalendarView::goPrevious()
 {
     mNavigator->selectPrevious();
 }
 void CalendarView::goNextMonth()
 {
     mNavigator->selectNextMonth();
 }
 
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index cdce072..0144ba4 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -1,608 +1,613 @@
 /*
     This file is part of KOrganizer.
     Copyright (c) 2000, 2001
     Cornelius Schumacher <schumacher@kde.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 #ifndef CALENDARVIEW_H
 #define CALENDARVIEW_H
 
 #include <qframe.h>
 #include <qlayout.h>
 #include <qwidget.h>
 #include <qptrlist.h>
 #include <qvbox.h>
 #include <qmap.h>
 #ifndef DESKTOP_VERSION
 #include <qtopia/ir.h> 
 #else
 #define Ir char
 #endif
 #include <libkcal/calendar.h>
 #include <libkcal/scheduler.h>
 #include <libkcal/calendarresources.h>
 #include <libkcal/resourcecalendar.h>
 #include <KDGanttMinimizeSplitter.h>
 
 #include <korganizer/calendarviewbase.h>
 
 #include <ksyncmanager.h>
+//#include <koprefs.h>
 
 class QWidgetStack;
 class QSplitter;
-
+class KopiCalendarFile;
 class CalPrinter;
 class KOFilterView;
 class KOCalEditView;
 class KOViewManager;
 class KODialogManager;
 class KOTodoView;
 class KDateNavigator;
 class DateNavigatorContainer;
 class DateNavigator;
 class KOIncidenceEditor;
 class KDatePicker;
 class ResourceView;
 class KOEventEditor;
 class KOTodoEditor ;
 class KOEventViewerDialog;
 class KOBeamPrefs;
 class KSyncProfile;
 class AlarmDialog;
 class KCal::Attendee;
 
 namespace KCal { class FileStorage; }
 
 using namespace KCal;
 
 /**
   This is the main calendar widget. It provides the different vies on t he
   calendar data as well as the date navigator. It also handles synchronisation
   of the different views and controls the different dialogs like preferences,
   event editor, search dialog etc.
   
   @short main calendar view widget
   @author Cornelius Schumacher
 */
 
 #include <qtextbrowser.h>
 #include <qtextcodec.h>
 
 class MissedAlarmTextBrowser : public QTextBrowser {
     Q_OBJECT
   public:
     MissedAlarmTextBrowser(QWidget *parent, QPtrList<Incidence> alarms ,QDateTime start);
     ~MissedAlarmTextBrowser();
     void setSource(const QString & n);
     
  private:
     Incidence * getNextInc(QDateTime start );
     QPtrList<Incidence> mAlarms;
   signals:
     void showIncidence( QString uid);
 };
 
 
 class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Observer, public KSyncInterface
 {
     Q_OBJECT
   public:
     /**
       Constructs a new calendar view widget.
 
       @param calendar calendar document
       @param parent   parent window
       @param name     Qt internal widget object name
     */
     CalendarView( CalendarResources *calendar, QWidget *parent = 0,
                   const char *name = 0 );
     CalendarView( Calendar *calendar, QWidget *parent = 0,
                   const char *name = 0 );
     virtual ~CalendarView();
   
     Calendar *calendar() { return mCalendar; }
 
     KOViewManager *viewManager();
     KODialogManager *dialogManager();
 
     QDate startDate();
     QDate endDate();
 
     QWidgetStack *viewStack();
     QWidget *leftFrame();
 
     DateNavigator *dateNavigator();
     KDateNavigator *dateNavigatorWidget();
 
     void addView(KOrg::BaseView *);
     void showView(KOrg::BaseView *);
     KOEventViewerDialog* getEventViewerDialog();
     Incidence *currentSelection();
 
   signals:
     void save ();
     void saveStopTimer ();
     void tempDisableBR(bool);
     /** This todo has been modified */
     void todoModified(Todo *, int);
   
     /** when change is made to options dialog, the topwidget will catch this
      *  and emit this signal which notifies all widgets which have registered 
      *  for notification to update their settings. */
     void configChanged();
     /** emitted when the topwidget is closing down, so that any attached
         child windows can also close. */
     void closingDown();
     /** emitted right before we die */
     void closed(QWidget *);
     
     /** Emitted when state of modified flag changes */
     void modifiedChanged(bool);
     void signalmodified();
   
     /** Emitted when state of read-only flag changes */
     void readOnlyChanged(bool);
   
     /** Emitted when the unit of navigation changes */
     void changeNavStringPrev(const QString &);
     void changeNavStringNext(const QString &);
   
     /** Emitted when state of events selection has changed and user is organizer*/
     void organizerEventsSelected(bool);
     /** Emitted when state of events selection has changed and user is attendee*/
     void groupEventsSelected(bool);
     /**
       Emitted when an incidence gets selected. If the selection is cleared the
       signal is emitted with 0 as argument.
     */
     void incidenceSelected( Incidence * );
     /** Emitted, when a todoitem is selected or deselected. */
     void todoSelected( bool );
 
     /**
       Emitted, when clipboard content changes. Parameter indicates if paste
       is possible or not.
     */
     void pasteEnabled(bool);
     
     /** Emitted, when the number of incoming messages has changed. */
     void numIncomingChanged(int);
 
     /** Emitted, when the number of outgoing messages has changed. */
     void numOutgoingChanged(int);
 
     /** Send status message, which can e.g. be displayed in the status bar. */
     void statusMessage(const QString &);
     
     void calendarViewExpanded( bool );
     void updateSearchDialog();
 
 
   public slots:
     void checkAlarms();
     void slotprintSelInc();
     void showNextAlarms();
     void showOpenError();
     void watchSavedFile();
     void recheckTimerAlarm();
     void checkNextTimerAlarm();
     void addAlarm(const QDateTime &qdt, const QString &noti  );
     void addSuspendAlarm(const QDateTime &qdt, const QString &noti  );
     void removeAlarm(const QDateTime &qdt, const QString &noti  );
 
     /** options dialog made a changed to the configuration. we catch this
      *  and notify all widgets which need to update their configuration. */
     void updateConfig();
 
     void insertBirthdays(const QString& uid, const QStringList& birthdayList, 
 			 const QStringList& anniversaryList, const QStringList& realNameList,
 			 const QStringList& emailList, const QStringList& assembledNameList,
 			 const QStringList& uidList);
 
     /**
       Load calendar from file \a filename. If \a merge is true, load 
       calendar into existing one, if it is false, clear calendar, before
       loading. Return true, if calendar could be successfully loaded.
     */
     bool openCalendar(QString filename, bool merge=false);
+    bool loadCalendars();
+    bool saveCalendars();
+    bool restoreCalendarSettings();
+    bool addCalendar( KopiCalendarFile * );
     bool syncCalendar(QString filename,int mode = 0 );
 
     /**
       Save calendar data to file. Return true if calendar could be
       successfully saved.
     */
     bool saveCalendar(QString filename);
   
     /**
       Close calendar. Clear calendar data and reset views to display an empty
       calendar.
     */
     void closeCalendar();
   
     /** Archive old events of calendar */
     void archiveCalendar();
 
     void showIncidence();
     void editIncidence();
     void editIncidenceDescription();
     void deleteIncidence();
     void cloneIncidence();
     void moveIncidence();
     void beamIncidence();
     void toggleCancelIncidence();
   
     /** create an editeventwin with supplied date/time, and if bool is true,
      * make the event take all day. */
     void newEvent(QDateTime, QDateTime, bool allDay );
     void newEvent(QDateTime, QDateTime);
     void newEvent(QDateTime fh);
     void newEvent(QDate dt);
     /** create new event without having a date hint. Takes current date as
      default hint. */ 
     void newEvent();
     void newFloatingEvent();
 
     /** Create a read-only viewer dialog for the supplied incidence. It calls the correct showXXX method*/
     void showIncidence(Incidence *);
     void showIncidence(QString uid);
     /** Create an editor for the supplied incidence. It calls the correct editXXX method*/
     void editIncidence(Incidence *);
     /** Delete the supplied incidence. It calls the correct deleteXXX method*/
     void deleteIncidence(Incidence *);
     void cloneIncidence(Incidence *);
     void cancelIncidence(Incidence *);
     /** Create an editor for the supplied event. */
     void editEvent(Event *);
     /** Delete the supplied event. */
     void deleteEvent(Event *);
     /** Delete the event with the given unique ID. Returns false, if event wasn't
     found. */
     bool deleteEvent(const QString &uid);
     /** Create a read-only viewer dialog for the supplied event. */
     void showEvent(Event *);
 
     void editJournal(Journal *);
     void showJournal(Journal *);
     void deleteJournal(Journal *);
     /** Create an editor dialog for a todo */
     void editTodo(Todo *);
     /** Create a read-only viewer dialog for the supplied todo */
     void showTodo(Todo *);
     /** create new todo */
     void newTodo();
     void newTodoDateTime(QDateTime, bool allday); 
     /** create new todo with a parent todo */
     void newSubTodo();
     /** create new todo with a parent todo */
     void newSubTodo(Todo *);
     /** Delete todo */
     void deleteTodo(Todo *);
 
             
     /** Check if clipboard contains vCalendar event. The signal pasteEnabled() is
      * emitted as result. */
     void checkClipboard();
     
     /** using the KConfig associated with the kapp variable, read in the
      * settings from the config file. 
      */
     void readSettings();
     
     /** write current state to config file. */
     void writeSettings();
 
     /** read settings for calendar filters */
     void readFilterSettings(KConfig *config);
     
     /** write settings for calendar filters */
     void writeFilterSettings(KConfig *config);
 
     /** passes on the message that an event has changed to the currently
      * activated view so that it can make appropriate display changes. */
     void changeEventDisplay(Event *, int);
     void changeIncidenceDisplay(Incidence *, int);
     void changeTodoDisplay(Todo *, int);
   
     void eventAdded(Event *);
     void eventChanged(Event *);
     void eventToBeDeleted(Event *);
     void eventDeleted();
   
     void todoAdded(Todo *);
     void todoChanged(Todo *);
     void todoToBeDeleted(Todo *);
     void todoDeleted();
 
     void updateView(const QDate &start, const QDate &end);
     void updateView();
     void clearAllViews();
   
     /** 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_global_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 * );
     void todo_resub( Todo * parent, Todo * sub );
 
     /** Take ownership of selected event. */
     void takeOverEvent();
 
     /** Take ownership of all events in calendar. */
     void takeOverCalendar();
   
     /** query whether or not the calendar is "dirty". */
     bool isModified();
     /** set the state of calendar. Modified means "dirty", i.e. needing a save. */
     void setModified(bool modified=true);
 
     /** query if the calendar is read-only. */
     bool isReadOnly();
     /** set state of calendar to read-only */
     void setReadOnly(bool readOnly=true);
 
     void eventUpdated(Incidence *);
 
     /* iTIP scheduling actions */
     void schedule_publish(Incidence *incidence = 0);
     void schedule_request(Incidence *incidence = 0);
     void schedule_refresh(Incidence *incidence = 0);
     void schedule_cancel(Incidence *incidence = 0);
     void schedule_add(Incidence *incidence = 0);
     void schedule_reply(Incidence *incidence = 0);
     void schedule_counter(Incidence *incidence = 0);
     void schedule_declinecounter(Incidence *incidence = 0);
     void schedule_publish_freebusy(int daysToPublish = 30);
 
     void openAddressbook();
 
     void editFilters();
     void toggleFilerEnabled();
     QPtrList<CalFilter> filters();
     void toggleFilter();
     void showFilter(bool visible);
     void updateFilter();
     void filterEdited();
     void selectFilter( int );
     KOFilterView *filterView();
 
     void showIntro();
 
     /** Move the curdatepient view date to today */
     void goToday();
 
     /** Move to the next date(s) in the current view */
     void goNext();
   
     /** Move to the previous date(s) in the current view */
     void goPrevious();
   /** Move to the next date(s) in the current view */
     void goNextMonth();
   
     /** Move to the previous date(s) in the current view */
     void goPreviousMonth();
 
     void toggleExpand();
     void toggleDateNavigatorWidget();
     void toggleAllDaySize();
     void dialogClosing(Incidence *);
   
     /** Look for new messages in the inbox */
     void lookForIncomingMessages();
    /** Look for new messages in the outbox */
     void lookForOutgoingMessages();
 
     void processMainViewSelection( Incidence * );
     void processTodoListSelection( Incidence * );
     
     void processIncidenceSelection( Incidence * );
 
     void purgeCompleted();
     bool removeCompletedSubTodos( Todo* );
     void slotCalendarChanged();
     bool importBday();
     bool addAnniversary( QDate data, QString name, KCal::Attendee* a , bool birthday  );
     bool importQtopia( const QString &categoriesFile,
                        const QString &datebookFile,
                        const QString &tasklistFile );
     void syncExternal( int mode );
     void slotSelectPickerDate( QDate ) ;
     void showDatePicker() ;
     void showDatePickerPopup() ;
     void moveIncidence(Incidence *) ;
     void beamIncidence(Incidence *) ;
     void beamCalendar() ;
     void beamFilteredCalendar() ;
     void beamIncidenceList(QPtrList<Incidence>) ;
     void manageCategories();
     int addCategories();
     void removeCategories();
     void setSyncDevice( QString );
     void setSyncName( QString );
     void showDay( QDate );
     void undo_delete();
   protected slots:
     void resetFocus();
     void slotViewerClosed();
     void timerAlarm();
     void suspendAlarm();
     void beamDone( Ir *ir );
     /** Select a view or adapt the current view to display the specified dates. */
     void showDates( const KCal::DateList & );
     void selectWeekNum ( int );
   
   public:
     // show a standard warning
     // returns KMsgBox::yesNoCancel()
     int msgCalModified(); 
     virtual bool sync(KSyncManager* manager, QString filename, int mode);
 
     virtual bool syncExternal(KSyncManager* manager, QString resource);
     virtual void removeSyncInfo( QString syncProfile);
     void setSyncManager(KSyncManager* manager);
     void setLoadedFileVersion(QDateTime);
     bool checkFileVersion(QString fn);
     bool checkFileChanged(QString fn);
     Event* getLastSyncEvent();
     /** Adapt navigation units correpsonding to step size of navigation of the
      * current view.
      */
     void adaptNavigationUnits();
     bool synchronizeCalendar( Calendar* local,  Calendar* remote, int mode );
     int  takeEvent( Incidence* local,  Incidence* remote, int mode, bool full = false );
     //Attendee* getYourAttendee(Event *event);
     void setBlockShowDates( bool b ) { mBlockShowDates = b ;}
   protected:
     void schedule(Scheduler::Method, Incidence *incidence = 0);
     
     // returns KMsgBox::OKCandel()
     int msgItemDelete(const QString name);
     void showEventEditor();
     void showTodoEditor();
     void writeLocale();
     Todo *selectedTodo();
 
   private:
     QDateTime mNextAlarmDateTime;
     bool mViewerCallerIsSearchDialog;
     bool mBlockShowDates;
     KSyncManager* mSyncManager;
     AlarmDialog * mAlarmDialog;
     QString mAlarmNotification;
     QString mSuspendAlarmNotification;
     QTimer* mSuspendTimer;
     QTimer* mAlarmTimer;
     QTimer* mRecheckAlarmTimer;
     void computeAlarm( QString );
     void startAlarm( QString, QString );
     void setSyncEventsReadOnly();
     
     QDateTime loadedFileVersion;
     void checkExternSyncEvent( QPtrList<Event> lastSync , Incidence* toDelete );
     void checkExternalId( Incidence * inc );
     int mGlobalSyncMode;
     QString  mCurrentSyncDevice;
     QString  mCurrentSyncName;
     KOBeamPrefs* beamDialog;
     void init();
     int mDatePickerMode;
     bool mFlagEditDescription;
     QDateTime mLastCalendarSync;
     void createPrinter();
 
     void calendarModified( bool, Calendar * );
 
     CalPrinter *mCalPrinter;
 
     QSplitter    *mPanner;
     QSplitter    *mLeftSplitter;
     KDGanttMinimizeSplitter  *mLeftFrame, *mMainFrame;
     QWidgetStack *mRightFrame;
 
     KDatePicker* mDatePicker;
     QVBox* mDateFrame;
 
     DateNavigatorContainer *mDateNavigator;       // widget showing small month view.
 
     KOFilterView *mFilterView;
     KOCalEditView *mCalEditView;
 
     ResourceView *mResourceView;
 
     // calendar object for this viewing instance
     Calendar      *mCalendar;
 
     CalendarResourceManager *mResourceManager;
 
     FileStorage *mStorage;
 
     DateNavigator *mNavigator;
 
     KOViewManager *mViewManager;
     KODialogManager *mDialogManager;
 
     // Calendar filters
     QPtrList<CalFilter> mFilters;
 
     // 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;
     QDate mMoveIncidenceOldDate;
     KOTodoView *mTodoList;
     KOEventEditor * mEventEditor;
     KOTodoEditor  * mTodoEditor;
     KOEventViewerDialog * mEventViewerDialog;
     void keyPressEvent ( QKeyEvent *e) ;
     //QMap<Incidence*,KOIncidenceEditor*> mDialogList;
 };
 
 
 class CalendarViewVisitor : public Incidence::Visitor
 {
   public:
diff --git a/korganizer/kofilterview.cpp b/korganizer/kofilterview.cpp
index 2dd4567..29a4393 100644
--- a/korganizer/kofilterview.cpp
+++ b/korganizer/kofilterview.cpp
@@ -1,383 +1,383 @@
 /*
     This file is part of KOrganizer.
     Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #include <qcheckbox.h>
 #include <qcombobox.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qdialog.h>
 
 
 #include <libkcal/calfilter.h>
 
 #include "kofilterview.h"
 #include "koprefs.h"
 #include <kiconloader.h>
 #include <kglobal.h>
 #include <kcolorbutton.h>
 #include <kmessagebox.h>
 
 
 #include <kurlrequester.h>
 #include <klineedit.h>
 
 class KONewCalPrefs : public QDialog
 {
   public:
     KONewCalPrefs( QWidget *parent=0, const char *name=0 ) :
       QDialog( parent, name, true ) 
     {
         setCaption( i18n("Add new Calendar") );
         QVBoxLayout* lay = new QVBoxLayout( this );
         lay->setSpacing( 3 );
         lay->setMargin( 3 );
         QLabel * lab = new QLabel( i18n("<b>Name of new calendar:</b>"), this );
         lay->addWidget( lab ); 
         nameE = new KLineEdit( this );
         lay->addWidget( nameE ); 
         lab = new QLabel( i18n("Local ical (*.ics) file:"), this );
         lay->addWidget( lab ); 
         url = new KURLRequester ( this );
         lay->addWidget( url ); 
         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 );
+        //resize( 200, 200 );
     }
       
         QString calName() { return nameE->text(); }
         QString calFileName() { return url->url(); }
 private:
     KLineEdit* nameE;
     KURLRequester *url;
 };
 
 
 KOFilterView::KOFilterView(QPtrList<CalFilter> *filterList,QWidget* parent,
                            const char* name,WFlags fl )
   : KOFilterView_base(parent,name,fl)
 {
   mFilters = filterList;
 
   connect(mSelectionCombo,SIGNAL(activated(int)),SIGNAL(filterChanged()));
   connect(mEnabledCheck,SIGNAL(clicked()),SIGNAL(filterChanged()));
   connect(mEditButton,SIGNAL(clicked()),SIGNAL(editFilters()));
 }
 
 KOFilterView::~KOFilterView()
 {
     // no need to delete child widgets, Qt does it all for us
 }
 
 bool KOFilterView::filtersEnabled()
 {
   return mEnabledCheck->isChecked();
 }
 
 void KOFilterView::setFiltersEnabled(bool set)
 {
   mEnabledCheck->setChecked(set);
   emit filterChanged();
 }
 
 
 void KOFilterView::updateFilters()
 {
   mSelectionCombo->clear();
 
   CalFilter *filter = mFilters->first();
   while(filter) {
     mSelectionCombo->insertItem(filter->name());
     filter = mFilters->next();
   }
 }
 
 CalFilter *KOFilterView::selectedFilter()
 {
   CalFilter *f = mFilters->at(mSelectionCombo->currentItem());
   return f;
 }
 
 void KOFilterView::setSelectedFilter(QString filterName)
 {
   int filter_num = mSelectionCombo->count();
   int i;
   for (i=0;i<filter_num;i++) {
     if (mSelectionCombo->text(i)==filterName)
       mSelectionCombo->setCurrentItem(i);
   }
   emit filterChanged();
 }
 void KOFilterView::setSelectedFilter( int fil )
 { 
   if ( fil >= mSelectionCombo->count() )
       return;
   mSelectionCombo->setCurrentItem( fil );
   emit filterChanged();
 }
 
 
 
 KOCalEditView::KOCalEditView(QWidget* parent,
                            const char* name )
   : QWidget(parent,name)
 {
     mw = 0;
     ml = new QVBoxLayout ( this );
 }
 
 KOCalEditView::~KOCalEditView()
 {
     // no need to delete child widgets, Qt does it all for us
 }
 void KOCalEditView::selectCal(int id ,bool b)
 {
     KOPrefs::instance()->getCalendar( id )->isEnabled = b;
     emit calendarEnabled ( id, b );
 
 }
 void KOCalEditView::selectStdCal( int id, bool b )
 {
 
     if ( !b ) {
         KOCalCheckButton* it = (KOCalCheckButton*) sender();
         if ( it ) {
             it->blockSignals( true );
             it->setChecked( true );
             it->blockSignals( false );
             return;
         }
         return;
     }
     KOCalCheckButton* sen = (KOCalCheckButton*) sender();
     KOCalCheckButton* it = mStdandardB.first();
     while ( it ) {
         if ( it->isChecked() ) {
             if ( it != sen ) {
                 it->blockSignals( true );
                 it->setChecked( false );
                 it->blockSignals( false );
                 break;
             }
         }
         it = mStdandardB.next();
     }
    KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first();
     while ( kkf ) {
         kkf->isStandard = false;
         kkf = KOPrefs::instance()->mCalendars.next();
     }
     KOPrefs::instance()->getCalendar( id )->isStandard = true;
     emit setCalendarDefault ( id );
 }
 
 void KOCalEditView::selectCalAlarm(int id ,bool b )
 {
     KOPrefs::instance()->getCalendar( id )->isAlarmEnabled = b;
     emit alarmEnabled ( id , b );
 }
 void KOCalEditView::selectReadOnly(int id ,bool b )
 {
     KOPrefs::instance()->getCalendar( id )->isReadOnly = b;
     emit calendarReadonly ( id , b );
     
 }
 void KOCalEditView::setColor( const QColor& c, int id )
 {
     KOPrefs::instance()->getCalendar( id )->mDefaultColor = c;
 }
 void KOCalEditView::deleteCal( int id )
 {
     KopiCalendarFile * kkf = KOPrefs::instance()->getCalendar( id );
     QString name = kkf->mName;
     QString file = kkf->mFileName;
     if ( KMessageBox::warningContinueCancel( this,  i18n("The calendar <b>%1</b> is displaying file <b>%2</b><tr> Do you want to remove this calendar from KO/Pi? (The file is not removed, of course!)").arg(name).arg(file) ) != KMessageBox::Continue ) return;
     emit removeCalendar ( id );
     KOPrefs::instance()->mCalendars.remove ( kkf );
     readConfig(); 
 }
 void KOCalEditView::infoCal( int id )
 {
     QString name = KOPrefs::instance()->getCalendar( id )->mName;
     QString file = KOPrefs::instance()->getCalendar( id )->mFileName;
     KMessageBox::information( this,  i18n("The calendar <b>%1</b> is displaying file <b>%2</b>").arg(name).arg(file) );
 }
 void KOCalEditView::readConfig() 
 {
     
     mStdandardB.clear();
     mEnabledB.clear();
     mAlarmB.clear();
     mROB.clear();
 
     if ( mw ) delete mw;
     mw = new QWidget ( this );
     ml->addWidget ( mw );
 
     mainLayout = new QGridLayout ( mw , 2, 8 ); 
     //mainLayout->setSpacing( 3 );
     QPushButton * addBut = new QPushButton ( mw );
     mainLayout->addWidget( addBut,0,0 );
     addBut->setPixmap ( SmallIcon("plus"));
     connect(addBut,SIGNAL(clicked()),SLOT(addCal()));
     addBut->setMaximumWidth( addBut->sizeHint().height() );
 
     addBut = new QPushButton ( mw );
     mainLayout->addWidget( addBut,0,1 );
     addBut->setPixmap ( SmallIcon("eye"));
     connect(addBut,SIGNAL(clicked()),SLOT(enableAll()));
     addBut->setMaximumWidth( addBut->sizeHint().height() );
 
     QLabel* lab = new QLabel ( " "+i18n("Calendar")+" ", mw );
     mainLayout->addWidget( lab,0,2 );
 
     addBut = new QPushButton ( mw );
     mainLayout->addWidget( addBut,0,3 );
     addBut->setPixmap ( SmallIcon("bell"));
     connect(addBut,SIGNAL(clicked()),SLOT(enableAlarm()));
     addBut->setMaximumWidth( addBut->sizeHint().height() );
 
     addBut = new QPushButton ( mw );
     mainLayout->addWidget( addBut,0,4 );
     addBut->setPixmap ( SmallIcon("pencil"));
     connect(addBut,SIGNAL(clicked()),SLOT(disableRO()));
     addBut->setMaximumWidth( addBut->sizeHint().height() );
 
     lab = new QLabel ( i18n(" Color "), mw );
     mainLayout->addWidget( lab,0,5 );
 #if 0
     addBut = new QPushButton ( mw );
     mainLayout->addWidget( addBut,0,6 );
     addBut->setPixmap ( SmallIcon("minus"));
     connect(addBut,SIGNAL(clicked()),SLOT(deleteAll()));
     addBut->setMaximumWidth( addBut->sizeHint().height() );
 #endif
 
 
     KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first();
     int row = 1;
     while ( kkf ) {
 
         KOCalCheckButton* cb = new KOCalCheckButton( mw );
         mainLayout->addWidget( cb,row,0 );mStdandardB.append( cb );
         cb->setChecked( kkf->isStandard );
         cb->setNum( kkf->mCalNumber );
         connect (cb, SIGNAL (selectNum(int,bool)), SLOT ( selectStdCal(int,bool) ) );
         cb = new KOCalCheckButton( mw );
         mainLayout->addWidget( cb,row,1 );mEnabledB.append( cb );
         cb->setChecked( kkf->isEnabled );
         cb->setNum( kkf->mCalNumber );
         connect (cb, SIGNAL (selectNum(int,bool)), SLOT ( selectCal(int,bool) ) );
         KOCalButton* name = new KOCalButton( mw );
         name->setNum( kkf->mCalNumber );
         name->setText(  kkf->mName );
         mainLayout->addWidget( name,row,2 );
         connect (name, SIGNAL (selectNum(int)), SLOT ( infoCal(int) ) );
         cb = new KOCalCheckButton( mw );
         mainLayout->addWidget( cb,row,3 );mAlarmB.append( cb );
         cb->setChecked( kkf->isAlarmEnabled );
         cb->setNum( kkf->mCalNumber );
         connect (cb, SIGNAL (selectNum(int,bool)), SLOT ( selectCalAlarm(int,bool) ) );
         cb = new KOCalCheckButton( mw );
         mainLayout->addWidget( cb,row,4 );mROB.append( cb );
         cb->setChecked( kkf->isReadOnly );
         cb->setNum( kkf->mCalNumber );
         connect (cb, SIGNAL (selectNum(int,bool)), SLOT ( selectReadOnly(int,bool) ) );
         KColorButton *colb = new KColorButton( mw );
         mainLayout->addWidget( colb,row,5 );
         colb->setID( kkf->mCalNumber );
         colb->setColor( kkf->mDefaultColor );
         connect (colb, SIGNAL (changedID(const QColor&, int )), SLOT ( setColor(const QColor&,int) ) );
         if ( row > 1) {
             KOCalButton* calb = new KOCalButton( mw );
             mainLayout->addWidget( calb,row,6 );
             calb->setNum( kkf->mCalNumber );
             calb->setPixmap ( SmallIcon("minus"));
             connect (calb, SIGNAL (selectNum(int)), SLOT ( deleteCal(int) ) );
             int hei = calb->sizeHint().height();
             //calb->setMaximumSize( hei*9/10, hei*9/10 );
         }
         ++row;
         kkf = KOPrefs::instance()->mCalendars.next();
     }
     lab = new QLabel (  "", mw );
     mainLayout->addWidget( lab,row,0 );
     mw->show();
 
 }
 void KOCalEditView::addCal()
 {
     qDebug("addcal ");
     KONewCalPrefs prefs ( this ); 
     if ( !  prefs.exec() )
         return;
     QString name = prefs.calName();
     QString file = prefs.calFileName();
     QFileInfo fi ( file );
     if (!fi.exists() ) {
         KMessageBox::information( this,  i18n("File does not exist!\nNo calendar added!"));
         return;
     }
     KopiCalendarFile * kkf = KOPrefs::instance()->getNewCalendar();
     kkf->mName = name;
     kkf->mFileName = file;
     emit calendarAdded( kkf->mCalNumber );
     readConfig(); 
 }
 void KOCalEditView::enableAll()
 {
     toggleList( mEnabledB );
 }
 void KOCalEditView::enableAlarm()
 {
     toggleList( mAlarmB );
 }
 void KOCalEditView::disableRO()
 {
     toggleList( mROB );
 }
 void KOCalEditView::toggleList ( QPtrList<KOCalCheckButton> list )
 {
     bool dis = false;
     KOCalCheckButton* it = list.first();
     while ( it ) {
         if ( !it->isChecked() ) {
             dis = true;
             break;
         }
         it = list.next();
     }
     it = list.first();
     while ( it ) {
         it->setChecked(dis);
         it = list.next();
     }  
 }
 void KOCalEditView::deleteAll()
 {
     qDebug("delteAll");
 }
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 95e1607..f05ada5 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -1,695 +1,695 @@
 #include <stdlib.h>
 
 #include <qaction.h>
 #include <qpopupmenu.h>
 #include <qpainter.h>
 #include <qwhatsthis.h>
 #include <qpushbutton.h>
 #include <qmessagebox.h>
 #include <qlineedit.h>
 #include <qtextcodec.h>
 #include <qfile.h>
 #include <qdir.h>
 #include <qapp.h>
 #include <qfileinfo.h>
 #include <qlabel.h>
 #include <qspinbox.h>
 #include <qcheckbox.h>
 #include <qmap.h>
 #include <qwmatrix.h>
 #include <qtextbrowser.h>
 #include <qtextstream.h>
 #ifndef DESKTOP_VERSION
 #include <qpe/global.h>
 #include <qpe/qpemenubar.h>
 #include <qpe/qpetoolbar.h>
 #include <qpe/resource.h>
 #include <qpe/qpeapplication.h>
 #include <qtopia/alarmserver.h>
 #include <qtopia/qcopenvelope_qws.h>
 #include <unistd.h> // for sleep
 #else
 #include <qmenubar.h>
 #include <qtoolbar.h>
 #include <qapplication.h>
 //#include <resource.h>
 
 #endif
 #include <libkcal/calendarlocal.h>
 #include <libkcal/todo.h>
 #include <libkcal/phoneformat.h>
 #include <libkdepim/ksyncprofile.h>
 #include <libkdepim/phoneaccess.h>
 #include <libkcal/kincidenceformatter.h>
 #include <libkdepim/kpimglobalprefs.h>
 
 #include "calendarview.h"
 #include "koviewmanager.h"
 #include "datenavigator.h"
 #include "koagendaview.h"
 #include "koagenda.h"
 #include "kodialogmanager.h"
 #include "kdialogbase.h"
 #include "kapplication.h"
 #include "kofilterview.h"
 #include "kstandarddirs.h"
 #include "koprefs.h"
 #include "kfiledialog.h"
 #include "koglobals.h"
 #include "kglobal.h"
 #include "ktoolbar.h"
 #include "klocale.h"
 #include "kconfig.h"
 #include "externalapphandler.h"
 #include <kglobalsettings.h>
 
 using namespace KCal;
 #ifndef _WIN32_
 #include <unistd.h>
 #else
 #ifdef _OL_IMPORT_
 #include "koimportoldialog.h"
 #endif
 #endif
 #include "mainwindow.h"
 
 
 class KOex2phonePrefs : public QDialog
 {
   public:
     KOex2phonePrefs( QWidget *parent=0, const char *name=0 ) :
       QDialog( parent, name, true ) 
     {
         setCaption( i18n("Export to phone options") );
         QVBoxLayout* lay = new QVBoxLayout( this );
         lay->setSpacing( 3 );
         lay->setMargin( 3 );
         QLabel *lab;
         lay->addWidget(lab = new QLabel( i18n("Please read Help-Sync Howto\nto know what settings to use."), this ) );  
         lab->setAlignment (AlignHCenter  ); 
         QHBox* temphb;
         temphb = new QHBox( this );
         new QLabel( i18n("I/O device: "), temphb ); 
         mPhoneDevice = new QLineEdit( temphb);
         lay->addWidget( temphb );
         temphb = new QHBox( this );
         new QLabel( i18n("Connection: "), temphb ); 
         mPhoneConnection = new QLineEdit( temphb);
         lay->addWidget( temphb );
         temphb = new QHBox( this );
         new QLabel( i18n("Model(opt.): "), temphb ); 
         mPhoneModel = new QLineEdit( temphb);
         lay->addWidget( temphb );
         mWriteBackFuture= new QCheckBox( i18n("Write back events in future only"), this );
         mWriteBackFuture->setChecked( true );
         lay->addWidget( mWriteBackFuture );
         temphb = new QHBox( this );
         new QLabel( i18n("Max. weeks in future: ") , temphb );
         mWriteBackFutureWeeks= new QSpinBox(1,104, 1, temphb);
         mWriteBackFutureWeeks->setValue( 8 );
         lay->addWidget( temphb );  
         lay->addWidget(lab = new QLabel( i18n("NOTE: This will remove all old\ntodo/calendar data on phone!"), this ) );  
         lab->setAlignment (AlignHCenter  ); 
         QPushButton * ok = new QPushButton( i18n("Export to mobile phone!"), this );
         lay->addWidget( ok );
         QPushButton * cancel = new QPushButton( i18n("Cancel"), this );
         lay->addWidget( cancel );
         connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() )  );
         connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject())  );
         resize( 220, 240 );
         qApp->processEvents();
         int dw = QApplication::desktop()->width();
         int dh = QApplication::desktop()->height();
         move( (dw-width())/2, (dh - height() )/2 );
     }
    
 public:
     QLineEdit* mPhoneConnection, *mPhoneDevice, *mPhoneModel; 
     QCheckBox* mWriteBackFuture;
     QSpinBox* mWriteBackFutureWeeks;
 };
 
 int globalFlagBlockStartup;
 MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
     QMainWindow( parent, name )
 {
 
     mClosed = false;
     //QString confFile = KStandardDirs::appDir() + "config/korganizerrc";
     QString confFile = locateLocal("config","korganizerrc");
     QFileInfo finf ( confFile );
     bool showWarning =  !finf.exists();
     setIcon(SmallIcon( "ko24" )  );
     mBlockAtStartup = true;
     mFlagKeyPressed = false;
     setCaption("KO/Pi");
     KOPrefs *p = KOPrefs::instance();
     KPimGlobalPrefs::instance()->setGlobalConfig();
     p->mCurrentDisplayedView = 0;
     if ( p->mHourSize >  22 )
         p->mHourSize = 22;
     QMainWindow::ToolBarDock tbd;
     if ( p->mToolBarHor ) {
         if ( p->mToolBarUp )
             tbd = Bottom;
         else
             tbd = Top;
     }
     else {
         if ( p->mToolBarUp )
             tbd = Right;
         else
             tbd = Left;
     }
     if ( KOPrefs::instance()->mUseAppColors )
         QApplication::setPalette( QPalette (KOPrefs::instance()->mAppColor1, KOPrefs::instance()->mAppColor2), true );
     globalFlagBlockStartup = 1;
     iconToolBar = new QPEToolBar( this );
     addToolBar (iconToolBar , tbd );
 
 #ifdef DESKTOP_VERSION
     if ( KOPrefs::instance()->mShowIconFilter ) 
 #else
     if ( KOPrefs::instance()->mShowIconFilter || !p->mShowIconOnetoolbar ) 
 #endif
 
 {
         if ( p->mToolBarHorF ) {
             if ( p->mToolBarUpF )
                 tbd = Bottom;
             else
                 tbd = Top;
         }
         else {
             if ( p->mToolBarUpF )
             tbd = Right;
             else
                 tbd = Left;
         }
         filterToolBar = new QPEToolBar ( this );
         filterMenubar = new QMenuBar( 0 );
         QFontMetrics fm ( filterMenubar->font() );
             
         filterPopupMenu = new QPopupMenu( this );
         filterMenubar->insertItem( i18n("No Filter"), filterPopupMenu,0  );
         QString addTest = "A";  
         filterMenubar->setMinimumWidth( fm.width( i18n("No Filter")+addTest ) );
 #ifdef DESKTOP_VERSION
         addTest = "AAABBBCCCx"; 
 #else
         addTest = "AAx";  
 #endif 
         filterMenubar->setMaximumWidth( fm.width( i18n("No Filter")+addTest ) );
         addToolBar (filterToolBar , tbd );
         connect ( filterPopupMenu , SIGNAL( activated ( int )  ), this, SLOT (selectFilterPopup( int ) ) );
         connect ( filterPopupMenu , SIGNAL( aboutToShow() ), this, SLOT (fillFilterMenuPopup() ) );
         if ( !KOPrefs::instance()->mShowIconFilter && !p->mShowIconOnetoolbar )
             filterToolBar->hide();
     } else {
         filterToolBar = 0;
         filterMenubar  = 0;
         filterPopupMenu = 0;
     }
     if ( p->mShowIconOnetoolbar ) {
         viewToolBar = iconToolBar ;
         navigatorToolBar = iconToolBar ;
     } else {
 #ifndef DESKTOP_VERSION
         setToolBarsMovable( false );
 #endif
         if ( p->mToolBarHorV ) {
             if ( p->mToolBarUpV )
                 tbd = Bottom;
             else
                 tbd = Top;
         }
         else {
             if ( p->mToolBarUpV )
                 tbd = Right;
             else
                 tbd = Left;
         }
         viewToolBar = new QPEToolBar( this );
         addToolBar (viewToolBar , tbd );
         if ( p->mToolBarHorN ) {
             if ( p->mToolBarUpN )
                 tbd = Bottom;
             else
                 tbd = Top;
         }
         else {
             if ( p->mToolBarUpN )
                 tbd = Right;
             else
                 tbd = Left;
         }
         navigatorToolBar = new QPEToolBar( this );
         addToolBar (navigatorToolBar , tbd );
     }
 
   
 
     mCalendarModifiedFlag = false;
     QLabel* splash  = new QLabel(i18n("KO/Pi is starting ... "), this );
     splash->setAlignment ( AlignCenter );
     setCentralWidget( splash );
 #ifndef DESKTOP_VERSION
     showMaximized();
 #endif
 
     //qDebug("Mainwidget x %d y %d w %d  h %d",  x(), y(), width(), height ());
     setDefaultPreferences();
     mCalendar = new CalendarLocal();
     mView = new CalendarView( mCalendar, this,"mCalendar " );
     mView->hide();
     //mView->resize(splash->size() );
     initActions(); 
     mSyncManager = new KSyncManager((QWidget*)this, (KSyncInterface*)mView, KSyncManager::KOPI, KOPrefs::instance(), syncMenu);
     mSyncManager->setBlockSave(false);
     mView->setSyncManager(mSyncManager);
 #ifndef DESKTOP_VERSION
     iconToolBar->show();
     qApp->processEvents();
 #endif
     //qDebug("Splashwidget x %d y %d w %d  h %d", splash-> x(), splash->y(), splash->width(),splash-> height ());
     int vh = height() ;
     int vw = width();
     //qDebug("Toolbar hei %d ",iconToolBar->height() );
     if ( iconToolBar->orientation () == Qt:: Horizontal ) {
         vh -=  iconToolBar->height();
     } else {
         vw -= iconToolBar->height();
     }
     //mView->setMaximumSize( splash->size() );
     //mView->resize( splash->size() );
     //qDebug("MainView x %d y %d w %d  h %d",  mView->x(),mView-> y(), mView->width(), mView->height ());
     mView->readSettings();
     bool newFile = false;
     if( !QFile::exists( defaultFileName() ) ) {
         QFileInfo finfo ( defaultFileName() );
         QString oldFile = QDir::convertSeparators(  QDir::homeDirPath()+"/Applications/korganizer/mycalendar.ics");
         QString message = "You are starting KO/Pi for the\nfirst time after updating to a\nversion >= 1.9.1. The location of the\ndefault calendar file has changed.\nA mycalendar.ics file was detected\nat the old location.\nThis file will be loaded now\nand stored at the new location!\n(Config file location has changed, too!)\nPlease read menu Help-What's New!\n";
         finfo.setFile( oldFile );
         if (finfo.exists() ) {
             KMessageBox::information( this, message);
             mView->openCalendar( oldFile );
             qApp->processEvents();
         } else {
             oldFile = QDir::convertSeparators(  QDir::homeDirPath()+"/korganizer/mycalendar.ics");
             finfo.setFile( oldFile );
             if (finfo.exists() ) {
                 KMessageBox::information( this, message);
                 mView->openCalendar( oldFile );
                 qApp->processEvents();
             }
         }
         mView->saveCalendar( defaultFileName() );
         newFile = true;
     }
 
     QTime neededSaveTime = QDateTime::currentDateTime().time();
-    mView->openCalendar( defaultFileName() );
+    mView->loadCalendars();
     int msNeeded = neededSaveTime.msecsTo( QDateTime::currentDateTime().time() );
     qDebug("KO: Calendar loading time: %d ms",msNeeded );
 
     if ( KPimGlobalPrefs::instance()->mPreferredLanguage != KOPrefs::instance()->mOldLoadedLanguage ) {
         KOPrefs::instance()->setAllDefaults();
         int count = mView->addCategories();
     }
     processIncidenceSelection( 0 );
     connect( mView, SIGNAL( incidenceSelected( Incidence * ) ),
              SLOT( processIncidenceSelection( Incidence * ) ) );
     connect( mView, SIGNAL( modifiedChanged( bool ) ),
              SLOT( slotModifiedChanged( bool ) ) );
 
 
     connect( mView, SIGNAL( tempDisableBR(bool) ),
              SLOT( disableBR(bool) ) );
     connect( &mSaveTimer, SIGNAL( timeout() ), SLOT( save() ) );
     mView->setModified( false );
     mBlockAtStartup = false;
     mView->setModified( false );
     setCentralWidget( mView );
     globalFlagBlockStartup = 0;
     mView->show();
     delete splash;
     if ( newFile )
         mView->updateConfig();
     // qApp->processEvents();
     //qDebug("MainView x %d y %d w %d  h %d",  mView->x(),mView-> y(), mView->width(), mView->height ());
     //fillSyncMenu();
    
     
     connect(mSyncManager , SIGNAL( save() ), this, SLOT( save() ) );
     connect(mView , SIGNAL( save() ), this, SLOT( save() ) );
     connect(mView , SIGNAL( saveStopTimer() ), this, SLOT( saveStopTimer() ) );
     connect(mSyncManager , SIGNAL( request_file() ), this, SLOT( syncFileRequest() ) );
     connect(mSyncManager , SIGNAL( getFile( bool )), this, SLOT(getFile( bool ) ) );
     mSyncManager->setDefaultFileName( sentSyncFile()); 
     connect ( syncMenu, SIGNAL( activated ( int )  ), mSyncManager, SLOT (slotSyncMenu( int ) ) );
     mSyncManager->fillSyncMenu();
 
 
 
     mView->viewManager()->agendaView()->setStartHour( KOPrefs::instance()->mDayBegins  );
     if ( showWarning ) {
         KMessageBox::information( this,
                          "You are starting KO/Pi for the first time.\nPlease read menu: Help-What's New,\nif you did an update!\nPlease choose your timezone in the \nConfigure Dialog TAB Time Zone!\nPlease choose your language\nin the TAB Locale!\nYou get the Configure Dialog\nvia Menu: Actions - Configure....\nClick OK to show the Configure Dialog!\n", "KO/Pi information");
         qApp->processEvents();
         mView->dialogManager()->showSyncOptions();
     }
 
   //US listen for result adressed from Ka/Pi
 #ifndef DESKTOP_VERSION
   connect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & )));
 #endif
 #ifndef DESKTOP_VERSION
     infrared = 0;
 #endif
     updateFilterToolbar();
     updateWeek( mView->startDate() );
     connect( mView->dateNavigator(), SIGNAL( datesSelected( const KCal::DateList & ) ),
              SLOT( updateWeekNum( const KCal::DateList & ) ) );
     mBRdisabled = false;
     //toggleBeamReceive();
     int tiint= 3000;
 #ifndef DESKTOP_VERSION
     tiint = 5000;
 #endif
     QTimer::singleShot( tiint, mView, SLOT ( checkAlarms() ));
 }
 MainWindow::~MainWindow()
 {
     //qDebug("MainWindow::~MainWindow() ");
     //save toolbar location
     delete mCalendar;
     delete mSyncManager;
 #ifndef DESKTOP_VERSION
     if ( infrared )
         delete infrared;
 #endif
 
 
 }
 
 void MainWindow::disableBR(bool b)
 {
 #ifndef DESKTOP_VERSION
     if ( b ) {
         if ( infrared ) {
             toggleBeamReceive();
             mBRdisabled = true;
         }
         mBRdisabled = true;
     } else {
         if ( mBRdisabled ) {
             mBRdisabled = false;
             //makes no sense,because other cal ap is probably running
             // toggleBeamReceive(); 
         }
     }
 #endif
 
 }
 bool MainWindow::beamReceiveEnabled()
 {
 #ifndef DESKTOP_VERSION
     return ( infrared != 0 );
 #endif
     return false;
 }
 
 void MainWindow::toggleBeamReceive()
 {
     if ( mBRdisabled  )
         return;
 #ifndef DESKTOP_VERSION
     if ( infrared ) {
         qDebug("KO: Disable BeamReceive ");
         delete infrared;
         infrared = 0;
         brAction->setOn(false);
         return;
     } 
     qDebug("KO: Enable BeamReceive ");
     brAction->setOn(true);
     infrared = new QCopChannel("QPE/Application/datebook",this, "channel" ) ;   
     QObject::connect( infrared, SIGNAL (received ( const QCString &, const QByteArray & )),this, SLOT(recieve(  const QCString&, const QByteArray& )));
 #endif
 }
 void MainWindow::showMaximized () 
 {
 #ifndef DESKTOP_VERSION
     if ( ! globalFlagBlockStartup )
         if ( mClosed )
             mView->goToday();
 #endif
     QWidget::showMaximized () ;
     mClosed = false;
 }
 void MainWindow::closeEvent( QCloseEvent* ce )
 {
 
 
 
     if ( ! KOPrefs::instance()->mAskForQuit ) {
         saveOnClose();
         mClosed = true;
         ce->accept();
         return;
 
     }
 
     switch( QMessageBox::information( this, "KO/Pi",
                                       i18n("Do you really want\nto close KO/Pi?"),
                                       i18n("Close"), i18n("No"),
                                       0, 0 ) ) {
     case 0:
         saveOnClose();
         mClosed = true;
         ce->accept();
         break;
     case 1:
         ce->ignore();
         break;
     case 2:
 
     default:
         break;
     }
 
 
 }
 
 void MainWindow::recieve( const QCString& cmsg, const QByteArray& data )
 {
     QDataStream stream( data, IO_ReadOnly );
     // QMessageBox::about( this, "About KOrganizer/Pi", "*" +msg +"*" );
     //QString datamess;
     //qDebug("message ");
     qDebug("KO: QCOP message received: %s ", cmsg.data()  );
  
     if ( cmsg == "setDocument(QString)" ) {
         QDataStream stream( data, IO_ReadOnly );
         QString fileName;
         stream >> fileName;
         //qDebug("filename %s ", fileName.latin1());
         showMaximized();
         raise();
         KOPrefs::instance()->mLastSyncedLocalFile = fileName ;
         mSyncManager->slotSyncMenu( 1002 );
         return;
     }
 
     if ( cmsg == "-writeFile" ) {
         // I made from the "-writeFile" an "-writeAlarm"
         mView->viewManager()->showWhatsNextView();
         mCalendar->checkAlarmForIncidence( 0, true);
         showMaximized();
         raise();
         return;
 
     }
     if ( cmsg == "-writeFileSilent" ) {
         // I made from the "-writeFile" an "-writeAlarm"
         // mView->viewManager()->showWhatsNextView();
         mCalendar->checkAlarmForIncidence( 0, true);
         //showMaximized();
         //raise();
         hide();
         return;
     }
     if ( cmsg == "-newCountdown" ) {
         qDebug("newCountdown ");
 
     }
     QString msg ;
     QString allmsg = cmsg;
     while ( allmsg.length() > 0 ) {
         int nextC = allmsg.find( "-", 1 );
         if ( nextC == -1 ) {
             msg = allmsg;
             allmsg = "";
         } else{
             msg = allmsg.left( nextC );
             allmsg = allmsg.mid( nextC,  allmsg.length()-nextC );
         }
         //qDebug("msg: %s  all: %s ", msg.latin1(), allmsg.latin1() );
         if ( msg == "-newEvent" ) {
             mView->newEvent();
         }
         if ( msg == "-newTodo" ) {
             mView->newTodo();
 
         }
         if ( msg == "-showWN" ) {
             mView->viewManager()->showWhatsNextView();
         }
         if ( msg == "-showTodo" ) {
             mView->viewManager()->showTodoView();
         }
         if ( msg == "-showList"  ) {
             mView->viewManager()->showListView();
         }
         else if ( msg == "-showDay" ) {
             mView->viewManager()->showDayView();
         }
         else if ( msg == "-showWWeek"  ) {
             mView->viewManager()->showWorkWeekView();
         }
         else if ( msg == "-ringSync"  ) {
             mSyncManager->multiSync( false );
         }
         else if ( msg == "-showWeek" ) {
             mView->viewManager()->showWeekView();
         }
         else if ( msg == "-showTodo" ) {
             mView->viewManager()->showTodoView();
         }
         else if ( msg == "-showJournal"  ) {
             mView->dateNavigator()->selectDates( 1 );
             mView->dateNavigator()->selectToday();
             mView->viewManager()->showJournalView();
         }
         else if ( msg == "-showKO" ) {
             mView->viewManager()->showNextXView();
         }
         else if ( msg == "-showWNext"  ) {
             mView->viewManager()->showWhatsNextView();
         }
         else if ( msg == "nextView()" ) {
             mView->viewManager()->showNextView();
         }
         else if ( msg == "-showNextXView" ) {
             mView->viewManager()->showNextXView();
         }
 
 
     }
 
     showMaximized();
     raise();
 }
 
 QPixmap MainWindow::loadPixmap( QString name )
 {
     return SmallIcon( name );
 
 }
 void MainWindow::setUsesBigPixmaps ( bool b )
 {
     qDebug("KO: MainWindow::setUsesBigPixmaps %d called", b);
     if ( b )
         qDebug("KO: BigPixmaps are not supported ");
 }
 void MainWindow::initActions()
 {
     //KOPrefs::instance()->mShowFullMenu
     iconToolBar->clear();
     KOPrefs *p = KOPrefs::instance();
     //QPEMenuBar *menuBar1;// = new QPEMenuBar( iconToolBar );
 
     QPopupMenu *viewMenu = new QPopupMenu( this );
     QPopupMenu *actionMenu = new QPopupMenu( this );
     QPopupMenu *importMenu = new QPopupMenu( this );
     QPopupMenu *importMenu_X = new QPopupMenu( this );
     QPopupMenu *exportMenu_X = new QPopupMenu( this );
     QPopupMenu *beamMenu_X = new QPopupMenu( this );
     selectFilterMenu = new QPopupMenu( this );
     selectFilterMenu->setCheckable( true );
     syncMenu = new QPopupMenu( this );
     configureAgendaMenu = new QPopupMenu( this );
     configureToolBarMenu = new QPopupMenu( this );
     QPopupMenu *helpMenu = new QPopupMenu( this );
     QIconSet icon;
     int pixWid = 22, pixHei = 22;
     QString pathString = "";
     if ( !p->mToolBarMiniIcons ) {
         if ( QApplication::desktop()->width() < 480 /*|| QApplication::desktop()->height() < 320*/) {
             pathString += "icons16/";
             pixWid = 18; pixHei = 16;
         }
     } else {
         pathString += "iconsmini/";
         pixWid = 18; pixHei = 16;
     }
     if ( KOPrefs::instance()->mShowFullMenu ) {
         QMenuBar *menuBar1;
         menuBar1 = menuBar();
         menuBar1->insertItem( i18n("File"), importMenu );
         menuBar1->insertItem( i18n("View"), viewMenu );
         menuBar1->insertItem( i18n("Actions"), actionMenu );
 #ifdef DESKTOP_VERSION
         menuBar1->insertItem( i18n("Synchronize"), syncMenu );
         menuBar1->insertItem( i18n("AgendaSize"),configureAgendaMenu  );
 #else
         menuBar1->insertItem( i18n("Sync"), syncMenu );
         menuBar1->insertItem( i18n("Agenda"),configureAgendaMenu  );
 #endif
         //menuBar1->insertItem( i18n("Toolbar"),configureToolBarMenu );
         menuBar1->insertItem( i18n("Filter"),selectFilterMenu  );
         menuBar1->insertItem( i18n("Help"), helpMenu );
     } else {
         QPEMenuBar *menuBar1;
         menuBar1 = new QPEMenuBar( iconToolBar );
         QPopupMenu *menuBar = new QPopupMenu( this );
         icon = loadPixmap( pathString + "z_menu" );
         menuBar1->insertItem( icon.pixmap(), menuBar);
         //menuBar1->insertItem( i18n("ME"), menuBar);
         menuBar->insertItem( i18n("File"), importMenu );
         menuBar->insertItem( i18n("View"), viewMenu );
         menuBar->insertItem( i18n("Actions"), actionMenu );
         menuBar->insertItem( i18n("Synchronize"), syncMenu );
         menuBar->insertItem( i18n("AgendaSize"),configureAgendaMenu  );
         menuBar->insertItem( i18n("Toolbar"),configureToolBarMenu );
         menuBar->insertItem( i18n("Filter"),selectFilterMenu  );
         menuBar->insertItem( i18n("Help"), helpMenu );
         //menuBar1->setMaximumWidth( menuBar1->sizeHint().width() );
         menuBar1->setMaximumSize( menuBar1->sizeHint( ));
     }
     connect ( selectFilterMenu, SIGNAL( activated ( int )  ), this, SLOT (selectFilter( int ) ) );
     connect ( selectFilterMenu, SIGNAL( aboutToShow() ), this, SLOT (fillFilterMenu() ) );
 
    
     mWeekBgColor = iconToolBar->backgroundColor();
     mWeekPixmap.resize( pixWid , pixHei );
     mWeekPixmap.fill( mWeekBgColor );
     icon = mWeekPixmap;
     mWeekAction = new QAction( i18n("Select week number"),icon, i18n("Select week number"), 0, this );
     if ( p-> mShowIconWeekNum )
         mWeekAction->addTo( iconToolBar );
     mWeekFont = font();
 
     int fontPoint = mWeekFont.pointSize();
     QFontMetrics f( mWeekFont );
     int fontWid =  f.width( "30" );
     while ( fontWid > pixWid ) {
         --fontPoint;
         mWeekFont.setPointSize( fontPoint );
         QFontMetrics f( mWeekFont );
         fontWid =  f.width( "30" );
         //qDebug("dec-- ");
     }
 
     connect( mWeekAction, SIGNAL( activated() ),
              this, SLOT( weekAction() ) );
@@ -1476,769 +1476,769 @@ void MainWindow::about()
 #ifdef DESKTOP_VERSION
                         i18n("Desktop Edition\n") +
 #else
                         i18n("PDA-Edition\nfor: Zaurus 5x00/7x0/860/3000/6000\n") +
 #endif
                         i18n("(c)2004 Lutz Rogowski (rogowski@kde.org)\nKO/Pi is based on KOrganizer\n(c)2002,2003 Cornelius Schumacher\n(schumacher@kde.org) and the KDE team.\nKOrganizer/Pi is licensed under the GPL.\nKO/Pi can be compiled for\nLinux, Zaurus-PDA and Windows\nwww.pi-sync.info --- www.korganizer.org\nSpecial thanks to Michael and Ben\nfor intensive testing!") );
 }
 void MainWindow::keyBindings()
 {
     QString cap = i18n("KO/Pi Keys + Colors");
     QString text =  i18n("<p><h2>KO/Pi key shortcuts:</h2></p>\n") +
         i18n("<p><b>H</b>: This help dialog | <b>S</b>: Search dialog</p>\n")+
         i18n("<p><b>N</b>: Switch to next view which has a toolbar icon</p>\n") +
         i18n("<p><b>A+(shift or ctrl)</b>: Show occurence of next alarm</p>\n") +
         i18n("<p><b>I</b>: Show info for selected event/todo</p>\n") +
         i18n("<p><b>Space</b>: Toggle fullscreen | <b>P</b>: Date picker</p>\n")+
         i18n("<p><b>R</b>: Toggle Resource View |<b>F</b>: Edit filter </p>\n")+
         i18n("<p><b>O</b>: Filter On/Off | <b>J</b>: Journal view</p>\n")+
         i18n("<p><b>1-0</b> (+<b>ctrl</b>): Select filter 1-10 (11-20)</p>\n")+
         i18n("<p><b>X</b>: Next X days view| <b>W</b>: What's next view\n ")+
         i18n("<p><b>V</b>: Todo view | <b>L</b>: Event list view</p>\n")+
         i18n("<p><b>Z,Y</b>: Work week view | <b>U</b>: Week view</p>\n")+
         i18n("<p><b>D</b>: One day view | <b>M</b>: Month view</p>\n")+
         i18n("<p><b>K</b>: Week view in Month view syle</p>\n")+
         i18n("<p><b>E</b>: Edit selected item |<b> E+ctrl</b>: New Event</p>\n")+
         i18n("<p><b>T</b>: Goto today | <b>T+ctrl</b>: New Todo</p>\n")+
         i18n("<p><b>S+ctrl</b>: Add sub-todo | <b>X+ctrl</b>: Toggle datenavigator</p>\n")+
         i18n("<p><b>+,-</b> : Zoom in/out agenda | <b>A</b>: Toggle allday agenda height</p>\n")+
         i18n("<p><b>C</b>: Show current time in agenda view</p>\n")+
         i18n("<p><b>B</b>: Edit description (details) of selected item</p>\n")+
         i18n("<p><b>right</b>: Next week | <b>right+ctrl</b>: Next month</p>\n")+
         i18n("<p><b>left</b>: Prev. week | <b>left+ctrl</b>: Prev. month</p>\n")+
         i18n("<p><b>del,backspace</b>: Delete selected item</p>\n")+
         i18n("<p><h3>In agenda view:</h3></p>\n") +
         i18n("<p><b>up/down</b>: Scroll agenda view</p>\n")+
         i18n("<p><b>ctrl+up/down</b>: Scroll small todo view</p>\n")+
         i18n("<p><h3>In todo view:</h3></p>\n") +
         i18n("<p><b>shift+U</b>: <b>U</b>nparent todo (make root todo)</p>\n")+
         i18n("<p><b>shift+S</b>: Make <b>S</b>ubtodo (reparent todo)</p>\n")+
         i18n("<p><b>shift+P</b>: Make new <b>P</b>arent for todo selected with shift+S</p>\n")+
         i18n("<p><b>Q</b>: Toggle quick todo line edit.</p>\n")+
         i18n("<p><b>I</b>: Show info of current item+one step down.</p>\n")+
         i18n("<p><b>return</b>: Mark item as completed+one step down.</p>\n")+
         i18n("<p><b>return+shift</b>:  Mark item as not completed+one step down</p>\n")+
         i18n("<p><h3>In list view:</h3></p>\n") +
         i18n("<p><b>I</b>: Show info of current item+one step down.</p>\n")+
         i18n("<p><b>return</b>: Select item+one step down</p>\n")+
         i18n("<p><b>return+shift</b>: Deselect item+one step down</p>\n")+
         i18n("<p><b>up/down</b>: Next/prev item</p>\n")+
         i18n("<p><b>ctrl+up/down</b>:  Goto up/down by 20% of items</p>\n")+
         i18n("<p><b>shift+up/down</b>: Goto first/last item</p>\n")+
         i18n("<p><h3>In event/todo viewer:</h3></p>\n") +
         i18n("<p><b>I,C</b>: Close dialog.</p>\n")+
         i18n("<p><b>A</b>: Show agenda view.</p>\n")+
         i18n("<p><b>E</b>:  Edit item</p>\n") +
         i18n("<p><h2>KO/Pi icon colors:</h2></p>\n") +
         i18n("<p><b>(for square icons in agenda and month view)</b></p>\n") +
         i18n("<p><b>Cross</b>: Item cancelled.([c] in Whats'Next view)</p>\n")+
         i18n("<p><b>Red</b>: Alarm set.([a] in Whats'Next view)</p>\n")+
         i18n("<p><b>Blue</b>: Recurrent event.([r] in Whats'Next view)</p>\n")+
         i18n("<p><b>Dark green</b>: Information(description) available.([i] in WN view)</p>\n")+
         i18n("<p><b>Black</b>: Event/todo with attendees. You are the organizer!</p>\n")+
         i18n("<p><b>Dark yellow</b>:  Event/todo with attendees.</p>\n") +
         i18n("<p><b>White</b>: Item readonly</p>\n");
     displayText( text, cap);
 }
 void MainWindow::aboutAutoSaving()
 {
     QString text = i18n("After changing something, the data is\nautomatically saved to the file\n~/kdepim/apps/korganizer/mycalendar.ics\nafter (configurable) three minutes.\nFor safety reasons there is  one autosaving\nafter 10 minutes (of idle time) again. The \ndata is saved automatically when closing KO/Pi\nYou can create a backup file \nwith: File - Save Calendar Backup\n");
   
     KApplication::showText( i18n("Auto Saving in  KOrganizer/Pi"), text);
 
 }
 void MainWindow::aboutKnownBugs()
 {
     QMessageBox* msg;
     msg = new QMessageBox(  i18n("Known Problems in  KOrganizer/Pi"),
                             i18n("1) Importing *.vcs or *.ics files from\nother applications may not work properly,\nif there are events with properties\nKO/Pi does not support.\n")+
                             i18n("2) Audio alarm daemon\nfor Zaurus is available!\nas an additional small application\n")+
                             i18n("\nPlease report unexpected behaviour to\nlutz@pi-sync.info\n") +
                             i18n("\nor report them in the bugtracker on\n") +
                             i18n("\nhttp://sourceforge.net/projects/kdepimpi\n"),
                             QMessageBox::NoIcon,
                             QMessageBox::Ok,
                             QMessageBox::NoButton,
                             QMessageBox::NoButton);
     msg->exec();
     delete msg;
 
 }
 
 QString MainWindow::defaultFileName()
 {
     return locateLocal( "data", "korganizer/mycalendar.ics" );
 }
 QString MainWindow::syncFileName()
 {
 #ifdef DESKTOP_VERSION
     return  locateLocal( "tmp", "synccalendar.ics" );
 #else
     return QString( "/tmp/synccalendar.ics" );
 #endif
 }
 #include "koglobals.h"
 #include <kcalendarsystem.h>
 void MainWindow::updateWeek(QDate seda)
 {
     int weekNum = KGlobal::locale()->weekNum ( seda );
     mWeekPixmap.fill( mWeekBgColor );
     QPainter p ( &mWeekPixmap );
     p.setFont( mWeekFont );
     p.drawText( 0,0,mWeekPixmap.width(), mWeekPixmap.height(),AlignCenter, QString::number( weekNum) );
     p.end();   
     QIconSet icon3 ( mWeekPixmap );
     mWeekAction->setIconSet ( icon3 );
 
 }
 void MainWindow::updateWeekNum(const DateList &selectedDates)
 {
     updateWeek( selectedDates.first() );
 }
 void MainWindow::processIncidenceSelection( Incidence *incidence )
 {
 
     if ( !incidence ) {
         enableIncidenceActions( false );
 
         mNewSubTodoAction->setEnabled( false );
         setCaptionToDates();
         return;
 
     }
 
     //KGlobal::locale()->formatDateTime(nextA, true);
     QString startString = "";
     if ( incidence->typeID() != todoID ) {
         if ( incidence->dtStart().date() < incidence->dtEnd().date()   ) {
             if ( incidence->doesFloat() ) {
             startString += ": "+incidence->dtStartDateStr( true );
             startString += " --- "+((Event*)incidence)->dtEndDateStr( true );
 
             } else {
             startString = ": "+incidence->dtStartStr(true);
             startString += " --- "+((Event*)incidence)->dtEndStr(true);
 
             }
 
         } else {
             if ( incidence->dtStart().time() != incidence->dtEnd().time() )
                 startString = ": "+KGlobal::locale()->formatTime(incidence->dtStart().time())+
                     "-"+KGlobal::locale()->formatTime(incidence->dtEnd().time());
 
             if ( incidence->isBirthday() || incidence->isAnniversary() ) {
                 bool ok;
                 QDateTime noc = incidence->getNextOccurence( mView->startDate().addDays(-1), &ok );
                 if ( ok ) {
                     int years = noc.date().year() - incidence->dtStart().date().year();
                     startString += i18n(" (%1 y.)"). arg( years );
                 }
             }
             else
                 startString +=" "+KGlobal::locale()->formatDate( incidence->dtStart().date(), true);
         }
 
     }
     else
         startString = i18n(": (Prio ") +QString::number( (( KCal::Todo*)incidence)->priority() ) +") "+QString::number( (( KCal::Todo*)incidence)->percentComplete() ) +i18n("\% completed");
     if ( !incidence->location().isEmpty() )
         startString += " (" +incidence->location()+")";
     setCaption( incidence->summary()+startString);
 
     enableIncidenceActions( true );
 
     if ( incidence->typeID() == eventID ) {
         mShowAction->setText( i18n("Show Event...") );
         mEditAction->setText( i18n("Edit Event...") );
         mDeleteAction->setText( i18n("Delete Event...") );
 
         mNewSubTodoAction->setEnabled( false );
     } else if ( incidence->typeID() == todoID ) {
         mShowAction->setText( i18n("Show Todo...") );
         mEditAction->setText( i18n("Edit Todo...") );
         mDeleteAction->setText( i18n("Delete Todo...") );
 
         mNewSubTodoAction->setEnabled( true );
     } else {
         mShowAction->setText( i18n("Show...") );
         mShowAction->setText( i18n("Edit...") );
         mShowAction->setText( i18n("Delete...") );
 
         mNewSubTodoAction->setEnabled( false );
     }
 }
 
 void MainWindow::enableIncidenceActions( bool enabled )
 {
     mShowAction->setEnabled( enabled );
     mEditAction->setEnabled( enabled );
     mDeleteAction->setEnabled( enabled );
 
     mCloneAction->setEnabled( enabled );
     mMoveAction->setEnabled( enabled );
     mBeamAction->setEnabled( enabled );
     mCancelAction->setEnabled( enabled );
 }
 
 void MainWindow::importOL()
 { 
 #ifdef _OL_IMPORT_
       mView->clearAllViews();
       KOImportOLdialog *id = new KOImportOLdialog("Import from OL - select folder!" , mView->calendar(),this );
       id->exec();
       delete id;
       mView->calendar()->checkAlarmForIncidence( 0, true );
       mView->updateView();
 #endif
 }
 void MainWindow::importBday()
 {
     int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),
                                        i18n("When importing birthdays twice\nduplicated events will be ignored,\nif the event has not been\nchanged in KO/Pi!\n"),
                                        i18n("Import!"), i18n("Cancel"), 0,
                                        0, 1 );
     if ( result == 0 ) {
         mView->importBday();
 
     }
 
 
 }
 void MainWindow::importQtopia()
 {
     //#ifndef DESKTOP_VERSION
     QString mess = i18n("When importing a calendar twice\nduplicated events will be ignored!\nYou can create a backup file with\nFile - Save Calendar Backup\nto revert importing");
 #ifdef DESKTOP_VERSION
     mess += i18n("The content of the following files will be\nimported (located in your home directory (hd)):\n(hd)/Applications/datebook/datebook.xml\n(hd)/Applications/todolist/todolist.xml\nThe following category file will be used:\n(hd)/Settings/Categories.xml");
 #endif
     int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),mess,
                                        i18n("Import!"), i18n("Cancel"), 0,
                                        0, 1 );
     if ( result == 0 ) {
 #ifndef DESKTOP_VERSION
         QString datebook = Global::applicationFileName( "datebook", "datebook.xml");
         QString todolist = Global::applicationFileName( "todolist", "todolist.xml");
         QString categories = QString( getenv( "HOME" ) ) + "/Settings/Categories.xml";
 #else
         QString datebook = QDir::homeDirPath()+ "/Applications/datebook/datebook.xml";
         QString todolist = QDir::homeDirPath()+ "/Applications/todolist/todolist.xml";
         QString categories = QDir::homeDirPath()+ "/Settings/Categories.xml";
 #endif
         mView->importQtopia( categories, datebook, todolist );
     }
     mView->calendar()->reInitAlarmSettings();
 #if 0
     int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),
                                        i18n("Not supported \non desktop!\n"),
                                        i18n("Ok"), i18n("Cancel"), 0,
                                        0, 1 );
 
 #endif
 }
 
 void MainWindow::saveOnClose()
 {
     KOPrefs *p = KOPrefs::instance();
     p->mToolBarHor = ( iconToolBar->orientation () == Qt:: Horizontal );
     p->mToolBarHorV = ( viewToolBar->orientation () == Qt:: Horizontal );
     p->mToolBarHorN = ( navigatorToolBar->orientation () == Qt:: Horizontal );
     if ( filterToolBar ) {
         p->mToolBarHorF = ( filterToolBar->orientation () == Qt:: Horizontal );
     }
 #ifdef DESKTOP_VERSION
     
     QPoint myP;
     myP = mapFromGlobal( iconToolBar->mapToGlobal( QPoint( 0,0) ) );
     if (  p->mToolBarHor )
         p->mToolBarUp = myP.y() > height()/2;
     else
         p->mToolBarUp = myP.x() > width()/2;
     myP = mapFromGlobal( viewToolBar->mapToGlobal( QPoint( 0,0) ) );
     if ( p->mToolBarHorV )
         p->mToolBarUpV = myP.y()  > height()/2;
     else
         p->mToolBarUpV = myP.x() > width()/2 ;
     myP = mapFromGlobal( navigatorToolBar->mapToGlobal( QPoint( 0,0) ) );
     if ( p->mToolBarHorN )
         p->mToolBarUpN = myP.y() > height()/2;
     else
         p->mToolBarUpN = myP.x() > width()/2 ;
     if ( filterToolBar ) {
         myP = mapFromGlobal( filterToolBar->mapToGlobal( QPoint( 0,0) ) );
         if ( p->mToolBarHorF )
             p->mToolBarUpF = myP.y() > height()/2;
         else
             p->mToolBarUpF = myP.x() > width()/2 ;
     }
 #else
     if (  p->mToolBarHor )
         p->mToolBarUp = iconToolBar->y() > height()/2;
     else
         p->mToolBarUp = iconToolBar->x() > width()/2;
     if ( p->mToolBarHorV )
         p->mToolBarUpV = viewToolBar->y() > height()/2;
     else
         p->mToolBarUpV = viewToolBar->x() > width()/2 ;
     
     if ( p->mToolBarHorN )
         p->mToolBarUpN = navigatorToolBar->y() > height()/2;
     else
         p->mToolBarUpN = navigatorToolBar->x() > width()/2 ;
     if ( filterToolBar ) {
         if ( p->mToolBarHorF )
             p->mToolBarUpF = filterToolBar->y() > height()/2;
         else
             p->mToolBarUpF = filterToolBar->x() > width()/2 ;
     }
 #endif
 
     if ( mCalendarModifiedFlag || mView->checkFileChanged( defaultFileName()))
         save();
     mView->writeSettings();
 }
 void MainWindow::slotModifiedChanged( bool changed )
 {
     if ( mBlockAtStartup )
         return;
    
     int msec;
     // we store the changes after 1 minute,
     // and for safety reasons after 10 minutes again
     if ( !mSyncManager->blockSave() )
         msec = (1000 * 60*KOPrefs::instance()->mAutoSaveInterval) +1000;
     else
         msec = 1000 * 600;
     mSaveTimer.start( msec, true ); // 1 minute
     qDebug("KO: Saving File in %d secs!", msec/1000);
     mCalendarModifiedFlag = true;
 }
 void MainWindow::saveStopTimer()
 {
     mSaveTimer.stop();
 }
 void MainWindow::save()
 {
     if ( !mCalendarModifiedFlag ) {
         qDebug("KO: Calendar not modified. Nothing saved.");
         return;
     }
     if ( mSyncManager->blockSave() )
         return;
     mSyncManager->setBlockSave(true);
     if ( mView->checkFileVersion( defaultFileName()) ) {
         if ( KPimGlobalPrefs::instance()->mBackupEnabled ){
             QDate reference ( 2000,1,1);
             int daysTo = reference.daysTo ( QDate::currentDate() );
             if ( daysTo - KPimGlobalPrefs::instance()->mBackupDayCount >= KOPrefs::instance()->mLastBackupDate ) {
                 setCaption(i18n("Creating backup ... please wait ..." ));
                 qDebug("KO: Last backup was %d days ago ", daysTo - KOPrefs::instance()->mLastBackupDate);
                 // we need the file path, the backup dir and the number of bups as param
                 QString bupDir = KPimGlobalPrefs::instance()->mBackupDatadir;
                 if ( KPimGlobalPrefs::instance()->mBackupUseDefaultDir)
                     bupDir = KGlobalSettings::backupDataDir();
                 int retval =  KApplication::createBackup(  defaultFileName(), bupDir, KPimGlobalPrefs::instance()->mBackupNumbers );
                 if ( retval == 0 ) {
                     qDebug("KO: Backup cancelled. Will try again tomorrow ");
                     // retval == 0 : backup skipped for today, try again tomorrow
                     KOPrefs::instance()->mLastBackupDate = daysTo- KPimGlobalPrefs::instance()->mBackupDayCount+1;
                 } else if ( retval == 1 ){
                     qDebug("KO: Backup created.");
                     // backup ok
                     KOPrefs::instance()->mLastBackupDate =  daysTo;
 
                 } else if ( retval == 2 ){
                     qDebug("KO: Backup globally cancelled.");
                     // backup globally cancelled
                     KPimGlobalPrefs::instance()->mBackupEnabled = false;
                 }
                 // retval == 3: do nothing, try again later
             }
                 ; //  KPimGlobalPrefs::instance()->mLastBackupDate
         }
         QTime neededSaveTime = QDateTime::currentDateTime().time();
         setCaption(i18n("KO/Pi:Saving Data to File ..." ));
         qDebug("KO: Start saving data to file!");
-        mView->saveCalendar( defaultFileName() );
+        mView->saveCalendars();
         mCalendarModifiedFlag = false;
         int msNeeded = neededSaveTime.msecsTo( QDateTime::currentDateTime().time() );
         qDebug("KO: Needed %d ms for saving.",msNeeded );
         QString savemes;
         savemes.sprintf(i18n("KO/Pi:File Saved. Needed %d sec, %d ms"),(msNeeded/1000)%100,msNeeded%1000  );
         setCaption(savemes);
     } else
         setCaption(i18n("Saving cancelled!"));
     mSyncManager->setBlockSave( false );
 }
 
 void MainWindow::keyReleaseEvent ( QKeyEvent * e)
 {
     if ( !e->isAutoRepeat() ) {
         mFlagKeyPressed = false;
     }
 }
 void MainWindow::keyPressEvent ( QKeyEvent * e )
 {
     qApp->processEvents();
     if ( e->isAutoRepeat() && !mFlagKeyPressed ) {
         e->ignore();
         // qDebug("  ignore  %d",e->isAutoRepeat()  );
         return;
     }
     if (! e->isAutoRepeat() )
         mFlagKeyPressed = true;
     KOPrefs *p = KOPrefs::instance();
     bool showSelectedDates = false;
     int size;
     int pro = 0;
     //qDebug("MainWindow::keyPressEvent ");
     switch ( e->key() ) {
     case Qt::Key_Right:
         if ( e->state() == Qt::ControlButton ||  e->state() == Qt::ShiftButton)
             mView->goNextMonth();
         else
             mView->goNext();
         showSelectedDates = true;
         break;
     case Qt::Key_Left:
         if ( e->state() == Qt::ControlButton||  e->state() == Qt::ShiftButton )
             mView->goPreviousMonth();
         else
             mView->goPrevious();
         showSelectedDates = true;
         break;
     case Qt::Key_Down:
         mView->viewManager()->agendaView()->scrollOneHourDown();
         break;
     case Qt::Key_Up:
         mView->viewManager()->agendaView()->scrollOneHourUp();
         break;
     case Qt::Key_K:
         mView->viewManager()->showMonthViewWeek();
         break;
     case Qt::Key_I:
         mView->showIncidence();
         break;
     case Qt::Key_Delete:
     case Qt::Key_Backspace:
         mView->deleteIncidence();
         break;
     case Qt::Key_D:
         mView->viewManager()->showDayView();
         showSelectedDates = true;
         break;
     case Qt::Key_O:
         mView->toggleFilerEnabled( );
         break;
     case Qt::Key_0:
     case Qt::Key_1:
     case Qt::Key_2:
     case Qt::Key_3:
     case Qt::Key_4:
     case Qt::Key_5:
     case Qt::Key_6:
     case Qt::Key_7:
     case Qt::Key_8:
     case Qt::Key_9:
         pro =  e->key()-48;
         if ( pro == 0 )
             pro = 10;
         if ( e->state() == Qt::ControlButton)
             pro += 10;
         break;
     case Qt::Key_M:
         mView->viewManager()->showMonthView();
         showSelectedDates = true;
         break;
     case Qt::Key_Insert:
         mView->newEvent();
         break;
     case Qt::Key_S :
         if ( e->state() == Qt::ControlButton ||  e->state() == Qt::ShiftButton)
             mView->newSubTodo();
         else
             mView->dialogManager()->showSearchDialog();
         break;
     case Qt::Key_Y :
     case Qt::Key_Z :
         mView->viewManager()->showWorkWeekView();
         showSelectedDates = true;
         break;
     case Qt::Key_U :
         mView->viewManager()->showWeekView();
         showSelectedDates = true;
         break;
     case Qt::Key_H :
         keyBindings();
         break;
     case Qt::Key_W:
         mView->viewManager()->showWhatsNextView();
         break;
     case Qt::Key_L:
         mView->viewManager()->showListView();
         break;
     case Qt::Key_N:
         mView->viewManager()->showNextView();
         break;
     case Qt::Key_V:
         mView->viewManager()->showTodoView();
         break;
     case Qt::Key_C:
         mView->viewManager()->agendaView()->setStartHour( QTime::currentTime ().hour() );
         break;
     case Qt::Key_P:
         mView->showDatePicker( );
         break;
     case Qt::Key_F:
         mView->editFilters();
         break;
     case Qt::Key_R:
         mView->toggleFilter();
         break;
     case Qt::Key_X: 
         if ( e->state() == Qt::ControlButton )
             mView->toggleDateNavigatorWidget();
         else {
             mView->viewManager()->showNextXView();
             showSelectedDates = true;
         }
         break;
     case Qt::Key_Space:
         mView->toggleExpand();
         break;
     case Qt::Key_A:
         if ( e->state() == Qt::ControlButton ||  e->state() == Qt::ShiftButton )
             mView->showNextAlarms();
         else
             mView->toggleAllDaySize();
         break;
     case Qt::Key_T:
         if ( e->state() == Qt::ControlButton||  e->state() == Qt::ShiftButton )
             mView->newTodo();
         else {
             mView->goToday();
             showSelectedDates = true;
         }
         break;
     case Qt::Key_J:
         mView->viewManager()->showJournalView();
         break;
     case Qt::Key_B:
         mView->editIncidenceDescription();;
         break;
         // case Qt::Key_Return:
     case Qt::Key_E:
         if ( e->state() == Qt::ControlButton||  e->state() == Qt::ShiftButton )
             mView->newEvent();
         else
             mView->editIncidence();
         break;
     case Qt::Key_Plus:
         size = p->mHourSize +2;
         if ( size <= 22 )
             configureAgenda( size );
         break;
     case Qt::Key_Minus:
         size = p->mHourSize - 2;
         if ( size >= 4 )
             configureAgenda( size );
         break;
 
 
     default:
         e->ignore();
     }
     if ( pro > 0 ) {
         mView->selectFilter(  pro-1 );
     }
     if ( showSelectedDates ) {
         ;//  setCaptionToDates();
     }
 
 }
 void MainWindow::fillFilterMenuTB()
 {
     selectFilterMenuTB->clear();
     selectFilterMenuTB->insertItem(i18n ( "Edit Filters" ),  0 );
     selectFilterMenuTB->insertSeparator();
     selectFilterMenuTB->insertItem(i18n ( "No Filter" ),  1 );
    
     selectFilterMenuTB->insertSeparator();
     QPtrList<CalFilter> fili = mView->filters();
     CalFilter *curfilter = mView->filterView()->selectedFilter();
     CalFilter *filter = fili.first();
     int iii = 2;
     bool checkitem = mView->filterView()->filtersEnabled();
     while(filter) {
         selectFilterMenuTB->insertItem( filter->name(),  iii );
         if ( filter == curfilter)
             selectFilterMenuTB->setItemChecked( iii, checkitem );
         filter = fili.next();
         ++iii;
     }
     if ( !checkitem )
         selectFilterMenuTB->setItemChecked( 1, true );
 
     int x = 0;
     int y = iconToolBar->height();
     int dX = 0;
     int dY = 0;
     if ( iconToolBar->orientation () == Qt:: Horizontal ) {
         if ( iconToolBar->y() > height()/2 ) {
             dY = selectFilterMenuTB->sizeHint().height()+8;
             y = 0;
         }
     } else {
         if ( iconToolBar->x() > width()/2 ) { // right side
             x=0;
             dX= selectFilterMenuTB->sizeHint().width()+8;
             y = 0;
         } else {
             x= iconToolBar->width();
             y = 0;
         }
     }
     //qDebug("dax %d  dy %d         %d %d ", dX, dY, iconToolBar->x(), iconToolBar->y() );
     selectFilterMenuTB->popup(iconToolBar->mapToGlobal(QPoint(x,y)-QPoint( dX,dY)));
 }
 void MainWindow::fillFilterMenu()
 {
     selectFilterMenu->clear();
     selectFilterMenu->insertItem(i18n ( "Edit Filters" ),  0 );
     selectFilterMenu->insertSeparator();
     selectFilterMenu->insertItem(i18n ( "No Filter" ),  1 );
    
     selectFilterMenu->insertSeparator();
     QPtrList<CalFilter> fili = mView->filters();
     CalFilter *curfilter = mView->filterView()->selectedFilter();
     CalFilter *filter = fili.first();
     int iii = 2;
     bool checkitem = mView->filterView()->filtersEnabled();
     while(filter) {
         selectFilterMenu->insertItem( filter->name(),  iii );
         if ( filter == curfilter)
             selectFilterMenu->setItemChecked( iii, checkitem );
         filter = fili.next();
         ++iii;
     }
     if ( !checkitem )
         selectFilterMenu->setItemChecked( 1, true );
 }
 void MainWindow::fillFilterMenuPopup()
 {
     filterPopupMenu->clear();
     filterPopupMenu->insertItem(i18n ( "No Filter" ),  0 );
    
     filterPopupMenu->insertSeparator();
     QPtrList<CalFilter> fili = mView->filters();
     CalFilter *curfilter = mView->filterView()->selectedFilter();
     CalFilter *filter = fili.first();
     int iii = 1;
     bool checkitem = mView->filterView()->filtersEnabled();
     while(filter) {
         filterPopupMenu->insertItem( filter->name(),  iii );
         if ( filter == curfilter)
             filterPopupMenu->setItemChecked( iii, checkitem );
         filter = fili.next();
         ++iii;
     }
     if ( !checkitem )
         filterPopupMenu->setItemChecked( 0, true ); 
 }
 void MainWindow::selectFilter( int fil )
 {
 
     if ( fil == 0 ) {
         mView->editFilters( );
     } else if ( fil == 1 ){
         if ( mView->filterView()->filtersEnabled() )
             mView->toggleFilerEnabled( );
     } else {
         if ( !mView->filterView()->filtersEnabled() ) {
             mView->filterView()->blockSignals( true );
             mView->toggleFilerEnabled( );
             mView->filterView()->blockSignals( false );
         }
         mView->selectFilter(  fil-2 );
     } 
 }
 void MainWindow::updateFilterToolbar()
 {
     if ( filterMenubar ) {
         if ( !mView->filterView()->filtersEnabled() ) {
             filterMenubar->changeItem( 0, i18n("No Filter") );
         } else {
             CalFilter *curfilter = mView->filterView()->selectedFilter();
             if ( curfilter ) {
                 filterMenubar->changeItem( 0, curfilter->name() );
             }
         }
     }
 }
 void MainWindow::selectFilterPopup( int fil )
 {
     selectFilter( fil + 1 );
    
 }
 void MainWindow::configureToolBar( int item  )
 {
 
     configureToolBarMenu->setItemChecked( item, !configureToolBarMenu-> isItemChecked ( item ) );
     KOPrefs *p = KOPrefs::instance();
     p-> mShowIconStretch= configureToolBarMenu->isItemChecked( 5 );
     p-> mShowIconOnetoolbar = configureToolBarMenu->isItemChecked( 6 );
     p-> mShowIconFilter = configureToolBarMenu->isItemChecked( 7 );
     p-> mShowIconNewEvent= configureToolBarMenu->isItemChecked( 10 );
     p->mShowIconNewTodo = configureToolBarMenu->isItemChecked( 20 );
     p->mShowIconNavigator = configureToolBarMenu->isItemChecked( 22 );
     p->mShowIconAllday = configureToolBarMenu->isItemChecked( 24 );
     p->mShowIconFilterview = configureToolBarMenu->isItemChecked( 26 );
     p->mShowIconToggleFull = configureToolBarMenu->isItemChecked( 28 );
     p-> mShowIconSearch= configureToolBarMenu->isItemChecked( 120 );
     p-> mShowIconList= configureToolBarMenu->isItemChecked( 30 );
     p-> mShowIconDay1= configureToolBarMenu->isItemChecked( 40 );
     p-> mShowIconDay5= configureToolBarMenu->isItemChecked( 50 );
     p-> mShowIconDay6= configureToolBarMenu->isItemChecked( 75 );
     p-> mShowIconDay7= configureToolBarMenu->isItemChecked( 60 );
     p-> mShowIconMonth= configureToolBarMenu->isItemChecked( 70 );
     p-> mShowIconTodoview= configureToolBarMenu->isItemChecked( 80 );
     p-> mShowIconBackFast= configureToolBarMenu->isItemChecked( 200 );
     p-> mShowIconBack = configureToolBarMenu->isItemChecked( 210 );
     p-> mShowIconToday= configureToolBarMenu->isItemChecked( 130 );
     p-> mShowIconForward= configureToolBarMenu->isItemChecked( 220 );
     p-> mShowIconForwardFast= configureToolBarMenu->isItemChecked( 230 );
     p-> mShowIconNextDays= configureToolBarMenu->isItemChecked( 100 );
     p-> mShowIconNext= configureToolBarMenu->isItemChecked( 110 );
     p-> mShowIconJournal= configureToolBarMenu->isItemChecked( 90 );
     p-> mShowIconWhatsThis= configureToolBarMenu->isItemChecked( 300 );
     p-> mShowIconWeekNum= configureToolBarMenu->isItemChecked( 400 );
     // initActions();
 }
 void MainWindow::setCaption ( const QString & c ) 
 {
     QString cap = c;
     cap.replace( QRegExp("\n"), " " );
     cap = cap.stripWhiteSpace();
     if ( cap.isEmpty() )
         cap = "KO/Pi";
     QWidget::setCaption( cap );
 }
 void MainWindow::setCaptionToDates()
 {
     QString selDates;
     QDate date = mView->startDate();
     if ( ! date.isValid() ) {
         setCaption("");
         return;
     }
     selDates = KGlobal::locale()->formatDate( date, true);
     if  (mView->startDate() < mView->endDate() )
         selDates += " - " + KGlobal::locale()->formatDate(mView->endDate(), true); 
     else {
         QString addString;
         if ( date == QDateTime::currentDateTime().date() )
             addString = i18n("Today");
         else if ( date == QDateTime::currentDateTime().date().addDays(1) )
             addString = i18n("Tomorrow");
         if ( !addString.isEmpty() )
             selDates = addString+", "+selDates ;
     }
     setCaption( i18n("Dates: ") + selDates );
diff --git a/libkcal/calendar.cpp b/libkcal/calendar.cpp
index f4350d9..5092d1a 100644
--- a/libkcal/calendar.cpp
+++ b/libkcal/calendar.cpp
@@ -1,483 +1,488 @@
 /*
     This file is part of libkcal.
     Copyright (c) 1998 Preston Brown
     Copyright (c) 2000,2001 Cornelius Schumacher <schumacher@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 #include <stdlib.h>
 #include <time.h>
 
 #include <kdebug.h>
 #include <kglobal.h>
 #include <klocale.h>
 
 #include "exceptions.h"
 #include "calfilter.h"
 
 #include "calendar.h"
 #include "syncdefines.h"
 
 using namespace KCal;
 
 Calendar::Calendar()
 {
   
   init();
   setTimeZoneId( " 00:00 Europe/London(UTC)" );
 }
 
 Calendar::Calendar( const QString &timeZoneId )
 { 
 
     init();
     setTimeZoneId(timeZoneId);
 }
 
 void Calendar::init()
 {
   mObserver = 0;
   mNewObserver = false;
   mUndoIncidence = 0;
+  mDeleteIncidencesOnClose = true;
   mModified = false;
   mDefaultCalendar = 1;
   // Setup default filter, which does nothing
   mDefaultFilter = new CalFilter;
   mFilter = mDefaultFilter;
   mFilter->setEnabled(false);
 
   // initialize random numbers.  This is a hack, and not
   // even that good of one at that.
 //  srandom(time(0));
 
   // user information...
   setOwner(i18n("Unknown Name"));
   setEmail(i18n("unknown@nowhere"));
 
 #if 0
   tmpStr = KOPrefs::instance()->mTimeZone;
 //  kdDebug(5800) << "Calendar::Calendar(): TimeZone: " << tmpStr << endl;
   int dstSetting = KOPrefs::instance()->mDaylightSavings;
   extern long int timezone;
   struct tm *now;
   time_t curtime;
   curtime = time(0);
   now = localtime(&curtime);
   int hourOff = - ((timezone / 60) / 60);
   if (now->tm_isdst)
     hourOff += 1;
   QString tzStr;
   tzStr.sprintf("%.2d%.2d",
 		hourOff,
 		abs((timezone / 60) % 60));
 
   // if no time zone was in the config file, write what we just discovered.
   if (tmpStr.isEmpty()) {
 //    KOPrefs::instance()->mTimeZone = tzStr;
   } else {
     tzStr = tmpStr;
   }
 
   // if daylight savings has changed since last load time, we need
   // to rewrite these settings to the config file.
   if ((now->tm_isdst && !dstSetting) ||
       (!now->tm_isdst && dstSetting)) {
     KOPrefs::instance()->mTimeZone = tzStr;
     KOPrefs::instance()->mDaylightSavings = now->tm_isdst;
   }
 
   setTimeZone(tzStr);
 #endif
 
 //  KOPrefs::instance()->writeConfig();
 }
 
 Calendar::~Calendar()
 {
   delete mDefaultFilter;
   if ( mUndoIncidence )
       delete mUndoIncidence;
 }
+void Calendar::setDontDeleteIncidencesOnClose ()
+{
+    mDeleteIncidencesOnClose = false;
+}
 void Calendar::setDefaultCalendar( int d )
 {
     mDefaultCalendar = d;
 }
 int Calendar::defaultCalendar()
 {
     return mDefaultCalendar;
 }
 const QString &Calendar::getOwner() const
 {
   return mOwner;
 }
 
 bool Calendar::undoDeleteIncidence()
 {
     if (!mUndoIncidence)
         return false;
     addIncidence(mUndoIncidence);
     mUndoIncidence = 0;
     return true;
 }
 void Calendar::setOwner(const QString &os)
 {
   int i;
   mOwner = os;
   i = mOwner.find(',');
   if (i != -1)
     mOwner = mOwner.left(i);
 
   setModified( true );
 }
 
 void Calendar::setTimeZone(const QString & tz)
 {
   bool neg = FALSE;
   int hours, minutes;
   QString tmpStr(tz);
 
   if (tmpStr.left(1) == "-")
     neg = TRUE;
   if (tmpStr.left(1) == "-" || tmpStr.left(1) == "+")
     tmpStr.remove(0, 1);
   hours = tmpStr.left(2).toInt();
   if (tmpStr.length() > 2)
     minutes = tmpStr.right(2).toInt();
   else
     minutes = 0;
   mTimeZone = (60*hours+minutes);
   if (neg)
     mTimeZone = -mTimeZone;
   mLocalTime = false;
 
   setModified( true );
 }
 
 QString Calendar::getTimeZoneStr() const
 {
   if (mLocalTime)
     return "";
   QString tmpStr;
   int hours = abs(mTimeZone / 60);
   int minutes = abs(mTimeZone % 60);
   bool neg = mTimeZone < 0;
 
   tmpStr.sprintf("%c%.2d%.2d",
 		 (neg ? '-' : '+'),
 		 hours, minutes);
   return tmpStr;
 }
 
 void Calendar::setTimeZone(int tz)
 {
   mTimeZone = tz;
   mLocalTime = false;
 
   setModified( true );
 }
 
 int Calendar::getTimeZone() const
 {
   return mTimeZone;
 }
 
 void Calendar::setTimeZoneId(const QString &id)
 { 
     mTimeZoneId = id;
     mLocalTime = false;
     mTimeZone  = KGlobal::locale()->timezoneOffset(mTimeZoneId);
     if ( mTimeZone > 1000)
          setLocalTime();
     //qDebug("Calendar::setTimeZoneOffset %s %d ",mTimeZoneId.latin1(), mTimeZone);
     setModified( true );
 }
 
 QString Calendar::timeZoneId() const
 {
   return mTimeZoneId;
 }
 
 void Calendar::setLocalTime()
 { 
     //qDebug("Calendar::setLocalTime() ");
     mLocalTime = true;
     mTimeZone = 0;
     mTimeZoneId = "";
 
   setModified( true );
 }
 
 bool Calendar::isLocalTime() const
 {
   return mLocalTime;
 }
 
 const QString &Calendar::getEmail()
 {
   return mOwnerEmail;
 }
 
 void Calendar::setEmail(const QString &e)
 {
   mOwnerEmail = e;
 
   setModified( true );
 }
 
 void Calendar::setFilter(CalFilter *filter)
 {
   mFilter = filter;
 }
 
 CalFilter *Calendar::filter()
 {
   return mFilter;
 }
 
 QPtrList<Incidence> Calendar::incidences()
 {
   QPtrList<Incidence> incidences;
   
   Incidence *i;
 
   QPtrList<Event> e = events();
   for( i = e.first(); i; i = e.next() ) incidences.append( i );
 
   QPtrList<Todo> t = todos();
   for( i = t.first(); i; i = t.next() ) incidences.append( i );
 
   QPtrList<Journal> j = journals();
   for( i = j.first(); i; i = j.next() ) incidences.append( i );
 
   return incidences;
 }
 
 void Calendar::resetPilotStat(int id )
 {
  QPtrList<Incidence> incidences;
   
   Incidence *i;
 
   QPtrList<Event> e = rawEvents();
   for( i = e.first(); i; i = e.next() ) i->setPilotId( id );
 
   QPtrList<Todo> t = rawTodos();
   for( i = t.first(); i; i = t.next() ) i->setPilotId( id );
 
   QPtrList<Journal> j = journals();
   for( i = j.first(); i; i = j.next() ) i->setPilotId( id );
 }
 void Calendar::resetTempSyncStat()
 {
  QPtrList<Incidence> incidences;
   
   Incidence *i;
 
   QPtrList<Event> e = rawEvents();
   for( i = e.first(); i; i = e.next() ) i->setTempSyncStat( SYNC_TEMPSTATE_INITIAL );
 
   QPtrList<Todo> t = rawTodos();
   for( i = t.first(); i; i = t.next() ) i->setTempSyncStat( SYNC_TEMPSTATE_INITIAL );
 
   QPtrList<Journal> j = journals();
   for( i = j.first(); i; i = j.next() ) i->setTempSyncStat( SYNC_TEMPSTATE_INITIAL );
 }
 QPtrList<Incidence> Calendar::rawIncidences()
 {
   QPtrList<Incidence> incidences;
   
   Incidence *i;
 
   QPtrList<Event> e = rawEvents();
   for( i = e.first(); i; i = e.next() ) incidences.append( i );
 
   QPtrList<Todo> t = rawTodos();
   for( i = t.first(); i; i = t.next() ) incidences.append( i );
 
   QPtrList<Journal> j = journals();
   for( i = j.first(); i; i = j.next() ) incidences.append( i );
 
   return incidences;
 }
 
 QPtrList<Event> Calendar::events( const QDate &date, bool sorted )
 {
   QPtrList<Event> el = rawEventsForDate(date,sorted);
   mFilter->apply(&el);
   return el;
 }
 
 QPtrList<Event> Calendar::events( const QDateTime &qdt )
 {
   QPtrList<Event> el = rawEventsForDate(qdt);
   mFilter->apply(&el);
   return el;
 }
 
 QPtrList<Event> Calendar::events( const QDate &start, const QDate &end,
                                   bool inclusive)
 {
   QPtrList<Event> el = rawEvents(start,end,inclusive);
   mFilter->apply(&el);
   return el;
 }
 
 QPtrList<Event> Calendar::events()
 {
   QPtrList<Event> el = rawEvents();
   mFilter->apply(&el);
   return el;
 }
 void Calendar::addIncidenceBranch(Incidence *i)
 {
     addIncidence( i );
     Incidence * inc;
     QPtrList<Incidence> Relations = i->relations();
     for (inc=Relations.first();inc;inc=Relations.next()) {
        addIncidenceBranch( inc );
     } 
 }
 
 bool Calendar::addIncidence(Incidence *i)
 {
   Incidence::AddVisitor<Calendar> v(this);
   i->setCalID( mDefaultCalendar );
   i->setCalEnabled( true );
   return i->accept(v);
 }
 void Calendar::deleteIncidence(Incidence *in)
 {
     if ( in->typeID() == eventID )
         deleteEvent( (Event*) in );
     else if ( in->typeID() == todoID )
         deleteTodo( (Todo*) in);
     else if ( in->typeID() == journalID )
         deleteJournal( (Journal*) in );
 }
 
 Incidence* Calendar::incidence( const QString& uid )
 {
   Incidence* i;
 
   if( (i = todo( uid )) != 0 )
     return i;
   if( (i = event( uid )) != 0 )
     return i;
   if( (i = journal( uid )) != 0 )
       return i;
 
   return 0;
 }
 
 QPtrList<Todo> Calendar::todos()
 {
   QPtrList<Todo> tl = rawTodos();
   mFilter->apply( &tl );
   return tl;
 }
 
 // When this is called, the todo have already been added to the calendar.
 // This method is only about linking related todos
 void Calendar::setupRelations( Incidence *incidence )
 {
   QString uid = incidence->uid();
   //qDebug("Calendar::setupRelations ");
   // First, go over the list of orphans and see if this is their parent
   while( Incidence* i = mOrphans[ uid ] ) {
     mOrphans.remove( uid );
     i->setRelatedTo( incidence );
     incidence->addRelation( i );
     mOrphanUids.remove( i->uid() );
   }
 
   // Now see about this incidences parent
   if( !incidence->relatedTo() && !incidence->relatedToUid().isEmpty() ) {
     // This incidence has a uid it is related to, but is not registered to it yet
     // Try to find it
     Incidence* parent = this->incidence( incidence->relatedToUid() );
     if( parent ) {
       // Found it
       incidence->setRelatedTo( parent );
       parent->addRelation( incidence );
     } else {
       // Not found, put this in the mOrphans list
       mOrphans.insert( incidence->relatedToUid(), incidence );
       mOrphanUids.insert( incidence->uid(), incidence );
     }
   }
 }
 
 // If a task with subtasks is deleted, move it's subtasks to the orphans list
 void Calendar::removeRelations( Incidence *incidence )
 {
     // qDebug("Calendar::removeRelations ");
   QString uid = incidence->uid();
 
   QPtrList<Incidence> relations = incidence->relations();
   for( Incidence* i = relations.first(); i; i = relations.next() )
     if( !mOrphanUids.find( i->uid() ) ) {
       mOrphans.insert( uid, i );
       mOrphanUids.insert( i->uid(), i );
       i->setRelatedTo( 0 );
       i->setRelatedToUid( uid );
     }
 
   // If this incidence is related to something else, tell that about it
   if( incidence->relatedTo() )
     incidence->relatedTo()->removeRelation( incidence );
 
   // Remove this one from the orphans list
   if( mOrphanUids.remove( uid ) )
     // This incidence is located in the orphans list - it should be removed
     if( !( incidence->relatedTo() != 0 && mOrphans.remove( incidence->relatedTo()->uid() ) ) ) {
       // Removing wasn't that easy
       for( QDictIterator<Incidence> it( mOrphans ); it.current(); ++it ) {
 	if( it.current()->uid() == uid ) {
 	  mOrphans.remove( it.currentKey() );
 	  break;
 	}
       }
     }
 }
 
 void Calendar::registerObserver( Observer *observer )
 {
   mObserver = observer;
   mNewObserver = true;
 }
 
 void Calendar::setModified( bool modified )
 {
     if ( mObserver ) mObserver->calendarModified( modified, this );
   if ( modified != mModified || mNewObserver ) {
     mNewObserver = false;
     // if ( mObserver ) mObserver->calendarModified( modified, this );
     mModified = modified;
   }
 }
 
 void Calendar::setLoadedProductId( const QString &id )
 {
   mLoadedProductId = id;
 }
 
 QString Calendar::loadedProductId()
 {
   return mLoadedProductId;
 }
 
 //#include "calendar.moc"
diff --git a/libkcal/calendar.h b/libkcal/calendar.h
index 4c6760f..73f82bb 100644
--- a/libkcal/calendar.h
+++ b/libkcal/calendar.h
@@ -1,366 +1,373 @@
 /*
     This file is part of libkcal.
     Copyright (c) 1998 Preston Brown
     Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 #ifndef CALENDAR_H
 #define CALENDAR_H
 
 #include <qobject.h>
 #include <qstring.h>
 #include <qdatetime.h>
 #include <qptrlist.h>
 #include <qdict.h>
 
 #include "customproperties.h"
 #include "event.h"
 #include "todo.h"
 #include "journal.h"
 #include "calfilter.h"
 
 //#define _TIME_ZONE "-0500" /* hardcoded, overridden in config file. */
 
 class KConfig;
 
 namespace KCal {
 
 
 /**
   This is the main "calendar" object class for KOrganizer.  It holds
   information like all appointments/events, user information, etc. etc.
   one calendar is associated with each CalendarView (@see calendarview.h).
   This is an abstract base class defining the interface to a calendar. It is
   implemented by subclasses like @see CalendarLocal, which use different
   methods to store and access the data.
 
   Ownership of events etc. is handled by the following policy: As soon as an
   event (or any other subclass of IncidenceBase) object is added to the
   Calendar by addEvent() it is owned by the Calendar object. The Calendar takes
   care of deleting it. All Events returned by the query functions are returned
   as pointers, that means all changes to the returned events are immediately
   visible in the Calendar. You shouldn't delete any Event object you get from
   Calendar.
 */
 class Calendar : public QObject, public CustomProperties,
                  public IncidenceBase::Observer
 {
     Q_OBJECT
 public:
     Calendar();
     Calendar(const QString &timeZoneId);
     virtual ~Calendar();
     Incidence * undoIncidence() { return mUndoIncidence; };
     bool undoDeleteIncidence();
     void deleteIncidence(Incidence *in);
     void resetTempSyncStat();
     void resetPilotStat(int id);
     /**
       Clears out the current calendar, freeing all used memory etc.
     */
     virtual void close() = 0;
+    virtual void addCalendar( Calendar*  ) = 0;
+    virtual bool addCalendarFile( QString name, int id ) = 0;
   
     /**
       Sync changes in memory to persistant storage.
     */
     virtual void save() = 0;
     virtual QPtrList<Event> getExternLastSyncEvents() = 0;
     virtual void removeSyncInfo( QString syncProfile) = 0; 
     virtual bool isSaving() { return false; }
 
     /**
       Return the owner of the calendar's full name.
     */
     const QString &getOwner() const;
     /**
       Set the owner of the calendar. Should be owner's full name.
     */
     void setOwner( const QString &os );
     /**
       Return the email address of the calendar owner.
     */
     const QString &getEmail();
     /**
       Set the email address of the calendar owner.
     */
     void setEmail( const QString & );
   
     /**
       Set time zone from a timezone string (e.g. -2:00)
     */
     void setTimeZone( const QString &tz );
     /**
       Set time zone from a minutes value (e.g. -60)
     */
     void setTimeZone( int tz );
     /**
       Return time zone as offest in minutes.
     */
     int getTimeZone() const;
     /**
       Compute an ISO 8601 format string from the time zone.
     */
     QString getTimeZoneStr() const;
     /**
       Set time zone id (see /usr/share/zoneinfo/zone.tab for list of legal
       values).
     */
     void setTimeZoneId( const QString & );
     /**
       Return time zone id.
     */
     QString timeZoneId() const;
     /**
       Use local time, not UTC or a time zone.
     */
     void setLocalTime();
     /**
       Return whether local time is being used.
     */
     bool isLocalTime() const;
   
     /**
       Add an incidence to calendar.
       
       @return true on success, false on error.
     */
     virtual bool addIncidence( Incidence * ); 
 
     // Adds an incidence and all relatedto incidences to the cal 
     void addIncidenceBranch( Incidence * );  
     /**
       Return filtered list of all incidences of this calendar.
     */
     virtual QPtrList<Incidence> incidences();
 
     /**
       Return unfiltered list of all incidences of this calendar.
     */
     virtual QPtrList<Incidence> rawIncidences();
 
     /**
       Adds a Event to this calendar object.
       @param anEvent a pointer to the event to add
       
       @return true on success, false on error.
     */
     virtual bool addEventNoDup( Event *event ) = 0;
     virtual bool addAnniversaryNoDup( Event *event ) = 0;
     virtual bool addEvent( Event *anEvent ) = 0;
     /**
       Delete event from calendar.
     */
     virtual void deleteEvent( Event * ) = 0;
     /**
       Retrieves an event on the basis of the unique string ID.
     */
     virtual Event *event( const QString &UniqueStr ) = 0;
     virtual Event *event( QString, QString ) = 0;
     /**
       Builds and then returns a list of all events that match for the
       date specified. useful for dayView, etc. etc.
       The calendar filter is applied.
     */
     QPtrList<Event> events( const QDate &date, bool sorted = false);
     /**
       Get events, which occur on the given date.
       The calendar filter is applied.
     */
     QPtrList<Event> events( const QDateTime &qdt );
     /**
       Get events in a range of dates. If inclusive is set to true, only events
       are returned, which are completely included in the range.
       The calendar filter is applied.
     */
     QPtrList<Event> events( const QDate &start, const QDate &end,
                             bool inclusive = false);
     /**
       Return filtered list of all events in calendar.
     */
     virtual QPtrList<Event> events();
     /**
       Return unfiltered list of all events in calendar.
     */
     virtual QPtrList<Event> rawEvents() = 0;
 
     /**
       Add a todo to the todolist.
       
       @return true on success, false on error.
     */
     virtual bool addTodo( Todo *todo ) = 0;
     virtual bool addTodoNoDup( Todo *todo ) = 0;
     /**
       Remove a todo from the todolist.
     */
     virtual void deleteTodo( Todo * ) = 0;
     virtual void deleteJournal( Journal * ) = 0;
     /**
       Return filterd list of todos.
     */
     virtual QPtrList<Todo> todos();
     /**
       Searches todolist for an event with this unique string identifier,
       returns a pointer or null.
     */
     virtual Todo *todo( const QString &uid ) = 0;
     virtual Todo *todo( QString, QString ) = 0;
     /**
       Returns list of todos due on the specified date.
     */
     virtual QPtrList<Todo> todos( const QDate &date ) = 0;
     /**
       Return unfiltered list of todos.
     */
     virtual QPtrList<Todo> rawTodos() = 0;
 
     /**
       Add a Journal entry to calendar.
       
       @return true on success, false on error.
     */
     virtual bool addJournal( Journal * ) = 0;
     /**
       Return Journal for given date.
     */
     virtual Journal *journal( const QDate & ) = 0;
     /**
       Return Journal with given UID.
     */
     virtual Journal *journal( const QString &UID ) = 0;
     /**
       Return list of all Journal entries.
     */
     virtual QPtrList<Journal> journals() = 0;
 
     /**
       Searches all incidence types for an incidence with this unique
       string identifier, returns a pointer or null.
     */
     Incidence* incidence( const QString&UID );
 
     /**
       Setup relations for an incidence.
     */
     virtual void setupRelations( Incidence * );
     /**
       Remove all relations to an incidence
     */
     virtual void removeRelations( Incidence * );
     
     /**
       Set calendar filter, which filters events for the events() functions.
       The Filter object is owned by the caller.
     */
     void setFilter( CalFilter * );
     /**
       Return calendar filter.
     */
     CalFilter *filter();
     virtual QDateTime  nextAlarm(  int daysTo ) = 0;
     virtual QString  nextSummary( ) const  = 0;
     virtual void reInitAlarmSettings() = 0;
     virtual QDateTime nextAlarmEventDateTime()  const = 0;
     virtual void  checkAlarmForIncidence( Incidence *, bool )  = 0;
     /**
       Return all alarms, which ocur in the given time interval.
     */
     virtual Alarm::List alarms( const QDateTime &from,
                                 const QDateTime &to ) = 0;
 
     class Observer {
     public:
         virtual void calendarModified( bool, Calendar * ) = 0;
     };
   
     void registerObserver( Observer * );
 
     void setModified( bool );
 
     /**
       Set product id returned by loadedProductId(). This function is only
       useful for the calendar loading code.
     */
     void setLoadedProductId( const QString & );
     /**
       Return product id taken from file that has been loaded. Returns
       QString::null, if no calendar has been loaded.
     */
     QString loadedProductId();
-    void setDefaultCalendar( int );
     int defaultCalendar();
+    void setDontDeleteIncidencesOnClose ();
+    public slots:
+    void setDefaultCalendar( int );
     virtual void setCalendarEnabled( int id, bool enable ) = 0;
     virtual void setAlarmEnabled( int id, bool enable ) = 0;
+    virtual void setReadOnly( int id, bool enable ) = 0;
     virtual void setDefaultCalendarEnabledOnly() = 0;
   signals:
     void calendarChanged();
     void calendarSaved();
     void calendarLoaded();
     void addAlarm(const QDateTime &qdt, const QString &noti  );
     void removeAlarm(const QDateTime &qdt, const QString &noti  );
 
   protected:
     /**
       Get unfiltered events, which occur on the given date.
     */
     virtual QPtrList<Event> rawEventsForDate( const QDateTime &qdt ) = 0;
     /**
       Get unfiltered events, which occur on the given date.
     */
     virtual QPtrList<Event> rawEventsForDate( const QDate &date,
                                               bool sorted = false ) = 0;  
     /**
       Get events in a range of dates. If inclusive is set to true, only events
       are returned, which are completely included in the range.
     */
     virtual QPtrList<Event> rawEvents( const QDate &start, const QDate &end,
                                        bool inclusive = false ) = 0; 
 
     Incidence *mNextAlarmIncidence;
     Incidence *mUndoIncidence;
     int mDefaultCalendar;
+    bool mDeleteIncidencesOnClose;
 
 private:
     void init();
   
     QString mOwner;        // who the calendar belongs to
     QString mOwnerEmail;   // email address of the owner
     int mTimeZone;         // timezone OFFSET from GMT (MINUTES)
     bool mLocalTime;       // use local time, not UTC or a time zone
 
+
     CalFilter *mFilter;
     CalFilter *mDefaultFilter;
 
     
     QString mTimeZoneId;
 
     Observer *mObserver;
     bool mNewObserver;
     
     bool mModified;
 
     QString mLoadedProductId;
 
     // This list is used to put together related todos
     QDict<Incidence> mOrphans;
     QDict<Incidence> mOrphanUids;
 };
   
 }
 
 #endif
diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp
index c5500bf..e48122a 100644
--- a/libkcal/calendarlocal.cpp
+++ b/libkcal/calendarlocal.cpp
@@ -1,782 +1,834 @@
 /*
     This file is part of libkcal.
 
     Copyright (c) 1998 Preston Brown
     Copyright (c) 2001,2003 Cornelius Schumacher <schumacher@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 #include <qdatetime.h>
 #include <qstring.h>
 #include <qptrlist.h>
 
 #include <kdebug.h>
 #include <kconfig.h>
 #include <kglobal.h>
 #include <klocale.h>
 
 #include "vcaldrag.h"
 #include "vcalformat.h"
 #include "icalformat.h"
 #include "exceptions.h"
 #include "incidence.h"
 #include "journal.h"
 #include "filestorage.h"
 #include "calfilter.h"
 
 #include "calendarlocal.h"
 
 // #ifndef DESKTOP_VERSION
 // #include <qtopia/alarmserver.h> 
 // #endif
 using namespace KCal;
 
 CalendarLocal::CalendarLocal()
   : Calendar()
 {
   init();
 }
 
 CalendarLocal::CalendarLocal(const QString &timeZoneId)
   : Calendar(timeZoneId)
 {
   init();
 }
 
 void CalendarLocal::init()
 {
     mNextAlarmIncidence = 0;
 }
 
 
 CalendarLocal::~CalendarLocal()
 {
+    if ( mDeleteIncidencesOnClose )
   close();
 }
-
+bool CalendarLocal::addCalendarFile( QString name, int id )
+{
+    CalendarLocal calendar( timeZoneId() );
+    calendar.setDefaultCalendar( id );
+    if ( calendar.load( name ) ) {
+        addCalendar( &calendar  );
+        return true;
+    }
+    return false;
+}
+void CalendarLocal::addCalendar( Calendar* cal )
+{
+    cal->setDontDeleteIncidencesOnClose();
+    {
+        QPtrList<Event> EventList = cal->rawEvents();
+        Event * ev = EventList.first();
+        while ( ev ) {
+            mEventList.append( ev );
+            ev = EventList.next();
+        }
+    }
+    {
+        QPtrList<Todo> TodoList = cal->rawTodos();
+        Todo * ev = TodoList.first();
+        while ( ev ) {
+            mTodoList.append( ev );
+            ev = TodoList.next();
+        }
+    }
+    {
+        QPtrList<Journal> JournalList = cal->journals();
+        Journal * ev = JournalList.first();
+        while ( ev ) {
+            mJournalList.append( ev );
+            ev = JournalList.next();
+        }
+    }
+}
 bool CalendarLocal::load( const QString &fileName )
 {
   FileStorage storage( this, fileName );
   return storage.load();
 }
 
 bool CalendarLocal::save( const QString &fileName, CalFormat *format )
 {
   FileStorage storage( this, fileName, format );
   return storage.save();
 }
 
 void CalendarLocal::close()
 {
 
   Todo * i;
   for( i = mTodoList.first(); i; i = mTodoList.next() ) i->setRunning(false);
 
   mEventList.setAutoDelete( true );
   mTodoList.setAutoDelete( true );
   mJournalList.setAutoDelete( false );
 
   mEventList.clear();
   mTodoList.clear();
   mJournalList.clear();
 
   mEventList.setAutoDelete( false );
   mTodoList.setAutoDelete( false );
   mJournalList.setAutoDelete( false );
 
   setModified( false );
 }
     
 bool CalendarLocal::addAnniversaryNoDup( Event *event )
 {
     QString cat;
     bool isBirthday = true;
     if(  event->categoriesStr() == i18n( "Anniversary" ) ) {
         isBirthday = false;
         cat = i18n( "Anniversary" );
     } else if(  event->categoriesStr() == i18n( "Birthday" ) ) {
         isBirthday = true;
         cat = i18n( "Birthday" );
     } else {
         qDebug("addAnniversaryNoDup called without fitting category! ");
         return false;
     }
     Event * eve;
     for ( eve = mEventList.first(); eve ; eve = mEventList.next() ) {
         if ( !(eve->categories().contains( cat ) ))
             continue;
         // now we have an event with fitting category
         if ( eve->dtStart().date() != event->dtStart().date() )
             continue;
         // now we have an event with fitting category+date
         if ( eve->summary() != event->summary() )
             continue;
         // now we have an event with fitting category+date+summary
         return false;
     }
     return addEvent( event );
 
 }
 bool CalendarLocal::addEventNoDup( Event *event )
 {
     Event * eve;
     for ( eve = mEventList.first(); eve ; eve = mEventList.next() ) {
         if ( *eve == *event ) {
             //qDebug("CalendarLocal::Duplicate event found! Not inserted! ");
             return false;
         }
     }
     return addEvent( event );
 }
 
 bool CalendarLocal::addEvent( Event *event )
 {
   insertEvent( event );
 
   event->registerObserver( this );
 
   setModified( true );
   event->setCalID( mDefaultCalendar );
   event->setCalEnabled( true );
 
   return true;
 }
 
 void CalendarLocal::deleteEvent( Event *event )
 {
     if ( mUndoIncidence ) delete mUndoIncidence;
     mUndoIncidence = event->clone();
     if ( mEventList.removeRef( event ) ) {
         setModified( true );
     }
 }
 
 
 Event *CalendarLocal::event( const QString &uid )
 {
 
   Event *event;
 
   for ( event = mEventList.first(); event; event = mEventList.next() ) {
       if ( event->uid() == uid && event->calEnabled() ) {
       return event;
     }
   }
 
   return 0;
 }
 bool CalendarLocal::addTodoNoDup( Todo *todo )
 {
   Todo * eve;
     for ( eve = mTodoList.first(); eve ; eve = mTodoList.next() ) {
         if ( *eve == *todo ) {
             //qDebug("duplicate todo found! not inserted! ");
             return false;
         }
     }
     return addTodo( todo );
 }
 bool CalendarLocal::addTodo( Todo *todo )
 {
   mTodoList.append( todo );
 
   todo->registerObserver( this );
 
   // Set up subtask relations
   setupRelations( todo );
 
   setModified( true );
   todo->setCalID( mDefaultCalendar );
   todo->setCalEnabled( true );
   return true;
 }
 
 void CalendarLocal::deleteTodo( Todo *todo )
 {
   // Handle orphaned children
     if ( mUndoIncidence ) delete mUndoIncidence;
     removeRelations( todo );
     mUndoIncidence = todo->clone();
 
   if ( mTodoList.removeRef( todo ) ) {
     setModified( true );
   }
 }
 
 QPtrList<Todo> CalendarLocal::rawTodos()
 {
     QPtrList<Todo> el;
     for ( Todo *it = mTodoList.first(); it; it = mTodoList.next() )
         if ( it->calEnabled() ) el.append( it );
     return el;
 }
 Todo *CalendarLocal::todo( QString syncProf, QString id )
 {
   Todo *todo;
   for ( todo = mTodoList.first(); todo; todo = mTodoList.next() ) {
       if ( todo->calEnabled() && todo->getID( syncProf ) == id ) return todo;
   }
 
   return 0;
 }
 void CalendarLocal::removeSyncInfo( QString syncProfile)
 {
     QPtrList<Incidence> all = rawIncidences() ;
     Incidence *inc;
     for ( inc = all.first(); inc; inc = all.next() ) {
         inc->removeID( syncProfile );
     }
     if ( syncProfile.isEmpty() ) {
         QPtrList<Event> el;
         Event *todo;
         for ( todo = mEventList.first(); todo; todo = mEventList.next() ) {
             if ( todo->uid().left( 15 ) == QString("last-syncEvent-") )
                     el.append( todo );
         }
         for ( todo = el.first(); todo; todo = el.next() ) {
            deleteIncidence ( todo );
         }
     } else {
         Event *lse = event( "last-syncEvent-"+ syncProfile);
         if ( lse )
             deleteIncidence ( lse );
     }
 }
 QPtrList<Event> CalendarLocal::getExternLastSyncEvents()
 {
     QPtrList<Event> el;
     Event *todo;
     for ( todo = mEventList.first(); todo; todo = mEventList.next() ) {
         if ( todo->uid().left( 15 ) == QString("last-syncEvent-") )
             if ( todo->summary().left(3) == "E: " )
                 el.append( todo );
     }
 
     return el;
 
 }
 Event *CalendarLocal::event( QString syncProf,  QString id )
 {
   Event *todo;
   for ( todo = mEventList.first(); todo; todo = mEventList.next() ) {
       if ( todo->calEnabled() && todo->getID( syncProf ) == id ) return todo;
   }
 
   return 0;
 }
 Todo *CalendarLocal::todo( const QString &uid )
 {
   Todo *todo;
   for ( todo = mTodoList.first(); todo; todo = mTodoList.next() ) {
     if ( todo->calEnabled() && todo->uid() == uid ) return todo;
   }
 
   return 0;
 }
 QString CalendarLocal::nextSummary() const
 {
     return mNextSummary;
 }
 QDateTime CalendarLocal::nextAlarmEventDateTime()  const
 {
     return mNextAlarmEventDateTime;
 }
 void  CalendarLocal::checkAlarmForIncidence( Incidence * incidence, bool deleted)
 {
     //mNextAlarmIncidence
     //mNextAlarmDateTime
     //return mNextSummary;
     //return mNextAlarmEventDateTime;
     bool newNextAlarm = false; 
     bool computeNextAlarm = false;
     bool ok;
     int offset;
     QDateTime nextA;
     // QString nextSum;
     //QDateTime nextEvent;
     if ( mNextAlarmIncidence == 0 || incidence == 0 ) {
         computeNextAlarm = true;
     } else {
         if ( ! deleted ) {
             nextA = incidence->getNextAlarmDateTime(& ok, &offset, QDateTime::currentDateTime() ) ;
             if ( ok ) {
                 if ( nextA < mNextAlarmDateTime  ) {
                     deRegisterAlarm();
                     mNextAlarmDateTime = nextA;
                     mNextSummary  = incidence->summary();
                     mNextAlarmEventDateTime = nextA.addSecs(offset ) ; 
                     mNextAlarmEventDateTimeString = KGlobal::locale()->formatDateTime(mNextAlarmEventDateTime);
                     newNextAlarm = true;
                     mNextAlarmIncidence = incidence;
                 } else {
                     if ( incidence == mNextAlarmIncidence ) {
                         computeNextAlarm = true;
                     }
                 }
             } else {
                 if ( mNextAlarmIncidence == incidence ) {
                     computeNextAlarm = true;
                 }
             }
         } else { // deleted
             if ( incidence == mNextAlarmIncidence ) {
                 computeNextAlarm = true;
             }
         }
     }
     if ( computeNextAlarm ) {
         deRegisterAlarm();
         nextA = nextAlarm( 1000 );  
         if (! mNextAlarmIncidence ) {
             return;
         }
         newNextAlarm = true;
     }
     if ( newNextAlarm )
         registerAlarm();
 }
 QString CalendarLocal:: getAlarmNotification()
 { 
     QString ret;
     // this should not happen
     if (! mNextAlarmIncidence ) 
             return "cal_alarm"+ mNextSummary.left( 25 )+"\n"+mNextAlarmEventDateTimeString;
     Alarm* alarm =  mNextAlarmIncidence->alarms().first();
     if ( alarm->type() == Alarm::Procedure ) {
         ret = "proc_alarm" + alarm->programFile()+"+++";
     } else {
         ret = "audio_alarm" +alarm->audioFile() +"+++";
     }
     ret += "cal_alarm"+ mNextSummary.left( 25 );
     if ( mNextSummary.length() > 25 )
         ret += "\n" + mNextSummary.mid(25, 25 );
     ret+= "\n"+mNextAlarmEventDateTimeString;
     return ret;
 }
 void CalendarLocal::registerAlarm()
 {
     mLastAlarmNotificationString = getAlarmNotification();
     // qDebug("++ register Alarm %s %s",mNextAlarmDateTime.toString().latin1(), mLastAlarmNotificationString.latin1() );
     emit addAlarm ( mNextAlarmDateTime, mLastAlarmNotificationString );
 // #ifndef DESKTOP_VERSION
 //     AlarmServer::addAlarm ( mNextAlarmDateTime,"koalarm", mLastAlarmNotificationString.latin1() );
 // #endif     
 }
 void CalendarLocal::deRegisterAlarm()
 {
     if ( mLastAlarmNotificationString.isNull() )
         return;
     //qDebug("-- deregister Alarm %s ", mLastAlarmNotificationString.latin1() );
 
     emit removeAlarm ( mNextAlarmDateTime, mLastAlarmNotificationString );
     mNextAlarmEventDateTime = QDateTime();
 // #ifndef DESKTOP_VERSION
 //     AlarmServer::deleteAlarm (mNextAlarmDateTime ,"koalarm" ,mLastAlarmNotificationString.latin1() );
 // #endif     
 }
 
 QPtrList<Todo> CalendarLocal::todos( const QDate &date )
 {
   QPtrList<Todo> todos;
 
   Todo *todo;
   for ( todo = mTodoList.first(); todo; todo = mTodoList.next() ) {
       if ( !todo->calEnabled() ) continue; 
     if ( todo->hasDueDate() && todo->dtDue().date() == date ) {
       todos.append( todo );
     }
   }
 
  filter()->apply( &todos );
   return todos;
 }
 void CalendarLocal::reInitAlarmSettings()
 {
     if ( !mNextAlarmIncidence  ) {
         nextAlarm( 1000 );
     }
     deRegisterAlarm();
     mNextAlarmIncidence = 0;
     checkAlarmForIncidence( 0, false );
     
 }
 
 
 
 QDateTime  CalendarLocal::nextAlarm( int daysTo )
 {
   QDateTime nextA = QDateTime::currentDateTime().addDays( daysTo );
     QDateTime start = QDateTime::currentDateTime().addSecs( 30 );
     QDateTime next;
     Event *e;
     bool ok;
     bool found = false;
     int offset;
     mNextAlarmIncidence = 0;
     for( e = mEventList.first(); e; e = mEventList.next() ) {
         if ( !e->calEnabled() ) continue;
         next = e->getNextAlarmDateTime(& ok, &offset, QDateTime::currentDateTime() ) ;
         if ( ok ) {
             if (  next < nextA ) {
                 nextA = next;
                 found = true;
                 mNextSummary = e->summary();
                 mNextAlarmEventDateTime = next.addSecs(offset ) ; 
                 mNextAlarmIncidence = (Incidence *) e;
             }
         }
     }
     Todo *t;
     for( t = mTodoList.first(); t; t = mTodoList.next() ) {
       if ( !t->calEnabled() ) continue; 
         next = t->getNextAlarmDateTime(& ok, &offset, QDateTime::currentDateTime() ) ;
         if ( ok ) {
             if (  next < nextA ) {
                 nextA = next;
                 found = true;
                 mNextSummary = t->summary();
                 mNextAlarmEventDateTime = next.addSecs(offset ); 
                 mNextAlarmIncidence = (Incidence *) t;
             }
         }
     } 
     if ( mNextAlarmIncidence  ) {
         mNextAlarmEventDateTimeString = KGlobal::locale()->formatDateTime(mNextAlarmEventDateTime);
         mNextAlarmDateTime = nextA;
     }
     return nextA;
 }
 Alarm::List CalendarLocal::alarmsTo( const QDateTime &to )
 {
   return alarms( QDateTime( QDate( 1900, 1, 1 ) ), to );
 }
 
 Alarm::List CalendarLocal::alarms( const QDateTime &from, const QDateTime &to )
 {
  
   Alarm::List alarms;
 
   Event *e;
 
   for( e = mEventList.first(); e; e = mEventList.next() ) {
       if ( !e->calEnabled() ) continue;
     if ( e->doesRecur() ) appendRecurringAlarms( alarms, e, from, to );
     else appendAlarms( alarms, e, from, to );
   }
 
   Todo *t;
   for( t = mTodoList.first(); t; t = mTodoList.next() ) {
       if ( !t->calEnabled() ) continue; 
       appendAlarms( alarms, t, from, to );
   }
 
   return alarms;
 }
 
 void CalendarLocal::appendAlarms( Alarm::List &alarms, Incidence *incidence,
                                   const QDateTime &from, const QDateTime &to )
 {
   QPtrList<Alarm> alarmList = incidence->alarms();
   Alarm *alarm;
   for( alarm = alarmList.first(); alarm; alarm = alarmList.next() ) {
 //    kdDebug(5800) << "CalendarLocal::appendAlarms() '" << alarm->text()
 //                  << "': " << alarm->time().toString() << " - " << alarm->enabled() << endl;
     if ( alarm->enabled() ) {
       if ( alarm->time() >= from && alarm->time() <= to ) {
         alarms.append( alarm );
       }
     }
   }
 }
 
 void CalendarLocal::appendRecurringAlarms( Alarm::List &alarms,
                                            Incidence *incidence,
                                            const QDateTime &from,
                                            const QDateTime &to )
 {
  
   QPtrList<Alarm> alarmList = incidence->alarms();
   Alarm *alarm;
   QDateTime qdt;
   for( alarm = alarmList.first(); alarm; alarm = alarmList.next() ) {
     if (incidence->recursOn(from.date())) {
       qdt.setTime(alarm->time().time());
       qdt.setDate(from.date());
     }
     else qdt = alarm->time();
     // qDebug("1 %s %s %s", qdt.toString().latin1(),  from.toString().latin1(), to.toString().latin1());
     if ( alarm->enabled() ) {
       if ( qdt >= from && qdt <= to ) {
         alarms.append( alarm );
       }
     }
   }
 }
 
 
 /****************************** PROTECTED METHODS ****************************/
 
 // after changes are made to an event, this should be called.
 void CalendarLocal::update( IncidenceBase *incidence )
 {
   incidence->setSyncStatus( Event::SYNCMOD );
   incidence->setLastModified( QDateTime::currentDateTime() );
   // we should probably update the revision number here,
   // or internally in the Event itself when certain things change.
   // need to verify with ical documentation.
 
   setModified( true );
 }
 
 void CalendarLocal::insertEvent( Event *event )
 {
   if ( mEventList.findRef( event ) < 0 ) mEventList.append( event );
 }
 
 
 QPtrList<Event> CalendarLocal::rawEventsForDate( const QDate &qd, bool sorted )
 {
   QPtrList<Event> eventList;
 
   Event *event;
   for( event = mEventList.first(); event; event = mEventList.next() ) {
       if ( !event->calEnabled() ) continue;
     if ( event->doesRecur() ) {
       if ( event->isMultiDay() ) {
         int extraDays = event->dtStart().date().daysTo( event->dtEnd().date() );
         int i;
         for ( i = 0; i <= extraDays; i++ ) {
             if ( event->recursOn( qd.addDays( -i ) ) ) {
                 eventList.append( event );
                 break;
             }
         }
       } else {
         if ( event->recursOn( qd ) )
           eventList.append( event );
       }
     } else {
       if ( event->dtStart().date() <= qd && event->dtEnd().date() >= qd ) {
         eventList.append( event );
       }
     }
   }
 
   if ( !sorted ) {
     return eventList;
   }
 
   //  kdDebug(5800) << "Sorting events for date\n" << endl;
   // now, we have to sort it based on dtStart.time()
   QPtrList<Event> eventListSorted;
   Event *sortEvent;
   for ( event = eventList.first(); event; event = eventList.next() ) {
     sortEvent = eventListSorted.first();
     int i = 0;
     while ( sortEvent && event->dtStart().time()>=sortEvent->dtStart().time() )
     {
       i++;
       sortEvent = eventListSorted.next();
     }
     eventListSorted.insert( i, event );
   }
   return eventListSorted;
 }
 
 
 QPtrList<Event> CalendarLocal::rawEvents( const QDate &start, const QDate &end,
                                           bool inclusive )
 {
   Event *event = 0;
 
   QPtrList<Event> eventList;
 
   // Get non-recurring events
   for( event = mEventList.first(); event; event = mEventList.next() ) {
       if ( !event->calEnabled() ) continue;
     if ( event->doesRecur() ) {
       QDate rStart = event->dtStart().date();
       bool found = false;
       if ( inclusive ) {
         if ( rStart >= start && rStart <= end ) {
           // Start date of event is in range. Now check for end date.
           // if duration is negative, event recurs forever, so do not include it.
           if ( event->recurrence()->duration() == 0 ) {  // End date set
             QDate rEnd = event->recurrence()->endDate();
             if ( rEnd >= start && rEnd <= end ) {  // End date within range
               found = true;
             }
           } else if ( event->recurrence()->duration() > 0 ) {  // Duration set
             // TODO: Calculate end date from duration. Should be done in Event
             // For now exclude all events with a duration.
           }
         }
       } else {
           bool founOne;
           QDate next = event->getNextOccurence( start, &founOne ).date();
           if ( founOne ) {
               if ( next <= end ) {
                   found = true;
               }
           }
           
           /*
           // crap !!!
         if ( rStart <= end ) {  // Start date not after range
           if ( rStart >= start ) {  // Start date within range
             found = true;
           } else if ( event->recurrence()->duration() == -1 ) {  // Recurs forever
             found = true;
           } else if ( event->recurrence()->duration() == 0 ) {  // End date set
             QDate rEnd = event->recurrence()->endDate();
             if ( rEnd >= start && rEnd <= end ) {  // End date within range
               found = true;
             }
           } else {  // Duration set
             // TODO: Calculate end date from duration. Should be done in Event
             // For now include all events with a duration.
             found = true;
           }
         }
           */
 
       }
 
       if ( found ) eventList.append( event );
     } else {
       QDate s = event->dtStart().date();
       QDate e = event->dtEnd().date();
 
       if ( inclusive ) {
         if ( s >= start && e <= end ) {
           eventList.append( event );
         }
       } else {
         if ( ( s >= start && s <= end ) || ( e >= start && e <= end ) ) {
           eventList.append( event );
         }
       }
     }
   }
 
   return eventList;
 }
 
 QPtrList<Event> CalendarLocal::rawEventsForDate( const QDateTime &qdt )
 {
   return rawEventsForDate( qdt.date() );
 }
 
 QPtrList<Event> CalendarLocal::rawEvents()
 {
     QPtrList<Event> el;
     for ( Event *it = mEventList.first(); it; it = mEventList.next() )
         if ( it->calEnabled() ) el.append( it );
     return el;
 }
 
 bool CalendarLocal::addJournal(Journal *journal)
 {
   if ( journal->dtStart().isValid())
     kdDebug(5800) << "Adding Journal on " << journal->dtStart().toString() << endl;
   else
     kdDebug(5800) << "Adding Journal without a DTSTART" << endl;
 
   mJournalList.append(journal);
 
   journal->registerObserver( this );
 
   setModified( true );
   journal->setCalID( mDefaultCalendar );
   journal->setCalEnabled( true );
   return true;
 }
 
 void CalendarLocal::deleteJournal( Journal *journal )
 {
     if ( mUndoIncidence ) delete mUndoIncidence;
     mUndoIncidence = journal->clone();
     mUndoIncidence->setSummary( mUndoIncidence->description().left(25));
   if ( mJournalList.removeRef(journal) ) {
     setModified( true );
   }
 }
 
 Journal *CalendarLocal::journal( const QDate &date )
 {
 //  kdDebug(5800) << "CalendarLocal::journal() " << date.toString() << endl;
 
   for ( Journal *it = mJournalList.first(); it; it = mJournalList.next() )
       if ( it->calEnabled() && it->dtStart().date() == date )
       return it;
 
   return 0;
 }
 
 Journal *CalendarLocal::journal( const QString &uid )
 {
   for ( Journal *it = mJournalList.first(); it; it = mJournalList.next() )
     if ( it->calEnabled() && it->uid() == uid )
       return it;
 
   return 0;
 }
 
 QPtrList<Journal> CalendarLocal::journals()
 {
     QPtrList<Journal> el;
     for ( Journal *it = mJournalList.first(); it; it = mJournalList.next() )
         if ( it->calEnabled() ) el.append( it );
     return el;
 }
 
 void CalendarLocal::setCalendarEnabled( int id, bool enable )
 {
     for ( Journal *it = mJournalList.first(); it; it = mJournalList.next() )
         if ( it->calID() == id ) it->setCalEnabled( enable );
 
     for ( Event *it = mEventList.first(); it; it = mEventList.next() )
         if ( it->calID() == id ) it->setCalEnabled( enable );
 
     for ( Todo *it = mTodoList.first(); it; it = mTodoList.next() )
         if ( it->calID() == id ) it->setCalEnabled( enable );
 
 }
+
+void CalendarLocal::setReadOnly( int id, bool enable )
+{
+    for ( Journal *it = mJournalList.first(); it; it = mJournalList.next() )
+        if ( it->calID() == id ) it->setReadOnly( enable );
+
+    for ( Event *it = mEventList.first(); it; it = mEventList.next() )
+        if ( it->calID() == id ) it->setReadOnly( enable );
+
+    for ( Todo *it = mTodoList.first(); it; it = mTodoList.next() )
+        if ( it->calID() == id ) it->setReadOnly( enable );
+
+}
+
 void CalendarLocal::setAlarmEnabled( int id, bool enable )
 {
     for ( Journal *it = mJournalList.first(); it; it = mJournalList.next() )
         if ( it->calID() == id ) it->setAlarmEnabled( enable );
 
     for ( Event *it = mEventList.first(); it; it = mEventList.next() )
         if ( it->calID() == id ) it->setAlarmEnabled( enable );
 
     for ( Todo *it = mTodoList.first(); it; it = mTodoList.next() )
         if ( it->calID() == id ) it->setAlarmEnabled( enable );
 
 }
 void CalendarLocal::setDefaultCalendarEnabledOnly()
 {
     for ( Journal *it = mJournalList.first(); it; it = mJournalList.next() )
         it->setCalEnabled( it->calID() == mDefaultCalendar );
 
     for ( Event *it = mEventList.first(); it; it = mEventList.next() )
         it->setCalEnabled( it->calID() == mDefaultCalendar);
 
     for ( Todo *it = mTodoList.first(); it; it = mTodoList.next() )
         it->setCalEnabled( it->calID() == mDefaultCalendar);
 
 }
diff --git a/libkcal/calendarlocal.h b/libkcal/calendarlocal.h
index b25fcbe..65f6aa7 100644
--- a/libkcal/calendarlocal.h
+++ b/libkcal/calendarlocal.h
@@ -1,221 +1,223 @@
 /*
     This file is part of libkcal.
 
     Copyright (c) 1998 Preston Brown
     Copyright (c) 2001,2003 Cornelius Schumacher <schumacher@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 #ifndef KCAL_CALENDARLOCAL_H
 #define KCAL_CALENDARLOCAL_H
 
 #include "calendar.h"
 
 namespace KCal {
 
 class CalFormat;
 
 /**
   This class provides a calendar stored as a local file.
 */
 class CalendarLocal : public Calendar
 {
   public:
     /**
       Constructs a new calendar, with variables initialized to sane values.
     */
     CalendarLocal();
     /**
       Constructs a new calendar, with variables initialized to sane values.
     */
     CalendarLocal( const QString &timeZoneId );
     ~CalendarLocal();
-  
+    void addCalendar( Calendar*  );
+    bool addCalendarFile( QString name, int id );
     /**
       Loads a calendar on disk in vCalendar or iCalendar format into the current
       calendar. Any information already present is lost.
       @return true, if successfull, false on error.
       @param fileName the name of the calendar on disk.
     */
     bool load( const QString &fileName );
     /**
       Writes out the calendar to disk in the specified \a format.
       CalendarLocal takes ownership of the CalFormat object.
       @return true, if successfull, false on error.
       @param fileName the name of the file
     */
     bool save( const QString &fileName, CalFormat *format = 0 );
 
     /**
       Clears out the current calendar, freeing all used memory etc. etc.
     */
     void close();
 
     void save() {}
   
     /**
       Add Event to calendar.
     */
     void removeSyncInfo( QString syncProfile); 
     bool addAnniversaryNoDup( Event *event );
     bool addEventNoDup( Event *event );
     bool addEvent( Event *event );
     /** 
       Deletes an event from this calendar.
     */
     void deleteEvent( Event *event );
 
     /**
       Retrieves an event on the basis of the unique string ID.
     */
     Event *event( const QString &uid );
     /**
       Return unfiltered list of all events in calendar.
     */
     QPtrList<Event> rawEvents();
     QPtrList<Event> getExternLastSyncEvents();
     /**
       Add a todo to the todolist.
     */
     bool addTodo( Todo *todo );
     bool addTodoNoDup( Todo *todo );
     /**
       Remove a todo from the todolist.
     */
     void deleteTodo( Todo * );
     /**
       Searches todolist for an event with this unique string identifier,
       returns a pointer or null.
     */
     Todo *todo( const QString &uid );
     /**
       Return list of all todos.
     */
     QPtrList<Todo> rawTodos();
     /**
       Returns list of todos due on the specified date.
     */
     QPtrList<Todo> todos( const QDate &date );
     /**
       Return list of all todos.
       
       Workaround because compiler does not recognize function of base class.
     */
     QPtrList<Todo> todos() { return Calendar::todos(); }
 
     /**
       Add a Journal entry to calendar.
     */
     bool addJournal( Journal * );
     /**
       Remove a Journal from the calendar.
     */
     void deleteJournal( Journal * );
     /**
       Return Journal for given date.
     */
     Journal *journal( const QDate & );
     /**
       Return Journal with given UID.
     */
     Journal *journal( const QString &uid );
     /**
       Return list of all Journals stored in calendar.
     */
     QPtrList<Journal> journals();
 
     /**
       Return all alarms, which ocur in the given time interval.
     */
     Alarm::List alarms( const QDateTime &from, const QDateTime &to );
 
     /**
       Return all alarms, which ocur before given date.
     */
     Alarm::List alarmsTo( const QDateTime &to );
  
     QDateTime nextAlarm( int daysTo ) ;
     QDateTime nextAlarmEventDateTime()  const;
     void  checkAlarmForIncidence( Incidence *, bool deleted )  ;
     void registerAlarm();
     void deRegisterAlarm();
     QString getAlarmNotification();
     QString nextSummary() const ;
     /**
       This method should be called whenever a Event is modified directly
       via it's pointer. It makes sure that the calendar is internally
       consistent.
     */
     void update( IncidenceBase *incidence );
  
     /**
       Builds and then returns a list of all events that match for the
       date specified. useful for dayView, etc. etc.
     */
     QPtrList<Event> rawEventsForDate( const QDate &date, bool sorted = false );
     /**
       Get unfiltered events for date \a qdt.
     */
     QPtrList<Event> rawEventsForDate( const QDateTime &qdt );
     /**
       Get unfiltered events in a range of dates. If inclusive is set to true,
       only events are returned, which are completely included in the range.
     */
     QPtrList<Event> rawEvents( const QDate &start, const QDate &end,
                                bool inclusive = false );
     Todo *todo( QString, QString );
     Event *event( QString, QString );
  
-
+public slots:
     void setCalendarEnabled( int id, bool enable );
     void setAlarmEnabled( int id, bool enable );
+    void setReadOnly( int id, bool enable );
     void setDefaultCalendarEnabledOnly();
 
   protected:
 
     // Event* mNextAlarmEvent;
     QString mNextSummary;
     QString mNextAlarmEventDateTimeString;
     QString mLastAlarmNotificationString;
     QDateTime mNextAlarmEventDateTime;
     QDateTime mNextAlarmDateTime; 
     void reInitAlarmSettings();
    
     /** Notification function of IncidenceBase::Observer. */
     void incidenceUpdated( IncidenceBase *i ) { update( i ); }
   
     /** inserts an event into its "proper place" in the calendar. */
     void insertEvent( Event *event );
   
     /** Append alarms of incidence in interval to list of alarms. */
     void appendAlarms( Alarm::List &alarms, Incidence *incidence,
                        const QDateTime &from, const QDateTime &to );
 
     /** Append alarms of recurring events in interval to list of alarms. */
     void appendRecurringAlarms( Alarm::List &alarms, Incidence *incidence,
                        const QDateTime &from, const QDateTime &to );
 
   private:
     void init();
 
     QPtrList<Event> mEventList;
     QPtrList<Todo> mTodoList;
     QPtrList<Journal> mJournalList;
 };
 
 }
 
 #endif