summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--kaddressbook/kabprefs.cpp4
-rw-r--r--kalarmd/alarmdialog.cpp9
-rw-r--r--kmicromail/koprefs.cpp11
-rw-r--r--korganizer/koprefs.cpp10
-rw-r--r--microkde/kdatetbl.cpp2
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
@@ -31,12 +31,13 @@
#include <stdlib.h>
#include <libkdepim/kpimglobalprefs.h>
#include <kconfig.h>
#include <klocale.h>
#include <kstaticdeleter.h>
+#include <kglobalsettings.h>
//US#include <kdebug.h> // defines kdDebug()
#include "kabprefs.h"
#ifdef DESKTOP_VERSION
#include <qapplication.h>
@@ -45,26 +46,25 @@
KABPrefs *KABPrefs::sInstance = 0;
static KStaticDeleter<KABPrefs> staticDeleterAB;
KABPrefs::KABPrefs()
: KPimPrefs("kaddressbookrc")
{
- mDetailsFont = QFont("helvetica",12);
KPrefs::setCurrentGroup( "Views" );
addItemBool( "HonorSingleClick", &mHonorSingleClick, false );
KPrefs::setCurrentGroup( "General" );
addItemBool( "AutomaticNameParsing", &mAutomaticNameParsing, true );
addItemInt( "CurrentIncSearchField", &mCurrentIncSearchField, 0 );
#ifdef KAB_EMBEDDED
addItemBool("AskForQuit",&mAskForQuit,true);
addItemBool("ToolBarHor",&mToolBarHor, true );
addItemBool("ToolBarUp",&mToolBarUp, false );
addItemBool("SearchWithReturn",&mSearchWithReturn, false );
- addItemFont("DetailsFont",&mDetailsFont);
+ addItemFont("DetailsFont",&mDetailsFont,KGlobalSettings::generalFont());
#endif //KAB_EMBEDDED
KPrefs::setCurrentGroup( "MainWindow" );
bool m_visible = false;
diff --git a/kalarmd/alarmdialog.cpp b/kalarmd/alarmdialog.cpp
index 521781e..751ba57 100644
--- a/kalarmd/alarmdialog.cpp
+++ b/kalarmd/alarmdialog.cpp
@@ -67,15 +67,18 @@ AlarmDialog::AlarmDialog(QWidget *parent,const char *name)
}
else {
setMaximumSize(440, 440);
}
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);
layout->addWidget ( mMessage );
layout->addWidget ( l );
mMissedAlarms= new QLabel ( "", this );
diff --git a/kmicromail/koprefs.cpp b/kmicromail/koprefs.cpp
index 7b1e169..e4b61dc 100644
--- a/kmicromail/koprefs.cpp
+++ b/kmicromail/koprefs.cpp
@@ -38,27 +38,24 @@
#include <kglobal.h>
#include <kconfig.h>
#include <klocale.h>
#include <kdebug.h>
#include <kemailsettings.h>
#include <kstaticdeleter.h>
+#include <kglobalsettings.h>
#include "koprefs.h"
#include "mainwindow.h"
KOPrefs *KOPrefs::mInstance = 0;
static KStaticDeleter<KOPrefs> 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") );
addItemString("SenderEmail",&mEmail,i18n ("Settings@General TAB") );
addItemBool("ViewMailAsHtml",&mViewAsHtml,false);
addItemBool("SendMailLater",&mSendLater,true);
@@ -67,15 +64,15 @@ KOPrefs::KOPrefs() :
addItemInt("CurrentCodec",&mCurrentCodec,0);
addItemBool("ShowInfoSub",&mShowInfoSub,true);
addItemBool("ShowInfoFrom",&mShowInfoFrom,true);
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;
}
KOPrefs::~KOPrefs()
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index 5bfe2a1..7efb6a6 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -60,22 +60,12 @@ KOPrefs::KOPrefs() :
QColor defaultHighlightColor = QColor(129,112,255);//64,64,255);
QColor defaultAgendaBgColor = QColor(239,241,169);//128,128,128);
QColor defaultWorkingHoursColor = QColor(170,223,150);//160,160,160);
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");
addItemBool("Enable Group Scheduling",&mEnableGroupScheduling,false);
diff --git a/microkde/kdatetbl.cpp b/microkde/kdatetbl.cpp
index a9924ba..1024796 100644
--- a/microkde/kdatetbl.cpp
+++ b/microkde/kdatetbl.cpp
@@ -454,12 +454,14 @@ KDateInternalMonthPicker::KDateInternalMonthPicker
activeRow = -1;
font=KGlobalSettings::generalFont();
int fontsize = 10;
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);
setVScrollBarMode(AlwaysOff);
setFrameStyle(QFrame::NoFrame);
setNumRows(4);