From 41111b332c2a5f1b2ec152df309b9199f5e9c921 Mon Sep 17 00:00:00 2001
From: zautrix <zautrix>
Date: Tue, 08 Feb 2005 14:12:31 +0000
Subject: fixes

---
(limited to 'microkde')

diff --git a/microkde/kdatetbl.cpp b/microkde/kdatetbl.cpp
index fce0e5a..e827412 100644
--- a/microkde/kdatetbl.cpp
+++ b/microkde/kdatetbl.cpp
@@ -198,8 +198,12 @@ KDateTable::paintCell(QPainter *painter, int row, int col)
         painter->setPen(pen);
         painter->drawText(0, 0, w, h, AlignCenter, text, -1, &rect);
     }
-    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());
+    }
+    */
 }
 
 void
@@ -313,9 +317,15 @@ KDateTable::setFontSize(int size)
     // ----- compare with a real wide number and add some space:
     rect=metrics.boundingRect(QString::fromLatin1("88"));
     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 ");
+    }
 }
 
 void
@@ -443,7 +453,7 @@ KDateInternalMonthPicker::KDateInternalMonthPicker
     activeCol = -1;
     activeRow = -1;
     font=KGlobalSettings::generalFont();
-    font.setPointSize(fontsize);
+    //font.setPointSize(fontsize);
     setFont(font);
     setHScrollBarMode(AlwaysOff);
     setVScrollBarMode(AlwaysOff);
@@ -761,7 +771,7 @@ KDateInternalWeekPicker::KDateInternalWeekPicker
     activeCol = -1;
     activeRow = -1;
     font=KGlobalSettings::generalFont();
-    font.setPointSize(fontsize);
+    //font.setPointSize(fontsize);
     setFont(font);
     setHScrollBarMode(AlwaysOff);
     setVScrollBarMode(AlwaysOff);
@@ -782,7 +792,11 @@ KDateInternalWeekPicker::KDateInternalWeekPicker
             if(max.width()<rect.width()) max.setWidth(rect.width());
             if(max.height()<rect.height()) max.setHeight(rect.height());
         }
-
+    if ( QApplication::desktop()->width() > 640 ) {
+      
+        max.setWidth(max.width()+6);
+        max.setHeight(max.height()+8);
+    }
 }
 
 QSize
diff --git a/microkde/kglobalsettings.cpp b/microkde/kglobalsettings.cpp
index 2fff8fc..30e793f 100644
--- a/microkde/kglobalsettings.cpp
+++ b/microkde/kglobalsettings.cpp
@@ -10,16 +10,18 @@ QFont KGlobalSettings::generalFont()
    int size = 12;
     if (QApplication::desktop()->width() < 480 )
         size = 10;   
-    return QFont("helvetica",size);
+    QFont f = QApplication::font();
+    f.setPointSize( size );
+    return f;
 }
 QFont KGlobalSettings::toolBarFont()
 {
-  return QFont("helevetica",12);
+    return  QApplication::font();
 }
 
 QColor KGlobalSettings::toolBarHighlightColor()
 {
-  return QColor("black");
+    return QColor( "black" );
 }
 
 QRect KGlobalSettings::desktopGeometry( QWidget * )
@@ -34,7 +36,7 @@ QRect KGlobalSettings::desktopGeometry( QWidget * )
      * @return true if single click mode, or false if double click mode.
      **/
 bool KGlobalSettings::singleClick()
-{
+{   
     KConfig *c = KGlobal::config();
     KConfigGroupSaver cgs( c, "KDE" );
     return c->readBoolEntry("SingleClick", KDE_DEFAULT_SINGLECLICK);
--
cgit v0.9.0.2