-rw-r--r-- | bin/kdepim/WhatsNew.txt | 3 | ||||
-rw-r--r-- | korganizer/calendarview.cpp | 2 | ||||
-rw-r--r-- | korganizer/koeventviewerdialog.cpp | 16 | ||||
-rw-r--r-- | korganizer/koeventviewerdialog.h | 1 | ||||
-rw-r--r-- | korganizer/koviewmanager.h | 2 |
5 files changed, 23 insertions, 1 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt index 5be1d28..da33d12 100644 --- a/bin/kdepim/WhatsNew.txt +++ b/bin/kdepim/WhatsNew.txt | |||
@@ -7,2 +7,5 @@ Fixed that tooltips were not updated after moving an item in agenda view. | |||
7 | Fixed a bug in sorting start date for recurring events in list view. | 7 | Fixed a bug in sorting start date for recurring events in list view. |
8 | Changed the left button in todo viewer from "Agenda" to "Set completed". | ||
9 | This makes it possible to change a todo in the What's Next View quickly to the completed state without leaving the What's Next View. | ||
10 | |||
8 | 11 | ||
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() | |||
2728 | viewManager(), SLOT( showAgendaView( bool ) ) ); | 2728 | viewManager(), SLOT( showAgendaView( bool ) ) ); |
2729 | connect( mEventViewerDialog, SIGNAL( todoCompleted(Todo *) ), | ||
2730 | this, SLOT( todoChanged(Todo *) ) ); | ||
2729 | mEventViewerDialog->resize( 640, 480 ); | 2731 | 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 | |||
@@ -152,2 +152,5 @@ void KOEventViewerDialog::addEvent(Event *event) | |||
152 | findButton( Close )->setFocus(); | 152 | findButton( Close )->setFocus(); |
153 | if ( !mSyncMode ) { | ||
154 | findButton( User1 )->setText( i18n("Agenda")); | ||
155 | } | ||
153 | } | 156 | } |
@@ -159,2 +162,5 @@ void KOEventViewerDialog::setTodo(Todo *event) | |||
159 | findButton( Close )->setFocus(); | 162 | findButton( Close )->setFocus(); |
163 | if ( !mSyncMode ) { | ||
164 | findButton( User1 )->setText( i18n("Set complete")); | ||
165 | } | ||
160 | } | 166 | } |
@@ -165,2 +171,5 @@ void KOEventViewerDialog::setJournal(Journal *j) | |||
165 | findButton( Close )->setFocus(); | 171 | findButton( Close )->setFocus(); |
172 | if ( !mSyncMode ) { | ||
173 | findButton( User1 )->setText( i18n("Agenda")); | ||
174 | } | ||
166 | } | 175 | } |
@@ -201,2 +210,3 @@ void KOEventViewerDialog::showIncidence() | |||
201 | if ( mIncidence->type() == "Todo" ) { | 210 | if ( mIncidence->type() == "Todo" ) { |
211 | /* | ||
202 | if ( ((Todo*)mIncidence)->hasDueDate() ) | 212 | if ( ((Todo*)mIncidence)->hasDueDate() ) |
@@ -208,2 +218,8 @@ void KOEventViewerDialog::showIncidence() | |||
208 | } | 218 | } |
219 | */ | ||
220 | ((Todo*)mIncidence)->setCompleted( true ); | ||
221 | hide(); | ||
222 | emit todoCompleted(((Todo*)mIncidence)); | ||
223 | return; | ||
224 | |||
209 | } else | 225 | } 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 { | |||
57 | void showAgendaView( bool ); | 57 | void showAgendaView( bool ); |
58 | void todoCompleted(Todo*); | ||
58 | private slots: | 59 | 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 | |||
68 | 68 | ||
69 | void updateView(); | ||
70 | void updateView( const QDate &start, const QDate &end ); | 69 | void updateView( const QDate &start, const QDate &end ); |
@@ -83,2 +82,3 @@ class KOViewManager : public QObject | |||
83 | public slots: | 82 | public slots: |
83 | void updateView(); | ||
84 | void showWhatsNextView(); | 84 | void showWhatsNextView(); |