-rw-r--r-- | bin/kdepim/WhatsNew.txt | 2 | ||||
-rw-r--r-- | korganizer/calendarview.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt index fd5e4f9..944ee1e 100644 --- a/bin/kdepim/WhatsNew.txt +++ b/bin/kdepim/WhatsNew.txt | |||
@@ -1,23 +1,25 @@ | |||
1 | Info about the changes in new versions of KDE-Pim/Pi | 1 | Info about the changes in new versions of KDE-Pim/Pi |
2 | 2 | ||
3 | ********** VERSION 2.2.1 ************ | 3 | ********** VERSION 2.2.1 ************ |
4 | 4 | ||
5 | KO/Pi: | 5 | KO/Pi: |
6 | Fixed a problem displaying very long allday events in agenda view in single day mode. | 6 | Fixed a problem displaying very long allday events in agenda view in single day mode. |
7 | Fixed a problem with the default settings for new todos. | 7 | Fixed a problem with the default settings for new todos. |
8 | Added an error message dialog if saving of calendar files is not possible. | ||
9 | Made it impossible to close KO/Pi if saving fails. | ||
8 | 10 | ||
9 | KA/Pi: | 11 | KA/Pi: |
10 | Added a config option to turn on asking before a contact is deleted. | 12 | Added a config option to turn on asking before a contact is deleted. |
11 | Fixed a problem with the default view and view selection at startup. | 13 | Fixed a problem with the default view and view selection at startup. |
12 | Formatted name is now set on import, if formatted name is empty. | 14 | Formatted name is now set on import, if formatted name is empty. |
13 | 15 | ||
14 | ********** VERSION 2.2.0 ************ | 16 | ********** VERSION 2.2.0 ************ |
15 | 17 | ||
16 | New stable release! | 18 | New stable release! |
17 | Fixed some minor usability problems. | 19 | Fixed some minor usability problems. |
18 | Added writing of next alarm to a file for usage on pdaXrom. | 20 | Added writing of next alarm to a file for usage on pdaXrom. |
19 | 21 | ||
20 | 22 | ||
21 | ************************************* | 23 | ************************************* |
22 | 24 | ||
23 | You can find the complete changelog | 25 | You can find the complete changelog |
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index ca071b2..26323b1 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -2534,33 +2534,32 @@ bool CalendarView::saveCalendars() | |||
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 | ||