-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 | |||
@@ -431,16 +431,18 @@ void KOTodoListView::keyPressEvent ( QKeyEvent * e ) | |||
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 ); |
@@ -513,32 +515,33 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) : | |||
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 ); |
@@ -574,11 +577,14 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) : | |||
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 |
@@ -587,9 +593,9 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) : | |||
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); |
@@ -1602,17 +1608,17 @@ void KOTodoView::addQuickTodoPar( Todo * parentTodo) | |||
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 | ||