author | zecke <zecke> | 2002-04-28 08:46:50 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-04-28 08:46:50 (UTC) |
commit | ee6fdf8783f7a2fa91792e2f0ce0f8350f8cac0d (patch) (unidiff) | |
tree | bdd4764fc90df1214a728eef6aacc3c2b3bb2ebb | |
parent | f68f837aec3d6ddd24c2281cadc02bda5d8678e1 (diff) | |
download | opie-ee6fdf8783f7a2fa91792e2f0ce0f8350f8cac0d.zip opie-ee6fdf8783f7a2fa91792e2f0ce0f8350f8cac0d.tar.gz opie-ee6fdf8783f7a2fa91792e2f0ce0f8350f8cac0d.tar.bz2 |
Patch from Stefan Eilers to raise the Tablewidget when searching and finding ;)
-rw-r--r-- | core/pim/todo/mainwindow.cpp | 2 | ||||
-rw-r--r-- | core/pim/todo/todotable.cpp | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/core/pim/todo/mainwindow.cpp b/core/pim/todo/mainwindow.cpp index d3f4cb4..a28fc3e 100644 --- a/core/pim/todo/mainwindow.cpp +++ b/core/pim/todo/mainwindow.cpp | |||
@@ -423,8 +423,9 @@ void TodoWindow::showCompleted( bool s ) | |||
423 | return; | 423 | return; |
424 | table->setPaintingEnabled( false ); | 424 | table->setPaintingEnabled( false ); |
425 | table->setShowCompleted( s ); | 425 | table->setShowCompleted( s ); |
426 | table->setPaintingEnabled( true ); | 426 | table->setPaintingEnabled( true ); |
427 | mStack->raiseWidget( 1 ); | ||
427 | } | 428 | } |
428 | 429 | ||
429 | void TodoWindow::currentEntryChanged( int r, int ) | 430 | void TodoWindow::currentEntryChanged( int r, int ) |
430 | { | 431 | { |
@@ -544,8 +545,9 @@ void TodoWindow::closeEvent( QCloseEvent *e ) | |||
544 | 545 | ||
545 | void TodoWindow::slotFind() | 546 | void TodoWindow::slotFind() |
546 | { | 547 | { |
547 | // put everything back to view all for searching... | 548 | // put everything back to view all for searching... |
549 | mStack->raiseWidget( 1 ); | ||
548 | if ( !catMenu->isItemChecked( 0 ) ) | 550 | if ( !catMenu->isItemChecked( 0 ) ) |
549 | setCategory( 0 ); | 551 | setCategory( 0 ); |
550 | 552 | ||
551 | FindDialog dlg( "Todo List", this ); | 553 | FindDialog dlg( "Todo List", this ); |
diff --git a/core/pim/todo/todotable.cpp b/core/pim/todo/todotable.cpp index 753c036..dc60cc4 100644 --- a/core/pim/todo/todotable.cpp +++ b/core/pim/todo/todotable.cpp | |||
@@ -597,9 +597,10 @@ void TodoTable::loadFile( const QString &/*we use the standard*/ ) | |||
597 | QList<ToDoEvent> list; | 597 | QList<ToDoEvent> list; |
598 | ToDoDB todoDB; | 598 | ToDoDB todoDB; |
599 | QValueList<ToDoEvent> vaList = todoDB.rawToDos(); | 599 | QValueList<ToDoEvent> vaList = todoDB.rawToDos(); |
600 | for(QValueList<ToDoEvent>::ConstIterator it = vaList.begin(); it != vaList.end(); ++it ){ | 600 | for(QValueList<ToDoEvent>::ConstIterator it = vaList.begin(); it != vaList.end(); ++it ){ |
601 | list.append( new ToDoEvent( (*it) ) ); | 601 | ToDoEvent *event = new ToDoEvent( (*it) ); |
602 | list.append( event ); | ||
602 | } | 603 | } |
603 | vaList.clear(); | 604 | vaList.clear(); |
604 | // qDebug("parsing done=%d", t.elapsed() ); | 605 | // qDebug("parsing done=%d", t.elapsed() ); |
605 | if ( list.count() > 0 ) { | 606 | if ( list.count() > 0 ) { |
@@ -639,10 +640,10 @@ void TodoTable::journalFreeReplaceEntry( const ToDoEvent &todo, int row ) | |||
639 | 640 | ||
640 | if (showDeadl){ | 641 | if (showDeadl){ |
641 | static_cast<DueTextItem*>(item(row,3))->setToDoEvent(&todo ); | 642 | static_cast<DueTextItem*>(item(row,3))->setToDoEvent(&todo ); |
642 | } | 643 | } |
643 | 644 | ToDoEvent *ev = new ToDoEvent( todo ); | |
644 | todoList.insert( static_cast<CheckItem*>(item(row,0)), new ToDoEvent(todo) ); | 645 | todoList.insert( static_cast<CheckItem*>(item(row,0)), new ToDoEvent(ev) ); |
645 | } | 646 | } |
646 | } | 647 | } |
647 | 648 | ||
648 | void TodoTable::journalFreeRemoveEntry( int row ) | 649 | void TodoTable::journalFreeRemoveEntry( int row ) |