summaryrefslogtreecommitdiffabout
path: root/korganizer
authorzautrix <zautrix>2005-07-01 18:39:59 (UTC)
committer zautrix <zautrix>2005-07-01 18:39:59 (UTC)
commitc53efbe8f53f468d21d93f5e19b625d1a4beb242 (patch) (side-by-side diff)
treef8fe2180733b6bd3514c02845cefa9f26e967e27 /korganizer
parent98d29d15275c4b8e9a3348742925f6e6d03f7a07 (diff)
downloadkdepimpi-c53efbe8f53f468d21d93f5e19b625d1a4beb242.zip
kdepimpi-c53efbe8f53f468d21d93f5e19b625d1a4beb242.tar.gz
kdepimpi-c53efbe8f53f468d21d93f5e19b625d1a4beb242.tar.bz2
fixxx
Diffstat (limited to 'korganizer') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/calendarview.cpp15
-rw-r--r--korganizer/calendarview.h1
-rw-r--r--korganizer/kofilterview.cpp2
-rw-r--r--korganizer/kofilterview.h1
-rw-r--r--korganizer/mainwindow.cpp7
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
@@ -473,8 +473,9 @@ void CalendarView::init()
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
@@ -680,12 +681,10 @@ void CalendarView::scrollBarValue(int val )
block = false;
#endif
}
-
-void CalendarView::checkAlarms()
+void CalendarView::checkFiles()
{
-
QString message;
QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
KopiCalendarFile * cal = calendars.first();
while ( cal ) {
@@ -694,11 +693,17 @@ 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 ) );
int daysto = dt.daysTo( QDate::currentDate() );
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index c9e9870..651194b 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -200,8 +200,9 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
public slots:
void checkAlarms();
+ void checkFiles();
void slotprintSelInc();
void showNextAlarms();
void showOpenError();
void watchSavedFile();
diff --git a/korganizer/kofilterview.cpp b/korganizer/kofilterview.cpp
index 3cde103..20118aa 100644
--- a/korganizer/kofilterview.cpp
+++ b/korganizer/kofilterview.cpp
@@ -214,8 +214,9 @@ void KOCalEditView::infoCal( int id )
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) );
@@ -378,8 +379,9 @@ void KOCalEditView::addCal()
kkf = KOPrefs::instance()->mCalendars.next();
}
}
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
@@ -232,8 +232,9 @@ class KOCalEditView : public QScrollView
void setCalendarDefault ( int cal );
void removeCalendar ( int cal );
void calendarAdded( int );
void needsUpdate();
+ void checkCalendar();
private:
QWidget *mw;
void toggleList ( QPtrList<KOCalCheckButton> );
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index b797d8c..501eed5 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -397,13 +397,10 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) :
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() ");