11 files changed, 38 insertions, 20 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
@@ -63,7 +63,7 @@ KABDetailedView::KABDetailedView( QWidget *parent, const char *name )
     i18n( "Show Web Pages (URLs)" )
   };
 
-  QFont general = KGlobalSettings::generalFont();
+  QFont general = KGlobalSettings::generalMaxFont();
   QFont fixed = KGlobalSettings::fixedFont();
   QString gfont = general.family();
   QString ffont = fixed.family();
diff --git a/kmicromail/koprefsdialog.cpp b/kmicromail/koprefsdialog.cpp
index 9cde5cf..7de7064 100644
--- a/kmicromail/koprefsdialog.cpp
+++ b/kmicromail/koprefsdialog.cpp
@@ -68,7 +68,7 @@ KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) :
   KPrefsDialog(KOPrefs::instance(),parent,name,true)
 {
   
-    setFont( KGlobalSettings::generalFont() );
+    setFont( KGlobalSettings::generalMaxFont() );
   setCaption( i18n("Settings - some need a restart (nr)"));
   setupGlobalTab();
   setupMainTab();
diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp
index e57daa4..f9c8b73 100644
--- a/korganizer/datenavigatorcontainer.cpp
+++ b/korganizer/datenavigatorcontainer.cpp
@@ -119,7 +119,7 @@ void DateNavigatorContainer::slotMonthSelected( int month )
 }
 void DateNavigatorContainer::computeMonthSelected( int month , bool forceEmit )
 {
- //qDebug("slotMonthSelected %d ", month);
+    //qDebug("slotMonthSelected %d ", month);
     QDate baseDate = mNavigatorView->baseDate();
     if ( baseDate.month() == month )
         return;
@@ -132,7 +132,6 @@ void DateNavigatorContainer::computeMonthSelected( int month , bool forceEmit )
     mNavigatorView->setBaseDate( newBase );
     QDate last = lastAvailableDate();
     QDate first = firstAvailableDate();
-
     QDate selFirst = mFirstSelectedDate;
     QDate selLast = selFirst.addDays( mSelectedDateCount-1 );
     if (  selFirst >= first && selLast <= last ) {
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index 322131f..ecca374 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -340,10 +340,10 @@ void KODayMatrix::updateView()
 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(); 
     int startDay = days[0].dayOfWeek(); // 1...7 7 = sunday
     int i;
diff --git a/korganizer/koeventviewerdialog.cpp b/korganizer/koeventviewerdialog.cpp
index 35d084d..1dce841 100644
--- a/korganizer/koeventviewerdialog.cpp
+++ b/korganizer/koeventviewerdialog.cpp
@@ -82,15 +82,20 @@ void KOEventViewerDialog::showMe()
     h = height();
     show();
     setGeometry(x,y,w,h);
+    raise();
 #else
     showMaximized();
 #endif
-    raise();
-    setActiveWindow();
-    mEventViewer->setFocus(); 
-    //raise();
+   QTimer::singleShot( 1, this, SLOT ( setMyFocus() ) );
 
 }
+void KOEventViewerDialog::setMyFocus()
+{
+   
+    setActiveWindow();
+    mEventViewer->setFocus();  
+    
+}
 void KOEventViewerDialog::print()
 {
     mEventViewer->printMe();
@@ -212,7 +217,8 @@ void KOEventViewerDialog::editIncidence()
     }
     if ( mIncidence ){
 #ifndef DESKTOP_VERSION
-        hide();
+        //hide();
+        close();
 #endif
         emit editIncidence( mIncidence );
     }
diff --git a/korganizer/koeventviewerdialog.h b/korganizer/koeventviewerdialog.h
index 8e1cd44..29fee49 100644
--- a/korganizer/koeventviewerdialog.h
+++ b/korganizer/koeventviewerdialog.h
@@ -52,6 +52,7 @@ class KOEventViewerDialog : public KDialogBase {
   public slots:
      void  updateConfig();
      void print();
+     void setMyFocus();
  signals:
     void editIncidence( Incidence* );
     void jumpToTime( const QDate &);
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index e72f94b..0bbb3bf 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -75,7 +75,7 @@ KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) :
   KPrefsDialog(KOPrefs::instance(),parent,name,true)
 {
 
-    setFont( KGlobalSettings::generalFont() );
+    setFont( KGlobalSettings::generalMaxFont() );
   setCaption( i18n("Preferences - some settings need a restart (nr)"));
   mCategoryDict.setAutoDelete(true);
 
@@ -719,7 +719,6 @@ void KOPrefsDialog::setupViewsTab()
   topLayout = new QGridLayout(topFrame,5,1);
   topLayout->setSpacing(mSpacingHint);
   topLayout->setMargin(mMarginHint);
-  qDebug("%d %d ",mSpacingHint, mMarginHint );
   ii = 0;
   QLabel *lab;
   QHBox *habo = new QHBox( topFrame );
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 9505d06..94f4677 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -1774,10 +1774,6 @@ void MainWindow::slotModifiedChanged( bool changed )
 void MainWindow::saveStopTimer()
 {
     mSaveTimer.stop();
-    if (mSaveTimer.isActive() )
-        qDebug("ti active ");
-    else
-        qDebug("KO: Save timer stopped");
 }
 void MainWindow::save()
 {
diff --git a/microkde/kglobalsettings.cpp b/microkde/kglobalsettings.cpp
index b6d2feb..b837b23 100644
--- a/microkde/kglobalsettings.cpp
+++ b/microkde/kglobalsettings.cpp
@@ -21,6 +21,22 @@ QFont KGlobalSettings::generalFont()
     f.setPointSize( size );
     return f;
 }
+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()
 {
     return  QApplication::font();
diff --git a/microkde/kglobalsettings.h b/microkde/kglobalsettings.h
index 7df8012..075bb1c 100644
--- a/microkde/kglobalsettings.h
+++ b/microkde/kglobalsettings.h
@@ -12,6 +12,7 @@ class KGlobalSettings
 {
   public:
     static QFont generalFont();
+    static QFont generalMaxFont();
     static QFont toolBarFont();
     
     static QColor toolBarHighlightColor();
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
@@ -42,7 +42,7 @@ KCMultiDialog::KCMultiDialog(const QString& baseGroup, QWidget *parent, const ch
   : KDialogBase(IconList, i18n("Configure"), Default |Cancel | Apply | Ok, Ok,
                 parent, name, modal, true), d(0L)
 {   
-    setFont( KGlobalSettings::generalFont() );
+    setFont( KGlobalSettings::generalMaxFont() );
     enableButton(Apply, false);
     //connect(this, SIGNAL(aboutToShowPage(QWidget *)), this, SLOT(slotAboutToShow(QWidget *)));