nf

2 files changed, 10 insertions, 2 deletions

diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 8800ada..df2d9d6 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -1,31 +1,39 @@
 Info about the changes in new versions of KDE-Pim/Pi
 
 ********** VERSION 2.0.18 ************
-
+KO/Pi:
 Fixed some minor problems.
 Cleaned up the KO/Pi config dialog.
+Fixed problem moving events in aganda view.
+Made datepicker scaleable, i.e. if the datepicker shows now a 
+datepicker matrix depending on its size.
+Birthdays are now displayed green in the datepicker.
+What'sThis Help in datepicker shows all events of the day. 
 
+OM/Pi:
+Updated the backend mail library to the latest version.
+Please backup your mail before using this version.
 
 ********** VERSION 2.0.17 ************
 
 KO/Pi:
 Tooltips in month view were not sorted. Fixed.
 Daylabel in agenda view ( for display of one day ) was too short. Fixed.
 Conflict display dialog for syncing was not on top of other windows. Fixed.
 Fixed some minor problems.
 
 Fixed an endless loop when importing vcs file with RESOURCES entry.
 
 ********** VERSION 2.0.16 ************
 OM/Pi:
 Fixed the SMTP account setting the option.
 Fixed something in mail sending.
 
 KO/Pi:
 Added possibility to export selected events/todos as vcal file.
 
 ********** VERSION 2.0.15 ************
 
 PwM/Pi:
 Added keyboard shorcuts for 
 - toggling summary view (space bar)
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index 36cd990..120bc89 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -673,49 +673,49 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent)
   int xyOff = frameWidth();
   int colModulo = sz.width()  % 7;
   int rowModulo = sz.height()  % 6;
   //qDebug("col %d  row %d ",colModulo,rowModulo  );
   
   bool isRTL = KOGlobals::self()->reverseLayout();
 
   // draw background and topleft frame
   p.fillRect(pevent->rect(), mDefaultBackColor);
   p.setPen(mDefaultTextColor);
   p.drawRect(0, 0, sz.width()+1, sz.height()+1);
   int mSelStartT = mSelStart;
   int mSelEndT = mSelEnd;
   if ( mSelEndT >=  NUMDAYS )
       mSelEndT = NUMDAYS-1;
   // draw selected days with highlighted background color
   if (mSelStart != NOSELECTION) {
       bool skip = false;
       if ( ! mouseDown ) {
           int mo = days[20].month();
           //qDebug("--  %d %d ", mSelStartT, mSelEndT);
           //qDebug("%d %d %d - d %d", mo,  days[mSelStartT].month() , days[mSelEndT].month(),  days[mSelEndT].day() );
           int startMo = days[mSelStartT].month();
           int endMo = days[mSelEndT].month();
-          if ( startMo == 12 && mo == 1 && endMo == 1 )
+          if ( startMo == 12 && mo == 1 && endMo <= 2 )
               startMo = 1;
           if ( endMo == 1 && mo == 12 )
               endMo = 12;
           if ( (startMo > mo || endMo < mo) ) {
               skip = true;
           } else {
               if ( days[mSelStartT].month() != mo ) {
                   int add = days[mSelStartT].daysInMonth ()-days[mSelStartT].day();
                   mSelStartT += add +1;
               }
               if ( days[mSelEndT].month() != mo ) {
                   int sub = days[mSelEndT].day();
                   mSelEndT -= sub ;
               }
           }
       }
       if ( ! skip ) {
           row = mSelStartT/7;
           col = mSelStartT -row*7;
           QColor selcol = KOPrefs::instance()->mHighlightColor;
           int addCol = 0;
           int addRow = 0; 
           int addRow2 = 0; 
           int addCol2 = 0;