-rw-r--r-- | korganizer/koeventviewer.cpp | 9 | ||||
-rw-r--r-- | korganizer/komonthview.cpp | 4 |
2 files changed, 6 insertions, 7 deletions
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp index c8c2f28..6315827 100644 --- a/korganizer/koeventviewer.cpp +++ b/korganizer/koeventviewer.cpp | |||
@@ -281,8 +281,9 @@ void KOEventViewer::appendEvent(Event *event, int mode ) | |||
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\">"; |
@@ -295,8 +296,9 @@ void KOEventViewer::appendEvent(Event *event, int mode ) | |||
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 | } |
@@ -387,9 +389,8 @@ void KOEventViewer::appendEvent(Event *event, int mode ) | |||
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 ){ |
@@ -427,10 +428,12 @@ void KOEventViewer::appendTodo(Todo *event, int mode ) | |||
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 | } |
@@ -441,8 +444,9 @@ void KOEventViewer::appendTodo(Todo *event, int mode ) | |||
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 | } |
@@ -502,9 +506,8 @@ void KOEventViewer::appendTodo(Todo *event, int mode ) | |||
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 ){ |
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index 475bb4a..cba85fa 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp | |||
@@ -314,10 +314,8 @@ void MonthViewItem::paint(QPainter *p) | |||
314 | bool sel = isSelected(); | 314 | bool sel = isSelected(); |
315 | #else | 315 | #else |
316 | bool sel = selected(); | 316 | bool sel = selected(); |
317 | #endif | 317 | #endif |
318 | |||
319 | |||
320 | int heihei = height( listBox () ); | 318 | int heihei = height( listBox () ); |
321 | int x = 1; | 319 | int x = 1; |
322 | if (KOPrefs::instance()->mMonthViewUsesCategoryColor) | 320 | if (KOPrefs::instance()->mMonthViewUsesCategoryColor) |
323 | { | 321 | { |
@@ -336,9 +334,8 @@ void MonthViewItem::paint(QPainter *p) | |||
336 | p->fillRect ( x, y-2,size,size+4, KOPrefs::instance()->defaultColor( mIncidence->calID() ) ); | 334 | p->fillRect ( x, y-2,size,size+4, KOPrefs::instance()->defaultColor( mIncidence->calID() ) ); |
337 | p->drawRect ( x, y-2,size,size+4); | 335 | p->drawRect ( x, y-2,size,size+4); |
338 | x += size + 1; | 336 | x += size + 1; |
339 | } | 337 | } |
340 | |||
341 | if ( KOPrefs::instance()->mMonthShowIcons ) { | 338 | if ( KOPrefs::instance()->mMonthShowIcons ) { |
342 | if ( mInfo ) { | 339 | if ( mInfo ) { |
343 | p->fillRect ( x, y,size,size, Qt::darkGreen ); | 340 | p->fillRect ( x, y,size,size, Qt::darkGreen ); |
344 | x += size + 1; | 341 | x += size + 1; |
@@ -376,9 +373,8 @@ void MonthViewItem::paint(QPainter *p) | |||
376 | p->drawPolygon( pa ); | 373 | p->drawPolygon( pa ); |
377 | } | 374 | } |
378 | if ( mMultiday == 1 ) { | 375 | if ( mMultiday == 1 ) { |
379 | // p->fillRect ( x, yyy-sizeM/2+1, sizeM/2, size, QBrush ( QBrush::SolidPattern ) ); | 376 | // p->fillRect ( x, yyy-sizeM/2+1, sizeM/2, size, QBrush ( QBrush::SolidPattern ) ); |
380 | |||
381 | p->drawLine ( x+1, yyy-sizeM/2, x+1, yyy+sizeM/2 ); | 377 | p->drawLine ( x+1, yyy-sizeM/2, x+1, yyy+sizeM/2 ); |
382 | } | 378 | } |
383 | if ( mMultiday == 3 ) { | 379 | if ( mMultiday == 3 ) { |
384 | // p->fillRect ( x+sizeM, yyy-sizeM/2+1, sizeM/2, size, QBrush ( QBrush::SolidPattern ) ); | 380 | // p->fillRect ( x+sizeM, yyy-sizeM/2+1, sizeM/2, size, QBrush ( QBrush::SolidPattern ) ); |