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 )
   for( i = 0; i < 7; i++ ) {
     headings[i] = new QLabel("",this);
     //headings[i]->setFont(QFont("Arial", 10, QFont::Bold));
     headings[i]->setAlignment(AlignCenter);
+    headings[i]->installEventFilter(this);
 
     topLayout->addWidget(headings[i],1,i+1);
   }
 
@@ -438,8 +439,23 @@ bool KDateNavigator::eventFilter (QObject *o,QEvent *e)
         emit weekClicked(weekstart);
         break;
       }
     }
+    for(i=0;i<7;++i) {
+      if (o == headings[i]) {
+          KCal::DateList selDays;
+          QDate date = daymatrix->getDate(14);
+          int dio = date.daysInMonth();
+          int j;
+          int ye =  date.year();
+          int mo = date.month();
+          for ( j = 1; j <= dio; ++j ) {
+              selDays.append( QDate( ye, mo, j ) );
+          }
+          emit datesSelected( selDays );
+        break;
+      }
+    }
     return true;
   } else {
     return false;
   }
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 )
 }
 
 void KOViewManager::showDayView()
 {
+    mCurrentAgendaView = mMainView->dateNavigator()->selectedDates().count();
     mFlagShowNextxDays =  false;
     globalFlagBlockLabel = 1;
     globalFlagBlockAgenda = 1;
     if ( mCurrentAgendaView != 1 )
@@ -436,8 +437,9 @@ void KOViewManager::showDayView()
 }
 
 void KOViewManager::showWorkWeekView()
 {
+    mCurrentAgendaView = mMainView->dateNavigator()->selectedDates().count();
     mFlagShowNextxDays =  false;
     globalFlagBlockAgenda = 1;
     globalFlagBlockLabel = 1;
     if ( mCurrentAgendaView != 5 )
@@ -461,8 +463,9 @@ void KOViewManager::showWeekView()
       showAgendaView();
     */
 
 
+    mCurrentAgendaView = mMainView->dateNavigator()->selectedDates().count();
     mFlagShowNextxDays = false;
     globalFlagBlockAgenda = 1;
     globalFlagBlockLabel = 1;
     if ( mCurrentAgendaView != 7 )