author | zautrix <zautrix> | 2005-04-14 18:55:22 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-04-14 18:55:22 (UTC) |
commit | 2a449f785f955649df9de639d38dcb250fe1376d (patch) (unidiff) | |
tree | 41aa30a1267ca70f4b9b8c07be26b3c577dc2874 /korganizer | |
parent | d334d77ab00b91b9527bb5992b476c656c88b2fa (diff) | |
download | kdepimpi-2a449f785f955649df9de639d38dcb250fe1376d.zip kdepimpi-2a449f785f955649df9de639d38dcb250fe1376d.tar.gz kdepimpi-2a449f785f955649df9de639d38dcb250fe1376d.tar.bz2 |
fixxx
-rw-r--r-- | korganizer/koeventviewerdialog.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/korganizer/koeventviewerdialog.cpp b/korganizer/koeventviewerdialog.cpp index 1dce841..baa11b5 100644 --- a/korganizer/koeventviewerdialog.cpp +++ b/korganizer/koeventviewerdialog.cpp | |||
@@ -232,11 +232,8 @@ void KOEventViewerDialog::showIncidence() | |||
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() ) |
@@ -248,19 +245,20 @@ void KOEventViewerDialog::showIncidence() | |||
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 ); |
262 | } | 256 | } |
257 | #ifndef DESKTOP_VERSION | ||
258 | reject(); | ||
259 | #endif | ||
260 | } | ||
263 | } | 261 | } |
264 | void KOEventViewerDialog::keyPressEvent ( QKeyEvent * e ) | 262 | void KOEventViewerDialog::keyPressEvent ( QKeyEvent * e ) |
265 | { | 263 | { |
266 | switch ( e->key() ) { | 264 | switch ( e->key() ) { |