summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-02-08 18:29:59 (UTC)
committer zautrix <zautrix>2005-02-08 18:29:59 (UTC)
commit2124ce7f8c6edbd0e3ec32b1d1e6a625ef9450d6 (patch) (unidiff)
tree733f50ad5513065fe407fa341948172aae893b52
parent126b79abd88bb13ab41c4d987ee759eb9ba7d483 (diff)
downloadkdepimpi-2124ce7f8c6edbd0e3ec32b1d1e6a625ef9450d6.zip
kdepimpi-2124ce7f8c6edbd0e3ec32b1d1e6a625ef9450d6.tar.gz
kdepimpi-2124ce7f8c6edbd0e3ec32b1d1e6a625ef9450d6.tar.bz2
font fix
Diffstat (more/less context) (ignore 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.cpp12
-rw-r--r--microkde/kdatetbl.cpp2
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
@@ -31,12 +31,13 @@
31#include <stdlib.h> 31#include <stdlib.h>
32#include <libkdepim/kpimglobalprefs.h> 32#include <libkdepim/kpimglobalprefs.h>
33 33
34#include <kconfig.h> 34#include <kconfig.h>
35#include <klocale.h> 35#include <klocale.h>
36#include <kstaticdeleter.h> 36#include <kstaticdeleter.h>
37#include <kglobalsettings.h>
37//US#include <kdebug.h> // defines kdDebug() 38//US#include <kdebug.h> // defines kdDebug()
38 39
39#include "kabprefs.h" 40#include "kabprefs.h"
40 41
41#ifdef DESKTOP_VERSION 42#ifdef DESKTOP_VERSION
42#include <qapplication.h> 43#include <qapplication.h>
@@ -45,26 +46,25 @@
45KABPrefs *KABPrefs::sInstance = 0; 46KABPrefs *KABPrefs::sInstance = 0;
46static KStaticDeleter<KABPrefs> staticDeleterAB; 47static KStaticDeleter<KABPrefs> staticDeleterAB;
47 48
48KABPrefs::KABPrefs() 49KABPrefs::KABPrefs()
49 : KPimPrefs("kaddressbookrc") 50 : KPimPrefs("kaddressbookrc")
50{ 51{
51 mDetailsFont = QFont("helvetica",12);
52 KPrefs::setCurrentGroup( "Views" ); 52 KPrefs::setCurrentGroup( "Views" );
53 addItemBool( "HonorSingleClick", &mHonorSingleClick, false ); 53 addItemBool( "HonorSingleClick", &mHonorSingleClick, false );
54 54
55 KPrefs::setCurrentGroup( "General" ); 55 KPrefs::setCurrentGroup( "General" );
56 addItemBool( "AutomaticNameParsing", &mAutomaticNameParsing, true ); 56 addItemBool( "AutomaticNameParsing", &mAutomaticNameParsing, true );
57 addItemInt( "CurrentIncSearchField", &mCurrentIncSearchField, 0 ); 57 addItemInt( "CurrentIncSearchField", &mCurrentIncSearchField, 0 );
58 58
59#ifdef KAB_EMBEDDED 59#ifdef KAB_EMBEDDED
60 addItemBool("AskForQuit",&mAskForQuit,true); 60 addItemBool("AskForQuit",&mAskForQuit,true);
61 addItemBool("ToolBarHor",&mToolBarHor, true ); 61 addItemBool("ToolBarHor",&mToolBarHor, true );
62 addItemBool("ToolBarUp",&mToolBarUp, false ); 62 addItemBool("ToolBarUp",&mToolBarUp, false );
63 addItemBool("SearchWithReturn",&mSearchWithReturn, false ); 63 addItemBool("SearchWithReturn",&mSearchWithReturn, false );
64 addItemFont("DetailsFont",&mDetailsFont); 64 addItemFont("DetailsFont",&mDetailsFont,KGlobalSettings::generalFont());
65 65
66 66
67#endif //KAB_EMBEDDED 67#endif //KAB_EMBEDDED
68 68
69 KPrefs::setCurrentGroup( "MainWindow" ); 69 KPrefs::setCurrentGroup( "MainWindow" );
70 bool m_visible = false; 70 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)
67 } 67 }
68 else { 68 else {
69 setMaximumSize(440, 440); 69 setMaximumSize(440, 440);
70 } 70 }
71 layout->setSpacing( 3 ); 71 layout->setSpacing( 3 );
72 layout->setMargin( 3 ); 72 layout->setMargin( 3 );
73 73 QFont fo = QApplication::font();
74 l->setFont( QFont("helvetica",fs2, QFont::Bold) ); 74 fo.setBold( true );
75 mMessage->setFont( QFont("helvetica",fs, QFont::Bold) ); 75 fo.setPointSize( fs2 );
76 l->setFont( fo );
77 fo.setPointSize( fs );
78 mMessage->setFont(fo );
76 mMessage->setAlignment( AlignCenter); 79 mMessage->setAlignment( AlignCenter);
77 l = new QLabel("Missed Alarms:",this); 80 l = new QLabel("Missed Alarms:",this);
78 l->setAlignment( AlignCenter); 81 l->setAlignment( AlignCenter);
79 layout->addWidget ( mMessage ); 82 layout->addWidget ( mMessage );
80 layout->addWidget ( l ); 83 layout->addWidget ( l );
81 mMissedAlarms= new QLabel ( "", this ); 84 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 @@
38#include <kglobal.h> 38#include <kglobal.h>
39#include <kconfig.h> 39#include <kconfig.h>
40#include <klocale.h> 40#include <klocale.h>
41#include <kdebug.h> 41#include <kdebug.h>
42#include <kemailsettings.h> 42#include <kemailsettings.h>
43#include <kstaticdeleter.h> 43#include <kstaticdeleter.h>
44#include <kglobalsettings.h>
44 45
45#include "koprefs.h" 46#include "koprefs.h"
46#include "mainwindow.h" 47#include "mainwindow.h"
47 48
48 49
49KOPrefs *KOPrefs::mInstance = 0; 50KOPrefs *KOPrefs::mInstance = 0;
50static KStaticDeleter<KOPrefs> insd; 51static KStaticDeleter<KOPrefs> insd;
51 52
52KOPrefs::KOPrefs() : 53KOPrefs::KOPrefs() :
53 KPimPrefs("kopiemailrc") 54 KPimPrefs("kopiemailrc")
54{ 55{
55 mAppFont = QFont("helvetica",12);
56 mComposeFont = QFont("helvetica",12);
57 mReadFont = QFont("helvetica",12);
58
59 KPrefs::setCurrentGroup("General"); 56 KPrefs::setCurrentGroup("General");
60 addItemString("SendCodec",&mSendCodec,i18n ("userdefined") ); 57 addItemString("SendCodec",&mSendCodec,i18n ("userdefined") );
61 addItemString("SenderName",&mName,i18n ("Please set at") ); 58 addItemString("SenderName",&mName,i18n ("Please set at") );
62 addItemString("SenderEmail",&mEmail,i18n ("Settings@General TAB") ); 59 addItemString("SenderEmail",&mEmail,i18n ("Settings@General TAB") );
63 addItemBool("ViewMailAsHtml",&mViewAsHtml,false); 60 addItemBool("ViewMailAsHtml",&mViewAsHtml,false);
64 addItemBool("SendMailLater",&mSendLater,true); 61 addItemBool("SendMailLater",&mSendLater,true);
@@ -67,15 +64,15 @@ KOPrefs::KOPrefs() :
67 addItemInt("CurrentCodec",&mCurrentCodec,0); 64 addItemInt("CurrentCodec",&mCurrentCodec,0);
68 addItemBool("ShowInfoSub",&mShowInfoSub,true); 65 addItemBool("ShowInfoSub",&mShowInfoSub,true);
69 addItemBool("ShowInfoFrom",&mShowInfoFrom,true); 66 addItemBool("ShowInfoFrom",&mShowInfoFrom,true);
70 addItemBool("ShowInfoTo",&mShowInfoTo,true); 67 addItemBool("ShowInfoTo",&mShowInfoTo,true);
71 addItemBool("ShowInfoStart",&mShowInfoStart,true); 68 addItemBool("ShowInfoStart",&mShowInfoStart,true);
72 KPrefs::setCurrentGroup("Fonts"); 69 KPrefs::setCurrentGroup("Fonts");
73 addItemFont("Application Font",&mAppFont); 70 addItemFont("Application Font",&mAppFont,KGlobalSettings::generalFont());
74 addItemFont("Compose Font",&mComposeFont); 71 addItemFont("Compose Font",&mComposeFont,KGlobalSettings::generalFont());
75 addItemFont("Read Font",&mReadFont); 72 addItemFont("Read Font",&mReadFont,KGlobalSettings::generalFont());
76 fillMailDefaults(); 73 fillMailDefaults();
77 isDirty = false; 74 isDirty = false;
78} 75}
79 76
80 77
81KOPrefs::~KOPrefs() 78KOPrefs::~KOPrefs()
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index 5bfe2a1..7efb6a6 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -60,23 +60,13 @@ KOPrefs::KOPrefs() :
60 QColor defaultHighlightColor = QColor(129,112,255);//64,64,255); 60 QColor defaultHighlightColor = QColor(129,112,255);//64,64,255);
61 QColor defaultAgendaBgColor = QColor(239,241,169);//128,128,128); 61 QColor defaultAgendaBgColor = QColor(239,241,169);//128,128,128);
62 QColor defaultWorkingHoursColor = QColor(170,223,150);//160,160,160); 62 QColor defaultWorkingHoursColor = QColor(170,223,150);//160,160,160);
63 QColor defaultTodoDueTodayColor = QColor(255,220,100); 63 QColor defaultTodoDueTodayColor = QColor(255,220,100);
64 QColor defaultTodoOverdueColor = QColor(255,153,125); 64 QColor defaultTodoOverdueColor = QColor(255,153,125);
65 65
66 /* 66
67 mTimeBarFont = QFont("helvetica",10);//,QFont::Bold);
68 mDefaultViewFont = QFont("helvetica",10);
69 mDefaultMonthViewFont = QFont("helvetica",8);
70 mMarcusBainsFont= QFont("helvetica",10);
71 mDateNavigatorFont= QFont("helvetica",10, QFont::Bold);
72 mEditBoxFont = QFont("helvetica",12);
73 mJornalViewFont = QFont("helvetica",12);
74 */
75
76
77 KPrefs::setCurrentGroup("General"); 67 KPrefs::setCurrentGroup("General");
78 68
79 69
80 addItemBool("Enable Group Scheduling",&mEnableGroupScheduling,false); 70 addItemBool("Enable Group Scheduling",&mEnableGroupScheduling,false);
81 71
82 addItemBool("ShowIconNewTodo",&mShowIconNewTodo,true); 72 addItemBool("ShowIconNewTodo",&mShowIconNewTodo,true);
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
454 activeRow = -1; 454 activeRow = -1;
455 font=KGlobalSettings::generalFont(); 455 font=KGlobalSettings::generalFont();
456 int fontsize = 10; 456 int fontsize = 10;
457 int add = 2; 457 int add = 2;
458 if ( QApplication::desktop()->width() >= 480 && QApplication::desktop()->width() <= 640 ) 458 if ( QApplication::desktop()->width() >= 480 && QApplication::desktop()->width() <= 640 )
459 add += 8; 459 add += 8;
460 if ( QApplication::desktop()->width() > 640 )
461 add += 4;
460 font.setPointSize(fontsize+add); 462 font.setPointSize(fontsize+add);
461 setFont(font); 463 setFont(font);
462 setHScrollBarMode(AlwaysOff); 464 setHScrollBarMode(AlwaysOff);
463 setVScrollBarMode(AlwaysOff); 465 setVScrollBarMode(AlwaysOff);
464 setFrameStyle(QFrame::NoFrame); 466 setFrameStyle(QFrame::NoFrame);
465 setNumRows(4); 467 setNumRows(4);