fixes

3 files changed, 8 insertions, 4 deletions

diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp
index 4b50b5a..2321acb 100644
--- a/korganizer/kdatenavigator.cpp
+++ b/korganizer/kdatenavigator.cpp
@@ -168,17 +168,17 @@ QSize KDateNavigator::sizeHintTwoButtons() const
         wid = nav.width() ;
     //qDebug("KDateNavigator+++++++++++++ %d %d", wid , hei);
   return   QSize ( wid, hei );
 }
 void KDateNavigator::slotMonthSelected( int m )
 {
     if ( m_MthYr.month() <= mMonthSignalOffset)
         m += 12;
-    int mo = m - mMonthSignalOffset;
+    //qDebug("%d mMonthSignalOffset %d emit %d", m, mMonthSignalOffset, m - mMonthSignalOffset);
     emit monthSelected( m - mMonthSignalOffset );
 
 }
 void KDateNavigator::setCalendar( Calendar *cal )
 {
   daymatrix->setCalendar( cal );
 }
 
diff --git a/korganizer/kdatenavigator.h b/korganizer/kdatenavigator.h
index d1f32b6..77b9b7c 100644
--- a/korganizer/kdatenavigator.h
+++ b/korganizer/kdatenavigator.h
@@ -58,17 +58,17 @@ class KDateNavigator: public QFrame
     enum RolloverType { None, FollowDay, FollowMonth } ;
     void enableRollover( RolloverType );
 
     void setShowWeekNums( bool enabled );
     void setCalendar( Calendar * );
     void setBaseDate( const QDate & , bool doRepaint = true );
     KCal::DateList selectedDates() const { return mSelectedDates; }
     NavigatorBar *navigatorBar() const { return mNavigatorBar; }
-    void setMonthSignalOffset ( int off ) { mMonthSignalOffset = off;}
+    void setMonthSignalOffset ( int off ) { mMonthSignalOffset = off%12;}
     QSize yourSizeHint() { return mySizeHint; }
     QFont yourFontHint( QSize , bool * b);
     bool fontChanged() {return mFontChanged; }
     void unsetFontChanged() { mFontChanged = false; }
     KODayMatrix *dayMatrix() { return daymatrix  ;} 
     QSize sizeHint() const;
     QSize sizeHintTwoButtons() const;
     void changeFont ( QFont fo ); 
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index 9baff20..493382d 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -406,18 +406,18 @@ void KODayMatrix::updateView(QDate actdate)
         mDayChanged = true;
         recalculateToday();
     }
     //qDebug("restart Timer %d vis: %d", mDayChanged, isVisible() );
     if ( !isVisible() ) {
         mPendingUpdateBeforeRepaint = true; 
     } else {
 #ifdef DESKTOP_VERSION
-        //mRepaintTimer->start( 150 );
-        mUpdateTimer->start( 150 );
+        //mRepaintTimer->start( 100 );
+        mUpdateTimer->start( 100 );
 #else
         mRepaintTimer->start( 350 ); 
         mUpdateTimer->start( 1200 );
 #endif
     }
 }
 void KODayMatrix::updateEvents()
 {
@@ -830,16 +830,18 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent)
           if (rowModulo) { 
               if ( row >= 6 - rowModulo )
                   addRow = row - 5 + rowModulo;
           }  
           if ( colModulo ) {
               if ( col >= 7 - colModulo )
                   addCol = col - 6 + colModulo-1;
           }
+          if ( col == 0 )
+              addCol = 1;
           p.drawRect(col*dwidth+addCol, row*dheight+addRow, dwidth, dheight+1);
           p.setPen(tmppen);
       }
 
       // if any events are on that day then draw it using a bold font
       if (events[i] > 0) {
           QFont myFont = font();
           myFont.setBold(true);
@@ -872,16 +874,18 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent)
               addCol = col - 7 + colModulo;
       }
       if ( rowModulo ) {
           if ( row >= 6 - rowModulo )
               addRow = row - 5 + rowModulo;
       }
       //qDebug("add %d %d -- %d %d ", col, addCol, row, addRow);
       ++addCol;//++addCol;
+      if ( row == 0)
+          addRow = 1;
       p.drawText(col*dwidth+addCol, row*dheight+addRow, dwidth, dheight,
                  Qt::AlignHCenter | Qt::AlignVCenter,  daylbls[i]);
 
       // reset color to actual color
       if (!mHolidays[i].isNull()) {
           p.setPen(actcol);
       }
       // reset bold font to plain font