font fix

5 files changed, 14 insertions, 22 deletions

diff --git a/kaddressbook/kabprefs.cpp b/kaddressbook/kabprefs.cpp
index a2095d4..01e84d0 100644
--- a/kaddressbook/kabprefs.cpp
+++ b/kaddressbook/kabprefs.cpp
@@ -36,2 +36,3 @@
 #include <kstaticdeleter.h>
+#include <kglobalsettings.h>
 //US#include <kdebug.h> // defines kdDebug()
@@ -50,3 +51,2 @@ KABPrefs::KABPrefs()
 {
-  mDetailsFont = QFont("helvetica",12);
   KPrefs::setCurrentGroup( "Views" );
@@ -63,3 +63,3 @@ KABPrefs::KABPrefs()
   addItemBool("SearchWithReturn",&mSearchWithReturn, false );
-  addItemFont("DetailsFont",&mDetailsFont);
+  addItemFont("DetailsFont",&mDetailsFont,KGlobalSettings::generalFont());
 
diff --git a/kalarmd/alarmdialog.cpp b/kalarmd/alarmdialog.cpp
index 521781e..751ba57 100644
--- a/kalarmd/alarmdialog.cpp
+++ b/kalarmd/alarmdialog.cpp
@@ -72,5 +72,8 @@ AlarmDialog::AlarmDialog(QWidget *parent,const char *name)
   layout->setMargin( 3 );
-
-  l->setFont( QFont("helvetica",fs2, QFont::Bold) );
-  mMessage->setFont( QFont("helvetica",fs, QFont::Bold) );
+  QFont fo = QApplication::font();
+  fo.setBold( true );
+  fo.setPointSize( fs2 );
+  l->setFont( fo );
+  fo.setPointSize( fs );
+  mMessage->setFont(fo );
   mMessage->setAlignment( AlignCenter);
diff --git a/kmicromail/koprefs.cpp b/kmicromail/koprefs.cpp
index 7b1e169..e4b61dc 100644
--- a/kmicromail/koprefs.cpp
+++ b/kmicromail/koprefs.cpp
@@ -43,2 +43,3 @@
 #include <kstaticdeleter.h>
+#include <kglobalsettings.h>
 
@@ -54,6 +55,2 @@ KOPrefs::KOPrefs() :
 {
-    mAppFont = QFont("helvetica",12);
-    mComposeFont = QFont("helvetica",12);
-    mReadFont = QFont("helvetica",12);
-
     KPrefs::setCurrentGroup("General");
@@ -72,5 +69,5 @@ KOPrefs::KOPrefs() :
     KPrefs::setCurrentGroup("Fonts");
-    addItemFont("Application Font",&mAppFont);
-    addItemFont("Compose Font",&mComposeFont);
-    addItemFont("Read Font",&mReadFont);
+    addItemFont("Application Font",&mAppFont,KGlobalSettings::generalFont());
+    addItemFont("Compose Font",&mComposeFont,KGlobalSettings::generalFont());
+    addItemFont("Read Font",&mReadFont,KGlobalSettings::generalFont());
     fillMailDefaults();
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index 5bfe2a1..7efb6a6 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -65,12 +65,2 @@ KOPrefs::KOPrefs() :
 
-  /*
-  mTimeBarFont = QFont("helvetica",10);//,QFont::Bold);
-  mDefaultViewFont = QFont("helvetica",10);
-  mDefaultMonthViewFont = QFont("helvetica",8);
-  mMarcusBainsFont= QFont("helvetica",10);
-  mDateNavigatorFont= QFont("helvetica",10, QFont::Bold);
-  mEditBoxFont = QFont("helvetica",12);
-  mJornalViewFont = QFont("helvetica",12);
-  */
-
 
diff --git a/microkde/kdatetbl.cpp b/microkde/kdatetbl.cpp
index a9924ba..1024796 100644
--- a/microkde/kdatetbl.cpp
+++ b/microkde/kdatetbl.cpp
@@ -459,2 +459,4 @@ KDateInternalMonthPicker::KDateInternalMonthPicker
         add += 8;
+    if ( QApplication::desktop()->width() > 640 )
+        add += 4;
     font.setPointSize(fontsize+add);