Diffstat (limited to 'core/pim/datebook/datebookweek.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/pim/datebook/datebookweek.cpp | 47 |
1 files changed, 23 insertions, 24 deletions
diff --git a/core/pim/datebook/datebookweek.cpp b/core/pim/datebook/datebookweek.cpp index 3ae4610..12f57a0 100644 --- a/core/pim/datebook/datebookweek.cpp +++ b/core/pim/datebook/datebookweek.cpp | |||
@@ -361,25 +361,25 @@ DateBookWeek::DateBookWeek( bool ap, bool startOnMonday, DateBookDB *newDB, | |||
361 | vb->addWidget( view ); | 361 | vb->addWidget( view ); |
362 | 362 | ||
363 | lblDesc = new QLabel( this, "event label" ); | 363 | lblDesc = new QLabel( this, "event label" ); |
364 | lblDesc->setFrameStyle( QFrame::Plain | QFrame::Box ); | 364 | lblDesc->setFrameStyle( QFrame::Plain | QFrame::Box ); |
365 | lblDesc->setBackgroundColor( yellow ); | 365 | lblDesc->setBackgroundColor( yellow ); |
366 | lblDesc->hide(); | 366 | lblDesc->hide(); |
367 | 367 | ||
368 | tHide = new QTimer( this ); | 368 | tHide = new QTimer( this ); |
369 | 369 | ||
370 | connect( view, SIGNAL( showDay( int ) ), this, SLOT( showDay( int ) ) ); | 370 | connect( view, SIGNAL( showDay( int ) ), this, SLOT( showDay( int ) ) ); |
371 | connect( view, SIGNAL(signalShowEvent(const EffectiveEvent&)), this, SLOT(slotShowEvent(const EffectiveEvent&)) ); | 371 | connect( view, SIGNAL(signalShowEvent(const EffectiveEvent&)), this, SLOT(slotShowEvent(const EffectiveEvent&)) ); |
372 | connect( view, SIGNAL(signalHideEvent()), this, SLOT(slotHideEvent()) ); | 372 | connect( view, SIGNAL(signalHideEvent()), this, SLOT(slotHideEvent()) ); |
373 | connect( header, SIGNAL( dateChanged( int, int ) ), this, SLOT( dateChanged( int, int ) ) ); | 373 | connect( header, SIGNAL( dateChanged( QDate &) ), this, SLOT( dateChanged( QDate &) ) ); |
374 | connect( tHide, SIGNAL( timeout() ), lblDesc, SLOT( hide() ) ); | 374 | connect( tHide, SIGNAL( timeout() ), lblDesc, SLOT( hide() ) ); |
375 | connect( qApp, SIGNAL(weekChanged(bool)), this, SLOT(slotWeekChanged(bool)) ); | 375 | connect( qApp, SIGNAL(weekChanged(bool)), this, SLOT(slotWeekChanged(bool)) ); |
376 | connect( qApp, SIGNAL(clockChanged(bool)), this, SLOT(slotClockChanged(bool))); | 376 | connect( qApp, SIGNAL(clockChanged(bool)), this, SLOT(slotClockChanged(bool))); |
377 | setDate(QDate::currentDate()); | 377 | setDate(QDate::currentDate()); |
378 | } | 378 | } |
379 | 379 | ||
380 | void DateBookWeek::keyPressEvent(QKeyEvent *e) | 380 | void DateBookWeek::keyPressEvent(QKeyEvent *e) |
381 | { | 381 | { |
382 | switch(e->key()) { | 382 | switch(e->key()) { |
383 | case Key_Up: | 383 | case Key_Up: |
384 | view->scrollBy(0, -20); | 384 | view->scrollBy(0, -20); |
385 | break; | 385 | break; |
@@ -390,64 +390,57 @@ void DateBookWeek::keyPressEvent(QKeyEvent *e) | |||
390 | setDate(date().addDays(-7)); | 390 | setDate(date().addDays(-7)); |
391 | break; | 391 | break; |
392 | case Key_Right: | 392 | case Key_Right: |
393 | setDate(date().addDays(7)); | 393 | setDate(date().addDays(7)); |
394 | break; | 394 | break; |
395 | default: | 395 | default: |
396 | e->ignore(); | 396 | e->ignore(); |
397 | } | 397 | } |
398 | } | 398 | } |
399 | 399 | ||
400 | void DateBookWeek::showDay( int day ) | 400 | void DateBookWeek::showDay( int day ) |
401 | { | 401 | { |
402 | QDate d; | 402 | QDate d=bdate; |
403 | d = dateFromWeek( _week, year, bStartOnMonday ); | 403 | |
404 | // Calculate offset to first day of week. | ||
405 | int dayoffset=d.dayOfWeek(); | ||
406 | if(bStartOnMonday) dayoffset--; | ||
407 | |||
404 | day--; | 408 | day--; |
405 | d = d.addDays( day ); | 409 | d=d.addDays(day-dayoffset); |
406 | emit showDate( d.year(), d.month(), d.day() ); | 410 | emit showDate( d.year(), d.month(), d.day() ); |
411 | qDebug("%4d-%02d-%02d / Day %d\n",d.year(),d.month(),d.day(),day); | ||
407 | } | 412 | } |
408 | 413 | ||
409 | void DateBookWeek::setDate( int y, int m, int d ) | 414 | void DateBookWeek::setDate( int y, int m, int d ) |
410 | { | 415 | { |
411 | setDate(QDate(y, m, d)); | 416 | setDate(QDate(y, m, d)); |
412 | } | 417 | } |
413 | 418 | ||
414 | void DateBookWeek::setDate(QDate date) | 419 | void DateBookWeek::setDate(QDate newdate) |
415 | { | 420 | { |
416 | dow = date.dayOfWeek(); | 421 | bdate=newdate; |
417 | int w, y; | 422 | dow = newdate.dayOfWeek(); |
418 | calcWeek( date, w, y, bStartOnMonday ); | 423 | header->setDate( newdate ); |
419 | header->setDate( date ); | ||
420 | } | 424 | } |
421 | 425 | ||
422 | void DateBookWeek::dateChanged( int y, int w ) | 426 | void DateBookWeek::dateChanged( QDate &newdate ) |
423 | { | 427 | { |
424 | year = y; | 428 | bdate=newdate; |
425 | _week = w; | ||
426 | getEvents(); | 429 | getEvents(); |
427 | } | 430 | } |
428 | 431 | ||
429 | QDate DateBookWeek::date() const | 432 | QDate DateBookWeek::date() const |
430 | { | 433 | { |
431 | QDate d; | 434 | return bdate; |
432 | d = dateFromWeek( _week - 1, year, bStartOnMonday ); | ||
433 | if ( bStartOnMonday ) | ||
434 | d = d.addDays( 7 + dow - 1 ); | ||
435 | else { | ||
436 | if ( dow == 7 ) | ||
437 | d = d.addDays( dow ); | ||
438 | else | ||
439 | d = d.addDays( 7 + dow ); | ||
440 | } | ||
441 | return d; | ||
442 | } | 435 | } |
443 | 436 | ||
444 | void DateBookWeek::getEvents() | 437 | void DateBookWeek::getEvents() |
445 | { | 438 | { |
446 | QDate startWeek = weekDate(); | 439 | QDate startWeek = weekDate(); |
447 | 440 | ||
448 | QDate endWeek = startWeek.addDays( 6 ); | 441 | QDate endWeek = startWeek.addDays( 6 ); |
449 | QValueList<EffectiveEvent> eventList = db->getEffectiveEvents(startWeek, endWeek); | 442 | QValueList<EffectiveEvent> eventList = db->getEffectiveEvents(startWeek, endWeek); |
450 | view->showEvents( eventList ); | 443 | view->showEvents( eventList ); |
451 | view->moveToHour( startTime ); | 444 | view->moveToHour( startTime ); |
452 | } | 445 | } |
453 | 446 | ||
@@ -569,25 +562,31 @@ void DateBookWeek::slotWeekChanged( bool onMonday ) | |||
569 | header->setStartOfWeek( bStartOnMonday ); | 562 | header->setStartOfWeek( bStartOnMonday ); |
570 | redraw(); | 563 | redraw(); |
571 | } | 564 | } |
572 | 565 | ||
573 | void DateBookWeek::slotClockChanged( bool ap ) | 566 | void DateBookWeek::slotClockChanged( bool ap ) |
574 | { | 567 | { |
575 | ampm = ap; | 568 | ampm = ap; |
576 | } | 569 | } |
577 | 570 | ||
578 | // return the date at the beginning of the week... | 571 | // return the date at the beginning of the week... |
579 | QDate DateBookWeek::weekDate() const | 572 | QDate DateBookWeek::weekDate() const |
580 | { | 573 | { |
581 | return dateFromWeek( _week, year, bStartOnMonday ); | 574 | QDate d=bdate; |
575 | |||
576 | // Calculate offset to first day of week. | ||
577 | int dayoffset=d.dayOfWeek(); | ||
578 | if(bStartOnMonday) dayoffset--; | ||
579 | |||
580 | return d.addDays(-dayoffset); | ||
582 | } | 581 | } |
583 | 582 | ||
584 | // this used to only be needed by datebook.cpp, but now we need it inside | 583 | // this used to only be needed by datebook.cpp, but now we need it inside |
585 | // week view since | 584 | // week view since |
586 | // we need to be able to figure out our total number of weeks on the fly... | 585 | // we need to be able to figure out our total number of weeks on the fly... |
587 | // this is probably the best place to put it.. | 586 | // this is probably the best place to put it.. |
588 | 587 | ||
589 | // For Weeks that start on Monday... (EASY!) | 588 | // For Weeks that start on Monday... (EASY!) |
590 | // At the moment we will use ISO 8601 method for computing | 589 | // At the moment we will use ISO 8601 method for computing |
591 | // the week. Granted, other countries use other methods, | 590 | // the week. Granted, other countries use other methods, |
592 | // bet we aren't doing any Locale stuff at the moment. So, | 591 | // bet we aren't doing any Locale stuff at the moment. So, |
593 | // this should pass. This Algorithim is public domain and | 592 | // this should pass. This Algorithim is public domain and |