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,55 +1,63 @@
 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)
 - delete item (delete + backspace key)
 - add new item ( i + n key)
 Fixed length of info in the title.
 
 KO/Pi-KA/Pi:
 Changed "ME" menu bar entry to an icon.
 
 KO/Pi:
 Fixed two minor bugs in displaying todos.
 If in month view a cell is selected, the key shortcut "d" shows now that date.
 Added complete info for a todo in month view as an icon left of the text.
 Fixed problems of displaying data when "<" or ">" are used in summary/location/description.
 Fixed problem of search dialog size when switching displays. 
 Cancel key now closes date picker.
 Rearranged KO/Pi file menu structure.
 
 OM/Pi:
 Added to the SMTP account setting the option
 "No secure connection".
 You have to configure your SMTP accounts again, sorry.
 
 KA/Pi:
 Added support for importing quoted-printable.
 Support was added by Peter P.. Thanks, Peter!
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index 36cd990..120bc89 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -649,97 +649,97 @@ void KODayMatrix::dropEvent(QDropEvent *e)
 // ----------------------------------------------------------------------------
 //  P A I N T   E V E N T   H A N D L I N G
 // ----------------------------------------------------------------------------
 
 void KODayMatrix::paintEvent(QPaintEvent * pevent)
 {
   QRect sz = frameRect();
     if ( sz.width() <= 0  || sz.height() <= 0 )
         return;
     if ( mPendingUpdateBeforeRepaint ) {
         updateViewTimed();
         mPendingUpdateBeforeRepaint = false;
     }
     if ( myPix.width() != sz.width() || myPix.height()!=sz.height() ) {
         myPix.resize(sz.size() );
     }
   QPainter p(&myPix);
   p.setFont(font());
 
 
   int dheight = daysize.height();
   int dwidth = daysize.width();
   int row,col;
   int selw, selh;
   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;
           if (row == mSelEndT/7) { 
               if ( rowModulo ) {
                   if ( row >= 6 - rowModulo )
                       addRow = row - 5 + rowModulo;
               }  
               if ( colModulo ) {
                   int colt1 = mSelEndT%7;
                   //qDebug("colt1 %d ", colt1 );
                   if ( colt1 >= 7 - colModulo )
                       addCol =  colt1 - 7 + colModulo+1; 
                   int colt = mSelStartT%7;
                   if ( colt >= 7 - colModulo )
                       addCol2 =  colt - 7 + colModulo;
                   addCol -= addCol2;
                   //qDebug("COL %d %d %d %d ",col , colt1 ,addCol ,addCol2 );
               }
               // Single row selection
               if ( row == 0)
                   addRow = 1;
               p.fillRect(isRTL ? (7 - (mSelEndT-mSelStartT+1) - col)*dwidth : col*dwidth+1+addCol2,
                          row*dheight+addRow, (mSelEndT-mSelStartT+1)*dwidth+addCol, dheight+1, selcol);
           } else {
               // draw first row to the right
               if ( colModulo ) {