5 files changed, 16 insertions, 10 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 70a1d2d..678143d 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -471,12 +471,13 @@ void CalendarView::init()
     connect( mCalEditView, SIGNAL( calendarReadonly(int,bool) ),mCalendar, SLOT( setReadOnly(int,bool)) );
     connect( mCalEditView, SIGNAL( setCalendarDefault(int) ),mCalendar, SLOT( setDefaultCalendar(int)) );
     connect( mCalEditView, SIGNAL( setCalendarDefault(int) ),mViewManager, SLOT( setDefaultCalendar(int)) );
     connect( mCalEditView, SIGNAL( removeCalendar(int) ),mCalendar, SLOT( setCalendarRemove(int)) );
     connect( mCalEditView, SIGNAL( calendarAdded(int) ),this, SLOT( addCalendarId(int)) );
     connect( mCalEditView, SIGNAL( needsUpdate() ),this, SLOT( updateView()) );
+    connect( mCalEditView, SIGNAL( checkCalendar() ),this, SLOT( checkFiles()  ));
     connect( mCalEditView, SIGNAL( needsUpdate() ),this, SLOT( updateUnmanagedViews()) );
    
     mTodoList->setNavigator( mNavigator );
 #if 0
     if (  QApplication::desktop()->width() < 480 ) {
         leftFrameLayout->addWidget(mFilterView);
@@ -678,29 +679,33 @@ void CalendarView::scrollBarValue(int val )
     QDate d ( year,1,1 );
     mNavigator->selectDates( d.addDays( val ), count );
     block = false;
 #endif
 
 }
-
-void CalendarView::checkAlarms()
+void CalendarView::checkFiles()
 {
-
     QString message;
     QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
     KopiCalendarFile * cal = calendars.first();
     while ( cal ) {
         if (  cal->mErrorOnLoad ) {
             message +=  cal->mName +"\n"+KGlobal::formatMessage ( "(" +i18n( "Filepath: ")+ cal->mFileName+")" ,0 )+"\n";
         }
         cal = calendars.next();
     }
     if ( !message.isEmpty() ) {
-        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); 
-        KMessageBox::error(this,message);
+        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"));
     }
+    QTimer::singleShot( 2000, this, SLOT ( checkAlarms() ));
+}
+void CalendarView::checkAlarms()
+{
+
+   
     KConfig *config = KOGlobals::config();
     config->setGroup( "AppRun" );
     QDateTime dt ( QDate (2005,1,1), QTime( 0,0,0 ) );
     int daysto = dt.daysTo( QDate::currentDate() );
     int days = config->readNumEntry( "LatestProgramStopDays" , daysto);
     dt =  dt.addDays( days );
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index c9e9870..651194b 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -198,12 +198,13 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
     void updateSearchDialog();
     void filtersUpdated();
 
 
   public slots:
     void checkAlarms();
+    void checkFiles();
     void slotprintSelInc();
     void showNextAlarms();
     void showOpenError();
     void watchSavedFile();
     void recheckTimerAlarm();
     void checkNextTimerAlarm();
diff --git a/korganizer/kofilterview.cpp b/korganizer/kofilterview.cpp
index 3cde103..20118aa 100644
--- a/korganizer/kofilterview.cpp
+++ b/korganizer/kofilterview.cpp
@@ -212,12 +212,13 @@ void KOCalEditView::infoCal( int id )
     QString file = KGlobal::formatMessage ( KOPrefs::instance()->getCalendar( id )->mFileName, 0 );
     if ( KOPrefs::instance()->getCalendar( id )->mErrorOnLoad ) {
         if (  KMessageBox::Yes == KMessageBox::questionYesNo( this,  i18n("The calendar <b>%1</b> is not loaded! Loading of file <b>%2</b> failed! <b>Try again to load the calendar?</b>").arg(name).arg(file) ) ) {
             emit calendarAdded( id );
             emit needsUpdate();
             QTimer::singleShot( 0, this, SLOT ( readConfig() ) ); 
+            QTimer::singleShot( 100, this, SIGNAL ( checkCalendar() ) ); 
         }
     }
     else
         KMessageBox::information( this,  i18n("The calendar <b>%1</b> is displaying file <b>%2</b>").arg(name).arg(file) );
 }
 void KOCalEditView::readConfig() 
@@ -376,12 +377,13 @@ void KOCalEditView::addCal()
                 break;
             }
             kkf = KOPrefs::instance()->mCalendars.next();
         }
     }
     addCalendar ( name, file );
+    QTimer::singleShot( 100, this, SIGNAL ( checkCalendar() ) ); 
 }
 int KOCalEditView::addCalendar( QString name, QString file, bool ask )
 {
   
     QFileInfo fi ( file );
     if (!fi.exists() ) {
diff --git a/korganizer/kofilterview.h b/korganizer/kofilterview.h
index 54fe2c5..02107cf 100644
--- a/korganizer/kofilterview.h
+++ b/korganizer/kofilterview.h
@@ -230,12 +230,13 @@ class KOCalEditView : public QScrollView
     void calendarEnabled ( int cal, bool enable );
     void calendarReadonly ( int cal, bool readonly );
     void setCalendarDefault ( int cal );
     void removeCalendar ( int cal );
     void calendarAdded( int );
     void needsUpdate();
+    void checkCalendar();
 
   private:
     QWidget *mw;
     void toggleList ( QPtrList<KOCalCheckButton> );
     QPtrList<KOCalRadioButton> mStdandardB;
     QPtrList<KOCalCheckButton> mEnabledB;
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index b797d8c..501eed5 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -395,17 +395,14 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) :
     updateFilterToolbar();
     updateWeek( mView->startDate() );
     connect( mView->dateNavigator(), SIGNAL( datesSelected( const KCal::DateList & ) ),
              SLOT( updateWeekNum( const KCal::DateList & ) ) );
     mBRdisabled = false;
     //toggleBeamReceive();
-    int tiint= 3000;
-#ifndef DESKTOP_VERSION
-    tiint = 5000;
-#endif
-    QTimer::singleShot( tiint, mView, SLOT ( checkAlarms() ));
+
+    QTimer::singleShot( 1000, mView, SLOT ( checkFiles() ));
 }
 MainWindow::~MainWindow()
 {
     //qDebug("MainWindow::~MainWindow() ");
     //save toolbar location
     delete mCalendar;