| -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 | ||||
| -rw-r--r-- | microkde/ofileselector_p.cpp | 4 |
5 files changed, 12 insertions, 8 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 7566c6f..4b3f806 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -3997,12 +3997,10 @@ 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 ); if ( event->organizer() == KOPrefs::instance()->email() ) { diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp index 92c1cd6..acdf5a0 100644 --- a/korganizer/koagenda.cpp +++ b/korganizer/koagenda.cpp @@ -154,7 +154,6 @@ void MarcusBains::updateLocation(bool recalculate) mTimeBox->raise(); //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 @@ -1154,6 +1154,7 @@ void KOTodoView::setNewPriority(int index) todoModified (mActiveItem->todo(), KOGlobals::PRIORITY_MODIFIED); mActiveItem->todo()->setRevision( mActiveItem->todo()->revision()+1 ); } + processSelectionChange(); } void KOTodoView::setNewPercentage(int index) @@ -1162,6 +1163,7 @@ void KOTodoView::setNewPercentage(int index) if ( mPercentage[index] == 100 && !mActiveItem->isOn() ) { mActiveItem->setOn( true ); + processSelectionChange(); return; } else if ( mPercentage[index] != 100 && mActiveItem->isOn() ) { KOTodoViewItem* par = (static_cast<KOTodoViewItem*>(mActiveItem->parent())); @@ -1178,6 +1180,7 @@ void KOTodoView::setNewPercentage(int index) todoModified (mActiveItem->todo (), KOGlobals::COMPLETION_MODIFIED); mActiveItem->todo()->setRevision( mActiveItem->todo()->revision()+1 ); } + processSelectionChange(); } void KOTodoView::fillCategories () diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 88dbd4f..cbf6096 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp @@ -1682,8 +1682,12 @@ void MainWindow::processIncidenceSelection( Incidence *incidence ) startString +=" "+KGlobal::locale()->formatDate( incidence->dtStart().date(), true); } } - 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() ) startString += " (" +incidence->location()+")"; setCaption( incidence->summary()+startString); diff --git a/microkde/ofileselector_p.cpp b/microkde/ofileselector_p.cpp index 488dee2..f4f112e 100644 --- a/microkde/ofileselector_p.cpp +++ b/microkde/ofileselector_p.cpp @@ -364,11 +364,11 @@ void OFileViewFileListView::reread( bool all ) { * */ if( fi->isSymLink() ){ - qDebug("SYMLINK "); + //qDebug("SYMLINK "); QString file = fi->readLink(); for( int i = 0; i<=5; i++) { // 5 tries to prevent dos QFileInfo info( file ); - qDebug("FILE %s ", file.latin1()); + //qDebug("FILE %s ", file.latin1()); if( !info.exists() ){ addSymlink( fi, TRUE ); break; |