-rw-r--r-- | korganizer/kdatenavigator.cpp | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp index 83a57ca..1474e4b 100644 --- a/korganizer/kdatenavigator.cpp +++ b/korganizer/kdatenavigator.cpp | |||
@@ -62,48 +62,49 @@ KDateNavigator::KDateNavigator( QWidget *parent, const char *name ) | |||
62 | m_MthYr = startDate; | 62 | m_MthYr = startDate; |
63 | m_bShowWeekNums = true; | 63 | m_bShowWeekNums = true; |
64 | 64 | ||
65 | setFont( KOPrefs::instance()->mDateNavigatorFont ); | 65 | setFont( KOPrefs::instance()->mDateNavigatorFont ); |
66 | mNavigatorBar = new NavigatorBar( startDate, this ); | 66 | mNavigatorBar = new NavigatorBar( startDate, this ); |
67 | topLayout->addMultiCellWidget( mNavigatorBar, 0, 0, 0, 7 ); | 67 | topLayout->addMultiCellWidget( mNavigatorBar, 0, 0, 0, 7 ); |
68 | //mNavigatorBar->resize( 1,1); | 68 | //mNavigatorBar->resize( 1,1); |
69 | connect( mNavigatorBar, SIGNAL( goPrevYear() ), SIGNAL( goPrevYear() ) ); | 69 | connect( mNavigatorBar, SIGNAL( goPrevYear() ), SIGNAL( goPrevYear() ) ); |
70 | connect( mNavigatorBar, SIGNAL( goPrevMonth() ), SIGNAL( goPrevMonth() ) ); | 70 | connect( mNavigatorBar, SIGNAL( goPrevMonth() ), SIGNAL( goPrevMonth() ) ); |
71 | connect( mNavigatorBar, SIGNAL( goNextMonth() ), SIGNAL( goNextMonth() ) ); | 71 | connect( mNavigatorBar, SIGNAL( goNextMonth() ), SIGNAL( goNextMonth() ) ); |
72 | connect( mNavigatorBar, SIGNAL( goNextYear() ), SIGNAL( goNextYear() ) ); | 72 | connect( mNavigatorBar, SIGNAL( goNextYear() ), SIGNAL( goNextYear() ) ); |
73 | connect( mNavigatorBar, SIGNAL( monthSelected( int ) ), SLOT( slotMonthSelected( int ) ) ); | 73 | connect( mNavigatorBar, SIGNAL( monthSelected( int ) ), SLOT( slotMonthSelected( int ) ) ); |
74 | 74 | ||
75 | // get the day of the week on the first day | 75 | // get the day of the week on the first day |
76 | QDate dayone(m_MthYr.year(), m_MthYr.month(), 1); | 76 | QDate dayone(m_MthYr.year(), m_MthYr.month(), 1); |
77 | m_fstDayOfWk = dayone.dayOfWeek(); | 77 | m_fstDayOfWk = dayone.dayOfWeek(); |
78 | 78 | ||
79 | int i; | 79 | int i; |
80 | 80 | ||
81 | // Set up the heading fields. | 81 | // Set up the heading fields. |
82 | for( i = 0; i < 7; i++ ) { | 82 | for( i = 0; i < 7; i++ ) { |
83 | headings[i] = new QLabel("",this); | 83 | headings[i] = new QLabel("",this); |
84 | //headings[i]->setFont(QFont("Arial", 10, QFont::Bold)); | 84 | //headings[i]->setFont(QFont("Arial", 10, QFont::Bold)); |
85 | headings[i]->setAlignment(AlignCenter); | 85 | headings[i]->setAlignment(AlignCenter); |
86 | headings[i]->installEventFilter(this); | ||
86 | 87 | ||
87 | topLayout->addWidget(headings[i],1,i+1); | 88 | topLayout->addWidget(headings[i],1,i+1); |
88 | } | 89 | } |
89 | 90 | ||
90 | // Create the weeknumber labels | 91 | // Create the weeknumber labels |
91 | for( i = 0; i < 6; i++ ) { | 92 | for( i = 0; i < 6; i++ ) { |
92 | weeknos[i] = new QLabel(this); | 93 | weeknos[i] = new QLabel(this); |
93 | weeknos[i]->setAlignment(AlignCenter); | 94 | weeknos[i]->setAlignment(AlignCenter); |
94 | //weeknos[i]->setFont(QFont("Arial", 10)); | 95 | //weeknos[i]->setFont(QFont("Arial", 10)); |
95 | if(!m_bShowWeekNums) { | 96 | if(!m_bShowWeekNums) { |
96 | weeknos[i]->hide(); | 97 | weeknos[i]->hide(); |
97 | } | 98 | } |
98 | weeknos[i]->installEventFilter(this); | 99 | weeknos[i]->installEventFilter(this); |
99 | 100 | ||
100 | topLayout->addWidget(weeknos[i],i+2,0); | 101 | topLayout->addWidget(weeknos[i],i+2,0); |
101 | } | 102 | } |
102 | 103 | ||
103 | daymatrix = new KODayMatrix( this, "KDateNavigator::DayMatrix"); | 104 | daymatrix = new KODayMatrix( this, "KDateNavigator::DayMatrix"); |
104 | daymatrix->setFrameStyle(QFrame::Panel|QFrame::Sunken); | 105 | daymatrix->setFrameStyle(QFrame::Panel|QFrame::Sunken); |
105 | daymatrix->setLineWidth(1); | 106 | daymatrix->setLineWidth(1); |
106 | 107 | ||
107 | connect( daymatrix, SIGNAL( selected( const KCal::DateList & ) ), | 108 | connect( daymatrix, SIGNAL( selected( const KCal::DateList & ) ), |
108 | SIGNAL( datesSelected( const KCal::DateList & ) ) ); | 109 | SIGNAL( datesSelected( const KCal::DateList & ) ) ); |
109 | 110 | ||
@@ -418,31 +419,46 @@ int KDateNavigator::dayToIndex(int dayNum) | |||
418 | row++; | 419 | row++; |
419 | col = (dayNum+m_fstDayOfWk-1-(KGlobal::locale()->weekStartsMonday() ? 1 : 0)) % 7; | 420 | col = (dayNum+m_fstDayOfWk-1-(KGlobal::locale()->weekStartsMonday() ? 1 : 0)) % 7; |
420 | return row * 7 + col; | 421 | return row * 7 + col; |
421 | } | 422 | } |
422 | 423 | ||
423 | void KDateNavigator::wheelEvent (QWheelEvent *e) | 424 | void KDateNavigator::wheelEvent (QWheelEvent *e) |
424 | { | 425 | { |
425 | if(e->delta()>0) emit goPrevious(); | 426 | if(e->delta()>0) emit goPrevious(); |
426 | else emit goNext(); | 427 | else emit goNext(); |
427 | 428 | ||
428 | e->accept(); | 429 | e->accept(); |
429 | } | 430 | } |
430 | 431 | ||
431 | bool KDateNavigator::eventFilter (QObject *o,QEvent *e) | 432 | bool KDateNavigator::eventFilter (QObject *o,QEvent *e) |
432 | { | 433 | { |
433 | if (e->type() == QEvent::MouseButtonPress) { | 434 | if (e->type() == QEvent::MouseButtonPress) { |
434 | int i; | 435 | int i; |
435 | for(i=0;i<6;++i) { | 436 | for(i=0;i<6;++i) { |
436 | if (o == weeknos[i]) { | 437 | if (o == weeknos[i]) { |
437 | QDate weekstart = daymatrix->getDate(i*7); | 438 | QDate weekstart = daymatrix->getDate(i*7); |
438 | emit weekClicked(weekstart); | 439 | emit weekClicked(weekstart); |
439 | break; | 440 | break; |
440 | } | 441 | } |
441 | } | 442 | } |
443 | for(i=0;i<7;++i) { | ||
444 | if (o == headings[i]) { | ||
445 | KCal::DateList selDays; | ||
446 | QDate date = daymatrix->getDate(14); | ||
447 | int dio = date.daysInMonth(); | ||
448 | int j; | ||
449 | int ye = date.year(); | ||
450 | int mo = date.month(); | ||
451 | for ( j = 1; j <= dio; ++j ) { | ||
452 | selDays.append( QDate( ye, mo, j ) ); | ||
453 | } | ||
454 | emit datesSelected( selDays ); | ||
455 | break; | ||
456 | } | ||
457 | } | ||
442 | return true; | 458 | return true; |
443 | } else { | 459 | } else { |
444 | return false; | 460 | return false; |
445 | } | 461 | } |
446 | } | 462 | } |
447 | 463 | ||
448 | //#include "kdatenavigator.moc" | 464 | //#include "kdatenavigator.moc" |