1 files changed, 2 insertions, 2 deletions

diff --git a/microkde/kdatetbl.cpp b/microkde/kdatetbl.cpp
index 990cfb9..a9924ba 100644
--- a/microkde/kdatetbl.cpp
+++ b/microkde/kdatetbl.cpp
@@ -267,671 +267,671 @@ KDateTable::keyPressEvent( QKeyEvent *e )
             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 = font();
     _font.setPointSize(fontsize);
     setFont( _font );
     _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()));
 #ifdef DESKTOP_VERSION
     maxCell.setHeight(QMAX(maxCell.height()+8, rect.height()));
 #else
     maxCell.setHeight(QMAX(maxCell.height()+4, rect.height()));
 #endif
     if ( maxCell.width() * 1000 / maxCell.height()  > 1900 ) {
         maxCell.setHeight(maxCell.width() * 1000 / 1900 );
         qDebug("setmax ");
     }
 }
 
 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;
     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
 (QWidget* parent, const char* name)
     : QGridView(parent, name),
       result(0) // invalid
 {
     QRect rect;
     QFont font;
     // -----
     activeCol = -1;
     activeRow = -1;
     font=KGlobalSettings::generalFont();
     int fontsize = 10;
     int add = 2;
     if ( QApplication::desktop()->width() >= 480 && QApplication::desktop()->width() <= 640 )
-        add += 6;
+        add += 8;
     font.setPointSize(fontsize+add);
     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;
                         }
                     activeCol = -1;
                     activeRow = -1;
                 } else {
                 bool differentCell = (activeRow != row || activeCol != col);
                 if ( activeCol > -1 && differentCell)
                     {
                         tmpRow = activeRow;
                         tmpCol = activeCol;
                     }
                 if ( differentCell)
                     {
                         activeRow = row;
                         activeCol = col;
                         updateCell( row, col /*, false */ ); // mark the new active cell
                     }
             }
             if ( tmpRow > -1 ) // repaint the former active cell
                 updateCell( tmpRow, tmpCol /*, true */ );
         }
 }
 
 void
 KDateInternalMonthPicker::contentsMouseReleaseEvent(QMouseEvent *e)
 {
     if(!isEnabled())
         {
             return;
         }
     // -----
     int row, col, pos;
     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
             emit(closeMe(0));
         }
     pos=3*row+col+1;
     result=pos;
     emit(closeMe(1));
 }
 
 
 
 KDateInternalYearSelector::KDateInternalYearSelector
 (int fontsize, QWidget* parent, const char* name)
     : QLineEdit(parent, name),
       val(new QIntValidator(this)),
       result(0)
 {
     QFont font;
     // -----
     font=KGlobalSettings::generalFont();
     font.setPointSize(fontsize);
     setFont(font);
 #if 0
     setFrameStyle(QFrame::NoFrame);
 #endif
     // we have to respect the limits of QDate here, I fear:
     val->setRange(0, 8000);
     setValidator(val);
     connect(this, SIGNAL(returnPressed()), SLOT(yearEnteredSlot()));
 }
 
 void
 KDateInternalYearSelector::yearEnteredSlot()
 {
     bool ok;
     int year;
     QDate date;
     // ----- check if this is a valid year:
     year=text().toInt(&ok);
     if(!ok)
         {
             KNotifyClient::beep();
             return;
         }
     date.setYMD(year, 1, 1);
     if(!date.isValid())
         {
             KNotifyClient::beep();
             return;
         }
     result=year;
     emit(closeMe(1));
 }
 
 int
 KDateInternalYearSelector::getYear()
 {
     return result;
 }
 
 void
 KDateInternalYearSelector::setYear(int year)
 {
     QString temp;
     // -----
     temp.setNum(year);
     setText(temp);
 }
 
 KPopupFrame::KPopupFrame(QWidget* parent, const char*  name)
     : QFrame(parent, name, WType_Popup),
       result(0), // rejected
       main(0)
 {
     setFrameStyle(QFrame::Box|QFrame::Raised);
     setMidLineWidth(2);
 }
 
 void
 KPopupFrame::keyPressEvent(QKeyEvent* e)
 {
     if(e->key()==Key_Escape)
         {
             result=0; // rejected
             qApp->exit_loop();
         }
 }
 
 void
 KPopupFrame::close(int r)
 {
     result=r;
     qApp->exit_loop();
 }
 
 void
 KPopupFrame::setMainWidget(QWidget* m)
 {
     main=m;
     if(main!=0)
         {
             resize(main->width()+2*frameWidth(), main->height()+2*frameWidth());
         }
 }
 
 void
 KPopupFrame::resizeEvent(QResizeEvent*)
 {
     if(main!=0)
         {
             main->setGeometry(frameWidth(), frameWidth(),
                               width()-2*frameWidth(), height()-2*frameWidth());
         }
 }
 
 void
 KPopupFrame::popup(const QPoint &pos)
 {
     // Make sure the whole popup is visible.
     QRect d = QApplication::desktop()->frameGeometry();
     int x = pos.x();
     int y = pos.y();
     int w = width();
     int h = height();
     if (x+w > d.x()+d.width())
         x = d.width() - w;
     if (y+h > d.y()+d.height())
         y = d.height() - h;
     if (x < d.x())
         x = 0;
     if (y < d.y())
         y = 0;
 
     // Pop the thingy up.
     move(x, y);
     show();
 }
 
 int
 KPopupFrame::exec(QPoint pos)
 {
     popup(pos);
     repaint();
     qApp->enter_loop();
     hide();
     return result;
 }
 
 int
 KPopupFrame::exec(int x, int y)
 {
     return exec(QPoint(x, y));
 }
 
 void KPopupFrame::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
 void KDateTable::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
 //#include "kdatetbl.moc"
 
 
 KDateInternalWeekPicker::KDateInternalWeekPicker
 (QWidget* parent, const char* name)
     : QGridView(parent, name),
       result(0) // invalid
 {
     QRect rect;
     QFont font;
     // -----
     activeCol = -1;
     activeRow = -1;
     font=KGlobalSettings::generalFont();
     int fontsize = 10;
     int add = 2;
     if ( QApplication::desktop()->width() >= 480 && QApplication::desktop()->width() <= 640 )
-        add += 4;
+        add += 6;
     font.setPointSize(fontsize+add);
     setFont(font);
     setHScrollBarMode(AlwaysOff);
     setVScrollBarMode(AlwaysOff);
     setFrameStyle(QFrame::NoFrame);
     setNumRows(13);
     setNumCols(4);
     // 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 <= 52; ++i)
         {
             rect=metrics.boundingRect(QString::number( i ));
             if(max.width()<rect.width()) max.setWidth(rect.width());
             if(max.height()<rect.height()) max.setHeight(rect.height());
         }
     if ( QApplication::desktop()->width() > 640 ) {
       
         max.setWidth(max.width()+6);
         max.setHeight(max.height()+8);
     }
 }
 
 QSize
 KDateInternalWeekPicker::sizeHint() const
 {
     return QSize((max.width()+6)*numCols()+2*frameWidth(),
                  (max.height()+6)*numRows()+2*frameWidth());
 }
 
 int
 KDateInternalWeekPicker::getResult() const
 {
     return result;
 }
 
 void
 KDateInternalWeekPicker::setupPainter(QPainter *p)
 {
     p->setPen(black);
 }
 
 void
 KDateInternalWeekPicker::viewportResizeEvent(QResizeEvent*)
 {
     setCellWidth(width()/4);
     setCellHeight(height()/13);
 }
 
 void
 KDateInternalWeekPicker::paintCell(QPainter* painter, int row, int col)
 {
     int index;
     QString text;
     // ----- find the number of the cell:
     index=4*row+col+1;
     text=QString::number( index );
     painter->drawText(0, 0, cellWidth(), cellHeight(), AlignCenter, text);
     if ( activeCol == col && activeRow == row )
         painter->drawRect( 0, 0, cellWidth(), cellHeight() );
 }
 
 void
 KDateInternalWeekPicker::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
 KDateInternalWeekPicker::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;
                         }
                     activeCol = -1;
                     activeRow = -1;
                 } else {
                 bool differentCell = (activeRow != row || activeCol != col);
                 if ( activeCol > -1 && differentCell)
                     {
                         tmpRow = activeRow;
                         tmpCol = activeCol;
                     }
                 if ( differentCell)
                     {
                         activeRow = row;
                         activeCol = col;
                         updateCell( row, col /*, false */ ); // mark the new active cell
                     }
             }
             if ( tmpRow > -1 ) // repaint the former active cell
                 updateCell( tmpRow, tmpCol /*, true */ );
         }
 }
 
 void
 KDateInternalWeekPicker::contentsMouseReleaseEvent(QMouseEvent *e)
 {
     if(!isEnabled())
         {
             return;
         }
     // -----
     int row, col, pos;
     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
             emit(closeMe(0));
         }
     pos=4*row+col+1;
     result=pos;
     emit(closeMe(1));
 }