-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 | |||
@@ -476,2 +476,3 @@ void CalendarView::init() | |||
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()) ); |
@@ -683,6 +684,4 @@ void CalendarView::scrollBarValue(int val ) | |||
683 | } | 684 | } |
684 | 685 | void CalendarView::checkFiles() | |
685 | void CalendarView::checkAlarms() | ||
686 | { | 686 | { |
687 | |||
688 | QString message; | 687 | QString message; |
@@ -697,5 +696,11 @@ void CalendarView::checkAlarms() | |||
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")); |
699 | } | ||
700 | QTimer::singleShot( 2000, this, SLOT ( checkAlarms() )); | ||
700 | } | 701 | } |
702 | void CalendarView::checkAlarms() | ||
703 | { | ||
704 | |||
705 | |||
701 | KConfig *config = KOGlobals::config(); | 706 | KConfig *config = KOGlobals::config(); |
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h index c9e9870..651194b 100644 --- a/korganizer/calendarview.h +++ b/korganizer/calendarview.h | |||
@@ -203,2 +203,3 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser | |||
203 | void checkAlarms(); | 203 | void checkAlarms(); |
204 | void checkFiles(); | ||
204 | void slotprintSelInc(); | 205 | void slotprintSelInc(); |
diff --git a/korganizer/kofilterview.cpp b/korganizer/kofilterview.cpp index 3cde103..20118aa 100644 --- a/korganizer/kofilterview.cpp +++ b/korganizer/kofilterview.cpp | |||
@@ -217,2 +217,3 @@ void KOCalEditView::infoCal( int id ) | |||
217 | QTimer::singleShot( 0, this, SLOT ( readConfig() ) ); | 217 | QTimer::singleShot( 0, this, SLOT ( readConfig() ) ); |
218 | QTimer::singleShot( 100, this, SIGNAL ( checkCalendar() ) ); | ||
218 | } | 219 | } |
@@ -381,2 +382,3 @@ void KOCalEditView::addCal() | |||
381 | addCalendar ( name, file ); | 382 | addCalendar ( name, file ); |
383 | QTimer::singleShot( 100, this, SIGNAL ( checkCalendar() ) ); | ||
382 | } | 384 | } |
diff --git a/korganizer/kofilterview.h b/korganizer/kofilterview.h index 54fe2c5..02107cf 100644 --- a/korganizer/kofilterview.h +++ b/korganizer/kofilterview.h | |||
@@ -235,2 +235,3 @@ class KOCalEditView : public QScrollView | |||
235 | void needsUpdate(); | 235 | void needsUpdate(); |
236 | void checkCalendar(); | ||
236 | 237 | ||
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index b797d8c..501eed5 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -400,7 +400,4 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) : | |||
400 | //toggleBeamReceive(); | 400 | //toggleBeamReceive(); |
401 | int tiint= 3000; | 401 | |
402 | #ifndef DESKTOP_VERSION | 402 | QTimer::singleShot( 1000, mView, SLOT ( checkFiles() )); |
403 | tiint = 5000; | ||
404 | #endif | ||
405 | QTimer::singleShot( tiint, mView, SLOT ( checkAlarms() )); | ||
406 | } | 403 | } |