kopi save error warning

1 files changed, 12 insertions, 2 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 316826a..ca071b2 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -814,49 +814,49 @@ void CalendarView::updateView(const QDate &start, const QDate &end)
             mDateScrollBar->blockSignals( false );
         }
     }
 #endif
     mTodoList->updateView();
     mViewManager->updateView(start, end);
     //mDateNavigator->updateView();
 }
 
 
 
 void CalendarView::checkFiles()
 {
     QString message;
     QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
     KopiCalendarFile * cal = calendars.first();
     while ( cal ) {
         if (  cal->mErrorOnLoad ) {
             message +=  cal->mName +"\n"+KGlobal::formatMessage ( "(" +i18n( "Filepath: ")+ cal->mFileName+")" ,0 )+"\n";
         }
         cal = calendars.next();
     }
     if ( !message.isEmpty() ) {
         message = KGlobal::formatMessage( i18n("Calendar(s) not loaded:"),0 )+"\n" + message +KGlobal::formatMessage(i18n("You can try to reload the calendar in the Resource View!"),0); 
-        KMessageBox::error(this,message, i18n("Loding of calendar(s) failed"));
+        KMessageBox::error(this,message, i18n("Loading of calendar(s) failed"));
     }
     static bool firstTime = true;
     if ( firstTime ) {
         firstTime = false;
         QTimer::singleShot( 2000, this, SLOT ( checkAlarms() ));
     }
 }
 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;
@@ -2510,60 +2510,70 @@ bool CalendarView::checkFileVersion(QString fn)
    
    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 )
         mCalendar->deleteEvent( e );
     return true;
 }
 bool CalendarView::saveCalendars()
 {
     QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
     KopiCalendarFile * cal = calendars.first();
     mCalendar->setDefaultCalendar( 1 ); 
     mCalendar->setDefaultCalendarEnabledOnly();
-    saveCalendar( MainWindow::defaultFileName() );
+    QString saveError;
+    if ( !saveCalendar( MainWindow::defaultFileName() ) )
+        saveError =  cal->mName +"\n";
     cal = calendars.next();
     while ( cal ) {
         if ( !cal->isReadOnly && !cal->mErrorOnLoad ) {
             mCalendar->setDefaultCalendar( cal->mCalNumber ); 
             mCalendar->setDefaultCalendarEnabledOnly();
             if ( saveCalendar( cal->mFileName ) )
                 cal->mLoadDt = QDateTime::currentDateTime();
+            else
+                saveError += cal->mName + "\n";
         }
         cal = calendars.next();
     }
     restoreCalendarSettings();
+
+    if ( !saveError.isEmpty() ) {
+        saveError = KGlobal::formatMessage( i18n("Calendar(s) not saved:"),0 )+"\n" + saveError;
+        KMessageBox::error(this, saveError, i18n("Error saving data"));
+        return false;
+    }
     return true;
 }
 bool CalendarView::saveCalendar( QString filename )
 {
  
     // Store back all unsaved data into calendar object
     // qDebug("file %s %d ",  filename.latin1()           , mViewManager->currentView()         );
     if ( mViewManager->currentView() )
         mViewManager->currentView()->flushView();
 
     
     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;