1 files changed, 78 insertions, 25 deletions

diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index e008625..ccc4b01 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -255,50 +255,64 @@ void KOTodoListView::contentsMouseMoveEvent(QMouseEvent* e)
               qDebug("Dnd: Internal move ");
           
       } else {
           if ( !internalDrop ) {
               qDebug("Dnd: External Copy");
           } else
               qDebug("DnD: Internal copy: Copy pending");
       }
     }
   } 
 #endif
 }
+void KOTodoListView::keyReleaseEvent ( QKeyEvent *e ) 
+{
+    if ( !e->isAutoRepeat() ) {
+        mFlagKeyPressed = false;
+    }
+}
+
+
 void KOTodoListView::keyPressEvent ( QKeyEvent * e )
 {
-    
+    qApp->processEvents();
+    if ( e->isAutoRepeat() && !mFlagKeyPressed ) {
+        e->ignore();
+        // qDebug("  ignore  %d",e->isAutoRepeat()  );
+        return;
+    }
+    if (! e->isAutoRepeat() )
+        mFlagKeyPressed = true;
     QListViewItem* cn;
     if ( e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter ) {
         cn = currentItem();
         if ( cn ) {
             KOTodoViewItem* ci = (KOTodoViewItem*)( cn ); 
             if ( ci ){
                 if ( e->state() == ShiftButton )
                     ci->setOn( false );
                 else
                     ci->setOn( true );
                 cn = cn->itemBelow();
                 if ( cn ) {
                     setCurrentItem ( cn );
                     ensureItemVisible ( cn );
                 }
                 
             }
         }
         
         return;
     }
    
-    //  qDebug("KOTodoListView::keyPressEvent  ");
     if ( e->state() == Qt::ControlButton || e->state() == Qt::ShiftButton || mName != "todolistsmall"  ) {
         switch ( e->key() ) {
         case Qt::Key_Down:
         case Qt::Key_Up:
             QListView::keyPressEvent (  e );
             break; 
         case Qt::Key_Left:
         case Qt::Key_Right:
             QListView::keyPressEvent (  e );
             e->accept();
             return;
             break; 
@@ -589,36 +603,35 @@ void  KOTodoView::paintEvent(QPaintEvent * pevent)
 }
 
 void KOTodoView::updateView()
 {
     pendingSubtodo = 0;
     if ( mBlockUpdate ) {
         return;
     }
     if ( !isVisible() ) {
        mPendingUpdateBeforeRepaint = true;
        return;
     }
+    storeCurrentItem();
     //qDebug("KOTodoView::updateView() %x", this);
     if ( isFlatDisplay ) {
         displayAllFlat();
+        resetCurrentItem();
         return;
     }
     //qDebug("update ");
 //  kdDebug() << "KOTodoView::updateView()" << endl;
     QFont fo = KOPrefs::instance()->mTodoViewFont;
-    Incidence* oldInc = 0;
-    mActiveItem = (KOTodoViewItem*)mTodoListView->currentItem();
-    if (mActiveItem)
-        oldInc = mActiveItem->todo();
+   
 
     mTodoListView->clear();
     if ( mName == "todolistsmall" ) {
         if ( KOPrefs::instance()->mTodoViewUsesSmallFont ) {
             int ps = fo.pointSize() -2;
             if ( ps > 12 )
                 ps -= 2;
             fo.setPointSize( ps );
         } 
     }
     
   mTodoListView->setFont( fo );
@@ -682,45 +695,84 @@ void KOTodoView::updateView()
   //qDebug("for  ");
   for(todo = todoList.first(); todo; todo = todoList.next()) {
       if (!mTodoMap.contains(todo)  && checkTodo( todo ) )
       {
       insertTodoItem(todo);
     }
   }
   //qDebug("for end ");
   // Restore opened/closed state
   mTodoListView->blockSignals( true );
   if( mDocPrefs ) restoreItemState( mTodoListView->firstChild() );
   mTodoListView->blockSignals( false );
-  mTodoListView->setFocus();
-  if ( mTodoListView->firstChild ()  ) {
-      if ( oldInc ) {
-          KOTodoViewItem* item = (KOTodoViewItem*)mTodoListView->firstChild ();
-          while ( item  ) {
-              if ( item->todo() == oldInc ) {
-                  mTodoListView->setCurrentItem( item ); 
-                  mTodoListView->ensureItemVisible( item );
-                  break;
-              }
-              item = (KOTodoViewItem*)item->itemBelow();
-          }
-          if ( ! item )
-              mTodoListView->setCurrentItem( mTodoListView->firstChild () );
-      } else {
-          mTodoListView->setCurrentItem( mTodoListView->firstChild () );
-      }
-  }
+  resetCurrentItem();
   processSelectionChange();
 }
 
+void KOTodoView::storeCurrentItem()
+{
+    mCurItem = 0;
+    mCurItemRootParent = 0;
+    mCurItemAbove = 0; 
+    mActiveItem = (KOTodoViewItem*)mTodoListView->currentItem();
+    if (mActiveItem) {
+        mCurItem = mActiveItem->todo();
+        KOTodoViewItem* activeItemAbove =  (KOTodoViewItem*)mActiveItem->itemAbove ();
+        if ( activeItemAbove )
+            mCurItemAbove = activeItemAbove->todo();
+        while ( mActiveItem->parent() != 0 )
+            mActiveItem = (KOTodoViewItem*)mActiveItem->parent();
+        mCurItemRootParent = mActiveItem->todo();
+    }
+    mActiveItem = 0;
+}
+
+void KOTodoView::resetCurrentItem()
+{
+    mTodoListView->setFocus();
+    KOTodoViewItem* foundItem = 0; 
+    KOTodoViewItem* foundItemRoot = 0; 
+    KOTodoViewItem* foundItemAbove = 0; 
+    if ( mTodoListView->firstChild ()  ) {
+        if ( mCurItem ) {
+            KOTodoViewItem* item = (KOTodoViewItem*)mTodoListView->firstChild ();
+            while ( item  ) {
+                if ( item->todo() ==  mCurItem ) {
+                    foundItem = item; 
+                    break;
+                } else if ( item->todo() ==  mCurItemAbove ) {
+                    foundItemAbove = item;
+
+                } else if ( item->todo() ==  mCurItemRootParent ) {
+                    foundItemRoot = item;
+                }
+                item = (KOTodoViewItem*)item->itemBelow();
+            }
+            if ( ! foundItem ) {
+                if ( foundItemAbove )
+                    foundItem = foundItemAbove;
+                else
+                    foundItem = foundItemRoot;
+            }  
+        } 
+        if ( foundItem ) {
+            mTodoListView->setCurrentItem( foundItem ); 
+            mTodoListView->ensureItemVisible(  foundItem );
+        } else {
+            mTodoListView->setCurrentItem( mTodoListView->firstChild () );
+        }
+    }
+    mTodoListView->setFocus();
+}
+//Incidence * mCurItem, *mCurItemRootParent,*mCurItemAbove; 
 bool KOTodoView::checkTodo( Todo * todo )
 {
    
     if (  !KOPrefs::instance()->mShowCompletedTodo &&  todo->isCompleted() )
         return false;
     if ( !todo->isCompleted()  ) {
         if ( todo->hasDueDate() && todo->dtDue().date() <= QDate::currentDate() )
             return true;
     }
     if ( KOPrefs::instance()->mHideNonStartedTodos && mNavigator ) {
         if ( todo->hasStartDate() ) 
             if ( mNavigator->selectedDates().last() < todo->dtStart().date() )
@@ -1230,26 +1282,27 @@ void KOTodoView::addQuickTodo()
   if ( cf ) {
       if ( cf->isEnabled()&& cf->showCategories()) {
           todo->setCategories(cf->categoryList());
       }
       if ( cf->isEnabled() )
           todo->setSecrecy( cf->getSecrecy());
   }
   mCalendar->addTodo(todo);
   mQuickAdd->setText("");
   todoModified (todo,  KOGlobals::EVENTADDED );
   updateView();
 }
+
 void KOTodoView::keyPressEvent ( QKeyEvent * e )
-{
+{  
     //    e->ignore();
     //return;
     //qDebug("KOTodoView::keyPressEvent  ");
     switch ( e->key() ) {
     case Qt::Key_Down:
     case Qt::Key_Up:
         QWidget::keyPressEvent (  e );
         break; 
    
     case Qt::Key_Q:
         toggleQuickTodo();
         break;