author | zautrix <zautrix> | 2005-07-26 14:26:36 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-07-26 14:26:36 (UTC) |
commit | e1d72bb77c51ff7313b390f263bc1f10d20123b0 (patch) (side-by-side diff) | |
tree | 35f6cb7936a6e05914bdb9329ece3143c8c9a2f7 /korganizer/calendarview.cpp | |
parent | 08f8edb64a919e51ad6e1a62031569a629cffa0f (diff) | |
download | kdepimpi-e1d72bb77c51ff7313b390f263bc1f10d20123b0.zip kdepimpi-e1d72bb77c51ff7313b390f263bc1f10d20123b0.tar.gz kdepimpi-e1d72bb77c51ff7313b390f263bc1f10d20123b0.tar.bz2 |
fixx
-rw-r--r-- | korganizer/calendarview.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 9674921..3ab4bb4 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -743,7 +743,7 @@ void CalendarView::nextConflict( bool all, bool allday ) } topLevelWidget()->setCaption( i18n("No conflict found") ); - qDebug("No conflict found "); + //qDebug("No conflict found "); block = false; return; } @@ -2828,14 +2828,15 @@ 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() ); |