summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/calendarview.cpp7
-rw-r--r--korganizer/kofilterview.cpp10
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
@@ -742,9 +742,9 @@ void CalendarView::nextConflict( bool all, bool allday )
return;
}
topLevelWidget()->setCaption( i18n("No conflict found") );
- qDebug("No conflict found ");
+ //qDebug("No conflict found ");
block = false;
return;
}
@@ -2827,16 +2827,17 @@ void CalendarView::checkConflictForEvent()
}
}
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();
diff --git a/korganizer/kofilterview.cpp b/korganizer/kofilterview.cpp
index 7ce3f1f..6a6fff9 100644
--- a/korganizer/kofilterview.cpp
+++ b/korganizer/kofilterview.cpp
@@ -364,9 +364,9 @@ void KOCalEditView::defaultInfo()
}
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 );
@@ -385,16 +385,20 @@ void KOCalEditView::addCal()
}
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 )
{