-rw-r--r-- | korganizer/navigatorbar.cpp | 12 | ||||
-rw-r--r-- | microkde/kdatetbl.cpp | 4 |
2 files changed, 5 insertions, 11 deletions
diff --git a/korganizer/navigatorbar.cpp b/korganizer/navigatorbar.cpp index 7ba97c8..b591232 100644 --- a/korganizer/navigatorbar.cpp +++ b/korganizer/navigatorbar.cpp | |||
@@ -59,21 +59,15 @@ NavigatorBar::NavigatorBar( const QDate & date, QWidget *parent, const char *nam | |||
59 | mCtrlFrame = new QFrame( this ); | 59 | mCtrlFrame = new QFrame( this ); |
60 | mCtrlFrame->setFrameStyle(QFrame::Panel|QFrame::Raised); | 60 | mCtrlFrame->setFrameStyle(QFrame::Panel|QFrame::Raised); |
61 | mCtrlFrame->setLineWidth(1); | 61 | mCtrlFrame->setLineWidth(1); |
62 | 62 | ||
63 | topLayout->addWidget( mCtrlFrame ); | 63 | topLayout->addWidget( mCtrlFrame ); |
64 | 64 | ||
65 | QFont tfont = KGlobalSettings::generalFont();//font(); | 65 | QFont tfont = font(); |
66 | int add = 0; | 66 | if ( QApplication::desktop()->width() >= 480 ) |
67 | if ( QApplication::desktop()->width() >= 480 ) { | 67 | tfont.setPointSize(tfont.pointSize()+2); |
68 | add = 2; | ||
69 | if ( QString ( name ) == QString("useBigPixmaps") ) | ||
70 | add += 2; | ||
71 | } | ||
72 | if ( add ) | ||
73 | tfont.setPointSize(tfont.pointSize()+add); | ||
74 | tfont.setBold(true); | 68 | tfont.setBold(true); |
75 | 69 | ||
76 | bool isRTL = KOGlobals::self()->reverseLayout(); | 70 | bool isRTL = KOGlobals::self()->reverseLayout(); |
77 | #ifndef DESKTOP_VERSION | 71 | #ifndef DESKTOP_VERSION |
78 | bool isDesktop = false; | 72 | bool isDesktop = false; |
79 | #else | 73 | #else |
diff --git a/microkde/kdatetbl.cpp b/microkde/kdatetbl.cpp index 990cfb9..a9924ba 100644 --- a/microkde/kdatetbl.cpp +++ b/microkde/kdatetbl.cpp | |||
@@ -453,13 +453,13 @@ KDateInternalMonthPicker::KDateInternalMonthPicker | |||
453 | activeCol = -1; | 453 | activeCol = -1; |
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 += 6; | 459 | add += 8; |
460 | font.setPointSize(fontsize+add); | 460 | font.setPointSize(fontsize+add); |
461 | setFont(font); | 461 | setFont(font); |
462 | setHScrollBarMode(AlwaysOff); | 462 | setHScrollBarMode(AlwaysOff); |
463 | setVScrollBarMode(AlwaysOff); | 463 | setVScrollBarMode(AlwaysOff); |
464 | setFrameStyle(QFrame::NoFrame); | 464 | setFrameStyle(QFrame::NoFrame); |
465 | setNumRows(4); | 465 | setNumRows(4); |
@@ -775,13 +775,13 @@ KDateInternalWeekPicker::KDateInternalWeekPicker | |||
775 | activeCol = -1; | 775 | activeCol = -1; |
776 | activeRow = -1; | 776 | activeRow = -1; |
777 | font=KGlobalSettings::generalFont(); | 777 | font=KGlobalSettings::generalFont(); |
778 | int fontsize = 10; | 778 | int fontsize = 10; |
779 | int add = 2; | 779 | int add = 2; |
780 | if ( QApplication::desktop()->width() >= 480 && QApplication::desktop()->width() <= 640 ) | 780 | if ( QApplication::desktop()->width() >= 480 && QApplication::desktop()->width() <= 640 ) |
781 | add += 4; | 781 | add += 6; |
782 | font.setPointSize(fontsize+add); | 782 | font.setPointSize(fontsize+add); |
783 | setFont(font); | 783 | setFont(font); |
784 | setHScrollBarMode(AlwaysOff); | 784 | setHScrollBarMode(AlwaysOff); |
785 | setVScrollBarMode(AlwaysOff); | 785 | setVScrollBarMode(AlwaysOff); |
786 | setFrameStyle(QFrame::NoFrame); | 786 | setFrameStyle(QFrame::NoFrame); |
787 | setNumRows(13); | 787 | setNumRows(13); |