author | zautrix <zautrix> | 2005-07-26 14:26:36 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-07-26 14:26:36 (UTC) |
commit | e1d72bb77c51ff7313b390f263bc1f10d20123b0 (patch) (unidiff) | |
tree | 35f6cb7936a6e05914bdb9329ece3143c8c9a2f7 /korganizer/kofilterview.cpp | |
parent | 08f8edb64a919e51ad6e1a62031569a629cffa0f (diff) | |
download | kdepimpi-e1d72bb77c51ff7313b390f263bc1f10d20123b0.zip kdepimpi-e1d72bb77c51ff7313b390f263bc1f10d20123b0.tar.gz kdepimpi-e1d72bb77c51ff7313b390f263bc1f10d20123b0.tar.bz2 |
fixx
-rw-r--r-- | korganizer/kofilterview.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/korganizer/kofilterview.cpp b/korganizer/kofilterview.cpp index 7ce3f1f..6a6fff9 100644 --- a/korganizer/kofilterview.cpp +++ b/korganizer/kofilterview.cpp | |||
@@ -365,7 +365,7 @@ void KOCalEditView::defaultInfo() | |||
365 | void KOCalEditView::addCal() | 365 | void KOCalEditView::addCal() |
366 | { | 366 | { |
367 | bool tryagain = true; | 367 | bool tryagain = true; |
368 | QString name, file; | 368 | QString name, file = KGlobalSettings::calendarDir()+"newCal.ics"; |
369 | while ( tryagain ) { | 369 | while ( tryagain ) { |
370 | KONewCalPrefs prefs ( this ); | 370 | KONewCalPrefs prefs ( this ); |
371 | prefs.nameE->setText( name ); | 371 | prefs.nameE->setText( name ); |
@@ -386,14 +386,18 @@ void KOCalEditView::addCal() | |||
386 | if ( kkf->mFileName == file ) { | 386 | if ( kkf->mFileName == file ) { |
387 | KMessageBox::information( this, i18n("Sorry, the file \n%1\nis already loaded!\nPlease choose another file!").arg( KGlobal::formatMessage (file, 0 )) ); | 387 | KMessageBox::information( this, i18n("Sorry, the file \n%1\nis already loaded!\nPlease choose another file!").arg( KGlobal::formatMessage (file, 0 )) ); |
388 | tryagain = true; | 388 | tryagain = true; |
389 | file = ""; | 389 | file = KGlobalSettings::calendarDir()+"newCal.ics"; |
390 | break; | 390 | break; |
391 | } | 391 | } |
392 | kkf = KOPrefs::instance()->mCalendars.next(); | 392 | kkf = KOPrefs::instance()->mCalendars.next(); |
393 | } | ||
394 | QFileInfo fi ( file ); | ||
395 | if ( fi.isDir() ) { | ||
396 | tryagain = true; | ||
393 | } | 397 | } |
394 | } | 398 | } |
395 | addCalendar ( name, file ); | 399 | addCalendar ( name, file ); |
396 | QTimer::singleShot( 100, this, SIGNAL ( checkCalendar() ) ); | 400 | QTimer::singleShot( 100, this, SIGNAL ( checkCalendar() ) ); |
397 | } | 401 | } |
398 | int KOCalEditView::addCalendar( QString name, QString file, bool ask ) | 402 | int KOCalEditView::addCalendar( QString name, QString file, bool ask ) |
399 | { | 403 | { |