author | zecke <zecke> | 2002-09-10 12:09:49 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-09-10 12:09:49 (UTC) |
commit | 6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4 (patch) (unidiff) | |
tree | 6ebc93c6432f4ed9d00ef1448b6a047ef522a79a /library/datebookmonth.cpp | |
parent | d10cddb3c9ce75bc90b14add14bc133737fe35aa (diff) | |
download | opie-6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4.zip opie-6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4.tar.gz opie-6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4.tar.bz2 |
Qtopia1-6 merge
still to test
bic changes to be resolved
more changes to be made?
-rw-r--r-- | library/datebookmonth.cpp | 203 |
1 files changed, 120 insertions, 83 deletions
diff --git a/library/datebookmonth.cpp b/library/datebookmonth.cpp index f4b3e6b..272c223 100644 --- a/library/datebookmonth.cpp +++ b/library/datebookmonth.cpp | |||
@@ -1,117 +1,123 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of the Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #include "config.h" | 20 | #include "config.h" |
21 | #include "datebookmonth.h" | 21 | #include "datebookmonth.h" |
22 | #include "datebookdb.h" | 22 | #include "datebookdb.h" |
23 | #include <qpe/event.h> | 23 | #include <qtopia/private/event.h> |
24 | #include "resource.h" | 24 | #include "resource.h" |
25 | #include "qpeapplication.h" | 25 | #include "qpeapplication.h" |
26 | #include "timestring.h" | 26 | #include "timestring.h" |
27 | 27 | ||
28 | #include <qtoolbutton.h> | 28 | #include <qtoolbutton.h> |
29 | #include <qspinbox.h> | 29 | #include <qspinbox.h> |
30 | #include <qcombobox.h> | 30 | #include <qcombobox.h> |
31 | #include <qdatetime.h> | 31 | #include <qdatetime.h> |
32 | #include <qpainter.h> | 32 | #include <qpainter.h> |
33 | #include <qpopupmenu.h> | 33 | #include <qpopupmenu.h> |
34 | #include <qvaluestack.h> | ||
35 | #include <qwhatsthis.h> | ||
34 | 36 | ||
35 | 37 | ||
36 | DateBookMonthHeader::DateBookMonthHeader( QWidget *parent, const char *name ) | 38 | DateBookMonthHeader::DateBookMonthHeader( QWidget *parent, const char *name ) |
37 | : QHBox( parent, name ) | 39 | : QHBox( parent, name ) |
38 | { | 40 | { |
39 | setBackgroundMode( PaletteButton ); | 41 | setBackgroundMode( PaletteButton ); |
40 | 42 | ||
41 | begin = new QToolButton( this ); | 43 | begin = new QToolButton( this ); |
42 | begin->setFocusPolicy(NoFocus); | 44 | begin->setFocusPolicy(NoFocus); |
43 | begin->setPixmap( Resource::loadPixmap( "start" ) ); | 45 | begin->setPixmap( Resource::loadPixmap( "start" ) ); |
44 | begin->setAutoRaise( TRUE ); | 46 | begin->setAutoRaise( TRUE ); |
45 | begin->setFixedSize( begin->sizeHint() ); | 47 | begin->setFixedSize( begin->sizeHint() ); |
48 | QWhatsThis::add( begin, tr("Show January in the selected year") ); | ||
46 | 49 | ||
47 | back = new QToolButton( this ); | 50 | back = new QToolButton( this ); |
48 | back->setFocusPolicy(NoFocus); | 51 | back->setFocusPolicy(NoFocus); |
49 | back->setPixmap( Resource::loadPixmap( "back" ) ); | 52 | back->setPixmap( Resource::loadPixmap( "back" ) ); |
50 | back->setAutoRaise( TRUE ); | 53 | back->setAutoRaise( TRUE ); |
51 | back->setFixedSize( back->sizeHint() ); | 54 | back->setFixedSize( back->sizeHint() ); |
55 | QWhatsThis::add( back, tr("Show the previous month") ); | ||
52 | 56 | ||
53 | month = new QComboBox( FALSE, this ); | 57 | month = new QComboBox( FALSE, this ); |
54 | for ( int i = 0; i < 12; ++i ) | 58 | for ( int i = 0; i < 12; ++i ) |
55 | month->insertItem( Calendar::nameOfMonth( i + 1 ) ); | 59 | month->insertItem( Calendar::nameOfMonth( i + 1 ) ); |
56 | 60 | ||
57 | year = new QSpinBox( 1752, 8000, 1, this ); | 61 | year = new QSpinBox( 1752, 8000, 1, this ); |
58 | 62 | ||
59 | next = new QToolButton( this ); | 63 | next = new QToolButton( this ); |
60 | next->setFocusPolicy(NoFocus); | 64 | next->setFocusPolicy(NoFocus); |
61 | next->setPixmap( Resource::loadPixmap( "forward" ) ); | 65 | next->setPixmap( Resource::loadPixmap( "forward" ) ); |
62 | next->setAutoRaise( TRUE ); | 66 | next->setAutoRaise( TRUE ); |
63 | next->setFixedSize( next->sizeHint() ); | 67 | next->setFixedSize( next->sizeHint() ); |
68 | QWhatsThis::add( next, tr("Show the next month") ); | ||
64 | 69 | ||
65 | end = new QToolButton( this ); | 70 | end = new QToolButton( this ); |
66 | end->setFocusPolicy(NoFocus); | 71 | end->setFocusPolicy(NoFocus); |
67 | end->setPixmap( Resource::loadPixmap( "finish" ) ); | 72 | end->setPixmap( Resource::loadPixmap( "finish" ) ); |
68 | end->setAutoRaise( TRUE ); | 73 | end->setAutoRaise( TRUE ); |
69 | end->setFixedSize( end->sizeHint() ); | 74 | end->setFixedSize( end->sizeHint() ); |
75 | QWhatsThis::add( end, tr("Show December in the selected year") ); | ||
70 | 76 | ||
71 | connect( month, SIGNAL( activated( int ) ), | 77 | connect( month, SIGNAL( activated( int ) ), |
72 | this, SLOT( updateDate() ) ); | 78 | this, SLOT( updateDate() ) ); |
73 | connect( year, SIGNAL( valueChanged( int ) ), | 79 | connect( year, SIGNAL( valueChanged( int ) ), |
74 | this, SLOT( updateDate() ) ); | 80 | this, SLOT( updateDate() ) ); |
75 | connect( begin, SIGNAL( clicked() ), | 81 | connect( begin, SIGNAL( clicked() ), |
76 | this, SLOT( firstMonth() ) ); | 82 | this, SLOT( firstMonth() ) ); |
77 | connect( end, SIGNAL( clicked() ), | 83 | connect( end, SIGNAL( clicked() ), |
78 | this, SLOT( lastMonth() ) ); | 84 | this, SLOT( lastMonth() ) ); |
79 | connect( back, SIGNAL( clicked() ), | 85 | connect( back, SIGNAL( clicked() ), |
80 | this, SLOT( monthBack() ) ); | 86 | this, SLOT( monthBack() ) ); |
81 | connect( next, SIGNAL( clicked() ), | 87 | connect( next, SIGNAL( clicked() ), |
82 | this, SLOT( monthForward() ) ); | 88 | this, SLOT( monthForward() ) ); |
83 | back->setAutoRepeat( TRUE ); | 89 | back->setAutoRepeat( TRUE ); |
84 | next->setAutoRepeat( TRUE ); | 90 | next->setAutoRepeat( TRUE ); |
85 | } | 91 | } |
86 | 92 | ||
87 | 93 | ||
88 | DateBookMonthHeader::~DateBookMonthHeader() | 94 | DateBookMonthHeader::~DateBookMonthHeader() |
89 | { | 95 | { |
90 | 96 | ||
91 | } | 97 | } |
92 | 98 | ||
93 | void DateBookMonthHeader::updateDate() | 99 | void DateBookMonthHeader::updateDate() |
94 | { | 100 | { |
95 | emit dateChanged( year->value(), month->currentItem() + 1 ); | 101 | emit dateChanged( year->value(), month->currentItem() + 1 ); |
96 | } | 102 | } |
97 | 103 | ||
98 | void DateBookMonthHeader::firstMonth() | 104 | void DateBookMonthHeader::firstMonth() |
99 | { | 105 | { |
100 | emit dateChanged( year->value(), 1 ); | 106 | emit dateChanged( year->value(), 1 ); |
101 | month->setCurrentItem( 0 ); | 107 | month->setCurrentItem( 0 ); |
102 | } | 108 | } |
103 | 109 | ||
104 | void DateBookMonthHeader::lastMonth() | 110 | void DateBookMonthHeader::lastMonth() |
105 | { | 111 | { |
106 | emit dateChanged( year->value(), 12 ); | 112 | emit dateChanged( year->value(), 12 ); |
107 | month->setCurrentItem( 11 ); | 113 | month->setCurrentItem( 11 ); |
108 | } | 114 | } |
109 | 115 | ||
110 | void DateBookMonthHeader::monthBack() | 116 | void DateBookMonthHeader::monthBack() |
111 | { | 117 | { |
112 | if ( month->currentItem() > 0 ) { | 118 | if ( month->currentItem() > 0 ) { |
113 | emit dateChanged( year->value(), month->currentItem() ); | 119 | emit dateChanged( year->value(), month->currentItem() ); |
114 | month->setCurrentItem( month->currentItem() - 1 ); | 120 | month->setCurrentItem( month->currentItem() - 1 ); |
115 | } else { | 121 | } else { |
116 | emit dateChanged( year->value() - 1, 12 ); | 122 | emit dateChanged( year->value() - 1, 12 ); |
117 | // we have a signal set to a changed value in year so we only need to change | 123 | // we have a signal set to a changed value in year so we only need to change |
@@ -409,305 +415,336 @@ void DateBookMonth::setDate( int y, int m ) | |||
409 | if ( (y != year) || (m != month) ) { | 415 | if ( (y != year) || (m != month) ) { |
410 | year = y; | 416 | year = y; |
411 | month = m; | 417 | month = m; |
412 | QDate nd( y, m, 1 ); | 418 | QDate nd( y, m, 1 ); |
413 | if ( nd.daysInMonth() < day ) | 419 | if ( nd.daysInMonth() < day ) |
414 | day = nd.daysInMonth(); | 420 | day = nd.daysInMonth(); |
415 | table->setDate( year, month, day ); | 421 | table->setDate( year, month, day ); |
416 | } | 422 | } |
417 | } | 423 | } |
418 | 424 | ||
419 | void DateBookMonth::setDate( int y, int m, int d ) | 425 | void DateBookMonth::setDate( int y, int m, int d ) |
420 | { | 426 | { |
421 | header->setDate( y, m); | 427 | header->setDate( y, m); |
422 | table->setDate( y, m, d); | 428 | table->setDate( y, m, d); |
423 | year = y; | 429 | year = y; |
424 | month = m; | 430 | month = m; |
425 | day = d; | 431 | day = d; |
426 | } | 432 | } |
427 | 433 | ||
428 | /* called when we wish to close or pass back the date */ | 434 | /* called when we wish to close or pass back the date */ |
429 | void DateBookMonth::finalDate(int y, int m, int d) | 435 | void DateBookMonth::finalDate(int y, int m, int d) |
430 | { | 436 | { |
431 | setDate( y, m, d ); | 437 | setDate( y, m, d ); |
432 | 438 | ||
433 | emit dateClicked(y, m, d); | 439 | emit dateClicked(y, m, d); |
434 | // emit dateClicked(QDate(y, m, d).toString()); | 440 | // emit dateClicked(QDate(y, m, d).toString()); |
435 | 441 | ||
436 | if ( autoClose && parentWidget() ) | 442 | if ( autoClose && parentWidget() ) |
437 | parentWidget()->close(); | 443 | parentWidget()->close(); |
438 | } | 444 | } |
439 | 445 | ||
440 | void DateBookMonth::setDate( QDate d) | 446 | void DateBookMonth::setDate( QDate d) |
441 | { | 447 | { |
442 | setDate(d.year(), d.month(), d.day()); | 448 | setDate(d.year(), d.month(), d.day()); |
443 | } | 449 | } |
444 | 450 | ||
445 | void DateBookMonth::redraw() | 451 | void DateBookMonth::redraw() |
446 | { | 452 | { |
447 | table->setDate( year, month, day ); | 453 | table->setDate( year, month, day ); |
448 | table->redraw(); | 454 | table->redraw(); |
449 | } | 455 | } |
450 | 456 | ||
451 | QDate DateBookMonth::selectedDate() const | 457 | QDate DateBookMonth::selectedDate() const |
452 | { | 458 | { |
453 | if ( !table ) | 459 | if ( !table ) |
454 | return QDate::currentDate(); | 460 | return QDate::currentDate(); |
455 | int y, m, d; | 461 | int y, m, d; |
456 | table->getDate( y, m, d ); | 462 | table->getDate( y, m, d ); |
457 | qDebug( "got %d %d %d", y, m, d ); | ||
458 | return QDate( y, m, d ); | 463 | return QDate( y, m, d ); |
459 | } | 464 | } |
460 | 465 | ||
461 | void DateBookMonth::slotWeekChange( bool startOnMonday ) | 466 | void DateBookMonth::slotWeekChange( bool startOnMonday ) |
462 | { | 467 | { |
463 | table->setWeekStart( startOnMonday ); | 468 | table->setWeekStart( startOnMonday ); |
464 | } | 469 | } |
465 | 470 | ||
466 | void DateBookMonth::keyPressEvent( QKeyEvent *e ) | 471 | void DateBookMonth::keyPressEvent( QKeyEvent *e ) |
467 | { | 472 | { |
468 | switch(e->key()) { | 473 | switch(e->key()) { |
469 | case Key_Up: | 474 | case Key_Up: |
470 | setDate(QDate(year, month, day).addDays(-7)); | 475 | setDate(QDate(year, month, day).addDays(-7)); |
471 | break; | 476 | break; |
472 | case Key_Down: | 477 | case Key_Down: |
473 | setDate(QDate(year, month, day).addDays(7)); | 478 | setDate(QDate(year, month, day).addDays(7)); |
474 | break; | 479 | break; |
475 | case Key_Left: | 480 | case Key_Left: |
476 | setDate(QDate(year, month, day).addDays(-1)); | 481 | setDate(QDate(year, month, day).addDays(-1)); |
477 | break; | 482 | break; |
478 | case Key_Right: | 483 | case Key_Right: |
479 | setDate(QDate(year, month, day).addDays(1)); | 484 | setDate(QDate(year, month, day).addDays(1)); |
480 | break; | 485 | break; |
481 | case Key_Space: | 486 | case Key_Space: |
482 | qWarning("space"); | 487 | qWarning("space"); |
483 | emit dateClicked(year, month, day); | 488 | emit dateClicked(year, month, day); |
484 | if ( autoClose && parentWidget() ) | 489 | if ( autoClose && parentWidget() ) |
485 | parentWidget()->close(); | 490 | parentWidget()->close(); |
486 | break; | 491 | break; |
487 | default: | 492 | default: |
488 | qWarning("ignore"); | 493 | qWarning("ignore"); |
489 | e->ignore(); | 494 | e->ignore(); |
490 | break; | 495 | break; |
491 | } | 496 | } |
492 | } | 497 | } |
493 | 498 | ||
494 | //--------------------------------------------------------------------------- | 499 | //--------------------------------------------------------------------------- |
495 | class DayItemMonthPrivate | 500 | class DayItemMonthPrivate |
496 | { | 501 | { |
497 | public: | 502 | public: |
498 | DayItemMonthPrivate() {}; | 503 | DayItemMonthPrivate() {}; |
499 | ~DayItemMonthPrivate() { mDayEvents.clear(); }; | 504 | ~DayItemMonthPrivate() { mDayEvents.clear(); }; |
500 | QValueList<EffectiveEvent> mDayEvents; | 505 | QValueList<EffectiveEvent> mDayEvents; |
501 | }; | 506 | }; |
502 | 507 | ||
503 | DayItemMonth::DayItemMonth( QTable *table, EditType et, const QString &t ) | 508 | DayItemMonth::DayItemMonth( QTable *table, EditType et, const QString &t ) |
504 | : QTableItem( table, et, t ) | 509 | : QTableItem( table, et, t ) |
505 | { | 510 | { |
506 | d = new DayItemMonthPrivate(); | 511 | d = new DayItemMonthPrivate(); |
507 | } | 512 | } |
508 | 513 | ||
509 | DayItemMonth::~DayItemMonth() | 514 | DayItemMonth::~DayItemMonth() |
510 | { | 515 | { |
511 | daysEvents.clear(); | 516 | daysEvents.clear(); |
512 | delete d; | 517 | delete d; |
513 | } | 518 | } |
514 | 519 | ||
515 | void DayItemMonth::setEvents( const QValueList<EffectiveEvent> &effEv ) | 520 | void DayItemMonth::setEvents( const QValueList<EffectiveEvent> &effEv ) |
516 | { | 521 | { |
517 | d->mDayEvents = effEv; | 522 | d->mDayEvents = effEv; |
518 | } | 523 | } |
519 | 524 | ||
520 | void DayItemMonth::clearEffEvents() | 525 | void DayItemMonth::clearEffEvents() |
521 | { | 526 | { |
522 | d->mDayEvents.clear(); | 527 | d->mDayEvents.clear(); |
523 | } | 528 | } |
524 | 529 | ||
525 | void DayItemMonth::paint( QPainter *p, const QColorGroup &cg, | 530 | void DayItemMonth::paint( QPainter *p, const QColorGroup &cg, |
526 | const QRect &cr, bool selected ) | 531 | const QRect &cr, bool selected ) |
527 | { | 532 | { |
533 | p->save(); | ||
534 | |||
528 | QColorGroup g( cg ); | 535 | QColorGroup g( cg ); |
529 | g.setBrush( QColorGroup::Base, back ); | 536 | g.setBrush( QColorGroup::Base, back ); |
530 | g.setColor( QColorGroup::Text, forg ); | 537 | g.setColor( QColorGroup::Text, forg ); |
531 | p->fillRect( 0, 0, cr.width(), cr.height(), selected ? g.brush( QColorGroup::Highlight ) : g.brush( QColorGroup::Base ) ); | ||
532 | |||
533 | if ( selected ) | 538 | if ( selected ) |
534 | p->setPen( g.highlightedText() ); | 539 | p->setPen( g.highlightedText() ); |
535 | else | 540 | else |
536 | p->setPen( g.text() ); | 541 | p->setPen( g.text() ); |
537 | 542 | ||
538 | p->save(); | 543 | QValueStack<int> normalLine; |
539 | QFont f = p->font(); | 544 | QValueStack<int> repeatLine; |
540 | f.setPointSize( ( f.pointSize() / 3 ) * 2 ); | 545 | QValueStack<int> travelLine; |
541 | p->setFont( f ); | 546 | |
542 | QFontMetrics fm( f ); | 547 | bool normalAllDay = FALSE; |
543 | p->drawText( 1, 1 + fm.ascent(), QString::number( day() ) ); | 548 | bool repeatAllDay = FALSE; |
544 | p->restore(); | 549 | bool travelAllDay = FALSE; |
545 | // Put indicators for something like this, (similar to PalmOS) | 550 | |
546 | // Before noon: item at top of the day | ||
547 | // At noon: put a small item at the middle | ||
548 | // After noon: put an indicator at the bottom of the day | ||
549 | // an all day event: mark with a circle in the middle (a la DateBook+) | ||
550 | bool beforeNoon = false; | ||
551 | bool atNoon = false; | ||
552 | bool afterNoon = false; | ||
553 | bool bAllDay = false; | ||
554 | bool bRepeatAfter = false; | ||
555 | bool bRepeatBefore = false; | ||
556 | bool bRepeatNoon = false; | ||
557 | bool straddleAfter = false; | ||
558 | bool straddleBefore = false; | ||
559 | QValueListIterator<EffectiveEvent> itDays = d->mDayEvents.begin(); | 551 | QValueListIterator<EffectiveEvent> itDays = d->mDayEvents.begin(); |
552 | |||
560 | for ( ; itDays != d->mDayEvents.end(); ++itDays ) { | 553 | for ( ; itDays != d->mDayEvents.end(); ++itDays ) { |
561 | if ( (*itDays).event().type() == Event::AllDay ) | 554 | int w = cr.width(); |
562 | bAllDay = TRUE; | 555 | Event ev = (*itDays).event(); |
563 | else if ( (*itDays).start().hour() < 12 ) { | 556 | |
564 | beforeNoon = TRUE; | 557 | int f = (*itDays).start().hour(); // assume Effective event |
565 | if ( (*itDays).end().hour() > 12 ) { | 558 | int t = (*itDays).end().hour(); // is truncated. |
566 | atNoon = TRUE; | 559 | |
567 | straddleBefore = TRUE; | 560 | if (ev.isAllDay()) { |
561 | if (!ev.hasRepeat()) | ||
562 | normalAllDay = TRUE; | ||
563 | else | ||
564 | repeatAllDay = TRUE; | ||
565 | } else { | ||
566 | int sLine, eLine; | ||
567 | if (f == 0) | ||
568 | sLine = 0; | ||
569 | else if (f < 8 ) | ||
570 | sLine = 1; | ||
571 | else if (f >= 17) | ||
572 | sLine = w - 4; | ||
573 | else { | ||
574 | sLine = (f - 8) * (w - 8); | ||
575 | if (sLine) | ||
576 | sLine /= 8; | ||
577 | sLine += 4; | ||
568 | } | 578 | } |
569 | if ( (*itDays).end().hour() > 14 || | 579 | if (t == 23) |
570 | (*itDays).end().hour() == 14 && (*itDays).end().minute() > 0 ) { | 580 | eLine = w; |
571 | afterNoon = TRUE; | 581 | else if (t < 8) |
572 | straddleAfter = TRUE; | 582 | eLine = 4; |
583 | else if (t >= 17) | ||
584 | eLine = w - 1; | ||
585 | else { | ||
586 | eLine = (t - 8) * (w - 8); | ||
587 | if (eLine) | ||
588 | eLine /= 8; | ||
589 | eLine += 4; | ||
573 | } | 590 | } |
574 | if ( (*itDays).event().hasRepeat() ) | 591 | if (!ev.hasRepeat()) { |
575 | bRepeatBefore = TRUE; | 592 | normalLine.push(sLine); |
576 | } else if ( (*itDays).start().hour() == 12 ) { | 593 | normalLine.push(eLine); |
577 | if ( !atNoon ) | 594 | } else { |
578 | atNoon = TRUE; | 595 | repeatLine.push(sLine); |
579 | if ( (*itDays).event().hasRepeat() ) | 596 | repeatLine.push(eLine); |
580 | bRepeatNoon = TRUE; | ||
581 | if ( (*itDays).end().hour() > 14 || | ||
582 | (*itDays).end().hour() == 14 && (*itDays).end().minute() > 0 ) { | ||
583 | afterNoon = TRUE; | ||
584 | straddleAfter = TRUE; | ||
585 | } | 597 | } |
586 | } else if ( (*itDays).start().hour() > 12 ) { | ||
587 | afterNoon = TRUE; | ||
588 | if ( (*itDays).event().hasRepeat() ) | ||
589 | bRepeatAfter = TRUE; | ||
590 | } | 598 | } |
591 | } | 599 | } |
592 | int x = cr.width() - 13; | 600 | |
593 | if ( beforeNoon ) { | 601 | // draw the background |
594 | p->setBrush( blue ); | 602 | if (normalAllDay || repeatAllDay || travelAllDay) { |
595 | p->drawRect( x, 2, 10, 10 ); | 603 | p->save(); |
596 | if ( bRepeatBefore ) | 604 | |
597 | p->fillRect( x + 5, 4, 3, 3, white ); | 605 | if (normalAllDay) |
598 | } | 606 | if (repeatAllDay) { |
599 | if ( atNoon ) { | 607 | p->fillRect( 0, 0, cr.width(), cr.height() / 2, |
600 | p->setBrush( blue ); | 608 | colorNormalLight ); |
601 | p->drawRect( x, 14, 10, 5 ); | 609 | p->fillRect( 0, cr.height() / 2, cr.width(), cr.height() / 2, |
602 | if ( bRepeatNoon ) | 610 | colorRepeatLight ); |
603 | p->fillRect( x + 5, 16, 3, 2, white ); | 611 | } else |
604 | } | 612 | p->fillRect( 0, 0, cr.width(), cr.height(), |
605 | if ( straddleBefore ) { | 613 | colorNormalLight ); |
606 | p->drawLine( x, 11, x, 14 ); | 614 | else if (repeatAllDay) |
607 | p->fillRect( x + 1, 11, 8, 4, blue ); | 615 | p->fillRect( 0, 0, cr.width(), cr.height(), |
608 | p->drawLine( x + 9, 11, x + 9, 14 ); | 616 | colorRepeatLight ); |
609 | } | 617 | } else { |
610 | if ( afterNoon ) { | 618 | p->fillRect( 0, 0, cr.width(), |
611 | p->setBrush( blue ); | 619 | cr.height(), selected |
612 | p->drawRect( x, 21, 10, 10 ); | 620 | ? g.brush( QColorGroup::Highlight ) |
613 | if ( bRepeatAfter ) | 621 | : g.brush( QColorGroup::Base ) ); |
614 | p->fillRect( x + 5, 23, 3, 3, white ); | ||
615 | } | 622 | } |
616 | if ( straddleAfter ) { | 623 | |
617 | p->drawLine( x, 18, x, 21 ); | 624 | // The lines |
618 | p->fillRect( x + 1, 18, 8, 4, blue ); | 625 | // now for the lines. |
619 | p->drawLine( x + 9, 18, x + 9, 21 ); | 626 | int h = 5; |
627 | int y = cr.height() / 2 - h; | ||
628 | |||
629 | while(normalLine.count() >= 2) { | ||
630 | int x2 = normalLine.pop(); | ||
631 | int x1 = normalLine.pop(); | ||
632 | if (x2 < x1 + 2) | ||
633 | x2 = x1 + 2; | ||
634 | p->fillRect(x1, y, x2 - x1, h, colorNormal); | ||
620 | } | 635 | } |
621 | if ( bAllDay ) { | 636 | |
622 | p->setBrush( green ); | 637 | y += h; |
623 | p->drawEllipse( cr.width() / 2 - 7, cr.height() / 2 - 5, 10, 10 ); | 638 | |
639 | while(repeatLine.count() >= 2) { | ||
640 | int x2 = repeatLine.pop(); | ||
641 | int x1 = repeatLine.pop(); | ||
642 | if (x2 < x1 + 2) | ||
643 | x2 = x1 + 2; | ||
644 | p->fillRect(x1, y, x2 - x1, h, colorRepeat); | ||
624 | } | 645 | } |
646 | |||
647 | |||
648 | // Finally, draw the number. | ||
649 | QFont f = p->font(); | ||
650 | f.setPointSize( ( f.pointSize() / 3 ) * 2 ); | ||
651 | p->setFont( f ); | ||
652 | QFontMetrics fm( f ); | ||
653 | p->drawText( 1, 1 + fm.ascent(), QString::number( day() ) ); | ||
654 | |||
655 | p->restore(); | ||
625 | } | 656 | } |
626 | 657 | ||
627 | 658 | ||
628 | 659 | ||
629 | void DayItemMonth::setType( Calendar::Day::Type t ) | 660 | void DayItemMonth::setType( Calendar::Day::Type t ) |
630 | { | 661 | { |
631 | switch ( t ) { | 662 | switch ( t ) { |
632 | case Calendar::Day::PrevMonth: | 663 | case Calendar::Day::PrevMonth: |
633 | case Calendar::Day::NextMonth: | 664 | case Calendar::Day::NextMonth: |
634 | back = QBrush( QColor( 224, 224, 224 ) ); | 665 | back = QBrush( QColor( 224, 224, 224 ) ); |
635 | forg = black; | 666 | forg = black; |
636 | break; | 667 | break; |
637 | case Calendar::Day::ThisMonth: | 668 | case Calendar::Day::ThisMonth: |
638 | back = QBrush( white ); | 669 | back = QBrush( white ); |
639 | forg = black; | 670 | forg = black; |
640 | break; | 671 | break; |
641 | } | 672 | } |
642 | typ = t; | 673 | typ = t; |
643 | } | 674 | } |
644 | 675 | ||
645 | 676 | ||
646 | 677 | ||
647 | DateButton::DateButton( bool longDate, QWidget *parent, const char * name ) | 678 | DateButton::DateButton( bool longDate, QWidget *parent, const char * name ) |
648 | :QPushButton( parent, name ) | 679 | :QPushButton( parent, name ) |
649 | { | 680 | { |
650 | longFormat = longDate; | 681 | longFormat = longDate; |
651 | df = DateFormat('/', DateFormat::MonthDayYear, DateFormat::MonthDayYear); | 682 | df = DateFormat('/', DateFormat::MonthDayYear, DateFormat::MonthDayYear); |
652 | setDate( QDate::currentDate() ); | 683 | setDate( QDate::currentDate() ); |
653 | 684 | ||
654 | connect(this,SIGNAL(pressed()),this,SLOT(pickDate())); | 685 | connect(this,SIGNAL(pressed()),this,SLOT(pickDate())); |
655 | 686 | ||
656 | 687 | ||
657 | } | 688 | } |
658 | 689 | ||
659 | 690 | ||
660 | void DateButton::pickDate() | 691 | void DateButton::pickDate() |
661 | { | 692 | { |
662 | static QPopupMenu *m1 = 0; | 693 | static QPopupMenu *m1 = 0; |
663 | static DateBookMonth *picker = 0; | 694 | static DateBookMonth *picker = 0; |
664 | if ( !m1 ) { | 695 | if ( !m1 ) { |
665 | m1 = new QPopupMenu( this ); | 696 | m1 = new QPopupMenu( this ); |
666 | picker = new DateBookMonth( m1, 0, TRUE ); | 697 | picker = new DateBookMonth( m1, 0, TRUE ); |
667 | m1->insertItem( picker ); | 698 | m1->insertItem( picker ); |
668 | connect( picker, SIGNAL( dateClicked( int, int, int ) ), | 699 | connect( picker, SIGNAL( dateClicked( int, int, int ) ), |
669 | this, SLOT( setDate( int, int, int ) ) ); | 700 | this, SLOT( setDate( int, int, int ) ) ); |
670 | connect( picker, SIGNAL( dateClicked( int, int, int ) ), | 701 | connect( picker, SIGNAL( dateClicked( int, int, int ) ), |
671 | this, SIGNAL( dateSelected( int, int, int ) ) ); | 702 | this, SIGNAL( dateSelected( int, int, int ) ) ); |
672 | connect( m1, SIGNAL( aboutToHide() ), | 703 | connect( m1, SIGNAL( aboutToHide() ), |
673 | this, SLOT( gotHide() ) ); | 704 | this, SLOT( gotHide() ) ); |
674 | } | 705 | } |
675 | picker->slotWeekChange( weekStartsMonday ); | 706 | picker->slotWeekChange( weekStartsMonday ); |
676 | picker->setDate( currDate.year(), currDate.month(), currDate.day() ); | 707 | picker->setDate( currDate.year(), currDate.month(), currDate.day() ); |
677 | m1->popup(mapToGlobal(QPoint(0,height()))); | 708 | m1->popup(mapToGlobal(QPoint(0,height()))); |
678 | picker->setFocus(); | 709 | picker->setFocus(); |
679 | } | 710 | } |
680 | 711 | ||
681 | 712 | ||
682 | void DateButton::gotHide() | 713 | void DateButton::gotHide() |
683 | { | 714 | { |
684 | // we have to redo the button... | 715 | // we have to redo the button... |
685 | setDown( false ); | 716 | setDown( false ); |
686 | } | 717 | } |
687 | 718 | ||
688 | 719 | ||
689 | // void dateSelected( int year, int month, int day ); | 720 | // void dateSelected( int year, int month, int day ); |
690 | 721 | ||
691 | void DateButton::setWeekStartsMonday( int b ) | 722 | void DateButton::setWeekStartsMonday( int b ) |
692 | { | 723 | { |
693 | weekStartsMonday = b; | 724 | weekStartsMonday = b; |
694 | } | 725 | } |
695 | 726 | ||
696 | void DateButton::setDate( int y, int m, int d ) | 727 | void DateButton::setDate( int y, int m, int d ) |
697 | { | 728 | { |
698 | setDate( QDate( y,m,d) ); | 729 | setDate( QDate( y,m,d) ); |
699 | } | 730 | } |
700 | 731 | ||
701 | void DateButton::setDate( QDate d ) | 732 | void DateButton::setDate( QDate d ) |
702 | { | 733 | { |
703 | currDate = d; | 734 | currDate = d; |
704 | setText( longFormat ? TimeString::longDateString( d, df ) : | 735 | setText( longFormat ? TimeString::longDateString( d, df ) : |
705 | TimeString::shortDate( d, df ) ); | 736 | TimeString::shortDate( d, df ) ); |
706 | 737 | ||
707 | } | 738 | } |
708 | 739 | ||
709 | void DateButton::setDateFormat( DateFormat f ) | 740 | void DateButton::setDateFormat( DateFormat f ) |
710 | { | 741 | { |
711 | df = f; | 742 | df = f; |
712 | setDate( currDate ); | 743 | setDate( currDate ); |
713 | } | 744 | } |
745 | |||
746 | bool DateButton::customWhatsThis() const | ||
747 | { | ||
748 | return TRUE; | ||
749 | } | ||
750 | |||