fixes

6 files changed, 15 insertions, 14 deletions

diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp
index e57daa4..f9c8b73 100644
--- a/korganizer/datenavigatorcontainer.cpp
+++ b/korganizer/datenavigatorcontainer.cpp
@@ -127,17 +127,16 @@ void DateNavigatorContainer::computeMonthSelected( int month , bool forceEmit )
     QDate date = QDate (  baseDate.year(), baseDate.month() , 15 );
     date = date.addDays( -(baseDate.month()-month ) *30 );
     QDate newBase = QDate (  date.year(), date.month() ,1 ); 
     
     //qDebug("NEW BASE %s", newBase.toString().latin1());
     mNavigatorView->setBaseDate( newBase );
     QDate last = lastAvailableDate();
     QDate first = firstAvailableDate();
-
     QDate selFirst = mFirstSelectedDate;
     QDate selLast = selFirst.addDays( mSelectedDateCount-1 );
     if (  selFirst >= first && selLast <= last ) {
         setBaseDates();
         if ( forceEmit ) 
             updateDayMatrixDates();
     }
     else {
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index 322131f..ecca374 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -335,20 +335,20 @@ void KODayMatrix::recalculateToday()
 
 void KODayMatrix::updateView()
 {
   updateView(startdate);
 }
 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;
     for(i = 0; i < NUMDAYS; i++) {
         if ( ( (i+startDay) % 7 == 0 ) ) {
             pDays.setBit(i);
         }
     }
diff --git a/korganizer/koeventviewerdialog.cpp b/korganizer/koeventviewerdialog.cpp
index 35d084d..1dce841 100644
--- a/korganizer/koeventviewerdialog.cpp
+++ b/korganizer/koeventviewerdialog.cpp
@@ -77,23 +77,28 @@ void KOEventViewerDialog::showMe()
 #ifdef DESKTOP_VERSION
     int x,y,w,h;
     x = geometry().x();
     y = geometry().y();
     w = width();
     h = height();
     show();
     setGeometry(x,y,w,h);
+    raise();
 #else
     showMaximized();
 #endif
-    raise();
+   QTimer::singleShot( 1, this, SLOT ( setMyFocus() ) );
+
+}
+void KOEventViewerDialog::setMyFocus()
+{
+   
     setActiveWindow();
     mEventViewer->setFocus(); 
-    //raise();
 
 }
 void KOEventViewerDialog::print()
 {
     mEventViewer->printMe();
 
 }
 void KOEventViewerDialog::setSyncMode( bool b )
@@ -207,17 +212,18 @@ void KOEventViewerDialog::editIncidence()
     sendSignalViewerClosed = false;
     if ( mSyncMode ) {
         mSyncResult = 2;
         accept();
         return;
     }
     if ( mIncidence ){
 #ifndef DESKTOP_VERSION
-        hide();
+        //hide();
+        close();
 #endif
         emit editIncidence( mIncidence );
     }
 }
 void KOEventViewerDialog::showIncidence()
 {
     sendSignalViewerClosed = false;
     if ( mSyncMode ) {
diff --git a/korganizer/koeventviewerdialog.h b/korganizer/koeventviewerdialog.h
index 8e1cd44..29fee49 100644
--- a/korganizer/koeventviewerdialog.h
+++ b/korganizer/koeventviewerdialog.h
@@ -47,16 +47,17 @@ class KOEventViewerDialog : public KDialogBase {
     void addText(QString text);
     void showMe();
     void setSyncMode( bool );
     void setColorMode( int m );
     int executeS( bool );
   public slots:
      void  updateConfig();
      void print();
+     void setMyFocus();
  signals:
     void editIncidence( Incidence* );
     void jumpToTime( const QDate &);
     void showAgendaView( bool );
     void todoCompleted(Todo*); 
     void signalViewerClosed();  
 private slots:
     void slotViewerClosed();
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index e72f94b..0bbb3bf 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -70,17 +70,17 @@
 #include "koprefsdialog.h"
 #include "kpimglobalprefs.h"
 
 
 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);
 
   KGlobal::locale()->insertCatalogue("timezones");
   mSpacingHint = spacingHintSmall();
    mMarginHint = marginHintSmall();
 #ifndef DESKTOP_VERSION
   if ( QApplication::desktop()->height() == 480  )
@@ -714,17 +714,16 @@ void KOPrefsDialog::setupViewsTab()
 
 
    topFrame = addPage(i18n("Month View"),0,0);
     //  DesktopIcon("viewmag",KIcon::SizeMedium));
 
   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 );
   if ( QApplication::desktop()->width() <= 480 ) {
       lab = new QLabel ( i18n("Show events that recur "), topFrame );
       topLayout->addMultiCellWidget(lab,ii, ii,0,1);
       ii++;
   } else {
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 9505d06..94f4677 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -1769,20 +1769,16 @@ void MainWindow::slotModifiedChanged( bool changed )
         msec = 1000 * 600;
     mSaveTimer.start( msec, true ); // 1 minute
     qDebug("KO: Saving File in %d secs!", msec/1000);
     mCalendarModifiedFlag = true;
 }
 void MainWindow::saveStopTimer()
 {
     mSaveTimer.stop();
-    if (mSaveTimer.isActive() )
-        qDebug("ti active ");
-    else
-        qDebug("KO: Save timer stopped");
 }
 void MainWindow::save()
 {
     if ( !mCalendarModifiedFlag ) {
         qDebug("KO: Calendar not modified. Nothing saved.");
         return;
     }
     if ( mSyncManager->blockSave() )