-rw-r--r-- | korganizer/calendarview.cpp | 4 | ||||
-rw-r--r-- | korganizer/koagenda.cpp | 1 | ||||
-rw-r--r-- | korganizer/kotodoview.cpp | 3 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 4 |
4 files changed, 8 insertions, 4 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 7566c6f..4b3f806 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -3998,10 +3998,8 @@ void CalendarView::processTodoListSelection( Incidence *incidence ) void CalendarView::processIncidenceSelection( Incidence *incidence ) { + emit incidenceSelected( incidence ); if ( incidence == mSelectedIncidence ) return; - mSelectedIncidence = incidence; - emit incidenceSelected( mSelectedIncidence ); - if ( incidence && incidence->typeID() == eventID ) { Event *event = static_cast<Event *>( incidence ); diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp index 92c1cd6..acdf5a0 100644 --- a/korganizer/koagenda.cpp +++ b/korganizer/koagenda.cpp @@ -155,5 +155,4 @@ void MarcusBains::updateLocation(bool recalculate) //mTimeBox->setAutoMask(true); int secs = QTime::currentTime().second(); - qDebug("second %d ", secs ); minutes->start( (60 - secs +1)*1000 ,true); } diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp index 86e1bd9..a87e6fc 100644 --- a/korganizer/kotodoview.cpp +++ b/korganizer/kotodoview.cpp @@ -1155,4 +1155,5 @@ void KOTodoView::setNewPriority(int index) mActiveItem->todo()->setRevision( mActiveItem->todo()->revision()+1 ); } + processSelectionChange(); } @@ -1163,4 +1164,5 @@ void KOTodoView::setNewPercentage(int index) if ( mPercentage[index] == 100 && !mActiveItem->isOn() ) { mActiveItem->setOn( true ); + processSelectionChange(); return; } else if ( mPercentage[index] != 100 && mActiveItem->isOn() ) { @@ -1179,4 +1181,5 @@ void KOTodoView::setNewPercentage(int index) mActiveItem->todo()->setRevision( mActiveItem->todo()->revision()+1 ); } + processSelectionChange(); } diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 88dbd4f..cbf6096 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp @@ -1683,6 +1683,10 @@ void MainWindow::processIncidenceSelection( Incidence *incidence ) } } + else { + if ( (( KCal::Todo*)incidence)->percentComplete() == 100 ) + startString = i18n(": (Prio ") +QString::number( (( KCal::Todo*)incidence)->priority() ) +") "+i18n("completed on %1").arg( (( KCal::Todo*)incidence)->completedStr(true) ); else startString = i18n(": (Prio ") +QString::number( (( KCal::Todo*)incidence)->priority() ) +") "+QString::number( (( KCal::Todo*)incidence)->percentComplete() ) +i18n("\% completed"); + } if ( !incidence->location().isEmpty() ) startString += " (" +incidence->location()+")"; |