1 files changed, 15 insertions, 1 deletions

diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index 2c017e1..c2ad886 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -309,192 +309,196 @@ void KOTodoListView::contentsDropEvent(QDropEvent *e)
         qDebug("KOTodoListView::contentsDropEvent(): Todo from drop not decodable ");
       e->ignore();
     }
   }
 #endif
 }
 void KOTodoListView::wheelEvent (QWheelEvent *e)
 {
     QListView::wheelEvent (e);
 }
 
 void KOTodoListView::contentsMousePressEvent(QMouseEvent* e)
 {
 
     QPoint p(contentsToViewport(e->pos()));
     QListViewItem *i = itemAt(p);
     bool rootClicked = true;
     if (i) {
         // if the user clicked into the root decoration of the item, don't
         // try to start a drag!
         int X = p.x();
         //qDebug("%d %d %d", X, header()->sectionPos(0), treeStepSize() );
         if (X > header()->sectionPos(0) +
             treeStepSize() * (i->depth() + (rootIsDecorated() ? 1 : 0)) +
             itemMargin() +i->height()||
             X < header()->sectionPos(0)) {
             rootClicked = false;
         }
     } else {
         rootClicked = false;
     }
 #ifndef KORG_NODND
     mMousePressed = false; 
     if (! rootClicked && !( e->button() == RightButton)  ) {
         mPressPos = e->pos();
         mMousePressed = true;
     } else {
         mMousePressed = false;
     }
 #endif
     //qDebug("KOTodoListView::contentsMousePressEvent %d", rootClicked);
 #ifndef DESKTOP_VERSION
     if (!( e->button() == RightButton && rootClicked) )
         QListView::contentsMousePressEvent(e);   
 #else
     QListView::contentsMousePressEvent(e);   
 #endif
 }
 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()*3) {
     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 ) {
               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 ( !isVisible() ) {
+        e->ignore();
+        return;
+    }
     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;
     }
    
     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; 
         default:
             e->ignore();
             break;
         }
         return;
     }
     e->ignore();
 }
 void KOTodoListView::contentsMouseReleaseEvent(QMouseEvent *e)
 {
   QListView::contentsMouseReleaseEvent(e);
   mMousePressed = false;
 }
 
 void KOTodoListView::contentsMouseDoubleClickEvent(QMouseEvent *e)
 {
   if (!e) return;
 
   QPoint vp = contentsToViewport(e->pos());
 
   QListViewItem *item = itemAt(vp);
 
   emit double_Clicked(item);
   if (!item) return;
 
   emit doubleClicked(item,vp,0);
 }
 
 /////////////////////////////////////////////////////////////////////////////
 
 KOQuickTodo::KOQuickTodo(QWidget *parent) :
   QLineEdit(parent)
 {
   setText(i18n("Click to add new Todo"));
 }
 
 void KOQuickTodo::focusInEvent(QFocusEvent *ev)
 {
   if ( text()==i18n("Click to add new Todo") )
     setText("");
   QLineEdit::focusInEvent(ev);
 }
 
 void KOQuickTodo::focusOutEvent(QFocusEvent *ev)
 {
   setText(i18n("Click to add new Todo"));
   QLineEdit::focusOutEvent(ev);
 }
 
 /////////////////////////////////////////////////////////////////////////////
 
 KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
   KOrg::BaseView(calendar,parent,name)
 {
     mCategoryPopupMenu = 0;
@@ -1506,192 +1510,202 @@ void KOTodoView::displayAllFlat()
         }
     }
     resetCurrentItem();
 }
 
 void  KOTodoView::setAllFlat()
 {
     if ( isFlatDisplay ) {
         isFlatDisplay = false;
         mPopupMenu->setItemChecked( 8,false );
         updateView();
         return;
     } 
     displayAllFlat();
 }
 
 void KOTodoView::purgeCompleted()
 {
   emit purgeCompletedSignal();
  
 }
 void KOTodoView::toggleQuickTodo()
 {
     if ( mQuickBar->isVisible() ) {
         mQuickBar->hide();
         KOPrefs::instance()->mEnableQuickTodo = false;
     }
     else {
         mQuickBar->show();
         KOPrefs::instance()->mEnableQuickTodo = true;
     }
     mPopupMenu->setItemChecked(4,KOPrefs::instance()->mEnableQuickTodo);
     mItemPopupMenu->setItemChecked( 34 , KOPrefs::instance()->mEnableQuickTodo );
 }
 
 void KOTodoView::toggleRunning()
 {
     KOPrefs::instance()->mHideNonStartedTodos = !KOPrefs::instance()->mHideNonStartedTodos;
     mPopupMenu->setItemChecked(5,KOPrefs::instance()->mHideNonStartedTodos);
     mItemPopupMenu->setItemChecked( 35 , KOPrefs::instance()->mHideNonStartedTodos );
     updateView();
     if ( KOPrefs::instance()->mHideNonStartedTodos )
         topLevelWidget()->setCaption(i18n("Hide not Running"));
     else
         topLevelWidget()->setCaption(i18n("Show not Running"));
 }
 
 void KOTodoView::toggleCompleted()
 {
     KOPrefs::instance()->mShowCompletedTodo = !KOPrefs::instance()->mShowCompletedTodo;
     mPopupMenu->setItemChecked( 3,KOPrefs::instance()->mShowCompletedTodo  );
     mItemPopupMenu->setItemChecked( 33 , KOPrefs::instance()->mShowCompletedTodo   );
     updateView();
     if ( KOPrefs::instance()->mShowCompletedTodo )
         topLevelWidget()->setCaption(i18n("Show Completed"));
     else
         topLevelWidget()->setCaption(i18n("Hide Completed"));
 }
 
 void KOTodoView::addQuickTodo()
 {
     addQuickTodoPar( 0 );
 }
 void KOTodoView::addQuickTodoPar( Todo * parentTodo)
 {
     Todo *todo = new Todo();
     todo->setSummary(mQuickAdd->text());
     todo->setOrganizer(KOPrefs::instance()->email());
     if ( parentTodo ) {
         todo->setRelatedTo(parentTodo);
 
         todo->setCategories (parentTodo->categoriesStr ());
         todo->setSecrecy (parentTodo->secrecy ());
         if ( parentTodo->priority() < 3 )
             todo->setPriority( parentTodo->priority() );
         todo->setCalID( parentTodo->calID() );
     } else {
         CalFilter * cf = mCalendar->filter();
         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  ");
+    //qDebug("KOTodoView::keyPressEvent  "); 
+    if ( !isVisible() ) {
+        e->ignore();
+        return;
+    }
     switch ( e->key() ) {
     case Qt::Key_Down:
     case Qt::Key_Up:
         QWidget::keyPressEvent (  e );
         break; 
    
     case Qt::Key_Q:
+
+
+        if ( e->state() == Qt::ControlButton || e->state() == Qt::ShiftButton ) {
+            e->ignore();
+            break; 
+        }
         toggleQuickTodo();
         break; 
     case Qt::Key_U:
         if ( e->state() == Qt::ControlButton||  e->state() == Qt::ShiftButton ) {
             mActiveItem = (KOTodoViewItem*)mTodoListView->currentItem();
             unparentTodo();
             e->accept();
         } else
             e->ignore();
         break; 
     case Qt::Key_S:
         if ( e->state() == Qt::ControlButton ) {
             e->ignore();
             break; 
         }
         if ( e->state() == Qt::ShiftButton ) {
             mActiveItem = (KOTodoViewItem*)mTodoListView->currentItem();
             reparentTodo();
             e->accept();
         } else
             e->ignore();
         break; 
     case Qt::Key_P:
         if ( e->state() == Qt::ControlButton||  e->state() == Qt::ShiftButton ) {
             mActiveItem = (KOTodoViewItem*)mTodoListView->currentItem();
             if ( pendingSubtodo )
                 itemClicked(mActiveItem);
             e->accept();
         } else
             e->ignore();
         break;  
     case Qt::Key_Escape:
         if ( pendingSubtodo ) {
             itemClicked(0);
             e->accept();
         } else
             e->ignore();
         break; 
     default:
         e->ignore();
     }
     
     if ( true ) {
         if (  e->key() == Qt::Key_I ) {
             KOTodoViewItem*cn = (KOTodoViewItem*)mTodoListView->currentItem();
             if ( cn ) {
                 mActiveItem = cn;
                 KOTodoViewItem* ci = (KOTodoViewItem*)( cn ); 
                 if ( ci ){
                     showTodo();
                     cn = (KOTodoViewItem*)cn->itemBelow();
                     if ( cn ) {
                         mTodoListView->setCurrentItem ( cn );
                         mTodoListView->ensureItemVisible ( cn );
                     }
                     
                 }
             }
             e->accept();
         
         }
         
     }
     
 }
 void KOTodoView::updateTodo( Todo * t, int type )
 {
     if  ( mBlockUpdate)
         return;
 
     QMap<Todo *,KOTodoViewItem *>::ConstIterator itemIterator;
     itemIterator = mTodoMap.find(t);
     if (itemIterator != mTodoMap.end()) {
         (*itemIterator)->construct();
     } else {
         if ( type == KOGlobals::EVENTADDED ) {
             insertTodoItem( t );
         }
     }
 
 }
 
 void KOTodoView::todoModified(Todo * t , int p )
 {
     mBlockUpdate = true;
     emit todoModifiedSignal ( t, p );
     mBlockUpdate = false;
 }