summaryrefslogtreecommitdiffabout
path: root/korganizer/calendarview.cpp
Side-by-side diff
Diffstat (limited to 'korganizer/calendarview.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/calendarview.cpp14
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
@@ -835,7 +835,7 @@ void CalendarView::checkFiles()
}
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 ) {
@@ -2531,7 +2531,9 @@ bool CalendarView::saveCalendars()
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 ) {
@@ -2539,10 +2541,18 @@ bool CalendarView::saveCalendars()
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 )