summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--korganizer/calendarview.cpp4
-rw-r--r--korganizer/koagenda.cpp1
-rw-r--r--korganizer/kotodoview.cpp3
-rw-r--r--korganizer/mainwindow.cpp4
-rw-r--r--microkde/ofileselector_p.cpp4
5 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 {
+ 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() )
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
@@ -366,3 +366,3 @@ void OFileViewFileListView::reread( bool all ) {
if( fi->isSymLink() ){
- qDebug("SYMLINK ");
+ //qDebug("SYMLINK ");
QString file = fi->readLink();
@@ -370,3 +370,3 @@ void OFileViewFileListView::reread( bool all ) {
QFileInfo info( file );
- qDebug("FILE %s ", file.latin1());
+ //qDebug("FILE %s ", file.latin1());
if( !info.exists() ){