1 files changed, 22 insertions, 14 deletions

diff --git a/microkde/kdatetbl.cpp b/microkde/kdatetbl.cpp
index e827412..990cfb9 100644
--- a/microkde/kdatetbl.cpp
+++ b/microkde/kdatetbl.cpp
@@ -76,17 +76,17 @@ void
 KDateValidator::fixup( QString& ) const
 {
 
 }
 
 KDateTable::KDateTable(QWidget *parent, QDate date_, const char* name, WFlags f)
     : QGridView(parent, name, f)
 {
-    setFontSize(10);
+    setFont( KGlobalSettings::generalFont() );
     if(!date_.isValid())
         {
             date_=QDate::currentDate();
         }
     setFocusPolicy( QWidget::StrongFocus );
     setNumRows(7); // 6 weeks max + headline
     setNumCols(7); // 7 days a week
     setHScrollBarMode(AlwaysOff);
@@ -105,23 +105,22 @@ KDateTable::paintCell(QPainter *painter, int row, int col)
     QRect rect;
     QString text;
     QPen pen;
     int w=cellWidth();
     int h=cellHeight();
     int pos;
     QBrush brushBlue(blue);
     QBrush brushLightblue(QColor(220,245,255));
-    QFont font=KGlobalSettings::generalFont();
+    QFont _font=font();
     // -----
-    font.setPointSize(fontsize);
     if(row==0)
         { // we are drawing the headline
-            font.setBold(true);
-            painter->setFont(font);
+            _font.setBold(true);
+            painter->setFont(_font);
             bool normalday = true;
             QString daystr;
             if (KGlobal::locale()->weekStartsMonday())
                 {
                     daystr = KGlobal::locale()->weekDayName(col+1, true);
                     if (col == 5 || col == 6)
                         normalday = false;
                 } else {
@@ -143,17 +142,17 @@ KDateTable::paintCell(QPainter *painter, int row, int col)
             }
             painter->drawText(0, 0, w, h-1, AlignCenter,
                               daystr, -1, &rect);
             painter->setPen(black);
             painter->moveTo(0, h-1);
             painter->lineTo(w-1, h-1);
             // ----- draw the weekday:
         } else {
-        painter->setFont(font);
+        painter->setFont(_font);
         pos=7*(row-1)+col;
         if (KGlobal::locale()->weekStartsMonday())
             pos++;
         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)
@@ -295,20 +294,21 @@ KDateTable::viewportResizeEvent(QResizeEvent * e)
 
 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);
+    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()));
@@ -438,27 +438,31 @@ KDateTable::sizeHint() const
             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)
+(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);
+    int fontsize = 10;
+    int add = 2;
+    if ( QApplication::desktop()->width() >= 480 && QApplication::desktop()->width() <= 640 )
+        add += 6;
+    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);
@@ -756,27 +760,31 @@ void KPopupFrame::virtual_hook( int, void* )
 
 void KDateTable::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
 //#include "kdatetbl.moc"
 
 
 KDateInternalWeekPicker::KDateInternalWeekPicker
-(int fontsize, QWidget* parent, const char* name)
+(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);
+    int fontsize = 10;
+    int add = 2;
+    if ( QApplication::desktop()->width() >= 480 && QApplication::desktop()->width() <= 640 )
+        add += 4;
+    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);