-rw-r--r-- | korganizer/kdatenavigator.cpp | 16 | ||||
-rw-r--r-- | korganizer/koviewmanager.cpp | 3 |
2 files changed, 19 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 | |||
@@ -82,8 +82,9 @@ KDateNavigator::KDateNavigator( QWidget *parent, const char *name ) | |||
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 | ||
@@ -438,8 +439,23 @@ bool KDateNavigator::eventFilter (QObject *o,QEvent *e) | |||
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 | } |
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index a9f5a41..cc0ce9b 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp | |||
@@ -420,8 +420,9 @@ void KOViewManager::showAgendaView( bool fullScreen ) | |||
420 | } | 420 | } |
421 | 421 | ||
422 | void KOViewManager::showDayView() | 422 | void KOViewManager::showDayView() |
423 | { | 423 | { |
424 | mCurrentAgendaView = mMainView->dateNavigator()->selectedDates().count(); | ||
424 | mFlagShowNextxDays = false; | 425 | mFlagShowNextxDays = false; |
425 | globalFlagBlockLabel = 1; | 426 | globalFlagBlockLabel = 1; |
426 | globalFlagBlockAgenda = 1; | 427 | globalFlagBlockAgenda = 1; |
427 | if ( mCurrentAgendaView != 1 ) | 428 | if ( mCurrentAgendaView != 1 ) |
@@ -436,8 +437,9 @@ void KOViewManager::showDayView() | |||
436 | } | 437 | } |
437 | 438 | ||
438 | void KOViewManager::showWorkWeekView() | 439 | void KOViewManager::showWorkWeekView() |
439 | { | 440 | { |
441 | mCurrentAgendaView = mMainView->dateNavigator()->selectedDates().count(); | ||
440 | mFlagShowNextxDays = false; | 442 | mFlagShowNextxDays = false; |
441 | globalFlagBlockAgenda = 1; | 443 | globalFlagBlockAgenda = 1; |
442 | globalFlagBlockLabel = 1; | 444 | globalFlagBlockLabel = 1; |
443 | if ( mCurrentAgendaView != 5 ) | 445 | if ( mCurrentAgendaView != 5 ) |
@@ -461,8 +463,9 @@ void KOViewManager::showWeekView() | |||
461 | showAgendaView(); | 463 | showAgendaView(); |
462 | */ | 464 | */ |
463 | 465 | ||
464 | 466 | ||
467 | mCurrentAgendaView = mMainView->dateNavigator()->selectedDates().count(); | ||
465 | mFlagShowNextxDays = false; | 468 | mFlagShowNextxDays = false; |
466 | globalFlagBlockAgenda = 1; | 469 | globalFlagBlockAgenda = 1; |
467 | globalFlagBlockLabel = 1; | 470 | globalFlagBlockLabel = 1; |
468 | if ( mCurrentAgendaView != 7 ) | 471 | if ( mCurrentAgendaView != 7 ) |