summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/koeventviewerdialog.cpp20
1 files changed, 9 insertions, 11 deletions
diff --git a/korganizer/koeventviewerdialog.cpp b/korganizer/koeventviewerdialog.cpp
index 1dce841..baa11b5 100644
--- a/korganizer/koeventviewerdialog.cpp
+++ b/korganizer/koeventviewerdialog.cpp
@@ -230,15 +230,12 @@ void KOEventViewerDialog::showIncidence()
230 mSyncResult = 1; 230 mSyncResult = 1;
231 accept(); 231 accept();
232 return; 232 return;
233 } 233 }
234 234
235 if ( mIncidence ){ 235 if ( mIncidence ){
236#ifndef DESKTOP_VERSION
237 hide();
238#endif
239 QDate date; 236 QDate date;
240 if ( mIncidence->type() == "Todo" ) { 237 if ( mIncidence->type() == "Todo" ) {
241 /* 238 /*
242 if ( ((Todo*)mIncidence)->hasDueDate() ) 239 if ( ((Todo*)mIncidence)->hasDueDate() )
243 date = ((Todo*)mIncidence)->dtDue().date(); 240 date = ((Todo*)mIncidence)->dtDue().date();
244 else { 241 else {
@@ -246,22 +243,23 @@ void KOEventViewerDialog::showIncidence()
246 emit showAgendaView( false ); 243 emit showAgendaView( false );
247 return; 244 return;
248 } 245 }
249 */ 246 */
250 ((Todo*)mIncidence)->setCompleted( true ); 247 ((Todo*)mIncidence)->setCompleted( true );
251 ((Todo*)mIncidence)->setCompleted(QDateTime::currentDateTime() ); 248 ((Todo*)mIncidence)->setCompleted(QDateTime::currentDateTime() );
252 hide();
253 emit todoCompleted(((Todo*)mIncidence)); 249 emit todoCompleted(((Todo*)mIncidence));
254 return; 250 } else {
255
256 } else
257 date = mIncidence->dtStart().date(); 251 date = mIncidence->dtStart().date();
258 globalFlagBlockAgenda = 1; 252 globalFlagBlockAgenda = 1;
259 emit showAgendaView( false ); 253 emit showAgendaView( false );
260 globalFlagBlockAgenda = 2; 254 globalFlagBlockAgenda = 2;
261 emit jumpToTime( date ); 255 emit jumpToTime( date );
256 }
257#ifndef DESKTOP_VERSION
258 reject();
259#endif
262 } 260 }
263} 261}
264void KOEventViewerDialog::keyPressEvent ( QKeyEvent * e ) 262void KOEventViewerDialog::keyPressEvent ( QKeyEvent * e )
265{ 263{
266 switch ( e->key() ) { 264 switch ( e->key() ) {
267 265