-rw-r--r-- | korganizer/kotodoview.cpp | 103 |
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 | |||
@@ -264,9 +264,24 @@ void KOTodoListView::contentsMouseMoveEvent(QMouseEvent* e) | |||
264 | } | 264 | } |
265 | #endif | 265 | #endif |
266 | } | 266 | } |
267 | void KOTodoListView::keyReleaseEvent ( QKeyEvent *e ) | ||
268 | { | ||
269 | if ( !e->isAutoRepeat() ) { | ||
270 | mFlagKeyPressed = false; | ||
271 | } | ||
272 | } | ||
273 | |||
274 | |||
267 | void KOTodoListView::keyPressEvent ( QKeyEvent * e ) | 275 | void KOTodoListView::keyPressEvent ( QKeyEvent * e ) |
268 | { | 276 | { |
269 | 277 | qApp->processEvents(); | |
278 | if ( e->isAutoRepeat() && !mFlagKeyPressed ) { | ||
279 | e->ignore(); | ||
280 | // qDebug(" ignore %d",e->isAutoRepeat() ); | ||
281 | return; | ||
282 | } | ||
283 | if (! e->isAutoRepeat() ) | ||
284 | mFlagKeyPressed = true; | ||
270 | QListViewItem* cn; | 285 | QListViewItem* cn; |
271 | if ( e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter ) { | 286 | if ( e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter ) { |
272 | cn = currentItem(); | 287 | cn = currentItem(); |
@@ -289,7 +304,6 @@ void KOTodoListView::keyPressEvent ( QKeyEvent * e ) | |||
289 | return; | 304 | return; |
290 | } | 305 | } |
291 | 306 | ||
292 | // qDebug("KOTodoListView::keyPressEvent "); | ||
293 | if ( e->state() == Qt::ControlButton || e->state() == Qt::ShiftButton || mName != "todolistsmall" ) { | 307 | if ( e->state() == Qt::ControlButton || e->state() == Qt::ShiftButton || mName != "todolistsmall" ) { |
294 | switch ( e->key() ) { | 308 | switch ( e->key() ) { |
295 | case Qt::Key_Down: | 309 | case Qt::Key_Down: |
@@ -598,18 +612,17 @@ void KOTodoView::updateView() | |||
598 | mPendingUpdateBeforeRepaint = true; | 612 | mPendingUpdateBeforeRepaint = true; |
599 | return; | 613 | return; |
600 | } | 614 | } |
615 | storeCurrentItem(); | ||
601 | //qDebug("KOTodoView::updateView() %x", this); | 616 | //qDebug("KOTodoView::updateView() %x", this); |
602 | if ( isFlatDisplay ) { | 617 | if ( isFlatDisplay ) { |
603 | displayAllFlat(); | 618 | displayAllFlat(); |
619 | resetCurrentItem(); | ||
604 | return; | 620 | return; |
605 | } | 621 | } |
606 | //qDebug("update "); | 622 | //qDebug("update "); |
607 | // kdDebug() << "KOTodoView::updateView()" << endl; | 623 | // kdDebug() << "KOTodoView::updateView()" << endl; |
608 | QFont fo = KOPrefs::instance()->mTodoViewFont; | 624 | QFont fo = KOPrefs::instance()->mTodoViewFont; |
609 | Incidence* oldInc = 0; | 625 | |
610 | mActiveItem = (KOTodoViewItem*)mTodoListView->currentItem(); | ||
611 | if (mActiveItem) | ||
612 | oldInc = mActiveItem->todo(); | ||
613 | 626 | ||
614 | mTodoListView->clear(); | 627 | mTodoListView->clear(); |
615 | if ( mName == "todolistsmall" ) { | 628 | if ( mName == "todolistsmall" ) { |
@@ -691,27 +704,66 @@ void KOTodoView::updateView() | |||
691 | mTodoListView->blockSignals( true ); | 704 | mTodoListView->blockSignals( true ); |
692 | if( mDocPrefs ) restoreItemState( mTodoListView->firstChild() ); | 705 | if( mDocPrefs ) restoreItemState( mTodoListView->firstChild() ); |
693 | mTodoListView->blockSignals( false ); | 706 | mTodoListView->blockSignals( false ); |
694 | mTodoListView->setFocus(); | 707 | resetCurrentItem(); |
695 | if ( mTodoListView->firstChild () ) { | ||
696 | if ( oldInc ) { | ||
697 | KOTodoViewItem* item = (KOTodoViewItem*)mTodoListView->firstChild (); | ||
698 | while ( item ) { | ||
699 | if ( item->todo() == oldInc ) { | ||
700 | mTodoListView->setCurrentItem( item ); | ||
701 | mTodoListView->ensureItemVisible( item ); | ||
702 | break; | ||
703 | } | ||
704 | item = (KOTodoViewItem*)item->itemBelow(); | ||
705 | } | ||
706 | if ( ! item ) | ||
707 | mTodoListView->setCurrentItem( mTodoListView->firstChild () ); | ||
708 | } else { | ||
709 | mTodoListView->setCurrentItem( mTodoListView->firstChild () ); | ||
710 | } | ||
711 | } | ||
712 | processSelectionChange(); | 708 | processSelectionChange(); |
713 | } | 709 | } |
714 | 710 | ||
711 | void KOTodoView::storeCurrentItem() | ||
712 | { | ||
713 | mCurItem = 0; | ||
714 | mCurItemRootParent = 0; | ||
715 | mCurItemAbove = 0; | ||
716 | mActiveItem = (KOTodoViewItem*)mTodoListView->currentItem(); | ||
717 | if (mActiveItem) { | ||
718 | mCurItem = mActiveItem->todo(); | ||
719 | KOTodoViewItem* activeItemAbove = (KOTodoViewItem*)mActiveItem->itemAbove (); | ||
720 | if ( activeItemAbove ) | ||
721 | mCurItemAbove = activeItemAbove->todo(); | ||
722 | while ( mActiveItem->parent() != 0 ) | ||
723 | mActiveItem = (KOTodoViewItem*)mActiveItem->parent(); | ||
724 | mCurItemRootParent = mActiveItem->todo(); | ||
725 | } | ||
726 | mActiveItem = 0; | ||
727 | } | ||
728 | |||
729 | void KOTodoView::resetCurrentItem() | ||
730 | { | ||
731 | mTodoListView->setFocus(); | ||
732 | KOTodoViewItem* foundItem = 0; | ||
733 | KOTodoViewItem* foundItemRoot = 0; | ||
734 | KOTodoViewItem* foundItemAbove = 0; | ||
735 | if ( mTodoListView->firstChild () ) { | ||
736 | if ( mCurItem ) { | ||
737 | KOTodoViewItem* item = (KOTodoViewItem*)mTodoListView->firstChild (); | ||
738 | while ( item ) { | ||
739 | if ( item->todo() == mCurItem ) { | ||
740 | foundItem = item; | ||
741 | break; | ||
742 | } else if ( item->todo() == mCurItemAbove ) { | ||
743 | foundItemAbove = item; | ||
744 | |||
745 | } else if ( item->todo() == mCurItemRootParent ) { | ||
746 | foundItemRoot = item; | ||
747 | } | ||
748 | item = (KOTodoViewItem*)item->itemBelow(); | ||
749 | } | ||
750 | if ( ! foundItem ) { | ||
751 | if ( foundItemAbove ) | ||
752 | foundItem = foundItemAbove; | ||
753 | else | ||
754 | foundItem = foundItemRoot; | ||
755 | } | ||
756 | } | ||
757 | if ( foundItem ) { | ||
758 | mTodoListView->setCurrentItem( foundItem ); | ||
759 | mTodoListView->ensureItemVisible( foundItem ); | ||
760 | } else { | ||
761 | mTodoListView->setCurrentItem( mTodoListView->firstChild () ); | ||
762 | } | ||
763 | } | ||
764 | mTodoListView->setFocus(); | ||
765 | } | ||
766 | //Incidence * mCurItem, *mCurItemRootParent,*mCurItemAbove; | ||
715 | bool KOTodoView::checkTodo( Todo * todo ) | 767 | bool KOTodoView::checkTodo( Todo * todo ) |
716 | { | 768 | { |
717 | 769 | ||
@@ -1239,8 +1291,9 @@ void KOTodoView::addQuickTodo() | |||
1239 | todoModified (todo, KOGlobals::EVENTADDED ); | 1291 | todoModified (todo, KOGlobals::EVENTADDED ); |
1240 | updateView(); | 1292 | updateView(); |
1241 | } | 1293 | } |
1294 | |||
1242 | void KOTodoView::keyPressEvent ( QKeyEvent * e ) | 1295 | void KOTodoView::keyPressEvent ( QKeyEvent * e ) |
1243 | { | 1296 | { |
1244 | // e->ignore(); | 1297 | // e->ignore(); |
1245 | //return; | 1298 | //return; |
1246 | //qDebug("KOTodoView::keyPressEvent "); | 1299 | //qDebug("KOTodoView::keyPressEvent "); |