month select fix

3 files changed, 14 insertions, 4 deletions

diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp
index cbfc5b2..3f6e29b 100644
--- a/korganizer/datenavigatorcontainer.cpp
+++ b/korganizer/datenavigatorcontainer.cpp
@@ -158,24 +158,25 @@ void DateNavigatorContainer::resizeEvent( QResizeEvent * )
 //  kdDebug(5850) << "  NAVIGATORVIEW minimumSizeHint: " << minSize << endl;
 
   int verticalCount = size().height() / minSize.height();
   int horizontalCount = size().width() / minSize.width();
   //qDebug("COUNT %d %d %d %d ", verticalCount, horizontalCount , mVerticalCount, mHorizontalCount );
   if ( horizontalCount != mHorizontalCount ||
        verticalCount != mVerticalCount ) {
     uint count = horizontalCount * verticalCount;
     if ( count == 0 ) return;
 
     while ( count > ( mExtraViews.count() + 1 ) ) {
       KDateNavigator *n = new KDateNavigator( this );
+      n->setMonthSignalOffset ( mExtraViews.count()+1 );
       mExtraViews.append( n );
       n->setCalendar( mCalendar );
       setBaseDates();
       connectNavigatorView( n );
       n->show();
     }
 
     while ( count < ( mExtraViews.count() + 1 ) ) {
       mExtraViews.removeLast();
     }
 
     mHorizontalCount = horizontalCount;
diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp
index e76a85a..ab9a40f 100644
--- a/korganizer/kdatenavigator.cpp
+++ b/korganizer/kdatenavigator.cpp
@@ -48,38 +48,38 @@
 KDateNavigator::KDateNavigator( QWidget *parent, const char *name )
   : QFrame(parent, name),
     updateTimer(0L)
 {
     setFrameStyle(QFrame::NoFrame);
     QDate startDate = QDate::currentDate();
   QGridLayout *topLayout = new QGridLayout(this,8,8);
 
   if (! startDate.isValid()) {
       qDebug("KDateNavigator::invalid startdate ");
     startDate = QDate::currentDate();
   }
-
+  mMonthSignalOffset = 0;
   mSelectedDates.append(startDate);
   m_MthYr = startDate;
   m_bShowWeekNums = true;
   
   setFont( KOPrefs::instance()->mDateNavigatorFont );
   mNavigatorBar = new NavigatorBar( startDate, this );
   topLayout->addMultiCellWidget( mNavigatorBar, 0, 0, 0, 7 );
   //mNavigatorBar->resize( 1,1);
   connect( mNavigatorBar, SIGNAL( goPrevYear() ), SIGNAL( goPrevYear() ) );
   connect( mNavigatorBar, SIGNAL( goPrevMonth() ), SIGNAL( goPrevMonth() ) );
   connect( mNavigatorBar, SIGNAL( goNextMonth() ), SIGNAL( goNextMonth() ) );
   connect( mNavigatorBar, SIGNAL( goNextYear() ), SIGNAL( goNextYear() ) );
-  connect( mNavigatorBar, SIGNAL( monthSelected( int ) ), SIGNAL( monthSelected( int ) ) );
+  connect( mNavigatorBar, SIGNAL( monthSelected( int ) ), SLOT( slotMonthSelected( int ) ) );
 
   // get the day of the week on the first day
   QDate dayone(m_MthYr.year(), m_MthYr.month(), 1);
   m_fstDayOfWk = dayone.dayOfWeek();
 
   int i;
 
   // Set up the heading fields.
   for( i = 0; i < 7; i++ ) {
     headings[i] = new QLabel("",this);
     //headings[i]->setFont(QFont("Arial", 10, QFont::Bold));
     headings[i]->setAlignment(AlignCenter);
@@ -108,24 +108,32 @@ KDateNavigator::KDateNavigator( QWidget *parent, const char *name )
            SIGNAL( datesSelected( const KCal::DateList & ) ) );
 
   connect( daymatrix, SIGNAL( eventDropped( Event * ) ),
            SIGNAL( eventDropped( Event * ) ) );
 
   topLayout->addMultiCellWidget(daymatrix,2,7,1,7);
 
   // read settings from configuration file.
   updateConfig();
   enableRollover(FollowMonth);
   //setFixedSize ( sizeHint() );
 }
+void KDateNavigator::slotMonthSelected( int m )
+{
+    if ( m_MthYr.month() <= mMonthSignalOffset)
+        m += 12;
+    int mo = m - mMonthSignalOffset;
+    emit monthSelected( m - mMonthSignalOffset );
+
+}
 void KDateNavigator::setCalendar( Calendar *cal )
 {
   daymatrix->setCalendar( cal );
 }
 
 void KDateNavigator::setBaseDate( const QDate &date )
 {
   m_MthYr  = date;
   
   updateDates();
   updateView();
 
diff --git a/korganizer/kdatenavigator.h b/korganizer/kdatenavigator.h
index 0aeb77a..56822fa 100644
--- a/korganizer/kdatenavigator.h
+++ b/korganizer/kdatenavigator.h
@@ -54,25 +54,25 @@ class KDateNavigator: public QFrame
     * With FollowMonth, it has the same effect
     * as FollowDay but also adjusts the month that is 
     * visible and emits monthPassed() when the month changes.
     */
     enum RolloverType { None, FollowDay, FollowMonth } ;
     void enableRollover( RolloverType );
 
     void setShowWeekNums( bool enabled );
     void setCalendar( Calendar * );
     void setBaseDate( const QDate & );
     KCal::DateList selectedDates() const { return mSelectedDates; }
     NavigatorBar *navigatorBar() const { return mNavigatorBar; }
-
+    void setMonthSignalOffset ( int off ) { mMonthSignalOffset = off;}
   public slots:
     void selectDates( const KCal::DateList & );
     void updateView();
     void updateConfig();
     void updateDayMatrix();
 
   signals:
     void datesSelected( const KCal::DateList & );
     void eventDropped( Event * );
     void weekClicked( const QDate &);
 
     void goPrevious();
@@ -96,33 +96,34 @@ class KDateNavigator: public QFrame
      * if you leave KOrganizer idle for long periods of time.
      *
      * Until we have a reliable way of setting QTimers to go
      * off at a particular wall-clock time, we need this,
      * which calls passedMidnight() at the right moments.
      */
      void possiblyPastMidnight();
 
      /** handles updating the view when midnight has come by due to idle time.
      *
      */
      void passedMidnight();
-
+     void slotMonthSelected( int m );
   protected:
     void updateDates();
 
     void wheelEvent (QWheelEvent *);
 
     bool eventFilter (QObject *,QEvent *);
 
   private:
+    int mMonthSignalOffset;
     NavigatorBar *mNavigatorBar;
 
     QFrame *headingSep;
     QFrame *weeknumSep;
     QLabel *headings[7];
     QLabel *weeknos[7];
     KODayMatrix *daymatrix;
 
     KCal::DateList mSelectedDates;
     QDate m_MthYr;
     int m_fstDayOfWk;
     bool m_bShowWeekNums;