-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 | |||
@@ -3998,10 +3998,8 @@ void CalendarView::processTodoListSelection( Incidence *incidence ) | |||
3998 | void CalendarView::processIncidenceSelection( Incidence *incidence ) | 3998 | void CalendarView::processIncidenceSelection( Incidence *incidence ) |
3999 | { | 3999 | { |
4000 | emit incidenceSelected( incidence ); | ||
4000 | if ( incidence == mSelectedIncidence ) return; | 4001 | if ( incidence == mSelectedIncidence ) return; |
4001 | |||
4002 | mSelectedIncidence = incidence; | 4002 | mSelectedIncidence = incidence; |
4003 | 4003 | ||
4004 | emit incidenceSelected( mSelectedIncidence ); | ||
4005 | |||
4006 | if ( incidence && incidence->typeID() == eventID ) { | 4004 | if ( incidence && incidence->typeID() == eventID ) { |
4007 | Event *event = static_cast<Event *>( incidence ); | 4005 | 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) | |||
155 | //mTimeBox->setAutoMask(true); | 155 | //mTimeBox->setAutoMask(true); |
156 | int secs = QTime::currentTime().second(); | 156 | int secs = QTime::currentTime().second(); |
157 | qDebug("second %d ", secs ); | ||
158 | minutes->start( (60 - secs +1)*1000 ,true); | 157 | minutes->start( (60 - secs +1)*1000 ,true); |
159 | } | 158 | } |
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) | |||
1155 | mActiveItem->todo()->setRevision( mActiveItem->todo()->revision()+1 ); | 1155 | mActiveItem->todo()->setRevision( mActiveItem->todo()->revision()+1 ); |
1156 | } | 1156 | } |
1157 | processSelectionChange(); | ||
1157 | } | 1158 | } |
1158 | 1159 | ||
@@ -1163,4 +1164,5 @@ void KOTodoView::setNewPercentage(int index) | |||
1163 | if ( mPercentage[index] == 100 && !mActiveItem->isOn() ) { | 1164 | if ( mPercentage[index] == 100 && !mActiveItem->isOn() ) { |
1164 | mActiveItem->setOn( true ); | 1165 | mActiveItem->setOn( true ); |
1166 | processSelectionChange(); | ||
1165 | return; | 1167 | return; |
1166 | } else if ( mPercentage[index] != 100 && mActiveItem->isOn() ) { | 1168 | } else if ( mPercentage[index] != 100 && mActiveItem->isOn() ) { |
@@ -1179,4 +1181,5 @@ void KOTodoView::setNewPercentage(int index) | |||
1179 | mActiveItem->todo()->setRevision( mActiveItem->todo()->revision()+1 ); | 1181 | mActiveItem->todo()->setRevision( mActiveItem->todo()->revision()+1 ); |
1180 | } | 1182 | } |
1183 | processSelectionChange(); | ||
1181 | } | 1184 | } |
1182 | 1185 | ||
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 ) | |||
1683 | } | 1683 | } |
1684 | } | 1684 | } |
1685 | else | 1685 | else { |
1686 | startString = i18n(": (Prio ") +QString::number( (( KCal::Todo*)incidence)->priority() ) +") "+QString::number( (( KCal::Todo*)incidence)->percentComplete() ) +i18n("\% completed"); | 1686 | if ( (( KCal::Todo*)incidence)->percentComplete() == 100 ) |
1687 | startString = i18n(": (Prio ") +QString::number( (( KCal::Todo*)incidence)->priority() ) +") "+i18n("completed on %1").arg( (( KCal::Todo*)incidence)->completedStr(true) ); | ||
1688 | else | ||
1689 | startString = i18n(": (Prio ") +QString::number( (( KCal::Todo*)incidence)->priority() ) +") "+QString::number( (( KCal::Todo*)incidence)->percentComplete() ) +i18n("\% completed"); | ||
1690 | } | ||
1687 | if ( !incidence->location().isEmpty() ) | 1691 | if ( !incidence->location().isEmpty() ) |
1688 | startString += " (" +incidence->location()+")"; | 1692 | startString += " (" +incidence->location()+")"; |
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 | |||
@@ -365,9 +365,9 @@ void OFileViewFileListView::reread( bool all ) { | |||
365 | */ | 365 | */ |
366 | if( fi->isSymLink() ){ | 366 | if( fi->isSymLink() ){ |
367 | qDebug("SYMLINK "); | 367 | //qDebug("SYMLINK "); |
368 | QString file = fi->readLink(); | 368 | QString file = fi->readLink(); |
369 | for( int i = 0; i<=5; i++) { // 5 tries to prevent dos | 369 | for( int i = 0; i<=5; i++) { // 5 tries to prevent dos |
370 | QFileInfo info( file ); | 370 | QFileInfo info( file ); |
371 | qDebug("FILE %s ", file.latin1()); | 371 | //qDebug("FILE %s ", file.latin1()); |
372 | if( !info.exists() ){ | 372 | if( !info.exists() ){ |
373 | addSymlink( fi, TRUE ); | 373 | addSymlink( fi, TRUE ); |