author | zautrix <zautrix> | 2005-03-31 23:55:51 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-03-31 23:55:51 (UTC) |
commit | b76ad1e7e329051a47e28c9d132ce3fcd0b25c5c (patch) (unidiff) | |
tree | b0b3d0eb7a3d29981c183275aadeed0cbbef0007 /korganizer/kotodoview.cpp | |
parent | c0fa26aa3b33c293853bdd7d028ddb0545e33c85 (diff) | |
download | kdepimpi-b76ad1e7e329051a47e28c9d132ce3fcd0b25c5c.zip kdepimpi-b76ad1e7e329051a47e28c9d132ce3fcd0b25c5c.tar.gz kdepimpi-b76ad1e7e329051a47e28c9d132ce3fcd0b25c5c.tar.bz2 |
fixes
-rw-r--r-- | korganizer/kotodoview.cpp | 81 |
1 files changed, 67 insertions, 14 deletions
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp index e008625..ccc4b01 100644 --- a/korganizer/kotodoview.cpp +++ b/korganizer/kotodoview.cpp | |||
@@ -261,15 +261,30 @@ void KOTodoListView::contentsMouseMoveEvent(QMouseEvent* e) | |||
261 | qDebug("DnD: Internal copy: Copy pending"); | 261 | qDebug("DnD: Internal copy: Copy pending"); |
262 | } | 262 | } |
263 | } | 263 | } |
264 | } | 264 | } |
265 | #endif | 265 | #endif |
266 | } | 266 | } |
267 | void KOTodoListView::keyPressEvent ( QKeyEvent * e ) | 267 | void KOTodoListView::keyReleaseEvent ( QKeyEvent *e ) |
268 | { | 268 | { |
269 | if ( !e->isAutoRepeat() ) { | ||
270 | mFlagKeyPressed = false; | ||
271 | } | ||
272 | } | ||
273 | |||
269 | 274 | ||
275 | void KOTodoListView::keyPressEvent ( QKeyEvent * e ) | ||
276 | { | ||
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(); |
273 | if ( cn ) { | 288 | if ( cn ) { |
274 | KOTodoViewItem* ci = (KOTodoViewItem*)( cn ); | 289 | KOTodoViewItem* ci = (KOTodoViewItem*)( cn ); |
275 | if ( ci ){ | 290 | if ( ci ){ |
@@ -286,13 +301,12 @@ void KOTodoListView::keyPressEvent ( QKeyEvent * e ) | |||
286 | } | 301 | } |
287 | } | 302 | } |
288 | 303 | ||
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: |
296 | case Qt::Key_Up: | 310 | case Qt::Key_Up: |
297 | QListView::keyPressEvent ( e ); | 311 | QListView::keyPressEvent ( e ); |
298 | break; | 312 | break; |
@@ -595,24 +609,23 @@ void KOTodoView::updateView() | |||
595 | return; | 609 | return; |
596 | } | 610 | } |
597 | if ( !isVisible() ) { | 611 | if ( !isVisible() ) { |
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" ) { |
616 | if ( KOPrefs::instance()->mTodoViewUsesSmallFont ) { | 629 | if ( KOPrefs::instance()->mTodoViewUsesSmallFont ) { |
617 | int ps = fo.pointSize() -2; | 630 | int ps = fo.pointSize() -2; |
618 | if ( ps > 12 ) | 631 | if ( ps > 12 ) |
@@ -688,33 +701,72 @@ void KOTodoView::updateView() | |||
688 | } | 701 | } |
689 | //qDebug("for end "); | 702 | //qDebug("for end "); |
690 | // Restore opened/closed state | 703 | // Restore opened/closed state |
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 ); |
707 | resetCurrentItem(); | ||
708 | processSelectionChange(); | ||
709 | } | ||
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 | { | ||
694 | mTodoListView->setFocus(); | 731 | mTodoListView->setFocus(); |
732 | KOTodoViewItem* foundItem = 0; | ||
733 | KOTodoViewItem* foundItemRoot = 0; | ||
734 | KOTodoViewItem* foundItemAbove = 0; | ||
695 | if ( mTodoListView->firstChild () ) { | 735 | if ( mTodoListView->firstChild () ) { |
696 | if ( oldInc ) { | 736 | if ( mCurItem ) { |
697 | KOTodoViewItem* item = (KOTodoViewItem*)mTodoListView->firstChild (); | 737 | KOTodoViewItem* item = (KOTodoViewItem*)mTodoListView->firstChild (); |
698 | while ( item ) { | 738 | while ( item ) { |
699 | if ( item->todo() == oldInc ) { | 739 | if ( item->todo() == mCurItem ) { |
700 | mTodoListView->setCurrentItem( item ); | 740 | foundItem = item; |
701 | mTodoListView->ensureItemVisible( item ); | ||
702 | break; | 741 | break; |
742 | } else if ( item->todo() == mCurItemAbove ) { | ||
743 | foundItemAbove = item; | ||
744 | |||
745 | } else if ( item->todo() == mCurItemRootParent ) { | ||
746 | foundItemRoot = item; | ||
703 | } | 747 | } |
704 | item = (KOTodoViewItem*)item->itemBelow(); | 748 | item = (KOTodoViewItem*)item->itemBelow(); |
705 | } | 749 | } |
706 | if ( ! item ) | 750 | if ( ! foundItem ) { |
707 | mTodoListView->setCurrentItem( mTodoListView->firstChild () ); | 751 | if ( foundItemAbove ) |
752 | foundItem = foundItemAbove; | ||
753 | else | ||
754 | foundItem = foundItemRoot; | ||
755 | } | ||
756 | } | ||
757 | if ( foundItem ) { | ||
758 | mTodoListView->setCurrentItem( foundItem ); | ||
759 | mTodoListView->ensureItemVisible( foundItem ); | ||
708 | } else { | 760 | } else { |
709 | mTodoListView->setCurrentItem( mTodoListView->firstChild () ); | 761 | mTodoListView->setCurrentItem( mTodoListView->firstChild () ); |
710 | } | 762 | } |
711 | } | 763 | } |
712 | processSelectionChange(); | 764 | mTodoListView->setFocus(); |
713 | } | 765 | } |
714 | 766 | //Incidence * mCurItem, *mCurItemRootParent,*mCurItemAbove; | |
715 | bool KOTodoView::checkTodo( Todo * todo ) | 767 | bool KOTodoView::checkTodo( Todo * todo ) |
716 | { | 768 | { |
717 | 769 | ||
718 | if ( !KOPrefs::instance()->mShowCompletedTodo && todo->isCompleted() ) | 770 | if ( !KOPrefs::instance()->mShowCompletedTodo && todo->isCompleted() ) |
719 | return false; | 771 | return false; |
720 | if ( !todo->isCompleted() ) { | 772 | if ( !todo->isCompleted() ) { |
@@ -1236,12 +1288,13 @@ void KOTodoView::addQuickTodo() | |||
1236 | } | 1288 | } |
1237 | mCalendar->addTodo(todo); | 1289 | mCalendar->addTodo(todo); |
1238 | mQuickAdd->setText(""); | 1290 | mQuickAdd->setText(""); |
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 "); |
1247 | switch ( e->key() ) { | 1300 | switch ( e->key() ) { |