-rw-r--r-- | core/pim/todo/todotable.cpp | 49 |
1 files changed, 26 insertions, 23 deletions
diff --git a/core/pim/todo/todotable.cpp b/core/pim/todo/todotable.cpp index 877308a..52a3087 100644 --- a/core/pim/todo/todotable.cpp +++ b/core/pim/todo/todotable.cpp | |||
@@ -297,38 +297,35 @@ void TodoTable::slotClicked( int row, int col, int, const QPoint &pos ) | |||
297 | int h = rowHeight( row ); | 297 | int h = rowHeight( row ); |
298 | if ( i && x >= ( w - BoxSize ) / 2 && x <= ( w - BoxSize ) / 2 + BoxSize && | 298 | if ( i && x >= ( w - BoxSize ) / 2 && x <= ( w - BoxSize ) / 2 + BoxSize && |
299 | y >= ( h - BoxSize ) / 2 && y <= ( h - BoxSize ) / 2 + BoxSize ) { | 299 | y >= ( h - BoxSize ) / 2 && y <= ( h - BoxSize ) / 2 + BoxSize ) { |
300 | i->toggle(); | 300 | i->toggle(); |
301 | } | 301 | } |
302 | emit signalDoneChanged( i->isChecked() ); | 302 | emit signalDoneChanged( i->isChecked() ); |
303 | } | 303 | } |
304 | } | 304 | } |
305 | break; | 305 | break; |
306 | case 1: | 306 | case 1: |
307 | break; | 307 | break; |
308 | case 2: | 308 | case 2: |
309 | // may as well edit it... | ||
310 | // menuTimer->stop(); | ||
311 | // emit signalEdit(); | ||
312 | // Show detailed view of the selected entry | 309 | // Show detailed view of the selected entry |
313 | { | 310 | { |
314 | menuTimer->stop(); | 311 | menuTimer->stop(); |
315 | ToDoEvent *todo = todoList[static_cast<CheckItem*>(item(row, 0))]; | 312 | ToDoEvent *todo = todoList[static_cast<CheckItem*>(item(row, 0))]; |
316 | emit showDetails( *todo ); | 313 | emit showDetails( *todo ); |
317 | } | 314 | } |
318 | break; | 315 | break; |
319 | case 3: | 316 | case 3: |
320 | // may as well edit it... | 317 | // may as well edit it... |
321 | menuTimer->stop(); | 318 | menuTimer->stop(); |
322 | // emit signalEdit(); | 319 | emit signalEdit(); |
323 | break; | 320 | break; |
324 | } | 321 | } |
325 | } | 322 | } |
326 | 323 | ||
327 | void TodoTable::slotPressed( int row, int col, int, const QPoint &pos ) | 324 | void TodoTable::slotPressed( int row, int col, int, const QPoint &pos ) |
328 | { | 325 | { |
329 | if ( col == 2 && cellGeometry( row, col ).contains(pos) ) | 326 | if ( col == 2 && cellGeometry( row, col ).contains(pos) ) |
330 | menuTimer->start( 750, TRUE ); | 327 | menuTimer->start( 750, TRUE ); |
331 | } | 328 | } |
332 | 329 | ||
333 | void TodoTable::slotShowMenu() | 330 | void TodoTable::slotShowMenu() |
334 | { | 331 | { |
@@ -650,45 +647,51 @@ void TodoTable::journalFreeRemoveEntry( int row ) | |||
650 | { | 647 | { |
651 | CheckItem *chk; | 648 | CheckItem *chk; |
652 | chk = static_cast<CheckItem*>(item(row, 0 )); | 649 | chk = static_cast<CheckItem*>(item(row, 0 )); |
653 | if ( !chk ) | 650 | if ( !chk ) |
654 | return; | 651 | return; |
655 | todoList.remove( chk ); | 652 | todoList.remove( chk ); |
656 | 653 | ||
657 | realignTable( row ); | 654 | realignTable( row ); |
658 | } | 655 | } |
659 | 656 | ||
660 | void TodoTable::keyPressEvent( QKeyEvent *e ) | 657 | void TodoTable::keyPressEvent( QKeyEvent *e ) |
661 | { | 658 | { |
662 | if ( e->key() == Key_Space || e->key() == Key_Return ) { | 659 | if ( e->key() == Key_Space || e->key() == Key_Return ) { |
663 | switch ( currentColumn() ) { | 660 | switch ( currentColumn() ) { |
664 | case 0: { | 661 | case 0: { |
665 | CheckItem *i = static_cast<CheckItem*>(item(currentRow(), | 662 | CheckItem *i = static_cast<CheckItem*>(item(currentRow(), |
666 | currentColumn())); | 663 | currentColumn())); |
667 | if ( i ) | 664 | if ( i ) |
668 | i->toggle(); | 665 | i->toggle(); |
669 | break; | 666 | break; |
670 | } | 667 | } |
671 | case 1: | 668 | case 1: |
672 | break; | 669 | break; |
673 | case 2: | 670 | case 2:{ |
674 | emit signalEdit(); | 671 | ToDoEvent *todo = todoList[static_cast<CheckItem*>(item(currentRow(), 0))]; |
675 | default: | 672 | emit showDetails(*todo); |
676 | break; | 673 | break; |
677 | } | 674 | } |
678 | } else { | 675 | case 3: |
679 | QTable::keyPressEvent( e ); | 676 | // Future: Let us change the dueDate directly... |
680 | } | 677 | emit signalEdit(); |
678 | default: | ||
679 | break; | ||
680 | } | ||
681 | } else | ||
682 | QTable::keyPressEvent( e ); | ||
681 | } | 683 | } |
682 | 684 | ||
685 | |||
683 | QStringList TodoTable::categories() | 686 | QStringList TodoTable::categories() |
684 | { | 687 | { |
685 | // This is called seldom, so calling a load in here | 688 | // This is called seldom, so calling a load in here |
686 | // should be fine. | 689 | // should be fine. |
687 | mCat.load( categoryFileName() ); | 690 | mCat.load( categoryFileName() ); |
688 | QStringList categoryList = mCat.labels( "Todo List" ); | 691 | QStringList categoryList = mCat.labels( "Todo List" ); |
689 | return categoryList; | 692 | return categoryList; |
690 | } | 693 | } |
691 | 694 | ||
692 | void TodoTable::slotDoFind( const QString &findString, bool caseSensitive, | 695 | void TodoTable::slotDoFind( const QString &findString, bool caseSensitive, |
693 | bool backwards, int category ) | 696 | bool backwards, int category ) |
694 | { | 697 | { |