| -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 | 8 |
4 files changed, 10 insertions, 6 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 7566c6f..4b3f806 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -3999,8 +3999,6 @@ void CalendarView::processIncidenceSelection( Incidence *incidence ) { + emit incidenceSelected( incidence ); if ( incidence == mSelectedIncidence ) return; - mSelectedIncidence = incidence; - emit incidenceSelected( mSelectedIncidence ); - if ( incidence && incidence->typeID() == eventID ) { diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp index 92c1cd6..acdf5a0 100644 --- a/korganizer/koagenda.cpp +++ b/korganizer/koagenda.cpp @@ -156,3 +156,2 @@ void MarcusBains::updateLocation(bool recalculate) 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 @@ -1156,2 +1156,3 @@ void KOTodoView::setNewPriority(int index) } + processSelectionChange(); } @@ -1164,2 +1165,3 @@ void KOTodoView::setNewPercentage(int index) mActiveItem->setOn( true ); + processSelectionChange(); return; @@ -1180,2 +1182,3 @@ void KOTodoView::setNewPercentage(int index) } + processSelectionChange(); } diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 88dbd4f..cbf6096 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp @@ -1684,4 +1684,8 @@ void MainWindow::processIncidenceSelection( Incidence *incidence ) } - else - startString = i18n(": (Prio ") +QString::number( (( KCal::Todo*)incidence)->priority() ) +") "+QString::number( (( KCal::Todo*)incidence)->percentComplete() ) +i18n("\% completed"); + 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() ) |