2 files changed, 13 insertions, 5 deletions

diff --git a/korganizer/navigatorbar.cpp b/korganizer/navigatorbar.cpp
index 2b8fd4f..7ba97c8 100644
--- a/korganizer/navigatorbar.cpp
+++ b/korganizer/navigatorbar.cpp
@@ -60,14 +60,20 @@ NavigatorBar::NavigatorBar( const QDate & date, QWidget *parent, const char *nam
   mCtrlFrame->setFrameStyle(QFrame::Panel|QFrame::Raised);
   mCtrlFrame->setLineWidth(1);
 
   topLayout->addWidget( mCtrlFrame );
 
   QFont tfont = KGlobalSettings::generalFont();//font();
-  if ( QApplication::desktop()->width() >= 480 ) 
-      tfont.setPointSize(tfont.pointSize()+2);
+  int add = 0;
+  if ( QApplication::desktop()->width() >= 480 ) {
+      add = 2;
+      if ( QString ( name ) == QString("useBigPixmaps") )
+          add += 2;
+  }
+  if ( add )
+      tfont.setPointSize(tfont.pointSize()+add);
   tfont.setBold(true);
 
   bool isRTL = KOGlobals::self()->reverseLayout();
 #ifndef DESKTOP_VERSION
   bool isDesktop = false;
 #else
diff --git a/libkdepim/kdatepicker.cpp b/libkdepim/kdatepicker.cpp
index d6e9b51..c13734f 100644
--- a/libkdepim/kdatepicker.cpp
+++ b/libkdepim/kdatepicker.cpp
@@ -49,18 +49,20 @@ KDatePicker::KDatePicker(QWidget *parent, QDate dt, const char *name)
     selectYear(new QToolButton(this)),
     //line(new QLineEdit(this)),
     val(new KDateValidator(this))
     //table(new KDateTable(this)),
     //fontsize(1)
 {
-  setFont ( KGlobalSettings::generalFont() );
-  table = new KDateTable(this);
+    QFont fo = KGlobalSettings::generalFont();
   int add = 2;
   if ( QApplication::desktop()->width() >= 480 && QApplication::desktop()->width() <= 640 )
       add += 4;
-  setFontSize(font().pointSize()+add);
+  fo.setPointSize(fo.pointSize()+add );
+  setFont( fo );
+  table = new KDateTable(this);
+  setFontSize(font().pointSize());
   //line->setValidator(val);
   lineDate = new KDateEdit( this, "dateediipicker", true );
   yearForward->setPixmap(SmallIcon("2rightarrowB"));
   yearBackward->setPixmap(SmallIcon("2leftarrowB"));
   monthForward->setPixmap(SmallIcon("1rightarrowB"));
   monthBackward->setPixmap(SmallIcon("1leftarrowB"));