| -rw-r--r-- | korganizer/calendarview.cpp | 15 | ||||
| -rw-r--r-- | korganizer/calendarview.h | 1 | ||||
| -rw-r--r-- | korganizer/kofilterview.cpp | 2 | ||||
| -rw-r--r-- | korganizer/kofilterview.h | 1 | ||||
| -rw-r--r-- | korganizer/mainwindow.cpp | 7 |
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 @@ -474,6 +474,7 @@ void CalendarView::init() 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 ); @@ -681,10 +682,8 @@ void CalendarView::scrollBarValue(int val ) #endif } - -void CalendarView::checkAlarms() +void CalendarView::checkFiles() { - QString message; QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars; KopiCalendarFile * cal = calendars.first(); @@ -695,9 +694,15 @@ void CalendarView::checkAlarms() 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 ) ); diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h index c9e9870..651194b 100644 --- a/korganizer/calendarview.h +++ b/korganizer/calendarview.h @@ -201,6 +201,7 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser public slots: void checkAlarms(); + void checkFiles(); void slotprintSelInc(); void showNextAlarms(); void showOpenError(); diff --git a/korganizer/kofilterview.cpp b/korganizer/kofilterview.cpp index 3cde103..20118aa 100644 --- a/korganizer/kofilterview.cpp +++ b/korganizer/kofilterview.cpp @@ -215,6 +215,7 @@ void KOCalEditView::infoCal( int id ) emit calendarAdded( id ); emit needsUpdate(); QTimer::singleShot( 0, this, SLOT ( readConfig() ) ); + QTimer::singleShot( 100, this, SIGNAL ( checkCalendar() ) ); } } else @@ -379,6 +380,7 @@ void KOCalEditView::addCal() } } addCalendar ( name, file ); + QTimer::singleShot( 100, this, SIGNAL ( checkCalendar() ) ); } int KOCalEditView::addCalendar( QString name, QString file, bool ask ) { diff --git a/korganizer/kofilterview.h b/korganizer/kofilterview.h index 54fe2c5..02107cf 100644 --- a/korganizer/kofilterview.h +++ b/korganizer/kofilterview.h @@ -233,6 +233,7 @@ class KOCalEditView : public QScrollView void removeCalendar ( int cal ); void calendarAdded( int ); void needsUpdate(); + void checkCalendar(); private: QWidget *mw; diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index b797d8c..501eed5 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp @@ -398,11 +398,8 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) : 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() { |