2 files changed, 31 insertions, 17 deletions

diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index 00c2d97..27d755e 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -502,7 +502,8 @@ void KOQuickTodo::focusOutEvent(QFocusEvent *ev)
 
 KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
   KOrg::BaseView(calendar,parent,name)
-{
+{ 
+    mActiveItem = 0;
     mCategoryPopupMenu = 0;
     mPendingUpdateBeforeRepaint = false;
     isFlatDisplay = false;
@@ -807,28 +808,38 @@ void  KOTodoView::paintEvent(QPaintEvent * pevent)
     KOrg::BaseView::paintEvent( pevent);
 }
 
+void KOTodoView::clearList( bool saveCurrentItem ) // default true 
+{
+   if ( mTodoListView->childCount() ) {
+       if ( saveCurrentItem )
+           storeCurrentItem();
+       mTodoListView->clear();
+       mTodoMap.clear();
+    }
+}
 void KOTodoView::updateView()
 {
+    mActiveItem = 0;
     pendingSubtodo = 0;
     if ( mBlockUpdate ) {
         return;
     }
     if ( !isVisible() ) {
-       mPendingUpdateBeforeRepaint = true;
-       return;
+        clearList ();
+        mPendingUpdateBeforeRepaint = true;
+        return;
     }
     //qDebug("KOTodoView::updateView() %x", this);
     if ( isFlatDisplay ) {
         displayAllFlat();
         return;
     }
-    storeCurrentItem();
     //qDebug("update ");
 //  kdDebug() << "KOTodoView::updateView()" << endl;
     QFont fo = KOPrefs::instance()->mTodoViewFont;
    
-
-    mTodoListView->clear();
+    clearList ();
+   
     if ( mName == "todolistsmall" ) {
         if ( KOPrefs::instance()->mTodoViewUsesSmallFont ) {
             int ps = fo.pointSize() -2;
@@ -864,7 +875,6 @@ void KOTodoView::updateView()
   // Put for each Event a KOTodoViewItem in the list view. Don't rely on a
   // specific order of events. That means that we have to generate parent items
   // recursively for proper hierarchical display of Todos.
-  mTodoMap.clear();
   Todo *todo;
   todo = todoList.first();// todo; todo = todoList.next()) {
   while ( todo ) {
@@ -974,7 +984,8 @@ void KOTodoView::resetCurrentItem()
         }
     }
     processSelectionChange(); 
-    QTimer::singleShot( 100, this, SLOT ( resetFocusToList() ));
+    if ( mName != "todolistsmall" )
+        QTimer::singleShot( 100, this, SLOT ( resetFocusToList() ));
 }
 void KOTodoView::resetFocusToList()
 {
@@ -1100,12 +1111,14 @@ void KOTodoView::printPreview(CalPrinter *calPrinter, const QDate &fd,
 
 void KOTodoView::editItem(QListViewItem *item )
 {
-  emit editTodoSignal(((KOTodoViewItem *)item)->todo());
+    if ( item ) 
+        emit editTodoSignal(((KOTodoViewItem *)item)->todo());
 }
 
 void KOTodoView::showItem(QListViewItem *item,const QPoint &,int)
 {
-  emit showTodoSignal(((KOTodoViewItem *)item)->todo());
+    if ( item ) 
+        emit showTodoSignal(((KOTodoViewItem *)item)->todo());
 }
 
 void KOTodoView::popupMenu(QListViewItem *item,const QPoint &p,int column)
@@ -1357,7 +1370,7 @@ void KOTodoView::toggleRunningItem()
             tp.setGeometry( xx,yy,wid,hei );
         }
         tp.exec();
-        updateTodo ( t, 0 );
+        updateTodo ( t, KOGlobals::EVENTEDITED );
     } else {
         KOStartTodoPrefs tp ( t->summary(), this );
         if (QApplication::desktop()->width() <= 800 ){
@@ -1374,7 +1387,7 @@ void KOTodoView::toggleRunningItem()
             updateView();
         } else {
             t->setRunning( true );
-            updateTodo ( t, 0 );
+            updateTodo ( t, KOGlobals::EVENTEDITED );
         }
     }
 }
@@ -1505,16 +1518,16 @@ void  KOTodoView::setOpen( QListViewItem* item, bool setOpenI)
 
 void KOTodoView::displayAllFlat()
 {
-    storeCurrentItem();
+  
+    mActiveItem = 0;
     pendingSubtodo = 0;
     if ( mBlockUpdate ) {
         return;
     }
+    clearList ();
     mPopupMenu->setItemChecked( 8,true );
     isFlatDisplay = true;
     QPtrList<Todo> todoList = calendar()->todos();
-    mTodoMap.clear();
-    mTodoListView->clear();
     Todo *todo;   
     for(todo = todoList.first(); todo; todo = todoList.next()) {
         if ( checkTodo( todo ) ) {
@@ -1696,9 +1709,10 @@ void KOTodoView::keyPressEvent ( QKeyEvent * e )
         }
     }
 }
+
 void KOTodoView::updateTodo( Todo * t, int type )
 {
-    if  ( mBlockUpdate)
+    if  ( mBlockUpdate )
         return;
 
     QMap<Todo *,KOTodoViewItem *>::ConstIterator itemIterator;
diff --git a/korganizer/kotodoview.h b/korganizer/kotodoview.h
index a8e90e2..9180015 100644
--- a/korganizer/kotodoview.h
+++ b/korganizer/kotodoview.h
@@ -174,7 +174,7 @@ class KOTodoView : public KOrg::BaseView
     void restoreLayout(KConfig *config, const QString &group);
     void setNavigator( DateNavigator* nav ) {mNavigator = nav;}
     QString getWhatsThisText(QPoint p);
-    void clearList() {mTodoListView->clear(); }
+    void clearList( bool saveCurrentItem = true );
 
   public slots:
     void updateView();