author | zautrix <zautrix> | 2005-02-08 16:24:18 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-02-08 16:24:18 (UTC) |
commit | 78c70cfbbe79243d8b0ec40f8f6438c99046e12b (patch) (side-by-side diff) | |
tree | 382bc11ad3b56f72b8f84414e1da5e5ea871204b /microkde/kdatetbl.cpp | |
parent | 584ed7893497b2adad5ba6c3e914d90b76973b92 (diff) | |
download | kdepimpi-78c70cfbbe79243d8b0ec40f8f6438c99046e12b.zip kdepimpi-78c70cfbbe79243d8b0ec40f8f6438c99046e12b.tar.gz kdepimpi-78c70cfbbe79243d8b0ec40f8f6438c99046e12b.tar.bz2 |
fix
-rw-r--r-- | microkde/kdatetbl.cpp | 36 |
1 files changed, 22 insertions, 14 deletions
diff --git a/microkde/kdatetbl.cpp b/microkde/kdatetbl.cpp index e827412..990cfb9 100644 --- a/microkde/kdatetbl.cpp +++ b/microkde/kdatetbl.cpp @@ -80,9 +80,9 @@ KDateValidator::fixup( QString& ) const KDateTable::KDateTable(QWidget *parent, QDate date_, const char* name, WFlags f) : QGridView(parent, name, f) { - setFontSize(10); + setFont( KGlobalSettings::generalFont() ); if(!date_.isValid()) { date_=QDate::currentDate(); } @@ -109,15 +109,14 @@ KDateTable::paintCell(QPainter *painter, int row, int col) int h=cellHeight(); int pos; QBrush brushBlue(blue); QBrush brushLightblue(QColor(220,245,255)); - QFont font=KGlobalSettings::generalFont(); + QFont _font=font(); // ----- - font.setPointSize(fontsize); if(row==0) { // we are drawing the headline - font.setBold(true); - painter->setFont(font); + _font.setBold(true); + painter->setFont(_font); bool normalday = true; QString daystr; if (KGlobal::locale()->weekStartsMonday()) { @@ -147,9 +146,9 @@ KDateTable::paintCell(QPainter *painter, int row, int col) painter->moveTo(0, h-1); painter->lineTo(w-1, h-1); // ----- draw the weekday: } else { - painter->setFont(font); + painter->setFont(_font); pos=7*(row-1)+col; if (KGlobal::locale()->weekStartsMonday()) pos++; if(pos<firstday || (firstday+numdays<=pos)) @@ -299,12 +298,13 @@ KDateTable::setFontSize(int size) int count; QRect rect; // ----- store rectangles: fontsize=size; - QFont font = KGlobalSettings::generalFont(); - font.setPointSize(fontsize); - font.setBold( true ); - QFontMetrics metrics(font); + QFont _font = font(); + _font.setPointSize(fontsize); + setFont( _font ); + _font.setBold( true ); + QFontMetrics metrics(_font); // ----- find largest day name: maxCell.setWidth(0); maxCell.setHeight(0); @@ -442,9 +442,9 @@ KDateTable::sizeHint() const } } KDateInternalMonthPicker::KDateInternalMonthPicker -(int fontsize, QWidget* parent, const char* name) +(QWidget* parent, const char* name) : QGridView(parent, name), result(0) // invalid { QRect rect; @@ -452,9 +452,13 @@ KDateInternalMonthPicker::KDateInternalMonthPicker // ----- activeCol = -1; activeRow = -1; font=KGlobalSettings::generalFont(); - //font.setPointSize(fontsize); + int fontsize = 10; + int add = 2; + if ( QApplication::desktop()->width() >= 480 && QApplication::desktop()->width() <= 640 ) + add += 6; + font.setPointSize(fontsize+add); setFont(font); setHScrollBarMode(AlwaysOff); setVScrollBarMode(AlwaysOff); setFrameStyle(QFrame::NoFrame); @@ -760,9 +764,9 @@ void KDateTable::virtual_hook( int, void* ) //#include "kdatetbl.moc" KDateInternalWeekPicker::KDateInternalWeekPicker -(int fontsize, QWidget* parent, const char* name) +(QWidget* parent, const char* name) : QGridView(parent, name), result(0) // invalid { QRect rect; @@ -770,9 +774,13 @@ KDateInternalWeekPicker::KDateInternalWeekPicker // ----- activeCol = -1; activeRow = -1; font=KGlobalSettings::generalFont(); - //font.setPointSize(fontsize); + int fontsize = 10; + int add = 2; + if ( QApplication::desktop()->width() >= 480 && QApplication::desktop()->width() <= 640 ) + add += 4; + font.setPointSize(fontsize+add); setFont(font); setHScrollBarMode(AlwaysOff); setVScrollBarMode(AlwaysOff); setFrameStyle(QFrame::NoFrame); |