-rw-r--r-- | korganizer/koeventviewer.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp index c8c2f28..6315827 100644 --- a/korganizer/koeventviewer.cpp +++ b/korganizer/koeventviewer.cpp | |||
@@ -273,38 +273,40 @@ void KOEventViewer::setColorMode( int m ) | |||
273 | { | 273 | { |
274 | mColorMode = m; | 274 | mColorMode = m; |
275 | } | 275 | } |
276 | void KOEventViewer::appendEvent(Event *event, int mode ) | 276 | void KOEventViewer::appendEvent(Event *event, int mode ) |
277 | { | 277 | { |
278 | mMailSubject = ""; | 278 | mMailSubject = ""; |
279 | mCurrentIncidence = event; | 279 | mCurrentIncidence = event; |
280 | bool shortDate = KOPrefs::instance()->mShortDateInViewer; | 280 | bool shortDate = KOPrefs::instance()->mShortDateInViewer; |
281 | bool wideScreen = ( QApplication::desktop()->width() >= 640 ); | 281 | bool wideScreen = ( QApplication::desktop()->width() >= 640 ); |
282 | topLevelWidget()->setCaption(i18n("Event Viewer")); | 282 | topLevelWidget()->setCaption(i18n("Event Viewer")); |
283 | if ( mode == 0 ) { | 283 | if ( mode == 0 ) { |
284 | addTag("h2",deTag(event->summary())); | 284 | addTag("h2",deTag(event->summary())); |
285 | formatReadOnly(event); | ||
285 | } | 286 | } |
286 | else { | 287 | else { |
287 | if ( mColorMode == 1 ) { | 288 | if ( mColorMode == 1 ) { |
288 | mText +="<font color=\"#00A000\">"; | 289 | mText +="<font color=\"#00A000\">"; |
289 | } | 290 | } |
290 | if ( mColorMode == 2 ) { | 291 | if ( mColorMode == 2 ) { |
291 | mText +="<font color=\"#C00000\">"; | 292 | mText +="<font color=\"#C00000\">"; |
292 | } | 293 | } |
293 | // mText +="<font color=\"#F00000\">" + i18n("O-due!") + "</font>"; | 294 | // mText +="<font color=\"#F00000\">" + i18n("O-due!") + "</font>"; |
294 | if ( mode == 1 ) { | 295 | if ( mode == 1 ) { |
295 | addTag("h2",i18n( "Local: " ) +deTag(event->summary())); | 296 | addTag("h2",i18n( "Local: " ) +deTag(event->summary())); |
296 | } else { | 297 | } else { |
297 | addTag("h2",i18n( "Remote: " ) +deTag(event->summary())); | 298 | addTag("h2",i18n( "Remote: " ) +deTag(event->summary())); |
298 | } | 299 | } |
300 | formatReadOnly(event); | ||
299 | addTag("h3",i18n( "Last modified: " ) + KGlobal::locale()->formatDateTime(event->lastModified(),shortDate, true ) ); | 301 | addTag("h3",i18n( "Last modified: " ) + KGlobal::locale()->formatDateTime(event->lastModified(),shortDate, true ) ); |
300 | if ( mColorMode ) | 302 | if ( mColorMode ) |
301 | mText += "</font>"; | 303 | mText += "</font>"; |
302 | } | 304 | } |
303 | mMailSubject += i18n( "Meeting " )+ event->summary(); | 305 | mMailSubject += i18n( "Meeting " )+ event->summary(); |
304 | if (event->cancelled ()) { | 306 | if (event->cancelled ()) { |
305 | mText +="<font color=\"#B00000\">"; | 307 | mText +="<font color=\"#B00000\">"; |
306 | addTag("i",i18n("This event has been cancelled!")); | 308 | addTag("i",i18n("This event has been cancelled!")); |
307 | mText.append("<br>"); | 309 | mText.append("<br>"); |
308 | mText += "</font>"; | 310 | mText += "</font>"; |
309 | mMailSubject += i18n("(cancelled)"); | 311 | mMailSubject += i18n("(cancelled)"); |
310 | } | 312 | } |
@@ -379,25 +381,24 @@ void KOEventViewer::appendEvent(Event *event, int mode ) | |||
379 | addTag("p",i18n("<b>Alarm on: ") + s +" </b>"+ KGlobal::locale()->formatDateTime( t, shortDate )); | 381 | addTag("p",i18n("<b>Alarm on: ") + s +" </b>"+ KGlobal::locale()->formatDateTime( t, shortDate )); |
380 | }else{ | 382 | }else{ |
381 | addTag("p",i18n("<b>Alarm on: ") + s +" </b>"); | 383 | addTag("p",i18n("<b>Alarm on: ") + s +" </b>"); |
382 | addTag("p", KGlobal::locale()->formatDateTime( t, shortDate )); | 384 | addTag("p", KGlobal::locale()->formatDateTime( t, shortDate )); |
383 | } | 385 | } |
384 | //addTag("p",s); | 386 | //addTag("p",s); |
385 | } | 387 | } |
386 | 388 | ||
387 | addTag("p","<b>"+i18n("Access: ") + "</b>" + event->secrecyStr()); | 389 | addTag("p","<b>"+i18n("Access: ") + "</b>" + event->secrecyStr()); |
388 | 390 | ||
389 | formatCategories(event); | 391 | formatCategories(event); |
390 | 392 | ||
391 | formatReadOnly(event); | ||
392 | formatAttendees(event); | 393 | formatAttendees(event); |
393 | 394 | ||
394 | if ( KOPrefs::instance()->mEVshowCreated ) { | 395 | if ( KOPrefs::instance()->mEVshowCreated ) { |
395 | if(wideScreen ){ | 396 | if(wideScreen ){ |
396 | addTag("p",i18n("<b>Created: ") +" </b>"+KGlobal::locale()->formatDateTime( event->created(), shortDate )); | 397 | addTag("p",i18n("<b>Created: ") +" </b>"+KGlobal::locale()->formatDateTime( event->created(), shortDate )); |
397 | }else{ | 398 | }else{ |
398 | addTag("p",i18n("<b>Created: ") +" </b>"); | 399 | addTag("p",i18n("<b>Created: ") +" </b>"); |
399 | addTag("p", KGlobal::locale()->formatDateTime( event->created(), shortDate )); | 400 | addTag("p", KGlobal::locale()->formatDateTime( event->created(), shortDate )); |
400 | } | 401 | } |
401 | 402 | ||
402 | 403 | ||
403 | } | 404 | } |
@@ -419,38 +420,41 @@ void KOEventViewer::appendEvent(Event *event, int mode ) | |||
419 | setText(mText); | 420 | setText(mText); |
420 | //QWhatsThis::add(this,mText); | 421 | //QWhatsThis::add(this,mText); |
421 | 422 | ||
422 | } | 423 | } |
423 | 424 | ||
424 | void KOEventViewer::appendTodo(Todo *event, int mode ) | 425 | void KOEventViewer::appendTodo(Todo *event, int mode ) |
425 | { | 426 | { |
426 | mMailSubject = ""; | 427 | mMailSubject = ""; |
427 | mCurrentIncidence = event; | 428 | mCurrentIncidence = event; |
428 | topLevelWidget()->setCaption(i18n("Todo Viewer")); | 429 | topLevelWidget()->setCaption(i18n("Todo Viewer")); |
429 | bool shortDate = KOPrefs::instance()->mShortDateInViewer; | 430 | bool shortDate = KOPrefs::instance()->mShortDateInViewer; |
430 | bool wideScreen = ( QApplication::desktop()->width() >= 640 ); | 431 | bool wideScreen = ( QApplication::desktop()->width() >= 640 ); |
431 | if (mode == 0 ) | 432 | if (mode == 0 ) { |
432 | addTag("h2",deTag(event->summary())); | 433 | addTag("h2",deTag(event->summary())); |
434 | formatReadOnly(event); | ||
435 | } | ||
433 | else { | 436 | else { |
434 | if ( mColorMode == 1 ) { | 437 | if ( mColorMode == 1 ) { |
435 | mText +="<font color=\"#00A000\">"; | 438 | mText +="<font color=\"#00A000\">"; |
436 | } | 439 | } |
437 | if ( mColorMode == 2 ) { | 440 | if ( mColorMode == 2 ) { |
438 | mText +="<font color=\"#B00000\">"; | 441 | mText +="<font color=\"#B00000\">"; |
439 | } | 442 | } |
440 | if ( mode == 1 ) { | 443 | if ( mode == 1 ) { |
441 | addTag("h2",i18n( "Local: " ) +deTag(event->summary())); | 444 | addTag("h2",i18n( "Local: " ) +deTag(event->summary())); |
442 | } else { | 445 | } else { |
443 | addTag("h2",i18n( "Remote: " ) +deTag(event->summary())); | 446 | addTag("h2",i18n( "Remote: " ) +deTag(event->summary())); |
444 | } | 447 | } |
448 | formatReadOnly(event); | ||
445 | addTag("h3",i18n( "Last modified: " ) + KGlobal::locale()->formatDateTime(event->lastModified(),shortDate, true ) ); | 449 | addTag("h3",i18n( "Last modified: " ) + KGlobal::locale()->formatDateTime(event->lastModified(),shortDate, true ) ); |
446 | if ( mColorMode ) | 450 | if ( mColorMode ) |
447 | mText += "</font>"; | 451 | mText += "</font>"; |
448 | } | 452 | } |
449 | mMailSubject += i18n( "Todo " )+ event->summary(); | 453 | mMailSubject += i18n( "Todo " )+ event->summary(); |
450 | 454 | ||
451 | if ( event->percentComplete() == 100 && event->hasCompletedDate() ) { | 455 | if ( event->percentComplete() == 100 && event->hasCompletedDate() ) { |
452 | mText +="<font color=\"#B00000\">"; | 456 | mText +="<font color=\"#B00000\">"; |
453 | addTag("i", i18n("<p><i>Completed on %1</i></p>").arg( event->completedStr(KOPrefs::instance()->mShortDateInViewer) ) ); | 457 | addTag("i", i18n("<p><i>Completed on %1</i></p>").arg( event->completedStr(KOPrefs::instance()->mShortDateInViewer) ) ); |
454 | mText += "</font>"; | 458 | mText += "</font>"; |
455 | } else { | 459 | } else { |
456 | mText.append(i18n("<p><i>%1 % completed</i></p>") | 460 | mText.append(i18n("<p><i>%1 % completed</i></p>") |
@@ -494,25 +498,24 @@ void KOEventViewer::appendTodo(Todo *event, int mode ) | |||
494 | if ( wideScreen ) { | 498 | if ( wideScreen ) { |
495 | addTag("p",i18n("<b>Alarm on: ") + s +" </b>"+ KGlobal::locale()->formatDateTime( t, shortDate )); | 499 | addTag("p",i18n("<b>Alarm on: ") + s +" </b>"+ KGlobal::locale()->formatDateTime( t, shortDate )); |
496 | } else { | 500 | } else { |
497 | addTag("p",i18n("<b>Alarm on: ") + s +" </b>"); | 501 | addTag("p",i18n("<b>Alarm on: ") + s +" </b>"); |
498 | addTag("p", KGlobal::locale()->formatDateTime( t, shortDate )); | 502 | addTag("p", KGlobal::locale()->formatDateTime( t, shortDate )); |
499 | } | 503 | } |
500 | } | 504 | } |
501 | 505 | ||
502 | addTag("p","<b>"+i18n("Access: ") + "</b>" + event->secrecyStr()); | 506 | addTag("p","<b>"+i18n("Access: ") + "</b>" + event->secrecyStr()); |
503 | 507 | ||
504 | formatCategories(event); | 508 | formatCategories(event); |
505 | 509 | ||
506 | formatReadOnly(event); | ||
507 | formatAttendees(event); | 510 | formatAttendees(event); |
508 | 511 | ||
509 | if ( KOPrefs::instance()->mEVshowCreated ) { | 512 | if ( KOPrefs::instance()->mEVshowCreated ) { |
510 | if(wideScreen ){ | 513 | if(wideScreen ){ |
511 | 514 | ||
512 | addTag("p",i18n("<b>Created: ") +" </b>"+KGlobal::locale()->formatDateTime( event->created(), shortDate )); | 515 | addTag("p",i18n("<b>Created: ") +" </b>"+KGlobal::locale()->formatDateTime( event->created(), shortDate )); |
513 | 516 | ||
514 | } else { | 517 | } else { |
515 | addTag("p",i18n("<b>Created: ") +" </b>"); | 518 | addTag("p",i18n("<b>Created: ") +" </b>"); |
516 | addTag("p", KGlobal::locale()->formatDateTime( event->created(), shortDate )); | 519 | addTag("p", KGlobal::locale()->formatDateTime( event->created(), shortDate )); |
517 | } | 520 | } |
518 | } | 521 | } |