-rw-r--r-- | korganizer/calendarview.cpp | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index c0f3be7..fd026fa 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -684,6 +684,20 @@ void CalendarView::scrollBarValue(int val ) | |||
684 | 684 | ||
685 | void CalendarView::checkAlarms() | 685 | void CalendarView::checkAlarms() |
686 | { | 686 | { |
687 | |||
688 | QString message; | ||
689 | QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars; | ||
690 | KopiCalendarFile * cal = calendars.first(); | ||
691 | while ( cal ) { | ||
692 | if ( cal->mErrorOnLoad ) { | ||
693 | message += cal->mName +"\n"+KGlobal::formatMessage ( "(" +i18n( "Filepath: ")+ cal->mFileName+")" ,0 )+"\n"; | ||
694 | } | ||
695 | cal = calendars.next(); | ||
696 | } | ||
697 | if ( !message.isEmpty() ) { | ||
698 | message = KGlobal::formatMessage( i18n("The loading of one or more calendar failed:"),0 )+"\n" + message +KGlobal::formatMessage(i18n("You can try to reload the calendar in the Resource View!"),0); | ||
699 | KMessageBox::error(this,message); | ||
700 | } | ||
687 | KConfig *config = KOGlobals::config(); | 701 | KConfig *config = KOGlobals::config(); |
688 | config->setGroup( "AppRun" ); | 702 | config->setGroup( "AppRun" ); |
689 | QDateTime dt ( QDate (2005,1,1), QTime( 0,0,0 ) ); | 703 | QDateTime dt ( QDate (2005,1,1), QTime( 0,0,0 ) ); |
@@ -1923,6 +1937,7 @@ bool CalendarView::restoreCalendarSettings() | |||
1923 | void CalendarView::addCalendarId( int id ) | 1937 | void CalendarView::addCalendarId( int id ) |
1924 | { | 1938 | { |
1925 | KopiCalendarFile * cal = KOPrefs::instance()->getCalendar( id ); | 1939 | KopiCalendarFile * cal = KOPrefs::instance()->getCalendar( id ); |
1940 | if ( cal ) | ||
1926 | addCalendar( cal ); | 1941 | addCalendar( cal ); |
1927 | } | 1942 | } |
1928 | bool CalendarView::addCalendar( KopiCalendarFile * cal ) | 1943 | bool CalendarView::addCalendar( KopiCalendarFile * cal ) |
@@ -1932,8 +1947,7 @@ bool CalendarView::addCalendar( KopiCalendarFile * cal ) | |||
1932 | cal->mLoadDt = QDateTime::currentDateTime(); | 1947 | cal->mLoadDt = QDateTime::currentDateTime(); |
1933 | return true; | 1948 | return true; |
1934 | } | 1949 | } |
1935 | qDebug("KO: Error adding calendar file %1 ",cal->mFileName.latin1() ); | 1950 | qDebug("KO: Error adding calendar file %s ",cal->mFileName.latin1() ); |
1936 | KMessageBox::error(this,i18n("Error loading calendar file\n%1.").arg(cal->mFileName)); | ||
1937 | cal->mErrorOnLoad = true; | 1951 | cal->mErrorOnLoad = true; |
1938 | return false; | 1952 | return false; |
1939 | } | 1953 | } |