2 files changed, 11 insertions, 6 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 9674921..3ab4bb4 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -714,65 +714,65 @@ void CalendarView::nextConflict( bool all, bool allday )
                                 cE = test;
                                 cE2 = test2;
                                 found = true;
                             }
                         } else {
                             if ( retVal >= startDT && retVal < conflict ) {
                                 conflict = retVal; 
                                 cE = test;
                                 cE2 = test2;
                             }
                         }
                     }
                 }
                 test2 = testlist2.next();
             }
         }
         test->setTagged( true );
         test = testlist.next();
     }
     //qDebug("Search time : %d", tm.elapsed());
     if ( found ) {
         if ( mViewManager->currentView() != mViewManager->agendaView() || mNavigator->selectedDates().count() > 1 )
             mViewManager->showDayView();
         mNavigator->slotDaySelect( conflict.date() );
         int hour = conflict.time().hour();
         mViewManager->agendaView()->setStartHour( hour  );
         topLevelWidget()->setCaption( i18n("Conflict %1 <-> %2"). arg( cE->summary().left( 20 ) ).arg( cE2->summary().left( 20 ) ) );
         block = false;
         return;
     }
 
     topLevelWidget()->setCaption( i18n("No conflict found") );
-    qDebug("No conflict found ");
+    //qDebug("No conflict found ");
     block = false;
     return;
 }
 
 void CalendarView::conflictAll()
 {
     nextConflict ( true, true );
 }
 void CalendarView::conflictAllday()
 {
     nextConflict ( false, true );
 }
 void CalendarView::conflictNotAll()
 {
     nextConflict ( false, false );
 }
 
 void CalendarView::setCalReadOnly( int id, bool readO )
 {
     if ( readO ) {
         emit save();
     }
     mCalendar->setReadOnly( id, readO );   
 }
 void CalendarView::setScrollBarStep(int val )
 {
 #ifdef DESKTOP_VERSION
     mDateScrollBar->setLineStep ( val );
 #endif
 }
 void CalendarView::scrollBarValue(int val )
 {
@@ -2799,72 +2799,73 @@ void CalendarView::checkConflictForEvent()
         return;
     }
     QPtrList<Event> testlist = mCalendar->events();
     Event * test = testlist.first();
     QDateTime conflict;
     QDateTime retVal;
     bool found = false;
     Event * cE = 0;
     topLevelWidget()->setCaption( i18n("Checking conflicts ... please wait") );
     while ( test ) {
         qApp->processEvents(); 
         bool skip = false;
         if ( found )
             skip =  !test->matchTime( &current, &conflict );
         else 
             skip =  !test->matchTime( &current, 0 ); 
         if ( !skip && !test->doesFloat() ) {
             if ( mConflictingEvent->isOverlapping ( test, &retVal, &current ) ) {
                 if ( ! found ) {
                     conflict = retVal; 
                     cE = test;
                 } else {
                     if ( retVal < conflict ) {
                         conflict = retVal; 
                         cE = test;
                     }
                 }
                 found = true;
             }
         }
         test = testlist.next();
     }
+    topLevelWidget()->setCaption( i18n("KO/Pi") );
     if ( found ) {
         QString mess = i18n("The event\n%1\nconflicts with event\n%2\nat date\n%3.\n").arg(KGlobal::formatMessage ( mConflictingEvent->summary(),0 ) ).arg( KGlobal::formatMessage ( cE->summary(),0 )).arg(KGlobal::locale()->formatDate(conflict.date()) ) ;
         qApp->processEvents();
         int km = KMessageBox::warningContinueCancel(this,mess,
                                                     i18n("KO/Pi Conflict delected"),i18n("Show date"),i18n("No problem!"));
-        if ( km != KMessageBox::Continue )
+        if ( km != KMessageBox::Continue ) {
             return;
-
+        }
         if ( mViewManager->currentView() != mViewManager->agendaView() || mNavigator->selectedDates().count() > 1 )
             mViewManager->showDayView();
         mNavigator->slotDaySelect( conflict.date() );
         int hour = conflict.time().hour();
         mViewManager->agendaView()->setStartHour( hour  );
         topLevelWidget()->setCaption( i18n("Conflict %1 <-> %2"). arg( mConflictingEvent->summary().left( 20 ) ).arg( cE->summary().left( 20 ) ) );
     } else
         topLevelWidget()->setCaption( i18n("No conflict found") );
     mConflictingEvent = 0;
     return;
    
 }
 
 void CalendarView::updateTodoViews()
 {
     mTodoList->updateView();
     mViewManager->currentView()->updateView();
  
 }
 
 
 
 void CalendarView::clearAllViews()
 {
     mTodoList->clearList();
     mViewManager->clearAllViews();
     SearchDialog * sd = mDialogManager->getSearchDialog();
     if ( sd ) {
         KOListView* kol = sd->listview();
         if ( kol )
             kol->clearList();
     }
diff --git a/korganizer/kofilterview.cpp b/korganizer/kofilterview.cpp
index 7ce3f1f..6a6fff9 100644
--- a/korganizer/kofilterview.cpp
+++ b/korganizer/kofilterview.cpp
@@ -336,93 +336,97 @@ void KOCalEditView::readConfig()
         if ( row > 1) {
             KColorButton *colb = new KColorButton( mw );
             mainLayout->addWidget( colb,row,++iii );
             colb->setID( kkf->mCalNumber );
             colb->setColor( kkf->mDefaultColor );
             connect (colb, SIGNAL (changedID(const QColor&, int )), SLOT ( setColor(const QColor&,int) ) );
             KOCalButton* calb = new KOCalButton( mw );
             mainLayout->addWidget( calb,row,++iii );
             calb->setNum( kkf->mCalNumber );
             calb->setPixmap ( SmallIcon("minus"));
             connect (calb, SIGNAL (selectNum(int)), SLOT ( deleteCal(int) ) );
             int hei = calb->sizeHint().height();
             //calb->setMaximumSize( hei*9/10, hei*9/10 );
         }
         ++row;
         kkf = KOPrefs::instance()->mCalendars.next();
     }
     if ( errorLoadStandard ) 
         findNewStandard();
     lab = new QLabel (  "", mw );
     mainLayout->addWidget( lab,row,0 );
     mw->show();
 
 }
 
 void KOCalEditView::defaultInfo()
 {
     KMessageBox::information( this,  i18n("Please choose the <b>default calendar</b> in this column. Newly created or imported items are added to the default calendar.") ); 
 }
 void KOCalEditView::addCal()
 {
     bool tryagain = true;
-    QString name, file;
+    QString name, file = KGlobalSettings::calendarDir()+"newCal.ics";
     while ( tryagain ) {
         KONewCalPrefs prefs ( this ); 
         prefs.nameE->setText( name );
         prefs.url->setURL( file );
         if ( !  prefs.exec() )
             return;
         name = prefs.calName();
         file = prefs.calFileName();
         tryagain = false;
         KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first();
         while ( kkf ) {
             if ( kkf->mName == name ) {
                 KMessageBox::information( this,  i18n("Sorry, the calendar name \n%1\nalready exists!\nPlease choose another name!").arg( name ) ); 
                 name = "";
                 tryagain = true;  
                 break;
             }
             if ( kkf->mFileName == file ) {
                 KMessageBox::information( this,  i18n("Sorry, the file \n%1\nis already loaded!\nPlease choose another file!").arg(  KGlobal::formatMessage (file, 0 )) ); 
                 tryagain = true;  
-                file = "";
+                file = KGlobalSettings::calendarDir()+"newCal.ics";
                 break;
             }
             kkf = KOPrefs::instance()->mCalendars.next();
+        } 
+        QFileInfo fi ( file );
+        if ( fi.isDir() ) {
+            tryagain = true;  
         }
     }
     addCalendar ( name, file );
-    QTimer::singleShot( 100, this, SIGNAL ( checkCalendar() ) ); 
+    QTimer::singleShot( 100, this, SIGNAL ( checkCalendar() ) );
 }
 int KOCalEditView::addCalendar( QString name, QString file, bool ask )
 {
   
     QFileInfo fi ( file );
     QString absFile = file;
     bool isRelative = false;
     if ( fi.isRelative() ) {
         isRelative = true; 
         absFile = KGlobalSettings::calendarDir()+file;
         fi.setFile( absFile );
     } else {
         QString cd = KGlobalSettings::calendarDir();
         if (  file.left( cd.length() ) ==  cd ) {
             isRelative = true; 
             file = fi.fileName ();
             fi.setFile( absFile );
         }
     }
     if (!fi.exists() ) {
         if ( ask )
             if ( KMessageBox::questionYesNo(this, i18n("The file\n%1\ndoes not exist!\nShall I create it for you?").arg( KGlobal::formatMessage (absFile,0) ) )== KMessageBox::No )
                 return 0;
         QFile fileIn( absFile );
         if (!fileIn.open( IO_WriteOnly ) ) {
             KMessageBox::sorry( this,  i18n("Sorry, cannot create the file\n%1!\nNo calendar added!").arg( file ) ); 
             return 0;
         } 
         QTextStream tsIn( &fileIn );
         tsIn.setCodec( QTextCodec::codecForName("utf8") );
         tsIn << "BEGIN:VCALENDAR\nPRODID:-//KDE-Pim//Platform-independent 2.1.0\nVERSION:2.0\nEND:VCALENDAR\n";
         fileIn.close();