1 files changed, 4 insertions, 1 deletions

diff --git a/microkde/kdatetbl.cpp b/microkde/kdatetbl.cpp
index 146291b..508ce31 100644
--- a/microkde/kdatetbl.cpp
+++ b/microkde/kdatetbl.cpp
@@ -155,396 +155,399 @@ KDateTable::paintCell(QPainter *painter, int row, int col)
       if(pos<firstday || (firstday+numdays<=pos))
         { // we are either
           // ° painting a day of the previous month or
           // ° painting a day of the following month
           if(pos<firstday)
             { // previous month
               text.setNum(numDaysPrevMonth+pos-firstday+1);
             } else { // following month
               text.setNum(pos-firstday-numdays+1);
             }
           painter->setPen(gray);
         } else { // paint a day of the current month
           text.setNum(pos-firstday+1);
           painter->setPen(black);
         }
 
       pen=painter->pen();
       if(firstday+date.day()-1==pos)
         {
             if(mMarkCurrent && firstday+QDate::currentDate().day()-1==pos)
                 painter->setPen(green);
             else
                 painter->setPen(red);
           if(hasFocus())
               {  
                   painter->setBrush(darkRed);
                   pen=white;
             } else {
               painter->setBrush(darkGray);
               pen=white;
             }
         } else {
           if(mMarkCurrent && firstday+QDate::currentDate().day()-1==pos)
               {
                   painter->setPen(green);
                   painter->setBrush(darkGreen);
                   pen=white;
               } else {
               painter->setBrush(QColor(220,245,255));
               painter->setPen(QColor(220,245,255));
           }
       }
       painter->drawRect(0, 0, w, h);
       painter->setPen(pen);
       painter->drawText(0, 0, w, h, AlignCenter, text, -1, &rect);
     }
   if(rect.width()>maxCell.width()) maxCell.setWidth(rect.width());
   if(rect.height()>maxCell.height()) maxCell.setHeight(rect.height());
 }
 
 void
 KDateTable::keyPressEvent( QKeyEvent *e )
 {
     /*
     // not working properly
     if ( e->key() == Qt::Key_Prior ) {
         if ( date.month() == 1 ) {
             KNotifyClient::beep();
             return;
         }
         int day = date.day();
         if ( day > 27 )
             while ( !QDate::isValid( date.year(), date.month()-1, day ) )
                 day--;
         setDate(QDate(date.year(), date.month()-1, day));
         return;
     }
     if ( e->key() == Qt::Key_Next ) {
         if ( date.month() == 12 ) {
             KNotifyClient::beep();
             return;
         }
         int day = date.day();
         if ( day > 27 )
             while ( !QDate::isValid( date.year(), date.month()+1, day ) )
                 day--;
         setDate(QDate(date.year(), date.month()+1, day));
         return;
     }
     */
     int dayoff = KGlobal::locale()->weekStartsMonday() ? 1 : 0;
 
     int temp=firstday+date.day()-dayoff;
     int pos = temp;
     bool irgnore = true;
     if ( e->state() != Qt::ControlButton ) {
     if ( e->key() == Qt::Key_Up ) {
         pos -= 7;
         irgnore = false;
     }
     if ( e->key() == Qt::Key_Down ) {
         pos += 7;
         irgnore = false;
     }
     if ( e->key() == Qt::Key_Left ) {
         pos--;
         irgnore = false;
     }
     if ( e->key() == Qt::Key_Right ) {
         pos++;
         irgnore = false;
     }
     } 
     if ( irgnore )
         e->ignore();
 
     if(pos+dayoff<=firstday)
     { // this day is in the previous month
         KNotifyClient::beep();
         return;
     }
     if(firstday+numdays<pos+dayoff)
     { // this date is in the next month
         KNotifyClient::beep(i18n( "Month not long enough" ));
         return;
     }
 
     if ( pos == temp )
         return;
 
     setDate(QDate(date.year(), date.month(), pos-firstday+dayoff));
     updateCell(temp/7+1, temp%7); // Update the previously selected cell
     updateCell(pos/7+1, pos%7); // Update the selected cell
     assert(QDate(date.year(), date.month(), pos-firstday+dayoff).isValid());
   
 
 }
 
 void
 KDateTable::viewportResizeEvent(QResizeEvent * e)
 {
   QGridView::viewportResizeEvent(e);
 
   setCellWidth(viewport()->width()/7);
   setCellHeight(viewport()->height()/7);
 }
 
 void
 KDateTable::setFontSize(int size)
 {
   int count;
   QRect rect;
   // ----- store rectangles:
   fontsize=size;
   QFont font = KGlobalSettings::generalFont();
   font.setPointSize(fontsize);
   font.setBold( true );
   QFontMetrics metrics(font);
 
   // ----- find largest day name:
   maxCell.setWidth(0);
   maxCell.setHeight(0);
   for(count=0; count<7; ++count)
     {
       rect=metrics.boundingRect(KGlobal::locale()->weekDayName(count+1, true));
       maxCell.setWidth(QMAX(maxCell.width(), rect.width()));
       maxCell.setHeight(QMAX(maxCell.height(), rect.height()));
     }
   // ----- compare with a real wide number and add some space:
   rect=metrics.boundingRect(QString::fromLatin1("88"));
   maxCell.setWidth(QMAX(maxCell.width()+2, rect.width()));
   maxCell.setHeight(QMAX(maxCell.height()+4, rect.height()));
   if ( maxCell.width() * 1000 / maxCell.height()  > 1900 )
       maxCell.setHeight(maxCell.width() * 1000 / 1900 );
 }
 
 void
 KDateTable::contentsMousePressEvent(QMouseEvent *e)
 {
   if(e->type()!=QEvent::MouseButtonPress)
     { // the KDatePicker only reacts on mouse press events:
       return;
     }
   if(!isEnabled())
     {
       KNotifyClient::beep();
       return;
     }
 
   int dayoff = KGlobal::locale()->weekStartsMonday() ? 1 : 0;
   // -----
   int row, col, pos, temp;
   QPoint mouseCoord;
   // -----
   mouseCoord = e->pos();
   row=rowAt(mouseCoord.y());
   col=columnAt(mouseCoord.x());
   if(row<0 || col<0)
     { // the user clicked on the frame of the table
       return;
     }
   pos=7*(row-1)+col+1;
+#if 0
   if(pos+dayoff<=firstday)
     { // this day is in the previous month
       KNotifyClient::beep();
       return;
     }
   if(firstday+numdays<pos+dayoff)
     { // this date is in the next month
       KNotifyClient::beep();
       return;
     }
+#endif
   temp=firstday+date.day()-dayoff-1;
-  setDate(QDate(date.year(), date.month(), pos-firstday+dayoff));
+  QDate da = QDate(date.year(), date.month(),1);
+  setDate(da.addDays( pos-firstday+dayoff-1));
   updateCell(temp/7+1, temp%7); // Update the previously selected cell
   updateCell(row, col); // Update the selected cell
   // assert(QDate(date.year(), date.month(), pos-firstday+dayoff).isValid());
   emit(tableClicked());
 }
 
 bool
 KDateTable::setDate(const QDate& date_)
 {
   bool changed=false;
   QDate temp;
   mMarkCurrent = false;
   // -----
   if(!date_.isValid())
     {
       kdDebug() << "KDateTable::setDate: refusing to set invalid date." << endl;
       return false;
     }
   if(date!=date_)
     {
       date=date_;
       changed=true;
     }
   mMarkCurrent = ( date.month() ==  QDate::currentDate().month() && date.year() ==  QDate::currentDate().year() );
   temp.setYMD(date.year(), date.month(), 1);
   firstday=temp.dayOfWeek();
   if(firstday==1) firstday=8;
   numdays=date.daysInMonth();
   if(date.month()==1)
     { // set to december of previous year
       temp.setYMD(date.year()-1, 12, 1);
     } else { // set to previous month
       temp.setYMD(date.year(), date.month()-1, 1);
     }
   numDaysPrevMonth=temp.daysInMonth();
   if(changed)
     {
       repaintContents(false);
     }
   emit(dateChanged(date));
   return true;
 }
 
 const QDate&
 KDateTable::getDate() const
 {
   return date;
 }
 
 void KDateTable::focusInEvent( QFocusEvent *e )
 {
     repaintContents(false);
     QGridView::focusInEvent( e );
 }
 
 void KDateTable::focusOutEvent( QFocusEvent *e )
 {
     repaintContents(false);
     QGridView::focusOutEvent( e );
 }
 
 QSize
 KDateTable::sizeHint() const
 {
   if(maxCell.height()>0 && maxCell.width()>0)
     {
       return QSize((maxCell.width()+2)*numCols()+2*frameWidth(),
              (maxCell.height()+4)*numRows()+2*frameWidth());
     } else {
       return QSize(-1, -1);
     }
 }
 
 KDateInternalMonthPicker::KDateInternalMonthPicker
 (int fontsize, QWidget* parent, const char* name)
   : QGridView(parent, name),
     result(0) // invalid
 {
   QRect rect;
   QFont font;
   // -----
   activeCol = -1;
   activeRow = -1;
   font=KGlobalSettings::generalFont();
   font.setPointSize(fontsize);
   setFont(font);
   setHScrollBarMode(AlwaysOff);
   setVScrollBarMode(AlwaysOff);
   setFrameStyle(QFrame::NoFrame);
   setNumRows(4);
   setNumCols(3);
   // enable to find drawing failures:
   // setTableFlags(Tbl_clipCellPainting);
 #if 0
   viewport()->setEraseColor(lightGray); // for consistency with the datepicker
 #endif
   // ----- find the preferred size
   //       (this is slow, possibly, but unfortunatly it is needed here):
   QFontMetrics metrics(font);
   for(int i=1; i <= 12; ++i)
     {
       rect=metrics.boundingRect(KGlobal::locale()->monthName(i, false));
       if(max.width()<rect.width()) max.setWidth(rect.width());
       if(max.height()<rect.height()) max.setHeight(rect.height());
     }
 
 }
 
 QSize
 KDateInternalMonthPicker::sizeHint() const
 {
   return QSize((max.width()+6)*numCols()+2*frameWidth(),
          (max.height()+6)*numRows()+2*frameWidth());
 }
 
 int
 KDateInternalMonthPicker::getResult() const
 {
   return result;
 }
 
 void
 KDateInternalMonthPicker::setupPainter(QPainter *p)
 {
   p->setPen(black);
 }
 
 void
 KDateInternalMonthPicker::viewportResizeEvent(QResizeEvent*)
 {
   setCellWidth(width()/3);
   setCellHeight(height()/4);
 }
 
 void
 KDateInternalMonthPicker::paintCell(QPainter* painter, int row, int col)
 {
   int index;
   QString text;
   // ----- find the number of the cell:
   index=3*row+col+1;
   text=KGlobal::locale()->monthName(index, false);
   painter->drawText(0, 0, cellWidth(), cellHeight(), AlignCenter, text);
   if ( activeCol == col && activeRow == row )
       painter->drawRect( 0, 0, cellWidth(), cellHeight() );
 }
 
 void
 KDateInternalMonthPicker::contentsMousePressEvent(QMouseEvent *e)
 {
   if(!isEnabled() || e->button() != LeftButton)
     {
       KNotifyClient::beep();
       return;
     }
   // -----
   int row, col;
   QPoint mouseCoord;
   // -----
   mouseCoord = e->pos();
   row=rowAt(mouseCoord.y());
   col=columnAt(mouseCoord.x());
 
   if(row<0 || col<0)
     { // the user clicked on the frame of the table
       activeCol = -1;
       activeRow = -1;
     } else {
       activeCol = col;
       activeRow = row;
       updateCell( row, col /*, false */ );
   }
 }
 
 void
 KDateInternalMonthPicker::contentsMouseMoveEvent(QMouseEvent *e)
 {
   if (e->state() & LeftButton)
     {
       int row, col;
       QPoint mouseCoord;
       // -----
       mouseCoord = e->pos();
       row=rowAt(mouseCoord.y());
       col=columnAt(mouseCoord.x());
       int tmpRow = -1, tmpCol = -1;
       if(row<0 || col<0)
         { // the user clicked on the frame of the table
           if ( activeCol > -1 )
             {
               tmpRow = activeRow;
               tmpCol = activeCol;