summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-10-10 00:54:59 (UTC)
committer zautrix <zautrix>2005-10-10 00:54:59 (UTC)
commit999e15691b8cd67db766a60906b96b68da8cfb30 (patch) (side-by-side diff)
tree4b4873b893d1a1099ea4cf3edd175f4cd03163be
parentdad8e8745591620c951cefd835ea7ea727db8925 (diff)
downloadkdepimpi-999e15691b8cd67db766a60906b96b68da8cfb30.zip
kdepimpi-999e15691b8cd67db766a60906b96b68da8cfb30.tar.gz
kdepimpi-999e15691b8cd67db766a60906b96b68da8cfb30.tar.bz2
chaged set todo complete in viewer
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/koeventviewerdialog.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/korganizer/koeventviewerdialog.cpp b/korganizer/koeventviewerdialog.cpp
index 0763825..2e936f3 100644
--- a/korganizer/koeventviewerdialog.cpp
+++ b/korganizer/koeventviewerdialog.cpp
@@ -199,97 +199,99 @@ void KOEventViewerDialog::setJournal(Journal *j)
//findButton( Close )->setFocus();
if ( !mSyncMode ) {
findButton( User1 )->setText( i18n("Agenda"));
}
}
void KOEventViewerDialog::addText(QString text)
{
mEventViewer->addText(text);
mEventViewer->setFocus();
//findButton( Close )->setFocus();
}
void KOEventViewerDialog::editIncidence()
{
sendSignalViewerClosed = false;
if ( mSyncMode ) {
mSyncResult = 2;
accept();
return;
}
if ( mIncidence ){
close();
emit editIncidence( mIncidence );
}
}
void KOEventViewerDialog::showIncidence()
{
sendSignalViewerClosed = false;
if ( mSyncMode ) {
mSyncResult = 1;
accept();
return;
}
if ( mIncidence ){
QDate date;
if ( mIncidence->type() == "Todo" ) {
/*
if ( ((Todo*)mIncidence)->hasDueDate() )
date = ((Todo*)mIncidence)->dtDue().date();
else {
globalFlagBlockAgenda = 2;
emit showAgendaView( false );
return;
}
*/
((Todo*)mIncidence)->setCompleted( true );
((Todo*)mIncidence)->setCompleted(QDateTime::currentDateTime() );
- emit todoCompleted(((Todo*)mIncidence));
+ emit todoCompleted(((Todo*)mIncidence));
+ mEventViewer->setTodo((Todo*)mIncidence);
+ return;
} else {
date = mIncidence->dtStart().date();
globalFlagBlockAgenda = 1;
emit showAgendaView( false );
globalFlagBlockAgenda = 2;
emit jumpToTime( date );
}
close();
}
}
void KOEventViewerDialog::keyPressEvent ( QKeyEvent * e )
{
switch ( e->key() ) {
case Qt::Key_A :
case Qt::Key_L :
showIncidence();
break;
case Qt::Key_E :
case Qt::Key_R :
editIncidence();
break;
case Qt::Key_C:
case Qt::Key_Escape:
sendSignalViewerClosed = true;
close();
break;
case Qt::Key_I:
#ifndef DESKTOP_VERSION
sendSignalViewerClosed = true;
close();
#else
sendSignalViewerClosed = true;
slotViewerClosed();
//accept();
#endif
break;
default:
KDialogBase::keyPressEvent ( e );
break;
}
}
void KOEventViewerDialog::hideEvent ( QHideEvent * e )
{
KDialogBase::hideEvent ( e );
QTimer::singleShot( 1, this, SLOT (slotViewerClosed() ) );
}