Diffstat (limited to 'korganizer/koeventviewer.cpp') (more/less context) (ignore whitespace changes)
-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 | |||
@@ -261,62 +261,64 @@ void KOEventViewer::addTag(const QString & tag,const QString & text) | |||
261 | else tmpStr += tmpText; | 261 | else tmpStr += tmpText; |
262 | tmpStr+="</" + tag + ">"; | 262 | tmpStr+="</" + tag + ">"; |
263 | mText.append(tmpStr); | 263 | mText.append(tmpStr); |
264 | } | 264 | } |
265 | else | 265 | else |
266 | { | 266 | { |
267 | str += text + "</" + tag + ">"; | 267 | str += text + "</" + tag + ">"; |
268 | mText.append(str); | 268 | mText.append(str); |
269 | } | 269 | } |
270 | } | 270 | } |
271 | 271 | ||
272 | void KOEventViewer::setColorMode( int m ) | 272 | 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 | } |
311 | 313 | ||
312 | if (event->doesFloat()) { | 314 | if (event->doesFloat()) { |
313 | if (event->isMultiDay()) { | 315 | if (event->isMultiDay()) { |
314 | mText.append(i18n("<p><b>From:</b> %1 </p><p><b>To:</b> %2</p>") | 316 | mText.append(i18n("<p><b>From:</b> %1 </p><p><b>To:</b> %2</p>") |
315 | .arg(event->dtStartDateStr(shortDate)) | 317 | .arg(event->dtStartDateStr(shortDate)) |
316 | .arg(event->dtEndDateStr(shortDate))); | 318 | .arg(event->dtEndDateStr(shortDate))); |
317 | } else { | 319 | } else { |
318 | mText.append(i18n("<p><b>On:</b> %1</p>").arg(event->dtStartDateStr( shortDate ))); | 320 | mText.append(i18n("<p><b>On:</b> %1</p>").arg(event->dtStartDateStr( shortDate ))); |
319 | } | 321 | } |
320 | } else { | 322 | } else { |
321 | if (event->isMultiDay()) { | 323 | if (event->isMultiDay()) { |
322 | mText.append(i18n("<p><b>From:</b> %1</p> ") | 324 | mText.append(i18n("<p><b>From:</b> %1</p> ") |
@@ -367,102 +369,104 @@ void KOEventViewer::appendEvent(Event *event, int mode ) | |||
367 | } | 369 | } |
368 | } else { | 370 | } else { |
369 | mMailSubject += i18n(" - " )+event->dtStartStr( true ); | 371 | mMailSubject += i18n(" - " )+event->dtStartStr( true ); |
370 | 372 | ||
371 | } | 373 | } |
372 | 374 | ||
373 | 375 | ||
374 | if (event->isAlarmEnabled()) { | 376 | if (event->isAlarmEnabled()) { |
375 | Alarm *alarm =event->alarms().first() ; | 377 | Alarm *alarm =event->alarms().first() ; |
376 | QDateTime t = alarm->time(); | 378 | QDateTime t = alarm->time(); |
377 | QString s =i18n("( %1 before )").arg( alarm->offsetText() ); | 379 | QString s =i18n("( %1 before )").arg( alarm->offsetText() ); |
378 | if(wideScreen ){ | 380 | if(wideScreen ){ |
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 | } |
404 | if ( KOPrefs::instance()->mEVshowChanged ) { | 405 | if ( KOPrefs::instance()->mEVshowChanged ) { |
405 | if(wideScreen ){ | 406 | if(wideScreen ){ |
406 | addTag("p",i18n("<b>Last modified: ") +" </b>" + KGlobal::locale()->formatDateTime( event->lastModified(), shortDate ) ); | 407 | addTag("p",i18n("<b>Last modified: ") +" </b>" + KGlobal::locale()->formatDateTime( event->lastModified(), shortDate ) ); |
407 | }else{ | 408 | }else{ |
408 | addTag("p",i18n("<b>Last modified: ") +" </b>"); | 409 | addTag("p",i18n("<b>Last modified: ") +" </b>"); |
409 | addTag("p", KGlobal::locale()->formatDateTime( event->lastModified(), shortDate )); | 410 | addTag("p", KGlobal::locale()->formatDateTime( event->lastModified(), shortDate )); |
410 | } | 411 | } |
411 | 412 | ||
412 | } | 413 | } |
413 | if ( KOPrefs::instance()->mEVshowDetails ) { | 414 | if ( KOPrefs::instance()->mEVshowDetails ) { |
414 | if (!event->description().isEmpty()) { | 415 | if (!event->description().isEmpty()) { |
415 | addTag("p",i18n("<b>Details: </b>")); | 416 | addTag("p",i18n("<b>Details: </b>")); |
416 | addTag("p",deTag(event->description())); | 417 | addTag("p",deTag(event->description())); |
417 | } | 418 | } |
418 | } | 419 | } |
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>") |
457 | .arg(event->percentComplete())); | 461 | .arg(event->percentComplete())); |
458 | } | 462 | } |
459 | 463 | ||
460 | if (event->cancelled ()) { | 464 | if (event->cancelled ()) { |
461 | mText +="<font color=\"#B00000\">"; | 465 | mText +="<font color=\"#B00000\">"; |
462 | addTag("i",i18n("This todo has been cancelled!")); | 466 | addTag("i",i18n("This todo has been cancelled!")); |
463 | mText.append("<br>"); | 467 | mText.append("<br>"); |
464 | mText += "</font>"; | 468 | mText += "</font>"; |
465 | mMailSubject += i18n("(cancelled)"); | 469 | mMailSubject += i18n("(cancelled)"); |
466 | } | 470 | } |
467 | 471 | ||
468 | 472 | ||
@@ -482,49 +486,48 @@ void KOEventViewer::appendTodo(Todo *event, int mode ) | |||
482 | } | 486 | } |
483 | if (!event->location().isEmpty()) { | 487 | if (!event->location().isEmpty()) { |
484 | addTag("p","<b>"+i18n("Location: ")+"</b>"+ deTag(event->location() ) ); | 488 | addTag("p","<b>"+i18n("Location: ")+"</b>"+ deTag(event->location() ) ); |
485 | mMailSubject += i18n(" at ") + event->location(); | 489 | mMailSubject += i18n(" at ") + event->location(); |
486 | } | 490 | } |
487 | mText.append(i18n("<p><b>Priority:</b> %2</p>") | 491 | mText.append(i18n("<p><b>Priority:</b> %2</p>") |
488 | .arg(QString::number(event->priority()))); | 492 | .arg(QString::number(event->priority()))); |
489 | 493 | ||
490 | if (event->isAlarmEnabled()) { | 494 | if (event->isAlarmEnabled()) { |
491 | Alarm *alarm =event->alarms().first() ; | 495 | Alarm *alarm =event->alarms().first() ; |
492 | QDateTime t = alarm->time(); | 496 | QDateTime t = alarm->time(); |
493 | QString s =i18n("( %1 before )").arg( alarm->offsetText() ); | 497 | QString s =i18n("( %1 before )").arg( alarm->offsetText() ); |
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 | } |
519 | if ( KOPrefs::instance()->mEVshowChanged ) { | 522 | if ( KOPrefs::instance()->mEVshowChanged ) { |
520 | if(wideScreen ){ | 523 | if(wideScreen ){ |
521 | addTag("p",i18n("<b>Last modified: ") +" </b>" +KGlobal::locale()->formatDateTime( event->lastModified(), shortDate ) ); | 524 | addTag("p",i18n("<b>Last modified: ") +" </b>" +KGlobal::locale()->formatDateTime( event->lastModified(), shortDate ) ); |
522 | 525 | ||
523 | } else { | 526 | } else { |
524 | addTag("p",i18n("<b>Last modified: ") +" </b>"); | 527 | addTag("p",i18n("<b>Last modified: ") +" </b>"); |
525 | addTag("p", KGlobal::locale()->formatDateTime( event->lastModified(), shortDate )); | 528 | addTag("p", KGlobal::locale()->formatDateTime( event->lastModified(), shortDate )); |
526 | } | 529 | } |
527 | } | 530 | } |
528 | if ( event->relatedTo() ) { | 531 | if ( event->relatedTo() ) { |
529 | addTag("b",i18n("Parent todo:<br>")); | 532 | addTag("b",i18n("Parent todo:<br>")); |
530 | mText.append(deTag(event->relatedTo()->summary())+" [" +QString::number(event->relatedTo()->priority()) + "/" + QString::number(((Todo*)event->relatedTo())->percentComplete())+"%] <br>"); | 533 | mText.append(deTag(event->relatedTo()->summary())+" [" +QString::number(event->relatedTo()->priority()) + "/" + QString::number(((Todo*)event->relatedTo())->percentComplete())+"%] <br>"); |