| -rw-r--r-- | kaddressbook/kabprefs.cpp | 4 | ||||
| -rw-r--r-- | kalarmd/alarmdialog.cpp | 9 | ||||
| -rw-r--r-- | kmicromail/koprefs.cpp | 11 | ||||
| -rw-r--r-- | korganizer/koprefs.cpp | 12 | ||||
| -rw-r--r-- | microkde/kdatetbl.cpp | 2 |
5 files changed, 15 insertions, 23 deletions
diff --git a/kaddressbook/kabprefs.cpp b/kaddressbook/kabprefs.cpp index a2095d4..01e84d0 100644 --- a/kaddressbook/kabprefs.cpp +++ b/kaddressbook/kabprefs.cpp @@ -35,4 +35,5 @@ #include <klocale.h> #include <kstaticdeleter.h> +#include <kglobalsettings.h> //US#include <kdebug.h> // defines kdDebug() @@ -49,5 +50,4 @@ KABPrefs::KABPrefs() : KPimPrefs("kaddressbookrc") { - mDetailsFont = QFont("helvetica",12); KPrefs::setCurrentGroup( "Views" ); addItemBool( "HonorSingleClick", &mHonorSingleClick, false ); @@ -62,5 +62,5 @@ KABPrefs::KABPrefs() addItemBool("ToolBarUp",&mToolBarUp, false ); 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 @@ -71,7 +71,10 @@ AlarmDialog::AlarmDialog(QWidget *parent,const char *name) layout->setSpacing( 3 ); 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); l = new QLabel("Missed Alarms:",this); diff --git a/kmicromail/koprefs.cpp b/kmicromail/koprefs.cpp index 7b1e169..e4b61dc 100644 --- a/kmicromail/koprefs.cpp +++ b/kmicromail/koprefs.cpp @@ -42,4 +42,5 @@ #include <kemailsettings.h> #include <kstaticdeleter.h> +#include <kglobalsettings.h> #include "koprefs.h" @@ -53,8 +54,4 @@ KOPrefs::KOPrefs() : KPimPrefs("kopiemailrc") { - mAppFont = QFont("helvetica",12); - mComposeFont = QFont("helvetica",12); - mReadFont = QFont("helvetica",12); - KPrefs::setCurrentGroup("General"); addItemString("SendCodec",&mSendCodec,i18n ("userdefined") ); @@ -71,7 +68,7 @@ KOPrefs::KOPrefs() : addItemBool("ShowInfoStart",&mShowInfoStart,true); 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(); isDirty = false; diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp index 5bfe2a1..7efb6a6 100644 --- a/korganizer/koprefs.cpp +++ b/korganizer/koprefs.cpp @@ -64,15 +64,5 @@ KOPrefs::KOPrefs() : QColor defaultTodoOverdueColor = QColor(255,153,125); - /* - 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); - */ - - + KPrefs::setCurrentGroup("General"); diff --git a/microkde/kdatetbl.cpp b/microkde/kdatetbl.cpp index a9924ba..1024796 100644 --- a/microkde/kdatetbl.cpp +++ b/microkde/kdatetbl.cpp @@ -458,4 +458,6 @@ KDateInternalMonthPicker::KDateInternalMonthPicker if ( QApplication::desktop()->width() >= 480 && QApplication::desktop()->width() <= 640 ) add += 8; + if ( QApplication::desktop()->width() > 640 ) + add += 4; font.setPointSize(fontsize+add); setFont(font); |