4 files changed, 71 insertions, 5 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index b3686aa..07ec459 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -461,2 +461,6 @@ void CalendarView::init()
     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 );
@@ -1836,2 +1840,42 @@ void CalendarView::setSyncEventsReadOnly()
 }
+
+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)
@@ -1966,3 +2010,20 @@ bool CalendarView::checkFileVersion(QString fn)
 }
-
+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 )
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index cdce072..0144ba4 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -46,2 +46,3 @@
 #include <ksyncmanager.h>
+//#include <koprefs.h>
 
@@ -49,3 +50,3 @@ class QWidgetStack;
 class QSplitter;
-
+class KopiCalendarFile;
 class CalPrinter;
@@ -224,2 +225,6 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
     bool openCalendar(QString filename, bool merge=false);
+    bool loadCalendars();
+    bool saveCalendars();
+    bool restoreCalendarSettings();
+    bool addCalendar( KopiCalendarFile * );
     bool syncCalendar(QString filename,int mode = 0 );
diff --git a/korganizer/kofilterview.cpp b/korganizer/kofilterview.cpp
index 2dd4567..29a4393 100644
--- a/korganizer/kofilterview.cpp
+++ b/korganizer/kofilterview.cpp
@@ -68,3 +68,3 @@ class KONewCalPrefs : public QDialog
         connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject())  );
-        resize( 200, 200 );
+        //resize( 200, 200 );
     }
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 95e1607..f05ada5 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -310,3 +310,3 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
     QTime neededSaveTime = QDateTime::currentDateTime().time();
-    mView->openCalendar( defaultFileName() );
+    mView->loadCalendars();
     int msNeeded = neededSaveTime.msecsTo( QDateTime::currentDateTime().time() );
@@ -1859,3 +1859,3 @@ void MainWindow::save()
         qDebug("KO: Start saving data to file!");
-        mView->saveCalendar( defaultFileName() );
+        mView->saveCalendars();
         mCalendarModifiedFlag = false;