| -rw-r--r-- | microkde/kdatetbl.cpp | 26 | ||||
| -rw-r--r-- | microkde/kglobalsettings.cpp | 10 |
2 files changed, 26 insertions, 10 deletions
diff --git a/microkde/kdatetbl.cpp b/microkde/kdatetbl.cpp index fce0e5a..e827412 100644 --- a/microkde/kdatetbl.cpp +++ b/microkde/kdatetbl.cpp @@ -200,4 +200,8 @@ KDateTable::paintCell(QPainter *painter, int row, int col) } - if(rect.width()>maxCell.width()) maxCell.setWidth(rect.width()); - if(rect.height()>maxCell.height()) maxCell.setHeight(rect.height()); + /* + if(rect.width()>maxCell.width()) maxCell.setWidth(rect.width()); + if(rect.height()>maxCell.height()) { + maxCell.setHeight(rect.height()); + } + */ } @@ -315,5 +319,11 @@ KDateTable::setFontSize(int size) maxCell.setWidth(QMAX(maxCell.width()+2, rect.width())); +#ifdef DESKTOP_VERSION + maxCell.setHeight(QMAX(maxCell.height()+8, rect.height())); +#else maxCell.setHeight(QMAX(maxCell.height()+4, rect.height())); - if ( maxCell.width() * 1000 / maxCell.height() > 1900 ) +#endif + if ( maxCell.width() * 1000 / maxCell.height() > 1900 ) { maxCell.setHeight(maxCell.width() * 1000 / 1900 ); + qDebug("setmax "); + } } @@ -445,3 +455,3 @@ KDateInternalMonthPicker::KDateInternalMonthPicker font=KGlobalSettings::generalFont(); - font.setPointSize(fontsize); + //font.setPointSize(fontsize); setFont(font); @@ -763,3 +773,3 @@ KDateInternalWeekPicker::KDateInternalWeekPicker font=KGlobalSettings::generalFont(); - font.setPointSize(fontsize); + //font.setPointSize(fontsize); setFont(font); @@ -784,3 +794,7 @@ KDateInternalWeekPicker::KDateInternalWeekPicker } - + if ( QApplication::desktop()->width() > 640 ) { + + max.setWidth(max.width()+6); + max.setHeight(max.height()+8); + } } diff --git a/microkde/kglobalsettings.cpp b/microkde/kglobalsettings.cpp index 2fff8fc..30e793f 100644 --- a/microkde/kglobalsettings.cpp +++ b/microkde/kglobalsettings.cpp @@ -12,3 +12,5 @@ QFont KGlobalSettings::generalFont() size = 10; - return QFont("helvetica",size); + QFont f = QApplication::font(); + f.setPointSize( size ); + return f; } @@ -16,3 +18,3 @@ QFont KGlobalSettings::toolBarFont() { - return QFont("helevetica",12); + return QApplication::font(); } @@ -21,3 +23,3 @@ QColor KGlobalSettings::toolBarHighlightColor() { - return QColor("black"); + return QColor( "black" ); } @@ -36,3 +38,3 @@ QRect KGlobalSettings::desktopGeometry( QWidget * ) bool KGlobalSettings::singleClick() -{ +{ KConfig *c = KGlobal::config(); |