-rw-r--r-- | korganizer/kotodoview.cpp | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp index add1819..94f35e6 100644 --- a/korganizer/kotodoview.cpp +++ b/korganizer/kotodoview.cpp | |||
@@ -419,40 +419,42 @@ void KOTodoListView::keyPressEvent ( QKeyEvent * e ) | |||
419 | if ( cn ) { | 419 | if ( cn ) { |
420 | KOTodoViewItem* ci = (KOTodoViewItem*)( cn ); | 420 | KOTodoViewItem* ci = (KOTodoViewItem*)( cn ); |
421 | if ( ci ){ | 421 | if ( ci ){ |
422 | if ( e->state() == ShiftButton ) | 422 | if ( e->state() == ShiftButton ) |
423 | ci->setOn( false ); | 423 | ci->setOn( false ); |
424 | else | 424 | else |
425 | ci->setOn( true ); | 425 | ci->setOn( true ); |
426 | cn = cn->itemBelow(); | 426 | cn = cn->itemBelow(); |
427 | if ( cn ) { | 427 | if ( cn ) { |
428 | setCurrentItem ( cn ); | 428 | setCurrentItem ( cn ); |
429 | ensureItemVisible ( cn ); | 429 | ensureItemVisible ( cn ); |
430 | } | 430 | } |
431 | 431 | ||
432 | } | 432 | } |
433 | } | 433 | } |
434 | 434 | ||
435 | e->accept(); | ||
435 | return; | 436 | return; |
436 | } | 437 | } |
437 | 438 | ||
438 | if ( e->state() == Qt::ControlButton || e->state() == Qt::ShiftButton || mName != "todolistsmall" ) { | 439 | if ( e->state() == Qt::ControlButton || e->state() == Qt::ShiftButton || mName != "todolistsmall" ) { |
439 | switch ( e->key() ) { | 440 | switch ( e->key() ) { |
440 | case Qt::Key_Down: | 441 | case Qt::Key_Down: |
441 | case Qt::Key_Up: | 442 | case Qt::Key_Up: |
442 | QListView::keyPressEvent ( e ); | 443 | QListView::keyPressEvent ( e ); |
444 | e->accept(); | ||
443 | break; | 445 | break; |
444 | case Qt::Key_Left: | 446 | case Qt::Key_Left: |
445 | case Qt::Key_Right: | 447 | case Qt::Key_Right: |
446 | QListView::keyPressEvent ( e ); | 448 | QListView::keyPressEvent ( e ); |
447 | e->accept(); | 449 | e->accept(); |
448 | return; | 450 | return; |
449 | break; | 451 | break; |
450 | default: | 452 | default: |
451 | e->ignore(); | 453 | e->ignore(); |
452 | break; | 454 | break; |
453 | } | 455 | } |
454 | return; | 456 | return; |
455 | } | 457 | } |
456 | e->ignore(); | 458 | e->ignore(); |
457 | } | 459 | } |
458 | void KOTodoListView::contentsMouseReleaseEvent(QMouseEvent *e) | 460 | void KOTodoListView::contentsMouseReleaseEvent(QMouseEvent *e) |
@@ -501,56 +503,57 @@ void KOQuickTodo::focusOutEvent(QFocusEvent *ev) | |||
501 | KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) : | 503 | KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) : |
502 | KOrg::BaseView(calendar,parent,name) | 504 | KOrg::BaseView(calendar,parent,name) |
503 | { | 505 | { |
504 | mCategoryPopupMenu = 0; | 506 | mCategoryPopupMenu = 0; |
505 | mPendingUpdateBeforeRepaint = false; | 507 | mPendingUpdateBeforeRepaint = false; |
506 | isFlatDisplay = false; | 508 | isFlatDisplay = false; |
507 | mNavigator = 0; | 509 | mNavigator = 0; |
508 | QBoxLayout *topLayout = new QVBoxLayout(this); | 510 | QBoxLayout *topLayout = new QVBoxLayout(this); |
509 | mName = QString ( name ); | 511 | mName = QString ( name ); |
510 | mBlockUpdate = false; | 512 | mBlockUpdate = false; |
511 | mQuickBar = new QWidget( this ); | 513 | mQuickBar = new QWidget( this ); |
512 | topLayout->addWidget(mQuickBar); | 514 | topLayout->addWidget(mQuickBar); |
513 | 515 | ||
514 | mQuickAdd = new KOQuickTodo(mQuickBar); | 516 | mQuickAdd = new KOQuickTodo(mQuickBar); |
515 | QBoxLayout *quickLayout = new QHBoxLayout(mQuickBar); | 517 | QBoxLayout *quickLayout = new QHBoxLayout(mQuickBar); |
516 | quickLayout->addWidget( mQuickAdd ); | 518 | quickLayout->addWidget( mQuickAdd ); |
519 | mNewSubBut = new QPushButton( "sub",mQuickBar ); | ||
520 | QPushButton * s_done = new QPushButton( "D",mQuickBar ); | ||
521 | QPushButton * s_run = new QPushButton( "R",mQuickBar ); | ||
522 | QPushButton * allopen = new QPushButton( "O",mQuickBar ); | ||
523 | QPushButton * allclose = new QPushButton( "C",mQuickBar ); | ||
517 | QPushButton * flat = new QPushButton( "F",mQuickBar ); | 524 | QPushButton * flat = new QPushButton( "F",mQuickBar ); |
525 | |||
518 | int fixwid = flat->sizeHint().height(); | 526 | int fixwid = flat->sizeHint().height(); |
519 | if ( QApplication::desktop()->width() >= 800 ) | 527 | if ( QApplication::desktop()->width() >= 800 ) |
520 | fixwid *= 2; | 528 | fixwid *= 2; |
521 | flat->setFixedWidth( fixwid ); | 529 | flat->setFixedWidth( fixwid ); |
522 | connect ( flat, SIGNAL ( clicked()), SLOT ( setAllFlat())); | 530 | connect ( flat, SIGNAL ( clicked()), SLOT ( setAllFlat())); |
523 | QPushButton * allopen = new QPushButton( "O",mQuickBar ); | ||
524 | allopen->setFixedWidth( fixwid ); | 531 | allopen->setFixedWidth( fixwid ); |
525 | connect ( allopen, SIGNAL ( clicked()), SLOT ( setAllOpen())); | 532 | connect ( allopen, SIGNAL ( clicked()), SLOT ( setAllOpen())); |
526 | QPushButton * allclose = new QPushButton( "C",mQuickBar ); | ||
527 | allclose->setFixedWidth( fixwid ); | 533 | allclose->setFixedWidth( fixwid ); |
528 | connect ( allclose, SIGNAL ( clicked()), SLOT ( setAllClose())); | 534 | connect ( allclose, SIGNAL ( clicked()), SLOT ( setAllClose())); |
529 | QPushButton * s_done = new QPushButton( "D",mQuickBar ); | ||
530 | s_done->setPixmap( SmallIcon("greenhook16")); | 535 | s_done->setPixmap( SmallIcon("greenhook16")); |
531 | s_done->setFixedWidth( fixwid ); | 536 | s_done->setFixedWidth( fixwid ); |
532 | s_done->setFixedHeight( flat->sizeHint().height() ); | 537 | s_done->setFixedHeight( flat->sizeHint().height() ); |
533 | connect ( s_done, SIGNAL ( clicked()), SLOT ( toggleCompleted())); | 538 | connect ( s_done, SIGNAL ( clicked()), SLOT ( toggleCompleted())); |
534 | QPushButton * s_run = new QPushButton( "R",mQuickBar ); | ||
535 | s_run->setPixmap( SmallIcon("ko16old")); | 539 | s_run->setPixmap( SmallIcon("ko16old")); |
536 | s_run->setFixedWidth( fixwid ); | 540 | s_run->setFixedWidth( fixwid ); |
537 | s_run->setFixedHeight( flat->sizeHint().height() ); | 541 | s_run->setFixedHeight( flat->sizeHint().height() ); |
538 | connect ( s_run, SIGNAL ( clicked()), SLOT ( toggleRunning())); | 542 | connect ( s_run, SIGNAL ( clicked()), SLOT ( toggleRunning())); |
539 | 543 | ||
540 | mNewSubBut = new QPushButton( "sub",mQuickBar ); | ||
541 | mNewSubBut->setFixedWidth( fixwid*3/2 ); | 544 | mNewSubBut->setFixedWidth( fixwid*3/2 ); |
542 | connect ( mNewSubBut, SIGNAL ( clicked()), SLOT ( newSubTodo())); | 545 | connect ( mNewSubBut, SIGNAL ( clicked()), SLOT ( newSubTodo())); |
543 | mNewSubBut->setEnabled( false ); | 546 | mNewSubBut->setEnabled( false ); |
544 | quickLayout->addWidget( mNewSubBut ); | 547 | quickLayout->addWidget( mNewSubBut ); |
545 | quickLayout->addWidget( s_done ); | 548 | quickLayout->addWidget( s_done ); |
546 | quickLayout->addWidget( s_run ); | 549 | quickLayout->addWidget( s_run ); |
547 | 550 | ||
548 | quickLayout->addWidget( allopen ); | 551 | quickLayout->addWidget( allopen ); |
549 | quickLayout->addWidget( allclose ); | 552 | quickLayout->addWidget( allclose ); |
550 | quickLayout->addWidget( flat ); | 553 | quickLayout->addWidget( flat ); |
551 | 554 | ||
552 | if ( !KOPrefs::instance()->mEnableQuickTodo ) mQuickBar->hide(); | 555 | if ( !KOPrefs::instance()->mEnableQuickTodo ) mQuickBar->hide(); |
553 | 556 | ||
554 | mTodoListView = new KOTodoListView(calendar,this, name ); | 557 | mTodoListView = new KOTodoListView(calendar,this, name ); |
555 | topLayout->addWidget(mTodoListView); | 558 | topLayout->addWidget(mTodoListView); |
556 | //mTodoListView->header()->setMaximumHeight(30); | 559 | //mTodoListView->header()->setMaximumHeight(30); |
@@ -562,46 +565,49 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) : | |||
562 | mTodoListView->addColumn(i18n("Todo")); | 565 | mTodoListView->addColumn(i18n("Todo")); |
563 | mTodoListView->addColumn(i18n("Prio")); | 566 | mTodoListView->addColumn(i18n("Prio")); |
564 | mTodoListView->setColumnAlignment(1,AlignHCenter); | 567 | mTodoListView->setColumnAlignment(1,AlignHCenter); |
565 | mTodoListView->addColumn(i18n("Complete")); | 568 | mTodoListView->addColumn(i18n("Complete")); |
566 | mTodoListView->setColumnAlignment(2,AlignCenter); | 569 | mTodoListView->setColumnAlignment(2,AlignCenter); |
567 | 570 | ||
568 | mTodoListView->addColumn(i18n("Due Date")); | 571 | mTodoListView->addColumn(i18n("Due Date")); |
569 | mTodoListView->setColumnAlignment(3,AlignLeft); | 572 | mTodoListView->setColumnAlignment(3,AlignLeft); |
570 | mTodoListView->addColumn(i18n("Due Time")); | 573 | mTodoListView->addColumn(i18n("Due Time")); |
571 | mTodoListView->setColumnAlignment(4,AlignHCenter); | 574 | mTodoListView->setColumnAlignment(4,AlignHCenter); |
572 | 575 | ||
573 | mTodoListView->addColumn(i18n("Start Date")); | 576 | mTodoListView->addColumn(i18n("Start Date")); |
574 | mTodoListView->setColumnAlignment(5,AlignLeft); | 577 | mTodoListView->setColumnAlignment(5,AlignLeft); |
575 | mTodoListView->addColumn(i18n("Start Time")); | 578 | mTodoListView->addColumn(i18n("Start Time")); |
576 | mTodoListView->setColumnAlignment(6,AlignHCenter); | 579 | mTodoListView->setColumnAlignment(6,AlignHCenter); |
577 | 580 | ||
578 | mTodoListView->addColumn(i18n("Cancelled")); | 581 | //mTodoListView->addColumn(i18n("Cancelled")); |
579 | mTodoListView->addColumn(i18n("Categories")); | 582 | mTodoListView->addColumn(i18n("Categories")); |
580 | mTodoListView->addColumn(i18n("Calendar")); | 583 | mTodoListView->addColumn(i18n("Calendar")); |
584 | mTodoListView->addColumn(i18n("Last Modified")); | ||
585 | mTodoListView->addColumn(i18n("Created")); | ||
586 | mTodoListView->addColumn(i18n("Last Modified Sub")); | ||
581 | #if 0 | 587 | #if 0 |
582 | mTodoListView->addColumn(i18n("Sort Id")); | 588 | mTodoListView->addColumn(i18n("Sort Id")); |
583 | mTodoListView->setColumnAlignment(4,AlignHCenter); | 589 | mTodoListView->setColumnAlignment(4,AlignHCenter); |
584 | #endif | 590 | #endif |
585 | 591 | ||
586 | mTodoListView->setMinimumHeight( 60 ); | 592 | mTodoListView->setMinimumHeight( 60 ); |
587 | mTodoListView->setItemsRenameable( true ); | 593 | mTodoListView->setItemsRenameable( true ); |
588 | mTodoListView->setRenameable( 0 ); | 594 | mTodoListView->setRenameable( 0 ); |
589 | mTodoListView->setColumnWidth( 0, 120 ); | 595 | mTodoListView->setColumnWidth( 0, 120 ); |
590 | int iii = 0; | 596 | int iii = 0; |
591 | for ( iii = 0; iii< 10 ; ++iii ) | 597 | for ( iii = 0; iii< 12 ; ++iii ) |
592 | mTodoListView->setColumnWidthMode( iii, QListView::Manual ); | 598 | mTodoListView->setColumnWidthMode( iii, QListView::Manual ); |
593 | 599 | ||
594 | 600 | ||
595 | mKOTodoViewWhatsThis = new KOTodoViewWhatsThis(mTodoListView->viewport(),this); | 601 | mKOTodoViewWhatsThis = new KOTodoViewWhatsThis(mTodoListView->viewport(),this); |
596 | 602 | ||
597 | mPriorityPopupMenu = new QPopupMenu(this); | 603 | mPriorityPopupMenu = new QPopupMenu(this); |
598 | for (int i = 1; i <= 5; i++) { | 604 | for (int i = 1; i <= 5; i++) { |
599 | QString label = QString ("%1").arg (i); | 605 | QString label = QString ("%1").arg (i); |
600 | mPriority[mPriorityPopupMenu->insertItem (label)] = i; | 606 | mPriority[mPriorityPopupMenu->insertItem (label)] = i; |
601 | } | 607 | } |
602 | connect (mPriorityPopupMenu, SIGNAL(activated (int)), SLOT (setNewPriority(int))); | 608 | connect (mPriorityPopupMenu, SIGNAL(activated (int)), SLOT (setNewPriority(int))); |
603 | 609 | ||
604 | mPercentageCompletedPopupMenu = new QPopupMenu(this); | 610 | mPercentageCompletedPopupMenu = new QPopupMenu(this); |
605 | for (int i = 0; i <= 100; i+=20) { | 611 | for (int i = 0; i <= 100; i+=20) { |
606 | QString label = QString ("%1 %").arg (i); | 612 | QString label = QString ("%1 %").arg (i); |
607 | mPercentage[mPercentageCompletedPopupMenu->insertItem (label)] = i; | 613 | mPercentage[mPercentageCompletedPopupMenu->insertItem (label)] = i; |
@@ -1590,41 +1596,41 @@ void KOTodoView::addQuickTodoPar( Todo * parentTodo) | |||
1590 | todo->setCategories(cf->categoryList()); | 1596 | todo->setCategories(cf->categoryList()); |
1591 | } | 1597 | } |
1592 | if ( cf->isEnabled() ) | 1598 | if ( cf->isEnabled() ) |
1593 | todo->setSecrecy( cf->getSecrecy()); | 1599 | todo->setSecrecy( cf->getSecrecy()); |
1594 | } | 1600 | } |
1595 | } | 1601 | } |
1596 | mCalendar->addTodo(todo); | 1602 | mCalendar->addTodo(todo); |
1597 | mQuickAdd->setText(""); | 1603 | mQuickAdd->setText(""); |
1598 | todoModified (todo, KOGlobals::EVENTADDED ); | 1604 | todoModified (todo, KOGlobals::EVENTADDED ); |
1599 | updateView(); | 1605 | updateView(); |
1600 | 1606 | ||
1601 | } | 1607 | } |
1602 | void KOTodoView::keyPressEvent ( QKeyEvent * e ) | 1608 | void KOTodoView::keyPressEvent ( QKeyEvent * e ) |
1603 | { | 1609 | { |
1604 | // e->ignore(); | 1610 | // e->ignore(); |
1605 | //return; | 1611 | //return; |
1606 | //qDebug("KOTodoView::keyPressEvent "); | ||
1607 | if ( !isVisible() ) { | 1612 | if ( !isVisible() ) { |
1608 | e->ignore(); | 1613 | e->ignore(); |
1609 | return; | 1614 | return; |
1610 | } | 1615 | } |
1611 | switch ( e->key() ) { | 1616 | switch ( e->key() ) { |
1612 | case Qt::Key_Down: | 1617 | case Qt::Key_Down: |
1613 | case Qt::Key_Up: | 1618 | case Qt::Key_Up: |
1614 | QWidget::keyPressEvent ( e ); | 1619 | // KOrg::BaseView::keyPressEvent ( e ); |
1620 | e->ignore(); | ||
1615 | break; | 1621 | break; |
1616 | 1622 | ||
1617 | case Qt::Key_Q: | 1623 | case Qt::Key_Q: |
1618 | 1624 | ||
1619 | 1625 | ||
1620 | if ( e->state() == Qt::ControlButton || e->state() == Qt::ShiftButton ) { | 1626 | if ( e->state() == Qt::ControlButton || e->state() == Qt::ShiftButton ) { |
1621 | e->ignore(); | 1627 | e->ignore(); |
1622 | break; | 1628 | break; |
1623 | } | 1629 | } |
1624 | toggleQuickTodo(); | 1630 | toggleQuickTodo(); |
1625 | break; | 1631 | break; |
1626 | case Qt::Key_U: | 1632 | case Qt::Key_U: |
1627 | if ( e->state() == Qt::ControlButton|| e->state() == Qt::ShiftButton ) { | 1633 | if ( e->state() == Qt::ControlButton|| e->state() == Qt::ShiftButton ) { |
1628 | mActiveItem = (KOTodoViewItem*)mTodoListView->currentItem(); | 1634 | mActiveItem = (KOTodoViewItem*)mTodoListView->currentItem(); |
1629 | unparentTodo(); | 1635 | unparentTodo(); |
1630 | e->accept(); | 1636 | e->accept(); |