mf

7 files changed, 116 insertions, 91 deletions

diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 178f92d..2858d9c 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -1,54 +1,61 @@
 Info about the changes in new versions of KDE-Pim/Pi
 
 
 ********** VERSION 2.0.1 ************
 
 Oooops ... I forgot to test on the Zaurus 5500 ...
 
 Fixed many problems of new (english) strings (and german translations)
 introduced in the latest versions, where the text was not fitting on the 
 240x320 display of the Zaurus 5500.
 
+KO/Pi:
 Added a popup menu ( press pen and hold to get popup ) to the agenda view
 with many useful items (add event/todo, show next week, two weeks, month, journal).
 
 Added items to the todolist popup menu for:
 Display all opened, all closed or all todos flat.
 The "flat" view makes is possible to sort all todos after ,e.g., prio or date.
 Made the reparenting of todos on the desktop possible via Drag&Drop.
 Fixed several bugs in setting the completed datetime for todos.
 Added info about completed datetime of todos to the todo viewer.
 Now displaying a completed todo (with completed datetime set) in the agenda view
 at the time of the completion. Such that now it is possible to see in the agenda view
 when what todo was completed.
 Fixed behaviour of automatic setting completion of todos with sub-todos/parent todos.
 Now the behaviour is:
 Setting a parent to complete  sets all (sub)childs to complete. 
 Setting a parent to uncomplete does not change the childs.
 Setting a child to uncomplete sets all parent to uncomplete.
 Setting a child to complete does not change the parents.
 
+Smart updating and double buffering of the daymatrix.
+Showing holidays in the day matrix.
+Many other small performance updates.
+
+Made day labels in agenda clickable. By clicking a label, the day is displayed in single day mode.
+
 Now the translation file usertranslation.txt is supposed to be in utf8 format.
 If you want to translate a language from western europe, just change the germantranslation.txt file. Please read the updated Usertranslation HowTo in KO/Pi Help menu.
 
 
 ********** VERSION 2.0.0 ************
 
 Stable release 2.0.0!
 
 KO/Pi:
 Fixed problem in edit dialog recreation at startup.
 Made "toggle view*" menu items enabled context sensitive.
 Changed agenda size menu to items 1-10.
 Made it possible to change agenda size quickly by pressing mouse on timelabels in agenda view and move mouse up/down.
 Usebility enhancements in the KO/Pi menus.
 Birthday import now adds year to summary.
 What's Next view shows age in years for birthday.
 
 OM/Pi:
 Added three info lines to display subject, from and to of selected mails.
 
 KA/Pi:
 Fixed jump bar behaviour on Zaurus.
 Now KA/Pi search field supports searching for a range of starting characters.
 E.g. to search for all contact beginning with b to n, type 
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index ca896b5..549ef2a 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -191,125 +191,118 @@ void KODayMatrix::setSelectedDaysFrom(const QDate& start, const QDate& end)
 void KODayMatrix::recalculateToday()
 {
     today = -1;
     for (int i=0; i<NUMDAYS; i++) {
         events[i] = 0;
       days[i] = startdate.addDays(i);
       daylbls[i] = QString::number( KOGlobals::self()->calendarSystem()->day( days[i] ));
       
       // if today is in the currently displayed month, hilight today
       if (days[i].year() == QDate::currentDate().year() &&
           days[i].month() == QDate::currentDate().month() &&
           days[i].day() == QDate::currentDate().day()) {
         today = i;
       }
     }
     // qDebug(QString("Today is visible at %1.").arg(today));
 }
 
 void KODayMatrix::updateView()
 {
   updateView(startdate);
 }
 void KODayMatrix::repaintViewTimed()
 {
-    qDebug("KODayMatrix::repaintViewTimed ");
     mRepaintTimer->stop(); 
     repaint(false);
 }
 void KODayMatrix::updateViewTimed()
 {
 
     mUpdateTimer->stop(); 
-    qDebug("KODayMatrix::updateView(QDate actdate)");
     for(int i = 0; i < NUMDAYS; i++) {
-
         // if events are set for the day then remember to draw it bold
         QPtrList<Event> eventlist = mCalendar->events(days[i]);
         Event *event;
         int numEvents = eventlist.count();
-
+        QString holiStr = "";
         for(event=eventlist.first();event != 0;event=eventlist.next()) {
             ushort recurType = event->recurrence()->doesRecur();
-
             if ((recurType == Recurrence::rDaily && !KOPrefs::instance()->mDailyRecur) ||
                 (recurType == Recurrence::rWeekly && !KOPrefs::instance()->mWeeklyRecur)) {
                 numEvents--;
             }
+            if ( event->categories().contains( i18n("Holiday") ) || event->categories().contains( "Holiday" )) {
+                if ( !holiStr.isEmpty() )
+                    holiStr += "\n";
+                holiStr += event->summary();
+            }
         }
         events[i] = numEvents;
-
         //if it is a holy day then draw it red. Sundays are consider holidays, too
-#ifndef KORG_NOPLUGINS
-        QString holiStr = KOCore::self()->holiday(days[i]);
-#else
-        QString holiStr = QString::null;
-#endif
         if ( (KOGlobals::self()->calendarSystem()->dayOfWeek(days[i]) == KOGlobals::self()->calendarSystem()->weekDayOfPray()) ||
              !holiStr.isEmpty()) {
-            if (holiStr.isNull()) holiStr = "";
             mHolidays[i] = holiStr;
-
         } else {
             mHolidays[i] = QString::null;
         }
     }
     if ( ! mPendingUpdateBeforeRepaint )
         repaint(false);
- }
+}
 void KODayMatrix::updateView(QDate actdate)
 {
    
     if ( ! actdate.isValid() ) {
         //qDebug("date not valid ");
         return;
     }
     mDayChanged = false;
     //flag to indicate if the starting day of the matrix has changed by this call
     //mDayChanged = false;
     // if a new startdate is to be set then apply Cornelius's calculation
     // of the first day to be shown
     if (actdate != startdate) {
         // reset index of selection according to shift of starting date from startdate to actdate
         if (mSelStart != NOSELECTION) {
             int tmp = actdate.daysTo(startdate);
             //kdDebug() <<  "Shift of Selection1: " << mSelStart << " - " << mSelEnd << " -> " << tmp << "(" << offset << ")" << endl;
             // shift selection if new one would be visible at least partly !
 
             if (mSelStart+tmp < NUMDAYS && mSelEnd+tmp >= 0) {
                 // nested if is required for next X display pushed from a different month - correction required
                 // otherwise, for month forward and backward, it must be avoided
                 if( mSelStart > NUMDAYS || mSelStart < 0 )
                     mSelStart = mSelStart + tmp;
                 if( mSelEnd > NUMDAYS || mSelEnd < 0 )
                     mSelEnd = mSelEnd + tmp;
             }	
         }
         startdate = actdate;
         mDayChanged = true;
         recalculateToday();
     }
-    qDebug("restart Timer %d vis: %d", mDayChanged, isVisible() );
+    //qDebug("restart Timer %d vis: %d", mDayChanged, isVisible() );
     if ( !isVisible() ) {
         mPendingUpdateBeforeRepaint = true; 
     } else {
 #ifdef DESKTOP_VERSION
         //mRepaintTimer->start( 250 );
         mUpdateTimer->start( 250 );
 #else
         mRepaintTimer->start( 350 ); 
         mUpdateTimer->start( 2000 );
 #endif
     }
 }
 
 const QDate& KODayMatrix::getDate(int offset)
 {
   if (offset < 0 || offset > NUMDAYS-1) {
       qDebug("Wrong offset2 ");
     return days[0];
   }
   return days[offset];
 }
 
 QString KODayMatrix::getHolidayLabel(int offset)
 {
@@ -466,165 +459,170 @@ void KODayMatrix::dropEvent(QDropEvent *e)
     int duration = start.daysTo(end);
     int idx = getDayIndexFrom(e->pos().x(), e->pos().y());
 
     start.setDate(days[idx]);
     end.setDate(days[idx].addDays(duration));
 
     event->setDtStart(start);
     event->setDtEnd(end);
     mCalendar->addEvent(event);
 
     emit eventDropped(event);
   } else {
 //    kdDebug() << "KODayMatrix::dropEvent(): Event from drop not decodable" << endl;
     e->ignore();
   }
 #endif
 }
 
 // ----------------------------------------------------------------------------
 //  P A I N T   E V E N T   H A N D L I N G
 // ----------------------------------------------------------------------------
 
 void KODayMatrix::paintEvent(QPaintEvent * pevent)
 {
-//kdDebug() << "KODayMatrix::paintEvent() BEGIN" << endl;
-   if ( mPendingUpdateBeforeRepaint ) {
-       updateViewTimed();
-       mPendingUpdateBeforeRepaint = false;
+    if ( width() <= 0  || height() <= 0 )
+        return;
+    if ( mPendingUpdateBeforeRepaint ) {
+        updateViewTimed();
+        mPendingUpdateBeforeRepaint = false;
+    }
+    if ( myPix.width() != width() || myPix.height()!=height() ) {
+        myPix.resize(size() );
     }
-  QPainter p(this);
+  QPainter p(&myPix);
 
   QRect sz = frameRect();
   int dheight = daysize.height();
   int dwidth = daysize.width();
   int row,col;
   int selw, selh;
   bool isRTL = KOGlobals::self()->reverseLayout();
 
   // draw background and topleft frame
   p.fillRect(pevent->rect(), mDefaultBackColor);
   p.setPen(mDefaultTextColor);
   p.drawRect(0, 0, sz.width()+1, sz.height()+1);
 
   // draw selected days with highlighted background color
   if (mSelStart != NOSELECTION) {
 
     row = mSelStart/7;
     col = mSelStart -row*7;
     QColor selcol = KOPrefs::instance()->mHighlightColor;
 
     if (row == mSelEnd/7) {
       // Single row selection
       p.fillRect(isRTL ? (7 - (mSelEnd-mSelStart+1) - col)*dwidth : col*dwidth,
                   row*dheight, (mSelEnd-mSelStart+1)*dwidth, dheight, selcol);
     } else {
       // draw first row to the right
       p.fillRect(isRTL ? 0 : col*dwidth, row*dheight, (7-col)*dwidth,
                  dheight, selcol);
       // draw full block till last line
       selh = mSelEnd/7-row;
       if (selh > 1) {
         p.fillRect(0, (row+1)*dheight, 7*dwidth, (selh-1)*dheight,selcol);
       }
       // draw last block from left to mSelEnd
       selw = mSelEnd-7*(mSelEnd/7)+1;
       p.fillRect(isRTL ? (7-selw)*dwidth : 0, (row+selh)*dheight,
                  selw*dwidth, dheight, selcol);
     }
   }
 
   // iterate over all days in the matrix and draw the day label in appropriate colors
   QColor actcol = mDefaultTextColorShaded;
   p.setPen(actcol);
   QPen tmppen;
   for(int i = 0; i < NUMDAYS; i++) {
-    row = i/7;
-    col = isRTL ? 6-(i-row*7) : i-row*7;
-
-    // if it is the first day of a month switch color from normal to shaded and vice versa
-    if ( KOGlobals::self()->calendarSystem()->day( days[i] ) == 1) {
-      if (actcol == mDefaultTextColorShaded) {
-        actcol = mDefaultTextColor;
-      } else {
-        actcol = mDefaultTextColorShaded;
+      row = i/7;
+      col = isRTL ? 6-(i-row*7) : i-row*7;
+
+      // if it is the first day of a month switch color from normal to shaded and vice versa
+      if ( KOGlobals::self()->calendarSystem()->day( days[i] ) == 1) {
+          if (actcol == mDefaultTextColorShaded) {
+              actcol = mDefaultTextColor;
+          } else {
+              actcol = mDefaultTextColorShaded;
+          }
+          p.setPen(actcol);
       }
-      p.setPen(actcol);
-    }
 
-    //Reset pen color after selected days block
-    if (i == mSelEnd+1) {
-      p.setPen(actcol);
-    }
+      //Reset pen color after selected days block
+      if (i == mSelEnd+1) {
+          p.setPen(actcol);
+      }
+
+      // if today then draw rectangle around day
+      if (today == i) {
+          tmppen = p.pen();
+          QPen mTodayPen(p.pen());
+
+          mTodayPen.setWidth(mTodayMarginWidth);
+          //draw red rectangle for holidays
+          if (!mHolidays[i].isNull()) {
+              if (actcol == mDefaultTextColor) {
+                  mTodayPen.setColor(KOPrefs::instance()->mHolidayColor);
+              } else {
+                  mTodayPen.setColor(mHolidayColorShaded);
+              }
+          }
+          //draw gray rectangle for today if in selection
+          if (i >= mSelStart && i <= mSelEnd) {
+              QColor grey("grey");
+              mTodayPen.setColor(grey);
+          }
+          p.setPen(mTodayPen);
+          p.drawRect(col*dwidth, row*dheight, dwidth, dheight);
+          p.setPen(tmppen);
+      }
 
-    // if today then draw rectangle around day
-    if (today == i) {
-      tmppen = p.pen();
-      QPen mTodayPen(p.pen());
+      // if any events are on that day then draw it using a bold font
+      if (events[i] > 0) {
+          QFont myFont = font();
+          myFont.setBold(true);
+          p.setFont(myFont);
+      }
 
-      mTodayPen.setWidth(mTodayMarginWidth);
-      //draw red rectangle for holidays
+      // if it is a holiday then use the default holiday color
       if (!mHolidays[i].isNull()) {
-        if (actcol == mDefaultTextColor) {
-          mTodayPen.setColor(KOPrefs::instance()->mHolidayColor);
-        } else {
-          mTodayPen.setColor(mHolidayColorShaded);
-        }
+          if (actcol == mDefaultTextColor) {
+              p.setPen(KOPrefs::instance()->mHolidayColor);
+          } else {
+              p.setPen(mHolidayColorShaded);
+          }
       }
-      //draw gray rectangle for today if in selection
+
+      // draw selected days with special color
+      // DO NOT specially highlight holidays in selection !
       if (i >= mSelStart && i <= mSelEnd) {
-        QColor grey("grey");
-        mTodayPen.setColor(grey);
+          p.setPen(mSelectedDaysColor);
       }
-      p.setPen(mTodayPen);
-      p.drawRect(col*dwidth, row*dheight, dwidth, dheight);
-      p.setPen(tmppen);
-    }
 
-    // if any events are on that day then draw it using a bold font
-    if (events[i] > 0) {
-      QFont myFont = font();
-      myFont.setBold(true);
-      p.setFont(myFont);
-    }
+      p.drawText(col*dwidth, row*dheight, dwidth, dheight,
+                 Qt::AlignHCenter | Qt::AlignVCenter,  daylbls[i]);
 
-    // if it is a holiday then use the default holiday color
-    if (!mHolidays[i].isNull()) {
-      if (actcol == mDefaultTextColor) {
-        p.setPen(KOPrefs::instance()->mHolidayColor);
-      } else {
-        p.setPen(mHolidayColorShaded);
+      // reset color to actual color
+      if (!mHolidays[i].isNull()) {
+          p.setPen(actcol);
+      }
+      // reset bold font to plain font
+      if (events[i] > 0) {
+          QFont myFont = font();
+          myFont.setBold(false);
+          p.setFont(myFont);
       }
-    }
-
-    // draw selected days with special color
-    // DO NOT specially highlight holidays in selection !
-    if (i >= mSelStart && i <= mSelEnd) {
-      p.setPen(mSelectedDaysColor);
-    }
-
-    p.drawText(col*dwidth, row*dheight, dwidth, dheight,
-              Qt::AlignHCenter | Qt::AlignVCenter,  daylbls[i]);
-
-    // reset color to actual color
-    if (!mHolidays[i].isNull()) {
-      p.setPen(actcol);
-    }
-    // reset bold font to plain font
-    if (events[i] > 0) {
-      QFont myFont = font();
-      myFont.setBold(false);
-      p.setFont(myFont);
-    }
   }
+    bitBlt (this, 0, 0, &myPix, 0 ,0,width(), height() ,CopyROP); 
 }
 
 // ----------------------------------------------------------------------------
 //  R E SI Z E   E V E N T   H A N D L I N G
 // ----------------------------------------------------------------------------
 
 void KODayMatrix::resizeEvent(QResizeEvent *)
 {
   QRect sz = frameRect();
   daysize.setHeight(sz.height()*7 / NUMDAYS);
   daysize.setWidth(sz.width() / 7);
 }
diff --git a/korganizer/kodaymatrix.h b/korganizer/kodaymatrix.h
index ac2f59c..2dd112a 100644
--- a/korganizer/kodaymatrix.h
+++ b/korganizer/kodaymatrix.h
@@ -10,48 +10,49 @@
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 #ifndef _KODAYMAT_H
 #define _KODAYMAT_H
 
 #include <libkcal/calendar.h>
 
 #include <qstring.h>
 #include <qframe.h>
 #include <qcolor.h>
 #include <qpen.h>
 #include <qdatetime.h>
 #include <qtooltip.h>
+#include <qpixmap.h>
 
 #include <qmap.h>
 
 class QDragEnterEvent;
 class QDragMoveEvent;
 class QDragLeaveEvent;
 class QDropEvent;
 
 class KODayMatrix;
 
 using namespace KCal;
 
 
 /**
  *  small helper class to dynamically show tooltips inside the day matrix.
  *  This class asks the day matrix object for a appropriate label which
  *  is in our special case the name of the holiday or null if this day is no holiday.
  */
 class DynamicTip : public QToolTip
 {
 public:
 
     /**
      * Constructor that expects a KODayMatrix object as parent.
@@ -200,48 +201,49 @@ signals:
      */
     void eventDropped(Event *event);
 
 protected:
 
     void paintEvent(QPaintEvent *ev);
 
     void mousePressEvent (QMouseEvent* e);
 
     void mouseReleaseEvent (QMouseEvent* e);
 
     void mouseMoveEvent (QMouseEvent* e);
 
     void dragEnterEvent(QDragEnterEvent *);
 
     void dragMoveEvent(QDragMoveEvent *);
 
     void dragLeaveEvent(QDragLeaveEvent *);
 
     void dropEvent(QDropEvent *);
 
     void resizeEvent(QResizeEvent *);
 
 private:
+    QPixmap myPix;
     QTimer* mUpdateTimer;
     QTimer* mRepaintTimer;
     bool mDayChanged;
     bool mPendingUpdateBeforeRepaint;
 
     /** returns the index of the day located at the matrix's widget (x,y) position.
      *
      *  @param x horizontal coordinate
      *  @param y vertical coordinate
      */
     int getDayIndexFrom(int x, int y);
 
     /** calculates a "shaded" color from the supplied color object.
      *  (Copied from Cornelius's kdpdatebutton.cpp)
      *
      *  @param color source based on which a shaded color should be calculated.
      */
     QColor getShadedColor(QColor color);
 
     /** number of days to be displayed. For now there is no support for any other number then 42.
         so change it at your own risk :o) */
     static const int NUMDAYS;
 
     /** calendar instance to be queried for holidays, events, ... */
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 4cff23a..6411156 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -955,50 +955,50 @@ void KOMonthView::showDates(const QDate &start, const QDate &)
             wno =dayOfYear / 7;
         mWeekLabels[i]->setWeekNum( wno );
         date = date.addDays( 7 );
     }
     updateView();
 }
 
 void KOMonthView::showEvents(QPtrList<Event>)
 {
     qDebug("KOMonthView::selectEvents is not implemented yet. ");
 }
 
 void KOMonthView::changeEventDisplay(Event *, int)
 {
     // this should be re-written to be much more efficient, but this
     // quick-and-dirty-hack gets the job done for right now.
     updateView();
 }
 
 void KOMonthView::updateView()
 { 
 
     if ( !updatePossible )
         return;
-    QTime ti;
-    ti.start();
+    //QTime ti;
+    //ti.start();
 #if 1
     int i;
     for( i = 0; i < mCells.count(); ++i ) {
         mCells[i]->startUpdateCell();
     }
  
     QPtrList<Event> events = calendar()->events();
     Event *event;
     QDateTime dt;
     bool ok;
     int timeSpan = mCells.size()-1;
     QDate endDate =  mStartDate.addDays( timeSpan );
     for( event = events.first(); event; event = events.next() ) { // for event
         if ( event->doesRecur() ) {
             bool last;
             QDateTime incidenceStart = event->recurrence()->getPreviousDateTime( QDateTime( mStartDate ) , &last );
             QDateTime incidenceEnd;
             int eventlen = event->dtStart().date().daysTo ( event->dtEnd().date()  );
             bool invalid = false;
             while( true ) {
                     if ( incidenceStart.isValid() ) {
                         incidenceEnd = incidenceStart.addDays( eventlen );
                         int st =   incidenceStart.date().daysTo( endDate );
                         if ( st >= 0 ) { // start before timeend
@@ -1059,49 +1059,49 @@ void KOMonthView::updateView()
         }
     }
 
     for( i = 0; i < mCells.count(); ++i ) {
         mCells[i]->finishUpdateCell();
     }
     processSelectionChange();
     mCells[0]->setFocus();
 
 
 #else
     // old code
     //qDebug("+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ");
     int i;
     for( i = 0; i < mCells.count(); ++i ) {
         mCells[i]->updateCell();
     }
  
     //qDebug("KOMonthView::updateView() ");
     processSelectionChange();
     // qDebug("---------------------------------------------------------------------+ ");
     mCells[0]->setFocus();
 #endif
 
-    qDebug("update time %d ", ti.elapsed());
+    //qDebug("update time %d ", ti.elapsed());
 }
 
 void KOMonthView::resizeEvent(QResizeEvent * e)
 {
     computeLayout();
     mCells[0]->setFocus();
 }
 void KOMonthView::computeLayout()
 {
     // select the appropriate heading string size. E.g. "Wednesday" or "Wed".
     // note this only changes the text if the requested size crosses the
     // threshold between big enough to support the full name and not big
     // enough.
 
     int daysToShow = 7;
     bool combinedSatSun  = false;
     if (mShowSatSunComp = KOPrefs::instance()->mMonthViewSatSunTog ) {
         daysToShow = 6;
         combinedSatSun  = true;
     }
     int tWid = topLevelWidget()->size().width();
     int tHei = topLevelWidget()->size().height();
 
     int wid = size().width();//e
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index 82437d8..99402c4 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -188,49 +188,53 @@ void KOTodoListView::contentsDropEvent(QDropEvent *e)
 }
 
 void KOTodoListView::contentsMousePressEvent(QMouseEvent* e)
 {
 #ifndef KORG_NODND
   QPoint p(contentsToViewport(e->pos()));
   QListViewItem *i = itemAt(p);
   mMousePressed = false; 
   if (i) {
     // if the user clicked into the root decoration of the item, don't
     // try to start a drag!
     if (p.x() > header()->sectionPos(header()->mapToIndex(0)) +
         treeStepSize() * (i->depth() + (rootIsDecorated() ? 1 : 0)) +
         itemMargin() ||
         p.x() < header()->sectionPos(header()->mapToIndex(0))) {
       if (e->button()==Qt::LeftButton) {
         mPressPos = e->pos();
         mMousePressed = true;
       }
     }
   }
 #endif
    QListView::contentsMousePressEvent(e);   
 }
-
+void KOTodoListView::paintEvent(QPaintEvent* e)
+{
+    emit paintNeeded();
+    QListView::paintEvent( e);
+}
 void KOTodoListView::contentsMouseMoveEvent(QMouseEvent* e)
 {
 
 #ifndef KORG_NODND
   QListView::contentsMouseMoveEvent(e);
   if (mMousePressed && (mPressPos - e->pos()).manhattanLength() >
       QApplication::startDragDistance()) {
     mMousePressed = false;
     QListViewItem *item = itemAt(contentsToViewport(mPressPos));
     if (item) {
       DndFactory factory( mCalendar );
       ICalDrag *vd = factory.createDrag(
                           ((KOTodoViewItem *)item)->todo(),viewport());
       internalDrop = false;
       // we cannot do any senseful here, because the DnD is still broken in Qt
       if (vd->drag()) {
           if ( !internalDrop ) {
               //emit deleteTodo( ((KOTodoViewItem *)item)->todo() );
               qDebug("Dnd: External move: Delete drag source "); 
           } else
               qDebug("Dnd: Internal move ");
           
       } else {
           if ( !internalDrop ) {
@@ -480,90 +484,99 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
 
   // Double clicking conflicts with opening/closing the subtree
   connect( mTodoListView, SIGNAL( doubleClicked( QListViewItem *) ),
            SLOT( editItem( QListViewItem *) ) );
   /*
   connect( mTodoListView, SIGNAL(  rightButtonClicked ( QListViewItem *,
                                                         const QPoint &,int ) ),
            SLOT( popupMenu( QListViewItem *, const QPoint & ,int) ) );
   */ 
   connect( mTodoListView, SIGNAL(  contextRequest ( QListViewItem *,
                                                         const QPoint &,int ) ),
            SLOT( popupMenu( QListViewItem *, const QPoint & ,int) ) );
   connect( mTodoListView, SIGNAL( clicked( QListViewItem * ) ),
            SLOT( itemClicked( QListViewItem * ) ) );
   connect( mTodoListView, SIGNAL( double_Clicked( QListViewItem * ) ),
            SLOT( itemDoubleClicked( QListViewItem * ) ) );
   connect( mTodoListView, SIGNAL( todoDropped( Todo *, int ) ),
            SLOT( updateView() ) );
   connect( mTodoListView, SIGNAL( todoDropped( Todo *, int ) ),
            SLOT( todoModified(Todo *, int) ) );
   connect( mTodoListView, SIGNAL( expanded( QListViewItem * ) ),
            SLOT( itemStateChanged( QListViewItem * ) ) );
   connect( mTodoListView, SIGNAL( collapsed( QListViewItem * ) ),
            SLOT( itemStateChanged( QListViewItem * ) ) );
+  connect( mTodoListView, SIGNAL( paintNeeded() ),
+           SLOT( paintNeeded()) );
 
 #if 0
   connect(mTodoListView,SIGNAL(selectionChanged(QListViewItem *)),
           SLOT(selectionChanged(QListViewItem *)));
   connect(mTodoListView,SIGNAL(clicked(QListViewItem *)),
           SLOT(selectionChanged(QListViewItem *)));
   connect(mTodoListView,SIGNAL(pressed(QListViewItem *)),
           SLOT(selectionChanged(QListViewItem *)));
 #endif
 
   connect( mTodoListView, SIGNAL(reparentTodoSignal( Todo *,Todo * ) ), SIGNAL(reparentTodoSignal( Todo *,Todo * ) ));
   connect( mTodoListView, SIGNAL(unparentTodoSignal(Todo *)  ), SIGNAL(unparentTodoSignal(Todo *)  ));
   connect( mTodoListView, SIGNAL( deleteTodo(Todo *)  ), SIGNAL(deleteTodoSignal(Todo *)  ));
 
   connect( mTodoListView, SIGNAL(selectionChanged() ),
            SLOT( processSelectionChange() ) );
   connect( mQuickAdd, SIGNAL( returnPressed () ),
            SLOT( addQuickTodo() ) );
  
 }
 
 KOTodoView::~KOTodoView()
 {
   delete mDocPrefs;
 }
 
 void KOTodoView::jumpToDate ()
 {
   //   if (mActiveItem) {
 //     mActiveItem->todo());
 //    if ( mActiveItem->todo()->hasDueDate() )
 //       emit mActiveItem->todo()jumpToTime( mTodo->dtDue().date() );
 }
+void  KOTodoView::paintNeeded()
+{
+    if ( mPendingUpdateBeforeRepaint ) {
+        updateView();
+       mPendingUpdateBeforeRepaint = false;
+    }
+}
 void  KOTodoView::paintEvent(QPaintEvent * pevent)
 {
     if ( mPendingUpdateBeforeRepaint ) {
         updateView();
        mPendingUpdateBeforeRepaint = false;
     }
     KOrg::BaseView::paintEvent( pevent);
 }
-    bool mPendingUpdateBeforeRepaint;
+
 void KOTodoView::updateView()
 {
     pendingSubtodo = 0;
     if ( mBlockUpdate ) {
         return;
     }
     if ( !isVisible() ) {
        mPendingUpdateBeforeRepaint = true;
        return;
     }
     //qDebug("KOTodoView::updateView() %x", this);
     if ( isFlatDisplay ) {
         setAllFlat();
         return;
     }
     //qDebug("update ");
 //  kdDebug() << "KOTodoView::updateView()" << endl;
     QFont fo = KOPrefs::instance()->mTodoViewFont;
     mTodoListView->clear();
     if ( mName == "todolistsmall" ) {
         if ( KOPrefs::instance()->mTodoViewUsesSmallFont ) {
             int ps = fo.pointSize() -2;
             if ( ps > 12 )
                 ps -= 2;
diff --git a/korganizer/kotodoview.h b/korganizer/kotodoview.h
index 16bc133..2a9e737 100644
--- a/korganizer/kotodoview.h
+++ b/korganizer/kotodoview.h
@@ -39,65 +39,67 @@
 #include <libkcal/todo.h>
 
 #include <korganizer/baseview.h>
 
 #include "kotodoviewitem.h"
 #include "koprefs.h"
 #include "koglobals.h"
 #include "datenavigator.h"
 
 class QDragEnterEvent;
 class QDragMoveEvent;
 class QDragLeaveEvent;
 class QDropEvent;
 
 class DocPrefs;
 
 class KOTodoListView : public KListView
 {
     Q_OBJECT
   public:
     KOTodoListView(Calendar *,QWidget *parent=0,const char *name=0);
     virtual ~KOTodoListView() {}
 
   signals:
+    void paintNeeded();
     void todoDropped(Todo *, int);  
     void double_Clicked(QListViewItem *item);
     void reparentTodoSignal( Todo *,Todo * );
     void unparentTodoSignal(Todo *);
     void deleteTodo( Todo * );
   protected:
     void contentsDragEnterEvent(QDragEnterEvent *);
     void contentsDragMoveEvent(QDragMoveEvent *);
     void contentsDragLeaveEvent(QDragLeaveEvent *);
     void contentsDropEvent(QDropEvent *);
 
     void contentsMousePressEvent(QMouseEvent *);
     void contentsMouseMoveEvent(QMouseEvent *);
     void contentsMouseReleaseEvent(QMouseEvent *);
     void contentsMouseDoubleClickEvent(QMouseEvent *);
 
   private:
+    void paintEvent(QPaintEvent * pevent);
     bool internalDrop;
     QString mName;
     Calendar *mCalendar;
     QPoint mPressPos;
     bool mMousePressed;
     QListViewItem *mOldCurrent;
     void keyPressEvent ( QKeyEvent * ) ;
 };
 
 
 /**
   This is the line-edit on top of the todoview for fast addition of new todos
 */
 class KOQuickTodo : public QLineEdit
 {
   public:
     KOQuickTodo(QWidget *parent=0);
   protected:
     void focusInEvent(QFocusEvent *ev);
     void focusOutEvent(QFocusEvent *ev);
 };
 
 
 /**
@@ -177,63 +179,65 @@ class KOTodoView : public KOrg::BaseView
     void itemClicked(QListViewItem *);
     void itemStateChanged(QListViewItem *);
     void modified(bool);
     void itemDoubleClicked(QListViewItem *item);
 
   signals:
     void newTodoSignal();
     void newSubTodoSignal(Todo *);
     void unparentTodoSignal(Todo *);
     void reparentTodoSignal( Todo *,Todo * );
     void showTodoSignal(Todo *);
 
     void editTodoSignal(Todo *);
     void deleteTodoSignal(Todo *);
     void todoModifiedSignal (Todo *, int);
 
     void isModified(bool);
     void cloneTodoSignal( Incidence * );
     void cancelTodoSignal( Incidence * );
     void moveTodoSignal( Incidence * );
     void beamTodoSignal( Incidence * );
     void purgeCompletedSignal();
 
   protected slots:
+    void paintNeeded();
     void processSelectionChange();
     void addQuickTodo();
     void setTodoModified( Todo* );
     void todoModified(Todo *, int );
 
   private:
     /*
      * the TodoEditor approach is rather unscaling in the long
      * run.
      * Korganizer keeps it in memory and we need to update
      * 1. make KOTodoViewItem a QObject again?
      * 2. add a public method for setting one todo modified?
      * 3. add a private method for setting a todo modified + friend here?
      *  -- zecke 2002-07-08
      */
+    friend class KOTodoListView;
     void paintEvent(QPaintEvent * pevent);
     bool mPendingUpdateBeforeRepaint;
     friend class KOTodoViewItem;
     QMap<Todo *,KOTodoViewItem *>::ConstIterator insertTodoItem(Todo *todo);
     void restoreItemState( QListViewItem * );
 
     bool checkTodo( Todo * );
     bool isFlatDisplay;
     void  setOpen( QListViewItem*, bool setOpen);
     KOTodoListView *mTodoListView;
     QPopupMenu *mItemPopupMenu;
     QPopupMenu *mPopupMenu;
     QPopupMenu *mPriorityPopupMenu;
     QPopupMenu *mPercentageCompletedPopupMenu;
     QPopupMenu *mCategoryPopupMenu;
 
     QMap<int, int> mPercentage;
     QMap<int, int> mPriority;
     QMap<int, QString> mCategory;
     KOTodoViewItem *mActiveItem;
 
     QMap<Todo *,KOTodoViewItem *> mTodoMap;
     QString mName;
 
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index 30f5fb1..188ad23 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -583,48 +583,49 @@ void KOViewManager::showTodoView()
                  mMainView, SLOT ( beamIncidence( Incidence * ) ) );
         KConfig *config = KOGlobals::config();
         mTodoView->restoreLayout(config,"Todo View");
         mTodoView->setNavigator( mMainView->dateNavigator() );
     }
 
     globalFlagBlockAgenda = 1;
     showView( mTodoView, true );
 
 }
 
 void KOViewManager::showJournalView()
 {
     //mFlagShowNextxDays = false;
     if (!mJournalView) {
         mJournalView = new KOJournalView(mMainView->calendar(),mMainView->viewStack(),
                                          "KOViewManager::JournalView"); 
         connect( mMainView, SIGNAL( configChanged() ), mJournalView,
                  SLOT( updateConfig() ) );
         connect(mJournalView, SIGNAL(deleteJournal(Journal *) ), mMainView,SLOT(deleteJournal(Journal *)) );
         addView(mJournalView);
     }
 
     showView(mJournalView);
+    mMainView->dateNavigator()->selectDates( 1 );
 }
 
 void KOViewManager::showTimeSpanView()
 {
     //mFlagShowNextxDays = false;
     if (!mTimeSpanView) {
         mTimeSpanView = new KOTimeSpanView(mMainView->calendar(),mMainView->viewStack(),
                                            "KOViewManager::TimeSpanView");
         addView(mTimeSpanView);
 
         mTimeSpanView->readSettings();
     }
 
     showView(mTimeSpanView);
 }
 
 Incidence *KOViewManager::currentSelection()
 {
     if (!mCurrentView) return 0;
     if ( mCurrentView == mListView ) {
         if ( mListView->currentItem() )
             return mListView->currentItem();
     }
     return mCurrentView->selectedIncidences().first();