Diffstat (limited to 'core/pim/datebook/datebookweek.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/pim/datebook/datebookweek.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/pim/datebook/datebookweek.cpp b/core/pim/datebook/datebookweek.cpp index 933e191..7503751 100644 --- a/core/pim/datebook/datebookweek.cpp +++ b/core/pim/datebook/datebookweek.cpp | |||
@@ -269,196 +269,196 @@ void DateBookWeekView::drawContents( QPainter *p, int cx, int cy, int cw, int ch | |||
269 | int y = t*rowHeight; | 269 | int y = t*rowHeight; |
270 | if ( QRect( 1, y, 20, rowHeight ).intersects( ur ) ) { | 270 | if ( QRect( 1, y, 20, rowHeight ).intersects( ur ) ) { |
271 | QString s; | 271 | QString s; |
272 | if ( ampm ) { | 272 | if ( ampm ) { |
273 | if ( t == 0 ) | 273 | if ( t == 0 ) |
274 | s = QString::number( 12 ); | 274 | s = QString::number( 12 ); |
275 | else if ( t == 12 ) | 275 | else if ( t == 12 ) |
276 | s = QString::number(12) + tr( "p" ); | 276 | s = QString::number(12) + tr( "p" ); |
277 | else if ( t > 12 ) { | 277 | else if ( t > 12 ) { |
278 | if ( t - 12 < 10 ) | 278 | if ( t - 12 < 10 ) |
279 | s = " "; | 279 | s = " "; |
280 | else | 280 | else |
281 | s = ""; | 281 | s = ""; |
282 | s += QString::number( t - 12 ) + tr("p"); | 282 | s += QString::number( t - 12 ) + tr("p"); |
283 | } else { | 283 | } else { |
284 | if ( 12 - t < 3 ) | 284 | if ( 12 - t < 3 ) |
285 | s = ""; | 285 | s = ""; |
286 | else | 286 | else |
287 | s = " "; | 287 | s = " "; |
288 | s += QString::number( t ); | 288 | s += QString::number( t ); |
289 | } | 289 | } |
290 | } else { | 290 | } else { |
291 | s = QString::number( t ); | 291 | s = QString::number( t ); |
292 | if ( s.length() == 1 ) | 292 | if ( s.length() == 1 ) |
293 | s.prepend( "0" ); | 293 | s.prepend( "0" ); |
294 | } | 294 | } |
295 | p->drawText( 1, y+p->fontMetrics().ascent()+1, s ); | 295 | p->drawText( 1, y+p->fontMetrics().ascent()+1, s ); |
296 | } | 296 | } |
297 | } | 297 | } |
298 | 298 | ||
299 | QListIterator<DateBookWeekItem> it(items); | 299 | QListIterator<DateBookWeekItem> it(items); |
300 | for ( ; it.current(); ++it ) { | 300 | for ( ; it.current(); ++it ) { |
301 | DateBookWeekItem *i = it.current(); | 301 | DateBookWeekItem *i = it.current(); |
302 | if ( i->geometry().intersects( ur ) ) { | 302 | if ( i->geometry().intersects( ur ) ) { |
303 | p->setBrush( i->color() ); | 303 | p->setBrush( i->color() ); |
304 | p->drawRect( i->geometry() ); | 304 | p->drawRect( i->geometry() ); |
305 | } | 305 | } |
306 | } | 306 | } |
307 | } | 307 | } |
308 | 308 | ||
309 | void DateBookWeekView::resizeEvent( QResizeEvent *e ) | 309 | void DateBookWeekView::resizeEvent( QResizeEvent *e ) |
310 | { | 310 | { |
311 | const int hourWidth = 20; | 311 | const int hourWidth = 20; |
312 | QScrollView::resizeEvent( e ); | 312 | QScrollView::resizeEvent( e ); |
313 | 313 | ||
314 | 314 | ||
315 | //HEAD | 315 | //HEAD |
316 | /* | 316 | /* |
317 | int avail = visibleWidth(); | 317 | int avail = visibleWidth(); |
318 | header->setGeometry( leftMargin()+frameWidth()+frameRect().left() , frameWidth(), | 318 | header->setGeometry( leftMargin()+frameWidth()+frameRect().left() , frameWidth(), |
319 | visibleWidth(), header->sizeHint().height() ); | 319 | visibleWidth(), header->sizeHint().height() ); |
320 | setMargins( 0, header->sizeHint().height(), 0, 0 ); | 320 | setMargins( 0, header->sizeHint().height(), 0, 0 ); |
321 | */ | 321 | */ |
322 | //BRANCH_1_0 | 322 | //BRANCH_1_0 |
323 | int avail = width()-qApp->style().scrollBarExtent().width()-1; | 323 | int avail = width()-qApp->style().scrollBarExtent().width()-1; |
324 | header->setGeometry( 0, 0, avail, header->sizeHint().height() ); | 324 | header->setGeometry( 0, 0, avail, header->sizeHint().height() ); |
325 | setMargins( 0, header->height(), 0, 0 ); | 325 | setMargins( 0, header->height(), 0, 0 ); |
326 | 326 | ||
327 | 327 | ||
328 | header->resizeSection( 0, hourWidth ); | 328 | header->resizeSection( 0, hourWidth ); |
329 | int sw = (avail - hourWidth) / 7; | 329 | int sw = (avail - hourWidth) / 7; |
330 | for ( int i = 1; i < 7; i++ ) | 330 | for ( int i = 1; i < 7; i++ ) |
331 | header->resizeSection( i, sw ); | 331 | header->resizeSection( i, sw ); |
332 | header->resizeSection( 7, avail - hourWidth - sw*6 ); | 332 | header->resizeSection( 7, avail - hourWidth - sw*6 ); |
333 | } | 333 | } |
334 | 334 | ||
335 | void DateBookWeekView::setStartOfWeek( bool bStartOnMonday ) | 335 | void DateBookWeekView::setStartOfWeek( bool bStartOnMonday ) |
336 | { | 336 | { |
337 | bOnMonday = bStartOnMonday; | 337 | bOnMonday = bStartOnMonday; |
338 | initNames(); | 338 | initNames(); |
339 | } | 339 | } |
340 | 340 | ||
341 | //------------------------------------------------------------------- | 341 | //------------------------------------------------------------------- |
342 | 342 | ||
343 | DateBookWeek::DateBookWeek( bool ap, bool startOnMonday, DateBookDB *newDB, | 343 | DateBookWeek::DateBookWeek( bool ap, bool startOnMonday, DateBookDB *newDB, |
344 | QWidget *parent, const char *name ) | 344 | QWidget *parent, const char *name ) |
345 | : QWidget( parent, name ), | 345 | : QWidget( parent, name ), |
346 | db( newDB ), | 346 | db( newDB ), |
347 | startTime( 0 ), | 347 | startTime( 0 ), |
348 | ampm( ap ), | 348 | ampm( ap ), |
349 | bStartOnMonday( startOnMonday ) | 349 | bStartOnMonday( startOnMonday ) |
350 | { | 350 | { |
351 | setFocusPolicy(StrongFocus); | 351 | setFocusPolicy(StrongFocus); |
352 | QVBoxLayout *vb = new QVBoxLayout( this ); | 352 | QVBoxLayout *vb = new QVBoxLayout( this ); |
353 | header = new DateBookWeekHeader( bStartOnMonday, this ); | 353 | header = new DateBookWeekHeader( bStartOnMonday, this ); |
354 | view = new DateBookWeekView( ampm, startOnMonday, this ); | 354 | view = new DateBookWeekView( ampm, startOnMonday, this ); |
355 | vb->addWidget( header ); | 355 | vb->addWidget( header ); |
356 | vb->addWidget( view ); | 356 | vb->addWidget( view ); |
357 | 357 | ||
358 | lblDesc = new QLabel( this, "event label" ); | 358 | lblDesc = new QLabel( this, "event label" ); |
359 | lblDesc->setFrameStyle( QFrame::Plain | QFrame::Box ); | 359 | lblDesc->setFrameStyle( QFrame::Plain | QFrame::Box ); |
360 | lblDesc->setBackgroundColor( yellow ); | 360 | lblDesc->setBackgroundColor( yellow ); |
361 | lblDesc->hide(); | 361 | lblDesc->hide(); |
362 | 362 | ||
363 | tHide = new QTimer( this ); | 363 | tHide = new QTimer( this ); |
364 | 364 | ||
365 | connect( view, SIGNAL( showDay( int ) ), this, SLOT( showDay( int ) ) ); | 365 | connect( view, SIGNAL( showDay(int) ), this, SLOT( showDay(int) ) ); |
366 | connect( view, SIGNAL(signalShowEvent(const EffectiveEvent&)), this, SLOT(slotShowEvent(const EffectiveEvent&)) ); | 366 | connect( view, SIGNAL(signalShowEvent(const EffectiveEvent&)), this, SLOT(slotShowEvent(const EffectiveEvent&)) ); |
367 | connect( view, SIGNAL(signalHideEvent()), this, SLOT(slotHideEvent()) ); | 367 | connect( view, SIGNAL(signalHideEvent()), this, SLOT(slotHideEvent()) ); |
368 | connect( header, SIGNAL( dateChanged( QDate &) ), this, SLOT( dateChanged( QDate &) ) ); | 368 | connect( header, SIGNAL( dateChanged(QDate&) ), this, SLOT( dateChanged(QDate&) ) ); |
369 | connect( tHide, SIGNAL( timeout() ), lblDesc, SLOT( hide() ) ); | 369 | connect( tHide, SIGNAL( timeout() ), lblDesc, SLOT( hide() ) ); |
370 | connect( qApp, SIGNAL(weekChanged(bool)), this, SLOT(slotWeekChanged(bool)) ); | 370 | connect( qApp, SIGNAL(weekChanged(bool)), this, SLOT(slotWeekChanged(bool)) ); |
371 | connect( qApp, SIGNAL(clockChanged(bool)), this, SLOT(slotClockChanged(bool))); | 371 | connect( qApp, SIGNAL(clockChanged(bool)), this, SLOT(slotClockChanged(bool))); |
372 | setDate(QDate::currentDate()); | 372 | setDate(QDate::currentDate()); |
373 | } | 373 | } |
374 | 374 | ||
375 | void DateBookWeek::keyPressEvent(QKeyEvent *e) | 375 | void DateBookWeek::keyPressEvent(QKeyEvent *e) |
376 | { | 376 | { |
377 | switch(e->key()) { | 377 | switch(e->key()) { |
378 | case Key_Up: | 378 | case Key_Up: |
379 | view->scrollBy(0, -20); | 379 | view->scrollBy(0, -20); |
380 | break; | 380 | break; |
381 | case Key_Down: | 381 | case Key_Down: |
382 | view->scrollBy(0, 20); | 382 | view->scrollBy(0, 20); |
383 | break; | 383 | break; |
384 | case Key_Left: | 384 | case Key_Left: |
385 | setDate(date().addDays(-7)); | 385 | setDate(date().addDays(-7)); |
386 | break; | 386 | break; |
387 | case Key_Right: | 387 | case Key_Right: |
388 | setDate(date().addDays(7)); | 388 | setDate(date().addDays(7)); |
389 | break; | 389 | break; |
390 | default: | 390 | default: |
391 | e->ignore(); | 391 | e->ignore(); |
392 | } | 392 | } |
393 | } | 393 | } |
394 | 394 | ||
395 | void DateBookWeek::showDay( int day ) | 395 | void DateBookWeek::showDay( int day ) |
396 | { | 396 | { |
397 | QDate d=bdate; | 397 | QDate d=bdate; |
398 | 398 | ||
399 | // Calculate offset to first day of week. | 399 | // Calculate offset to first day of week. |
400 | int dayoffset=d.dayOfWeek() % 7; | 400 | int dayoffset=d.dayOfWeek() % 7; |
401 | 401 | ||
402 | if(bStartOnMonday) dayoffset--; | 402 | if(bStartOnMonday) dayoffset--; |
403 | 403 | ||
404 | day--; | 404 | day--; |
405 | d=d.addDays(day-dayoffset); | 405 | d=d.addDays(day-dayoffset); |
406 | emit showDate( d.year(), d.month(), d.day() ); | 406 | emit showDate( d.year(), d.month(), d.day() ); |
407 | } | 407 | } |
408 | 408 | ||
409 | void DateBookWeek::setDate( int y, int m, int d ) | 409 | void DateBookWeek::setDate( int y, int m, int d ) |
410 | { | 410 | { |
411 | setDate(QDate(y, m, d)); | 411 | setDate(QDate(y, m, d)); |
412 | } | 412 | } |
413 | 413 | ||
414 | void DateBookWeek::setDate(QDate newdate) | 414 | void DateBookWeek::setDate(QDate newdate) |
415 | { | 415 | { |
416 | bdate=newdate; | 416 | bdate=newdate; |
417 | dow = newdate.dayOfWeek(); | 417 | dow = newdate.dayOfWeek(); |
418 | header->setDate( newdate ); | 418 | header->setDate( newdate ); |
419 | } | 419 | } |
420 | 420 | ||
421 | void DateBookWeek::dateChanged( QDate &newdate ) | 421 | void DateBookWeek::dateChanged( QDate &newdate ) |
422 | { | 422 | { |
423 | bdate=newdate; | 423 | bdate=newdate; |
424 | getEvents(); | 424 | getEvents(); |
425 | } | 425 | } |
426 | 426 | ||
427 | QDate DateBookWeek::date() const | 427 | QDate DateBookWeek::date() const |
428 | { | 428 | { |
429 | return bdate; | 429 | return bdate; |
430 | } | 430 | } |
431 | 431 | ||
432 | void DateBookWeek::getEvents() | 432 | void DateBookWeek::getEvents() |
433 | { | 433 | { |
434 | QDate startWeek = weekDate(); | 434 | QDate startWeek = weekDate(); |
435 | 435 | ||
436 | QDate endWeek = startWeek.addDays( 6 ); | 436 | QDate endWeek = startWeek.addDays( 6 ); |
437 | QValueList<EffectiveEvent> eventList = db->getEffectiveEvents(startWeek, endWeek); | 437 | QValueList<EffectiveEvent> eventList = db->getEffectiveEvents(startWeek, endWeek); |
438 | view->showEvents( eventList ); | 438 | view->showEvents( eventList ); |
439 | view->moveToHour( startTime ); | 439 | view->moveToHour( startTime ); |
440 | } | 440 | } |
441 | 441 | ||
442 | void DateBookWeek::generateAllDayTooltext( QString& text ) { | 442 | void DateBookWeek::generateAllDayTooltext( QString& text ) { |
443 | text += "<b>" + tr("This is an all day event.") + "</b><br>"; | 443 | text += "<b>" + tr("This is an all day event.") + "</b><br>"; |
444 | } | 444 | } |
445 | 445 | ||
446 | void DateBookWeek::generateNormalTooltext( QString& str, const EffectiveEvent &ev ) { | 446 | void DateBookWeek::generateNormalTooltext( QString& str, const EffectiveEvent &ev ) { |
447 | str += "<b>" + QObject::tr("Start") + "</b>: "; | 447 | str += "<b>" + QObject::tr("Start") + "</b>: "; |
448 | str += TimeString::timeString( ev.event().start().time(), ampm, FALSE ); | 448 | str += TimeString::timeString( ev.event().start().time(), ampm, FALSE ); |
449 | if( ev.startDate()!=ev.endDate() ) { | 449 | if( ev.startDate()!=ev.endDate() ) { |
450 | str += " <i>" + TimeString::longDateString( ev.startDate() )+"</i>"; | 450 | str += " <i>" + TimeString::longDateString( ev.startDate() )+"</i>"; |
451 | } | 451 | } |
452 | str += "<br>"; | 452 | str += "<br>"; |
453 | str += "<b>" + QObject::tr("End") + "</b>: "; | 453 | str += "<b>" + QObject::tr("End") + "</b>: "; |
454 | str += TimeString::timeString( ev.event().end().time(), ampm, FALSE ); | 454 | str += TimeString::timeString( ev.event().end().time(), ampm, FALSE ); |
455 | if( ev.startDate()!=ev.endDate() ) { | 455 | if( ev.startDate()!=ev.endDate() ) { |
456 | str += " <i>" + TimeString::longDateString( ev.endDate() ) + "</i>"; | 456 | str += " <i>" + TimeString::longDateString( ev.endDate() ) + "</i>"; |
457 | } | 457 | } |
458 | } | 458 | } |
459 | 459 | ||
460 | void DateBookWeek::slotShowEvent( const EffectiveEvent &ev ) | 460 | void DateBookWeek::slotShowEvent( const EffectiveEvent &ev ) |
461 | { | 461 | { |
462 | if ( tHide->isActive() ) | 462 | if ( tHide->isActive() ) |
463 | tHide->stop(); | 463 | tHide->stop(); |
464 | 464 | ||