fixes

11 files changed, 35 insertions, 17 deletions

diff --git a/kaddressbook/details/look_details.cpp b/kaddressbook/details/look_details.cpp
index 51ec0c0..11d06e9 100644
--- a/kaddressbook/details/look_details.cpp
+++ b/kaddressbook/details/look_details.cpp
@@ -65,3 +65,3 @@ KABDetailedView::KABDetailedView( QWidget *parent, const char *name )
 
-  QFont general = KGlobalSettings::generalFont();
+  QFont general = KGlobalSettings::generalMaxFont();
   QFont fixed = KGlobalSettings::fixedFont();
diff --git a/kmicromail/koprefsdialog.cpp b/kmicromail/koprefsdialog.cpp
index 9cde5cf..7de7064 100644
--- a/kmicromail/koprefsdialog.cpp
+++ b/kmicromail/koprefsdialog.cpp
@@ -70,3 +70,3 @@ KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) :
   
-    setFont( KGlobalSettings::generalFont() );
+    setFont( KGlobalSettings::generalMaxFont() );
   setCaption( i18n("Settings - some need a restart (nr)"));
diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp
index e57daa4..f9c8b73 100644
--- a/korganizer/datenavigatorcontainer.cpp
+++ b/korganizer/datenavigatorcontainer.cpp
@@ -134,3 +134,2 @@ void DateNavigatorContainer::computeMonthSelected( int month , bool forceEmit )
     QDate first = firstAvailableDate();
-
     QDate selFirst = mFirstSelectedDate;
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index 322131f..ecca374 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -342,6 +342,6 @@ void KODayMatrix::repaintViewTimed()
     mRedrawNeeded = true;
-    bDays.fill( false);
-    pDays.fill( false);
-    hDays.fill( false);
-    eDays.fill( false);
+    // bDays.fill( false);
+    //pDays.fill( false);
+    //hDays.fill( false);
+    //eDays.fill( false);
     mRepaintTimer->stop(); 
diff --git a/korganizer/koeventviewerdialog.cpp b/korganizer/koeventviewerdialog.cpp
index 35d084d..1dce841 100644
--- a/korganizer/koeventviewerdialog.cpp
+++ b/korganizer/koeventviewerdialog.cpp
@@ -84,2 +84,3 @@ void KOEventViewerDialog::showMe()
     setGeometry(x,y,w,h);
+    raise();
 #else
@@ -87,6 +88,10 @@ void KOEventViewerDialog::showMe()
 #endif
-    raise();
+   QTimer::singleShot( 1, this, SLOT ( setMyFocus() ) );
+
+}
+void KOEventViewerDialog::setMyFocus()
+{
+   
     setActiveWindow();
     mEventViewer->setFocus(); 
-    //raise();
 
@@ -214,3 +219,4 @@ void KOEventViewerDialog::editIncidence()
 #ifndef DESKTOP_VERSION
-        hide();
+        //hide();
+        close();
 #endif
diff --git a/korganizer/koeventviewerdialog.h b/korganizer/koeventviewerdialog.h
index 8e1cd44..29fee49 100644
--- a/korganizer/koeventviewerdialog.h
+++ b/korganizer/koeventviewerdialog.h
@@ -54,2 +54,3 @@ class KOEventViewerDialog : public KDialogBase {
      void print();
+     void setMyFocus();
  signals:
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index e72f94b..0bbb3bf 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -77,3 +77,3 @@ KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) :
 
-    setFont( KGlobalSettings::generalFont() );
+    setFont( KGlobalSettings::generalMaxFont() );
   setCaption( i18n("Preferences - some settings need a restart (nr)"));
@@ -721,3 +721,2 @@ void KOPrefsDialog::setupViewsTab()
   topLayout->setMargin(mMarginHint);
-  qDebug("%d %d ",mSpacingHint, mMarginHint );
   ii = 0;
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 9505d06..94f4677 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -1776,6 +1776,2 @@ void MainWindow::saveStopTimer()
     mSaveTimer.stop();
-    if (mSaveTimer.isActive() )
-        qDebug("ti active ");
-    else
-        qDebug("KO: Save timer stopped");
 }
diff --git a/microkde/kglobalsettings.cpp b/microkde/kglobalsettings.cpp
index b6d2feb..b837b23 100644
--- a/microkde/kglobalsettings.cpp
+++ b/microkde/kglobalsettings.cpp
@@ -23,2 +23,18 @@ QFont KGlobalSettings::generalFont()
 }
+QFont KGlobalSettings::generalMaxFont()
+{
+   int size = 12;
+   if (QApplication::desktop()->width() < 480 ) {
+        size = 10;   
+   }
+#ifndef DESKTOP_VERSION
+   else
+    if (QApplication::desktop()->width() >= 480 && QApplication::desktop()->width() <= 640 )
+        size = 18;  
+#endif 
+    QFont f = QApplication::font();
+    if ( f.pointSize() > size )
+        f.setPointSize( size );
+    return f;
+}
 QFont KGlobalSettings::toolBarFont()
diff --git a/microkde/kglobalsettings.h b/microkde/kglobalsettings.h
index 7df8012..075bb1c 100644
--- a/microkde/kglobalsettings.h
+++ b/microkde/kglobalsettings.h
@@ -14,2 +14,3 @@ class KGlobalSettings
     static QFont generalFont();
+    static QFont generalMaxFont();
     static QFont toolBarFont();
diff --git a/microkde/kutils/kcmultidialog.cpp b/microkde/kutils/kcmultidialog.cpp
index bb41b18..9c87682 100644
--- a/microkde/kutils/kcmultidialog.cpp
+++ b/microkde/kutils/kcmultidialog.cpp
@@ -44,3 +44,3 @@ KCMultiDialog::KCMultiDialog(const QString& baseGroup, QWidget *parent, const ch
 {   
-    setFont( KGlobalSettings::generalFont() );
+    setFont( KGlobalSettings::generalMaxFont() );
     enableButton(Apply, false);