-rw-r--r-- | korganizer/calendarview.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 70a1d2d..678143d 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -474,6 +474,7 @@ void CalendarView::init() | |||
474 | connect( mCalEditView, SIGNAL( removeCalendar(int) ),mCalendar, SLOT( setCalendarRemove(int)) ); | 474 | connect( mCalEditView, SIGNAL( removeCalendar(int) ),mCalendar, SLOT( setCalendarRemove(int)) ); |
475 | connect( mCalEditView, SIGNAL( calendarAdded(int) ),this, SLOT( addCalendarId(int)) ); | 475 | connect( mCalEditView, SIGNAL( calendarAdded(int) ),this, SLOT( addCalendarId(int)) ); |
476 | connect( mCalEditView, SIGNAL( needsUpdate() ),this, SLOT( updateView()) ); | 476 | connect( mCalEditView, SIGNAL( needsUpdate() ),this, SLOT( updateView()) ); |
477 | connect( mCalEditView, SIGNAL( checkCalendar() ),this, SLOT( checkFiles() )); | ||
477 | connect( mCalEditView, SIGNAL( needsUpdate() ),this, SLOT( updateUnmanagedViews()) ); | 478 | connect( mCalEditView, SIGNAL( needsUpdate() ),this, SLOT( updateUnmanagedViews()) ); |
478 | 479 | ||
479 | mTodoList->setNavigator( mNavigator ); | 480 | mTodoList->setNavigator( mNavigator ); |
@@ -681,10 +682,8 @@ void CalendarView::scrollBarValue(int val ) | |||
681 | #endif | 682 | #endif |
682 | 683 | ||
683 | } | 684 | } |
684 | 685 | void CalendarView::checkFiles() | |
685 | void CalendarView::checkAlarms() | ||
686 | { | 686 | { |
687 | |||
688 | QString message; | 687 | QString message; |
689 | QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars; | 688 | QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars; |
690 | KopiCalendarFile * cal = calendars.first(); | 689 | KopiCalendarFile * cal = calendars.first(); |
@@ -695,9 +694,15 @@ void CalendarView::checkAlarms() | |||
695 | cal = calendars.next(); | 694 | cal = calendars.next(); |
696 | } | 695 | } |
697 | if ( !message.isEmpty() ) { | 696 | 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); | 697 | 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); |
699 | KMessageBox::error(this,message); | 698 | KMessageBox::error(this,message, i18n("Loding of calendar(s) failed")); |
700 | } | 699 | } |
700 | QTimer::singleShot( 2000, this, SLOT ( checkAlarms() )); | ||
701 | } | ||
702 | void CalendarView::checkAlarms() | ||
703 | { | ||
704 | |||
705 | |||
701 | KConfig *config = KOGlobals::config(); | 706 | KConfig *config = KOGlobals::config(); |
702 | config->setGroup( "AppRun" ); | 707 | config->setGroup( "AppRun" ); |
703 | QDateTime dt ( QDate (2005,1,1), QTime( 0,0,0 ) ); | 708 | QDateTime dt ( QDate (2005,1,1), QTime( 0,0,0 ) ); |