| -rw-r--r-- | korganizer/calendarview.cpp | 2 | ||||
| -rw-r--r-- | korganizer/koeventviewerdialog.cpp | 20 | ||||
| -rw-r--r-- | korganizer/koeventviewerdialog.h | 1 | ||||
| -rw-r--r-- | korganizer/koviewmanager.h | 2 |
4 files changed, 22 insertions, 3 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 363dc32..378c7d4 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -2728,2 +2728,4 @@ KOEventViewerDialog* CalendarView::getEventViewerDialog() viewManager(), SLOT( showAgendaView( bool ) ) ); + connect( mEventViewerDialog, SIGNAL( todoCompleted(Todo *) ), + this, SLOT( todoChanged(Todo *) ) ); mEventViewerDialog->resize( 640, 480 ); diff --git a/korganizer/koeventviewerdialog.cpp b/korganizer/koeventviewerdialog.cpp index 68c0e1a..772fd95 100644 --- a/korganizer/koeventviewerdialog.cpp +++ b/korganizer/koeventviewerdialog.cpp @@ -151,3 +151,6 @@ void KOEventViewerDialog::addEvent(Event *event) mIncidence = event; - findButton( Close )->setFocus(); + findButton( Close )->setFocus(); + if ( !mSyncMode ) { + findButton( User1 )->setText( i18n("Agenda")); + } } @@ -158,3 +161,6 @@ void KOEventViewerDialog::setTodo(Todo *event) mIncidence = (Incidence*)event; - findButton( Close )->setFocus(); + findButton( Close )->setFocus(); + if ( !mSyncMode ) { + findButton( User1 )->setText( i18n("Set complete")); + } } @@ -165,2 +171,5 @@ void KOEventViewerDialog::setJournal(Journal *j) findButton( Close )->setFocus(); + if ( !mSyncMode ) { + findButton( User1 )->setText( i18n("Agenda")); + } } @@ -201,2 +210,3 @@ void KOEventViewerDialog::showIncidence() if ( mIncidence->type() == "Todo" ) { + /* if ( ((Todo*)mIncidence)->hasDueDate() ) @@ -208,2 +218,8 @@ void KOEventViewerDialog::showIncidence() } + */ + ((Todo*)mIncidence)->setCompleted( true ); + hide(); + emit todoCompleted(((Todo*)mIncidence)); + return; + } else diff --git a/korganizer/koeventviewerdialog.h b/korganizer/koeventviewerdialog.h index 21cb3ee..b6b4103 100644 --- a/korganizer/koeventviewerdialog.h +++ b/korganizer/koeventviewerdialog.h @@ -57,2 +57,3 @@ class KOEventViewerDialog : public KDialogBase { void showAgendaView( bool ); + void todoCompleted(Todo*); private slots: diff --git a/korganizer/koviewmanager.h b/korganizer/koviewmanager.h index 6f76e2c..3c251fb 100644 --- a/korganizer/koviewmanager.h +++ b/korganizer/koviewmanager.h @@ -68,3 +68,2 @@ class KOViewManager : public QObject - void updateView(); void updateView( const QDate &start, const QDate &end ); @@ -83,2 +82,3 @@ class KOViewManager : public QObject public slots: + void updateView(); void showWhatsNextView(); |