fix

7 files changed, 22 insertions, 2 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 6ed6a1c..92fd59c 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -369,8 +369,12 @@ void CalendarView::init()
     connect( mNavigator, SIGNAL( datesSelected( const KCal::DateList & ) ),
              mDateNavigator, SLOT( selectDates( const KCal::DateList & ) ) );
   
     
+    
+    connect( mDateNavigator, SIGNAL( showMonth( const QDate & ) ),
+             mViewManager, SLOT(  showMonth( const QDate & ) ) );
+
     connect( mDateNavigator, SIGNAL( weekClicked( const QDate & ) ),
              mNavigator, SLOT( selectWeek( const QDate & ) ) );
 
     connect( mDateNavigator, SIGNAL( goPrevYear() ),
diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp
index 11dc592..edeebdf 100644
--- a/korganizer/datenavigatorcontainer.cpp
+++ b/korganizer/datenavigatorcontainer.cpp
@@ -70,8 +70,10 @@ void DateNavigatorContainer::connectNavigatorView( KDateNavigator *v )
            SIGNAL( incidenceDroppedMove( Incidence *, const QDate & ) ) );
 #endif
   connect( v, SIGNAL( weekClicked( const QDate & ) ),
            SIGNAL( weekClicked( const QDate & ) ) );
+  connect( v, SIGNAL( showMonth( const QDate & ) ),
+           SIGNAL( showMonth( const QDate & ) ) );
 
   connect( v, SIGNAL( goPrevious() ), SIGNAL( goPrevious() ) );
   connect( v, SIGNAL( goNext() ), SIGNAL( goNext() ) );
 
diff --git a/korganizer/datenavigatorcontainer.h b/korganizer/datenavigatorcontainer.h
index ac9745d..87cc59f 100644
--- a/korganizer/datenavigatorcontainer.h
+++ b/korganizer/datenavigatorcontainer.h
@@ -77,8 +77,9 @@ class DateNavigatorContainer: public QWidget
     void goNextMonth();
     void goPrevMonth();
     void goNextYear();
     void goPrevYear();
+    void showMonth( const QDate & );
 
     void monthSelected( int month );
 
   protected:
diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp
index 5eccfd6..38bddc2 100644
--- a/korganizer/kdatenavigator.cpp
+++ b/korganizer/kdatenavigator.cpp
@@ -446,16 +446,19 @@ bool KDateNavigator::eventFilter (QObject *o,QEvent *e)
     for(i=0;i<7;++i) {
       if (o == headings[i]) {
           KCal::DateList selDays;
           QDate date = daymatrix->getDate(14);
+          emit showMonth(date );
+#if 0
           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 );
+#endif
         break;
       }
     }
     return true;
diff --git a/korganizer/kdatenavigator.h b/korganizer/kdatenavigator.h
index 93bbceb..780ebb8 100644
--- a/korganizer/kdatenavigator.h
+++ b/korganizer/kdatenavigator.h
@@ -85,8 +85,9 @@ class KDateNavigator: public QFrame
   signals:
     void datesSelected( const KCal::DateList & );
     void eventDropped( Event * );
     void weekClicked( const QDate &);
+    void showMonth( const QDate & );
 
     void goPrevious();
     void goNext();
 
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index c6e76c4..5a2dce3 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -127,10 +127,11 @@ void KOViewManager::showDateView( int view, QDate date)
         //mCurrentAgendaView = 1 ;
         lastDate = mMainView->dateNavigator()->selectedDates().first();
         lastCount = mMainView->dateNavigator()->selectedDates().count();
         lastNDMode = savemFlagShowNextxDays;
-        mMainView->showDay( date );
+        mMainView->dateNavigator()->selectDate( date );
         lastMode = 1;
+        mCurrentAgendaView = 1 ;
     } else if (view == 4 ) {
         mCurrentAgendaView = 7 ;
         mMainView->dateNavigator()->selectDates( date, 7 );
     } else if (view == 5 ) {
@@ -576,8 +577,15 @@ void KOViewManager::showMonthViewWeek()
     mMainView->dateNavigator()->selectWeek();
     showView(mMonthView, full );
 }
 
+void KOViewManager::showMonth( const QDate & date )
+{
+    mMainView->dateNavigator()->blockSignals( true );
+    mMainView->dateNavigator()->selectDate( date );
+    mMainView->dateNavigator()->blockSignals( false );
+    showMonthView();
+}
 void KOViewManager::showMonthView()
  {
     
      createMonthView();
diff --git a/korganizer/koviewmanager.h b/korganizer/koviewmanager.h
index 8f0bf82..6290227 100644
--- a/korganizer/koviewmanager.h
+++ b/korganizer/koviewmanager.h
@@ -80,9 +80,10 @@ class KOViewManager : public QObject
  signals:
     void printWNV();
     void signalFullScreen( bool );
     void signalAgendaView( bool );
-  public slots:
+  public slots: 
+    void showMonth( const QDate & );
     void showDateView( int, QDate );
     void updateView();
     void showWhatsNextView();
     void showListView();