From 2124ce7f8c6edbd0e3ec32b1d1e6a625ef9450d6 Mon Sep 17 00:00:00 2001 From: zautrix Date: Tue, 08 Feb 2005 18:29:59 +0000 Subject: font fix --- diff --git a/kaddressbook/kabprefs.cpp b/kaddressbook/kabprefs.cpp index a2095d4..01e84d0 100644 --- a/kaddressbook/kabprefs.cpp +++ b/kaddressbook/kabprefs.cpp @@ -34,6 +34,7 @@ #include #include #include +#include //US#include // defines kdDebug() #include "kabprefs.h" @@ -48,7 +49,6 @@ static KStaticDeleter staticDeleterAB; KABPrefs::KABPrefs() : KPimPrefs("kaddressbookrc") { - mDetailsFont = QFont("helvetica",12); KPrefs::setCurrentGroup( "Views" ); addItemBool( "HonorSingleClick", &mHonorSingleClick, false ); @@ -61,7 +61,7 @@ KABPrefs::KABPrefs() addItemBool("ToolBarHor",&mToolBarHor, true ); addItemBool("ToolBarUp",&mToolBarUp, false ); addItemBool("SearchWithReturn",&mSearchWithReturn, false ); - addItemFont("DetailsFont",&mDetailsFont); + addItemFont("DetailsFont",&mDetailsFont,KGlobalSettings::generalFont()); #endif //KAB_EMBEDDED diff --git a/kalarmd/alarmdialog.cpp b/kalarmd/alarmdialog.cpp index 521781e..751ba57 100644 --- a/kalarmd/alarmdialog.cpp +++ b/kalarmd/alarmdialog.cpp @@ -70,9 +70,12 @@ 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); l->setAlignment( AlignCenter); diff --git a/kmicromail/koprefs.cpp b/kmicromail/koprefs.cpp index 7b1e169..e4b61dc 100644 --- a/kmicromail/koprefs.cpp +++ b/kmicromail/koprefs.cpp @@ -41,6 +41,7 @@ #include #include #include +#include #include "koprefs.h" #include "mainwindow.h" @@ -52,10 +53,6 @@ static KStaticDeleter insd; KOPrefs::KOPrefs() : KPimPrefs("kopiemailrc") { - mAppFont = QFont("helvetica",12); - mComposeFont = QFont("helvetica",12); - mReadFont = QFont("helvetica",12); - KPrefs::setCurrentGroup("General"); addItemString("SendCodec",&mSendCodec,i18n ("userdefined") ); addItemString("SenderName",&mName,i18n ("Please set at") ); @@ -70,9 +67,9 @@ KOPrefs::KOPrefs() : addItemBool("ShowInfoTo",&mShowInfoTo,true); 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 @@ -63,17 +63,7 @@ KOPrefs::KOPrefs() : QColor defaultTodoDueTodayColor = QColor(255,220,100); 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 @@ -457,6 +457,8 @@ KDateInternalMonthPicker::KDateInternalMonthPicker int add = 2; if ( QApplication::desktop()->width() >= 480 && QApplication::desktop()->width() <= 640 ) add += 8; + if ( QApplication::desktop()->width() > 640 ) + add += 4; font.setPointSize(fontsize+add); setFont(font); setHScrollBarMode(AlwaysOff); -- cgit v0.9.0.2