-rw-r--r-- | korganizer/navigatorbar.cpp | 10 | ||||
-rw-r--r-- | libkdepim/kdatepicker.cpp | 8 |
2 files changed, 13 insertions, 5 deletions
diff --git a/korganizer/navigatorbar.cpp b/korganizer/navigatorbar.cpp index 2b8fd4f..7ba97c8 100644 --- a/korganizer/navigatorbar.cpp +++ b/korganizer/navigatorbar.cpp | |||
@@ -63,8 +63,14 @@ NavigatorBar::NavigatorBar( const QDate & date, QWidget *parent, const char *nam | |||
63 | topLayout->addWidget( mCtrlFrame ); | 63 | topLayout->addWidget( mCtrlFrame ); |
64 | 64 | ||
65 | QFont tfont = KGlobalSettings::generalFont();//font(); | 65 | QFont tfont = KGlobalSettings::generalFont();//font(); |
66 | if ( QApplication::desktop()->width() >= 480 ) | 66 | int add = 0; |
67 | tfont.setPointSize(tfont.pointSize()+2); | 67 | if ( QApplication::desktop()->width() >= 480 ) { |
68 | add = 2; | ||
69 | if ( QString ( name ) == QString("useBigPixmaps") ) | ||
70 | add += 2; | ||
71 | } | ||
72 | if ( add ) | ||
73 | tfont.setPointSize(tfont.pointSize()+add); | ||
68 | tfont.setBold(true); | 74 | tfont.setBold(true); |
69 | 75 | ||
70 | bool isRTL = KOGlobals::self()->reverseLayout(); | 76 | bool isRTL = KOGlobals::self()->reverseLayout(); |
diff --git a/libkdepim/kdatepicker.cpp b/libkdepim/kdatepicker.cpp index d6e9b51..c13734f 100644 --- a/libkdepim/kdatepicker.cpp +++ b/libkdepim/kdatepicker.cpp | |||
@@ -52,12 +52,14 @@ KDatePicker::KDatePicker(QWidget *parent, QDate dt, const char *name) | |||
52 | //table(new KDateTable(this)), | 52 | //table(new KDateTable(this)), |
53 | //fontsize(1) | 53 | //fontsize(1) |
54 | { | 54 | { |
55 | setFont ( KGlobalSettings::generalFont() ); | 55 | QFont fo = KGlobalSettings::generalFont(); |
56 | table = new KDateTable(this); | ||
57 | int add = 2; | 56 | int add = 2; |
58 | if ( QApplication::desktop()->width() >= 480 && QApplication::desktop()->width() <= 640 ) | 57 | if ( QApplication::desktop()->width() >= 480 && QApplication::desktop()->width() <= 640 ) |
59 | add += 4; | 58 | add += 4; |
60 | setFontSize(font().pointSize()+add); | 59 | fo.setPointSize(fo.pointSize()+add ); |
60 | setFont( fo ); | ||
61 | table = new KDateTable(this); | ||
62 | setFontSize(font().pointSize()); | ||
61 | //line->setValidator(val); | 63 | //line->setValidator(val); |
62 | lineDate = new KDateEdit( this, "dateediipicker", true ); | 64 | lineDate = new KDateEdit( this, "dateediipicker", true ); |
63 | yearForward->setPixmap(SmallIcon("2rightarrowB")); | 65 | yearForward->setPixmap(SmallIcon("2rightarrowB")); |