summaryrefslogtreecommitdiff
authorzecke <zecke>2002-04-28 08:46:50 (UTC)
committer zecke <zecke>2002-04-28 08:46:50 (UTC)
commitee6fdf8783f7a2fa91792e2f0ce0f8350f8cac0d (patch) (side-by-side diff)
treebdd4764fc90df1214a728eef6aacc3c2b3bb2ebb
parentf68f837aec3d6ddd24c2281cadc02bda5d8678e1 (diff)
downloadopie-ee6fdf8783f7a2fa91792e2f0ce0f8350f8cac0d.zip
opie-ee6fdf8783f7a2fa91792e2f0ce0f8350f8cac0d.tar.gz
opie-ee6fdf8783f7a2fa91792e2f0ce0f8350f8cac0d.tar.bz2
Patch from Stefan Eilers to raise the Tablewidget when searching and finding ;)
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/todo/mainwindow.cpp2
-rw-r--r--core/pim/todo/todotable.cpp7
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
@@ -415,24 +415,25 @@ void TodoWindow::slotDuplicate()
void TodoWindow::slotShowPopup( const QPoint &p )
{
contextMenu->popup( p );
}
void TodoWindow::showCompleted( bool s )
{
if ( !table->isUpdatesEnabled() )
return;
table->setPaintingEnabled( false );
table->setShowCompleted( s );
table->setPaintingEnabled( true );
+ mStack->raiseWidget( 1 );
}
void TodoWindow::currentEntryChanged( int r, int )
{
if ( r != -1 && table->rowHeight( r ) > 0 ) {
editAction->setEnabled( TRUE );
deleteAction->setEnabled( TRUE );
duplicateAction->setEnabled( TRUE );
deleteAllAction->setEnabled( TRUE );
} else {
editAction->setEnabled( FALSE );
deleteAction->setEnabled( FALSE );
@@ -536,24 +537,25 @@ void TodoWindow::closeEvent( QCloseEvent *e )
QMessageBox::Yes|QMessageBox::Escape,
QMessageBox::No|QMessageBox::Default)
!= QMessageBox::No )
e->accept();
else
e->ignore();
}
}
void TodoWindow::slotFind()
{
// put everything back to view all for searching...
+ mStack->raiseWidget( 1 );
if ( !catMenu->isItemChecked( 0 ) )
setCategory( 0 );
FindDialog dlg( "Todo List", this );
QObject::connect( &dlg,
SIGNAL(signalFindClicked(const QString &,
bool, bool, int)),
table,
SLOT(slotDoFind(const QString&, bool, bool, int)) );
QObject::connect( table, SIGNAL(signalNotFound()), &dlg,
SLOT(slotNotFound()) );
QObject::connect( table, SIGNAL(signalWrapAround()), &dlg,
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
@@ -589,25 +589,26 @@ void TodoTable::rowHeightChanged( int row )
{
if ( enablePainting )
QTable::rowHeightChanged( row );
}
void TodoTable::loadFile( const QString &/*we use the standard*/ )
{
QList<ToDoEvent> list;
ToDoDB todoDB;
QValueList<ToDoEvent> vaList = todoDB.rawToDos();
for(QValueList<ToDoEvent>::ConstIterator it = vaList.begin(); it != vaList.end(); ++it ){
- list.append( new ToDoEvent( (*it) ) );
+ ToDoEvent *event = new ToDoEvent( (*it) );
+ list.append( event );
}
vaList.clear();
// qDebug("parsing done=%d", t.elapsed() );
if ( list.count() > 0 ) {
internalAddEntries( list );
list.clear();
}
// qDebug("loading done: t=%d", t.elapsed() );
}
void TodoTable::journalFreeReplaceEntry( const ToDoEvent &todo, int row )
{
@@ -631,26 +632,26 @@ void TodoTable::journalFreeReplaceEntry( const ToDoEvent &todo, int row )
}
} else {
ToDoEvent *t = todoList[static_cast<CheckItem*>(item(row, 0))];
todoList.remove( static_cast<CheckItem*>(item(row, 0)) );
delete t;
static_cast<CheckItem*>(item(row, 0))->setChecked( todo.isCompleted() );
static_cast<ComboItem*>(item(row, 1))->setText( QString::number(todo.priority()) );
item( row, 2 )->setText( strTodo );
if (showDeadl){
static_cast<DueTextItem*>(item(row,3))->setToDoEvent(&todo );
}
-
- todoList.insert( static_cast<CheckItem*>(item(row,0)), new ToDoEvent(todo) );
+ ToDoEvent *ev = new ToDoEvent( todo );
+ todoList.insert( static_cast<CheckItem*>(item(row,0)), new ToDoEvent(ev) );
}
}
void TodoTable::journalFreeRemoveEntry( int row )
{
CheckItem *chk;
chk = static_cast<CheckItem*>(item(row, 0 ));
if ( !chk )
return;
todoList.remove( chk );
realignTable( row );