fixx

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
@@ -450,24 +450,28 @@ void CalendarView::init()
     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();
@@ -1825,24 +1829,64 @@ bool CalendarView::importQtopia( const QString &categories,
     
 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;
     }
 
@@ -1955,25 +1999,42 @@ bool CalendarView::checkFileVersion(QString fn)
     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 );
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index cdce072..0144ba4 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -35,28 +35,29 @@
 #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;
@@ -213,24 +214,28 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
 
     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.
     */
diff --git a/korganizer/kofilterview.cpp b/korganizer/kofilterview.cpp
index 2dd4567..29a4393 100644
--- a/korganizer/kofilterview.cpp
+++ b/korganizer/kofilterview.cpp
@@ -57,25 +57,25 @@ class KONewCalPrefs : public QDialog
         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 )
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 95e1607..f05ada5 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -299,25 +299,25 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
             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 ) ) );
@@ -1848,25 +1848,25 @@ void MainWindow::save()
                 } 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)