author | zautrix <zautrix> | 2005-08-17 19:54:28 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-08-17 19:54:28 (UTC) |
commit | 7b85cd21eac504f2004df9f3c2b818cbc1478fc0 (patch) (unidiff) | |
tree | 8b99349eb4ddb9fb10e44618a03f17a80810a392 /korganizer/calendarview.cpp | |
parent | 39f1119563e038a029fd23c4b3af03eda02fe308 (diff) | |
download | kdepimpi-7b85cd21eac504f2004df9f3c2b818cbc1478fc0.zip kdepimpi-7b85cd21eac504f2004df9f3c2b818cbc1478fc0.tar.gz kdepimpi-7b85cd21eac504f2004df9f3c2b818cbc1478fc0.tar.bz2 |
uuu
-rw-r--r-- | korganizer/calendarview.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index ca071b2..26323b1 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -2526,49 +2526,48 @@ bool CalendarView::checkFileVersion(QString fn) | |||
2526 | return true; | 2526 | return true; |
2527 | } | 2527 | } |
2528 | bool CalendarView::saveCalendars() | 2528 | bool CalendarView::saveCalendars() |
2529 | { | 2529 | { |
2530 | QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars; | 2530 | QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars; |
2531 | KopiCalendarFile * cal = calendars.first(); | 2531 | KopiCalendarFile * cal = calendars.first(); |
2532 | mCalendar->setDefaultCalendar( 1 ); | 2532 | mCalendar->setDefaultCalendar( 1 ); |
2533 | mCalendar->setDefaultCalendarEnabledOnly(); | 2533 | mCalendar->setDefaultCalendarEnabledOnly(); |
2534 | QString saveError; | 2534 | QString saveError; |
2535 | if ( !saveCalendar( MainWindow::defaultFileName() ) ) | 2535 | if ( !saveCalendar( MainWindow::defaultFileName() ) ) |
2536 | saveError = cal->mName +"\n"; | 2536 | saveError = cal->mName +"\n"; |
2537 | cal = calendars.next(); | 2537 | cal = calendars.next(); |
2538 | while ( cal ) { | 2538 | while ( cal ) { |
2539 | if ( !cal->isReadOnly && !cal->mErrorOnLoad ) { | 2539 | if ( !cal->isReadOnly && !cal->mErrorOnLoad ) { |
2540 | mCalendar->setDefaultCalendar( cal->mCalNumber ); | 2540 | mCalendar->setDefaultCalendar( cal->mCalNumber ); |
2541 | mCalendar->setDefaultCalendarEnabledOnly(); | 2541 | mCalendar->setDefaultCalendarEnabledOnly(); |
2542 | if ( saveCalendar( cal->mFileName ) ) | 2542 | if ( saveCalendar( cal->mFileName ) ) |
2543 | cal->mLoadDt = QDateTime::currentDateTime(); | 2543 | cal->mLoadDt = QDateTime::currentDateTime(); |
2544 | else | 2544 | else |
2545 | saveError += cal->mName + "\n"; | 2545 | saveError += cal->mName + "\n"; |
2546 | } | 2546 | } |
2547 | cal = calendars.next(); | 2547 | cal = calendars.next(); |
2548 | } | 2548 | } |
2549 | restoreCalendarSettings(); | 2549 | restoreCalendarSettings(); |
2550 | |||
2551 | if ( !saveError.isEmpty() ) { | 2550 | if ( !saveError.isEmpty() ) { |
2552 | saveError = KGlobal::formatMessage( i18n("Calendar(s) not saved:"),0 )+"\n" + saveError; | 2551 | saveError = KGlobal::formatMessage( i18n("Calendar(s) not saved:"),0 )+"\n" + saveError; |
2553 | KMessageBox::error(this, saveError, i18n("Error saving data")); | 2552 | KMessageBox::error(this, saveError, i18n("Error saving data")); |
2554 | return false; | 2553 | return false; |
2555 | } | 2554 | } |
2556 | return true; | 2555 | return true; |
2557 | } | 2556 | } |
2558 | bool CalendarView::saveCalendar( QString filename ) | 2557 | bool CalendarView::saveCalendar( QString filename ) |
2559 | { | 2558 | { |
2560 | 2559 | ||
2561 | // Store back all unsaved data into calendar object | 2560 | // Store back all unsaved data into calendar object |
2562 | // qDebug("file %s %d ", filename.latin1() , mViewManager->currentView() ); | 2561 | // qDebug("file %s %d ", filename.latin1() , mViewManager->currentView() ); |
2563 | if ( mViewManager->currentView() ) | 2562 | if ( mViewManager->currentView() ) |
2564 | mViewManager->currentView()->flushView(); | 2563 | mViewManager->currentView()->flushView(); |
2565 | 2564 | ||
2566 | 2565 | ||
2567 | QDateTime lfv = QDateTime::currentDateTime().addSecs( -2); | 2566 | QDateTime lfv = QDateTime::currentDateTime().addSecs( -2); |
2568 | mStorage->setSaveFormat( new ICalFormat() ); | 2567 | mStorage->setSaveFormat( new ICalFormat() ); |
2569 | mStorage->setFileName( filename ); | 2568 | mStorage->setFileName( filename ); |
2570 | bool success; | 2569 | bool success; |
2571 | success = mStorage->save(); | 2570 | success = mStorage->save(); |
2572 | if ( !success ) { | 2571 | if ( !success ) { |
2573 | return false; | 2572 | return false; |
2574 | } | 2573 | } |