summaryrefslogtreecommitdiff
path: root/library/datebookmonth.cpp
Unidiff
Diffstat (limited to 'library/datebookmonth.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--library/datebookmonth.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/library/datebookmonth.cpp b/library/datebookmonth.cpp
index 2616b7b..ffdf335 100644
--- a/library/datebookmonth.cpp
+++ b/library/datebookmonth.cpp
@@ -600,129 +600,136 @@ void DayItemMonth::paint( QPainter *p, const QColorGroup &cg,
600 normalLine.push(sLine); 600 normalLine.push(sLine);
601 normalLine.push(eLine); 601 normalLine.push(eLine);
602 } else { 602 } else {
603 repeatLine.push(sLine); 603 repeatLine.push(sLine);
604 repeatLine.push(eLine); 604 repeatLine.push(eLine);
605 } 605 }
606 } 606 }
607 } 607 }
608 608
609 // draw the background 609 // draw the background
610 if (normalAllDay || repeatAllDay || travelAllDay || holidayAllDay) { 610 if (normalAllDay || repeatAllDay || travelAllDay || holidayAllDay) {
611 p->save(); 611 p->save();
612 612
613 if (normalAllDay) 613 if (normalAllDay)
614 if (repeatAllDay) { 614 if (repeatAllDay) {
615 p->fillRect( 0, 0, cr.width(), cr.height() / 2, 615 p->fillRect( 0, 0, cr.width(), cr.height() / 2,
616 s_colorNormalLight ); 616 s_colorNormalLight );
617 p->fillRect( 0, cr.height() / 2, cr.width(), cr.height() / 2, 617 p->fillRect( 0, cr.height() / 2, cr.width(), cr.height() / 2,
618 colorRepeatLight ); 618 colorRepeatLight );
619 } else { 619 } else {
620 if (!holidayAllDay) { 620 if (!holidayAllDay) {
621 p->fillRect( 0, 0, cr.width(), cr.height(), 621 p->fillRect( 0, 0, cr.width(), cr.height(),
622 s_colorNormalLight ); 622 s_colorNormalLight );
623 } else { 623 } else {
624 p->fillRect( 0, 0, cr.width(), cr.height(), 624 p->fillRect( 0, 0, cr.width(), cr.height(),
625 s_colorHolidayLight ); 625 s_colorHolidayLight );
626 } 626 }
627 } else if (repeatAllDay) { 627 } else if (repeatAllDay) {
628 p->fillRect( 0, 0, cr.width(), cr.height(), 628 p->fillRect( 0, 0, cr.width(), cr.height(),
629 s_colorRepeatLight ); 629 s_colorRepeatLight );
630 } 630 }
631 } else { 631 } else {
632 p->fillRect( 0, 0, cr.width(), 632 p->fillRect( 0, 0, cr.width(),
633 cr.height(), selected 633 cr.height(), selected
634 ? g.brush( QColorGroup::Highlight ) 634 ? g.brush( QColorGroup::Highlight )
635 : g.brush( QColorGroup::Base ) ); 635 : g.brush( QColorGroup::Base ) );
636 } 636 }
637 637
638 // The lines 638 // The lines
639 // now for the lines. 639 // now for the lines.
640 int h = 5; 640 int h = 5;
641 int y = cr.height() / 2 - h; 641 int y = cr.height() / 2 - h;
642 642
643 while(normalLine.count() >= 2) { 643 while(normalLine.count() >= 2) {
644 int x2 = normalLine.pop(); 644 int x2 = normalLine.pop();
645 int x1 = normalLine.pop(); 645 int x1 = normalLine.pop();
646 if (x2 < x1 + 2) 646 if (x2 < x1 + 2)
647 x2 = x1 + 2; 647 x2 = x1 + 2;
648 p->fillRect(x1, y, x2 - x1, h, colorNormal); 648 p->fillRect(x1, y, x2 - x1, h, colorNormal);
649 } 649 }
650 650
651 y += h; 651 y += h;
652 652
653 while(repeatLine.count() >= 2) { 653 while(repeatLine.count() >= 2) {
654 int x2 = repeatLine.pop(); 654 int x2 = repeatLine.pop();
655 int x1 = repeatLine.pop(); 655 int x1 = repeatLine.pop();
656 if (x2 < x1 + 2) 656 if (x2 < x1 + 2)
657 x2 = x1 + 2; 657 x2 = x1 + 2;
658 p->fillRect(x1, y, x2 - x1, h, colorRepeat); 658 p->fillRect(x1, y, x2 - x1, h, colorRepeat);
659 } 659 }
660 660
661 661
662 // Finally, draw the number. 662 // Finally, draw the number.
663 QFont f = p->font(); 663 QFont f = p->font();
664 f.setPointSize( ( f.pointSize() / 3 ) * 2 ); 664 if(qApp->desktop()->width() >= 480)
665 {
666 f.setPointSize( f.pointSize() - 2 );
667 }
668 else
669 {
670 f.setPointSize( ( f.pointSize() / 3 ) * 2 );
671 }
665 p->setFont( f ); 672 p->setFont( f );
666 QFontMetrics fm( f ); 673 QFontMetrics fm( f );
667 p->drawText( 1, 1 + fm.ascent(), QString::number( day() ) ); 674 p->drawText( 1, 1 + fm.ascent(), QString::number( day() ) );
668 675
669 p->restore(); 676 p->restore();
670} 677}
671 678
672 679
673 680
674void DayItemMonth::setType( Calendar::Day::Type t ) 681void DayItemMonth::setType( Calendar::Day::Type t )
675{ 682{
676 switch ( t ) { 683 switch ( t ) {
677 case Calendar::Day::PrevMonth: 684 case Calendar::Day::PrevMonth:
678 case Calendar::Day::NextMonth: 685 case Calendar::Day::NextMonth:
679 back = QBrush( QColor( 224, 224, 224 ) ); 686 back = QBrush( QColor( 224, 224, 224 ) );
680 forg = black; 687 forg = black;
681 break; 688 break;
682 case Calendar::Day::ThisMonth: 689 case Calendar::Day::ThisMonth:
683 back = QBrush( white ); 690 back = QBrush( white );
684 forg = black; 691 forg = black;
685 break; 692 break;
686 } 693 }
687 typ = t; 694 typ = t;
688} 695}
689 696
690 697
691 698
692DateButton::DateButton( bool longDate, QWidget *parent, const char * name ) 699DateButton::DateButton( bool longDate, QWidget *parent, const char * name )
693 :QPushButton( parent, name ) 700 :QPushButton( parent, name )
694{ 701{
695 longFormat = longDate; 702 longFormat = longDate;
696 df = DateFormat('/', DateFormat::MonthDayYear, DateFormat::MonthDayYear); 703 df = DateFormat('/', DateFormat::MonthDayYear, DateFormat::MonthDayYear);
697 setDate( QDate::currentDate() ); 704 setDate( QDate::currentDate() );
698 705
699 connect(this,SIGNAL(pressed()),this,SLOT(pickDate())); 706 connect(this,SIGNAL(pressed()),this,SLOT(pickDate()));
700 707
701 708
702} 709}
703 710
704 711
705void DateButton::pickDate() 712void DateButton::pickDate()
706{ 713{
707 static QPopupMenu *m1 = 0; 714 static QPopupMenu *m1 = 0;
708 static DateBookMonth *picker = 0; 715 static DateBookMonth *picker = 0;
709 if ( !m1 ) { 716 if ( !m1 ) {
710 m1 = new QPopupMenu( this ); 717 m1 = new QPopupMenu( this );
711 picker = new DateBookMonth( m1, 0, TRUE ); 718 picker = new DateBookMonth( m1, 0, TRUE );
712 m1->insertItem( picker ); 719 m1->insertItem( picker );
713 connect( picker, SIGNAL( dateClicked(int,int,int) ), 720 connect( picker, SIGNAL( dateClicked(int,int,int) ),
714 this, SLOT( setDate(int,int,int) ) ); 721 this, SLOT( setDate(int,int,int) ) );
715 connect( picker, SIGNAL( dateClicked(int,int,int) ), 722 connect( picker, SIGNAL( dateClicked(int,int,int) ),
716 this, SIGNAL( dateSelected(int,int,int) ) ); 723 this, SIGNAL( dateSelected(int,int,int) ) );
717 connect( m1, SIGNAL( aboutToHide() ), 724 connect( m1, SIGNAL( aboutToHide() ),
718 this, SLOT( gotHide() ) ); 725 this, SLOT( gotHide() ) );
719 } 726 }
720 picker->slotWeekChange( weekStartsMonday ); 727 picker->slotWeekChange( weekStartsMonday );
721 picker->setDate( currDate.year(), currDate.month(), currDate.day() ); 728 picker->setDate( currDate.year(), currDate.month(), currDate.day() );
722 m1->popup(mapToGlobal(QPoint(0,height()))); 729 m1->popup(mapToGlobal(QPoint(0,height())));
723 picker->setFocus(); 730 picker->setFocus();
724} 731}
725 732
726 733
727void DateButton::gotHide() 734void DateButton::gotHide()
728{ 735{