-rw-r--r-- | korganizer/koagendaitem.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp index df7d612..6a312b3 100644 --- a/korganizer/koagendaitem.cpp +++ b/korganizer/koagendaitem.cpp | |||
@@ -224,193 +224,193 @@ bool KOAgendaItem::updateIcons(QPainter * p, bool horLayout) | |||
224 | if (mIncidence->attendeeCount()>0) { | 224 | if (mIncidence->attendeeCount()>0) { |
225 | 225 | ||
226 | if (mIncidence->organizer() == KOPrefs::instance()->email()) { | 226 | if (mIncidence->organizer() == KOPrefs::instance()->email()) { |
227 | p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, black ); | 227 | p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, black ); |
228 | if ( horLayout ) | 228 | if ( horLayout ) |
229 | ++xOff; | 229 | ++xOff; |
230 | else | 230 | else |
231 | ++yOff; | 231 | ++yOff; |
232 | } else { | 232 | } else { |
233 | Attendee *me = mIncidence->attendeeByMails(KOPrefs::instance()->mAdditionalMails,KOPrefs::instance()->email()); | 233 | Attendee *me = mIncidence->attendeeByMails(KOPrefs::instance()->mAdditionalMails,KOPrefs::instance()->email()); |
234 | if (me!=0) { | 234 | if (me!=0) { |
235 | 235 | ||
236 | 236 | ||
237 | } else { | 237 | } else { |
238 | p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, yellow ); | 238 | p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, yellow ); |
239 | if ( horLayout ) | 239 | if ( horLayout ) |
240 | ++xOff; | 240 | ++xOff; |
241 | else | 241 | else |
242 | ++yOff; | 242 | ++yOff; |
243 | 243 | ||
244 | } | 244 | } |
245 | p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, darkYellow ); | 245 | p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, darkYellow ); |
246 | if ( horLayout ) | 246 | if ( horLayout ) |
247 | ++xOff; | 247 | ++xOff; |
248 | else | 248 | else |
249 | ++yOff; | 249 | ++yOff; |
250 | 250 | ||
251 | } | 251 | } |
252 | 252 | ||
253 | } | 253 | } |
254 | return ( yOff || xOff ); | 254 | return ( yOff || xOff ); |
255 | } | 255 | } |
256 | 256 | ||
257 | 257 | ||
258 | void KOAgendaItem::select(bool selected) | 258 | void KOAgendaItem::select(bool selected) |
259 | { | 259 | { |
260 | //qDebug("select %d %d",firstMultiItem(), nextMultiItem() ); | 260 | //qDebug("select %d %d",firstMultiItem(), nextMultiItem() ); |
261 | if (mSelected == selected) return; | 261 | if (mSelected == selected) return; |
262 | mSelected = selected; | 262 | mSelected = selected; |
263 | if ( ! isVisible() ) | 263 | if ( ! isVisible() ) |
264 | return; | 264 | return; |
265 | if ( firstMultiItem() ) | 265 | if ( firstMultiItem() ) |
266 | firstMultiItem()->select( selected ); | 266 | firstMultiItem()->select( selected ); |
267 | if ( !firstMultiItem() && nextMultiItem() ) { | 267 | if ( !firstMultiItem() && nextMultiItem() ) { |
268 | KOAgendaItem * placeItem = nextMultiItem(); | 268 | KOAgendaItem * placeItem = nextMultiItem(); |
269 | while ( placeItem ) { | 269 | while ( placeItem ) { |
270 | placeItem->select( selected ); | 270 | placeItem->select( selected ); |
271 | placeItem = placeItem->nextMultiItem(); | 271 | placeItem = placeItem->nextMultiItem(); |
272 | } | 272 | } |
273 | } | 273 | } |
274 | globalFlagBlockAgendaItemUpdate = 0; | 274 | globalFlagBlockAgendaItemUpdate = 0; |
275 | paintMe( selected ); | 275 | paintMe( selected ); |
276 | globalFlagBlockAgendaItemUpdate = 1; | 276 | globalFlagBlockAgendaItemUpdate = 1; |
277 | repaint( false ); | 277 | repaint( false ); |
278 | } | 278 | } |
279 | 279 | ||
280 | 280 | ||
281 | /* | 281 | /* |
282 | The eventFilter has to filter the mouse events of the agenda item childs. The | 282 | The eventFilter has to filter the mouse events of the agenda item childs. The |
283 | events are fed into the event handling method of KOAgendaItem. This allows the | 283 | events are fed into the event handling method of KOAgendaItem. This allows the |
284 | KOAgenda to handle the KOAgendaItems by using an eventFilter. | 284 | KOAgenda to handle the KOAgendaItems by using an eventFilter. |
285 | */ | 285 | */ |
286 | bool KOAgendaItem::eventFilter ( QObject *object, QEvent *e ) | 286 | bool KOAgendaItem::eventFilter ( QObject *object, QEvent *e ) |
287 | { | 287 | { |
288 | if (e->type() == QEvent::MouseButtonPress || | 288 | if (e->type() == QEvent::MouseButtonPress || |
289 | e->type() == QEvent::MouseButtonDblClick || | 289 | e->type() == QEvent::MouseButtonDblClick || |
290 | e->type() == QEvent::MouseButtonRelease || | 290 | e->type() == QEvent::MouseButtonRelease || |
291 | e->type() == QEvent::MouseMove) { | 291 | e->type() == QEvent::MouseMove) { |
292 | QMouseEvent *me = (QMouseEvent *)e; | 292 | QMouseEvent *me = (QMouseEvent *)e; |
293 | QPoint itemPos = this->mapFromGlobal(((QWidget *)object)-> | 293 | QPoint itemPos = this->mapFromGlobal(((QWidget *)object)-> |
294 | mapToGlobal(me->pos())); | 294 | mapToGlobal(me->pos())); |
295 | QMouseEvent returnEvent (e->type(),itemPos,me->button(),me->state()); | 295 | QMouseEvent returnEvent (e->type(),itemPos,me->button(),me->state()); |
296 | return event(&returnEvent); | 296 | return event(&returnEvent); |
297 | } else { | 297 | } else { |
298 | return false; | 298 | return false; |
299 | } | 299 | } |
300 | } | 300 | } |
301 | void KOAgendaItem::repaintMe( ) | 301 | void KOAgendaItem::repaintMe( ) |
302 | { | 302 | { |
303 | paintMe ( mSelected ); | 303 | paintMe ( mSelected ); |
304 | } | 304 | } |
305 | void KOAgendaItem::paintMe( bool selected, QPainter* paint ) | 305 | void KOAgendaItem::paintMe( bool selected, QPainter* paint ) |
306 | { | 306 | { |
307 | if ( globalFlagBlockAgendaItemUpdate && ! selected) | 307 | if ( globalFlagBlockAgendaItemUpdate && ! selected) |
308 | return; | 308 | return; |
309 | QPainter pa; | 309 | QPainter pa; |
310 | 310 | ||
311 | if ( mSelected ) { | 311 | if ( mSelected ) { |
312 | pa.begin( paintPixSel() ); | 312 | pa.begin( paintPixSel() ); |
313 | } else { | 313 | } else { |
314 | if ( mAllDay ) | 314 | if ( mAllDay ) |
315 | pa.begin( paintPixAllday() ); | 315 | pa.begin( paintPixAllday() ); |
316 | else | 316 | else |
317 | pa.begin( paintPix() ); | 317 | pa.begin( paintPix() ); |
318 | } | 318 | } |
319 | int x, yy, w, h; | 319 | int x, yy, w, h; |
320 | float nfh; | 320 | float nfh = 7.0; |
321 | x = pos().x(); w = width(); h = height (); | 321 | x = pos().x(); w = width(); h = height (); |
322 | if ( mAllDay ) | 322 | if ( mAllDay ) |
323 | yy = y(); | 323 | yy = y(); |
324 | else | 324 | else |
325 | yy = mCellYTop * ( height() / cellHeight() ); | 325 | yy = mCellYTop * ( height() / cellHeight() ); |
326 | xPaintCoord= x; | 326 | xPaintCoord= x; |
327 | yPaintCoord = yy; | 327 | yPaintCoord = yy; |
328 | wPaintCoord = width(); | 328 | wPaintCoord = width(); |
329 | hPaintCoord = height(); | 329 | hPaintCoord = height(); |
330 | //qDebug("paintMe %s %d %d %d %d",incidence()->summary().latin1(), x, yy, width(), height()); | 330 | //qDebug("paintMe %s %d %d %d %d",incidence()->summary().latin1(), x, yy, width(), height()); |
331 | if ( paint == 0 ) | 331 | if ( paint == 0 ) |
332 | paint = &pa; | 332 | paint = &pa; |
333 | bool horLayout = ( w < h ); | 333 | bool horLayout = ( w < h ); |
334 | int maxhei = mFontPixelSize+4; | 334 | int maxhei = mFontPixelSize+4; |
335 | if ( horLayout ) | 335 | if ( horLayout ) |
336 | maxhei += AGENDA_ICON_SIZE -4; | 336 | maxhei += AGENDA_ICON_SIZE -4; |
337 | bool small = ( h < maxhei ); | 337 | bool small = ( h < maxhei ); |
338 | if ( ! small ) | 338 | if ( ! small ) |
339 | paint->setFont(KOPrefs::instance()->mAgendaViewFont); | 339 | paint->setFont(KOPrefs::instance()->mAgendaViewFont); |
340 | else { | 340 | else { |
341 | QFont f = KOPrefs::instance()->mAgendaViewFont; | 341 | QFont f = KOPrefs::instance()->mAgendaViewFont; |
342 | f.setBold( false ); | 342 | f.setBold( false ); |
343 | int fh = f.pointSize(); | 343 | int fh = f.pointSize(); |
344 | nfh = (((float)height())/(float)(mFontPixelSize+4))*fh; | 344 | nfh = (((float)height())/(float)(mFontPixelSize+4))*fh; |
345 | if ( nfh < 6 ) | 345 | if ( nfh < 6 ) |
346 | nfh = 6; | 346 | nfh = 6; |
347 | f.setPointSize( nfh ); | 347 | f.setPointSize( nfh ); |
348 | paint->setFont(f); | 348 | paint->setFont(f); |
349 | } | 349 | } |
350 | paint->fillRect ( x, yy, w, h, mBackgroundColor ); | 350 | paint->fillRect ( x, yy, w, h, mBackgroundColor ); |
351 | static const QPixmap completedPxmp = SmallIcon("greenhook16"); | 351 | static const QPixmap completedPxmp = SmallIcon("greenhook16"); |
352 | static const QPixmap overduePxmp = SmallIcon("redcross16"); | 352 | static const QPixmap overduePxmp = SmallIcon("redcross16"); |
353 | if ( mIncidence->type() == "Todo" ) { | 353 | if ( mIncidence->type() == "Todo" ) { |
354 | Todo* tempTodo = static_cast<Todo*>(mIncidence); | 354 | Todo* tempTodo = static_cast<Todo*>(mIncidence); |
355 | int xx = pos().x()+(width()-completedPxmp.width()-3 ); | 355 | int xx = pos().x()+(width()-completedPxmp.width()-3 ); |
356 | int yyy = yy+3; | 356 | int yyy = yy+3; |
357 | if ( tempTodo->isCompleted() ) | 357 | if ( tempTodo->isCompleted() ) |
358 | paint->drawPixmap ( xx, yyy, completedPxmp ); | 358 | paint->drawPixmap ( xx, yyy, completedPxmp ); |
359 | else { | 359 | else { |
360 | paint->drawPixmap ( xx, yyy, overduePxmp ); | 360 | paint->drawPixmap ( xx, yyy, overduePxmp ); |
361 | 361 | ||
362 | } | 362 | } |
363 | } | 363 | } |
364 | bool addIcon = false; | 364 | bool addIcon = false; |
365 | if ( ! small || w > 3 * h || h > 3* w ) | 365 | if ( ! small || w > 3 * h || h > 3* w ) |
366 | addIcon = updateIcons( paint, horLayout ); | 366 | addIcon = updateIcons( paint, horLayout ); |
367 | 367 | ||
368 | qDrawShadePanel (paint, x, yy, w, h, mColorGroup, selected , 2, 0); | 368 | qDrawShadePanel (paint, x, yy, w, h, mColorGroup, selected , 2, 0); |
369 | //qDebug("draw rect %d %d %d %d ",x, yy, w, h ); | 369 | //qDebug("draw rect %d %d %d %d ",x, yy, w, h ); |
370 | if ( ! small ) { | 370 | if ( ! small ) { |
371 | x += 3; yy += 3;w -= 6; h-= 5; | 371 | x += 3; yy += 3;w -= 6; h-= 5; |
372 | } else { | 372 | } else { |
373 | x += 2; yy += 1;w -= 4; h-= 4; | 373 | x += 2; yy += 1;w -= 4; h-= 4; |
374 | if ( nfh < 6.01 ) { | 374 | if ( nfh < 6.01 ) { |
375 | yy -= 2; | 375 | yy -= 2; |
376 | h += 4; | 376 | h += 4; |
377 | } | 377 | } |
378 | else | 378 | else |
379 | if ( nfh < h -2 ) | 379 | if ( nfh < h -2 ) |
380 | ++yy; | 380 | ++yy; |
381 | } | 381 | } |
382 | int align; | 382 | int align; |
383 | #ifndef DESKTOP_VERSION | 383 | #ifndef DESKTOP_VERSION |
384 | align = ( AlignLeft|WordBreak|AlignTop); | 384 | align = ( AlignLeft|WordBreak|AlignTop); |
385 | #else | 385 | #else |
386 | align = ( AlignLeft|BreakAnywhere|WordBreak|AlignTop); | 386 | align = ( AlignLeft|BreakAnywhere|WordBreak|AlignTop); |
387 | #endif | 387 | #endif |
388 | if ( addIcon ) { | 388 | if ( addIcon ) { |
389 | if ( ! horLayout ) { | 389 | if ( ! horLayout ) { |
390 | x += AGENDA_ICON_SIZE+3; | 390 | x += AGENDA_ICON_SIZE+3; |
391 | w -= (AGENDA_ICON_SIZE+3); | 391 | w -= (AGENDA_ICON_SIZE+3); |
392 | } | 392 | } |
393 | else { | 393 | else { |
394 | yy+= AGENDA_ICON_SIZE+2; | 394 | yy+= AGENDA_ICON_SIZE+2; |
395 | h -=(AGENDA_ICON_SIZE+3); | 395 | h -=(AGENDA_ICON_SIZE+3); |
396 | } | 396 | } |
397 | } | 397 | } |
398 | int colsum = mBackgroundColor.red() + mBackgroundColor.green() + mBackgroundColor.blue(); | 398 | int colsum = mBackgroundColor.red() + mBackgroundColor.green() + mBackgroundColor.blue(); |
399 | if ( colsum < 250 ) | 399 | if ( colsum < 250 ) |
400 | paint->setPen ( white); | 400 | paint->setPen ( white); |
401 | if ( x < 0 ) { | 401 | if ( x < 0 ) { |
402 | w = w+x-3; | 402 | w = w+x-3; |
403 | x = 3; | 403 | x = 3; |
404 | if ( w > parentWidget()->width() ){ | 404 | if ( w > parentWidget()->width() ){ |
405 | w = parentWidget()->width() - 6; | 405 | w = parentWidget()->width() - 6; |
406 | #ifndef DESKTOP_VERSION | 406 | #ifndef DESKTOP_VERSION |
407 | align = ( AlignCenter|WordBreak); | 407 | align = ( AlignCenter|WordBreak); |
408 | #else | 408 | #else |
409 | align = ( AlignCenter|BreakAnywhere|WordBreak); | 409 | align = ( AlignCenter|BreakAnywhere|WordBreak); |
410 | #endif | 410 | #endif |
411 | 411 | ||
412 | } | 412 | } |
413 | } | 413 | } |
414 | QRect dr; | 414 | QRect dr; |
415 | paint->drawText ( x, yy, w, h, align, mDisplayedText, -1, &dr ); | 415 | paint->drawText ( x, yy, w, h, align, mDisplayedText, -1, &dr ); |
416 | if ( mIncidence->cancelled() ){ | 416 | if ( mIncidence->cancelled() ){ |