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
@@ -43,579 +43,581 @@
 #include <qpe/qpetoolbar.h>
 
 #include <qaction.h>
 #include <qarray.h>
 #include <qdatastream.h>
 #include <qdatetime.h>
 #include <qfile.h>
 #include <qmessagebox.h>
 #include <qpopupmenu.h>
 #include <qwidgetstack.h>
 
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <fcntl.h>
 #include <unistd.h>
 
 #include <stdlib.h>
 
 static QString todolistXMLFilename()
 {
     return Global::applicationFileName("todolist","todolist.xml");
 }
 
 static QString categoriesXMLFilename()
 {
     return Global::applicationFileName("todolist","categories.xml");
 }
 
 TodoWindow::TodoWindow( QWidget *parent, const char *name, WFlags f = 0 ) :
     QMainWindow( parent, name, f ), syncing(FALSE)
 {
 //     QTime t;
 //     t.start();
     mView = 0l;
     mStack = new QWidgetStack(this, "main stack");
     setCaption( tr("Todo") );
     QString str;
     table = new TodoTable( this );
     table->setColumnWidth( 2, 10 );
     table->setPaintingEnabled( FALSE );
     table->setUpdatesEnabled( FALSE );
     table->viewport()->setUpdatesEnabled( FALSE );
 
     {
         str = todolistXMLFilename();
         if ( str.isNull() )
             QMessageBox::critical( this,
                                    tr("Out of Space"),
                                    tr("Unable to create startup files\n"
                                       "Free up some space\n"
                                       "before you enter any data") );
         else
             table->load( str );
     }
 
     // repeat for categories...
     str = categoriesXMLFilename();
     if ( str.isNull() )
         QMessageBox::critical( this,
                                tr( "Out of Space" ),
                                tr( "Unable to create startup files\n"
                                    "Free up some space\n"
                                    "before you enter any data") );
 
     mStack->addWidget(table, 1 );
     mStack->raiseWidget( 1 );
     setCentralWidget( mStack );
     setToolBarsMovable( FALSE );
 
 //     qDebug("after load: t=%d", t.elapsed() );
     
     Config config( "todo" );
     config.setGroup( "View" );
     bool complete = config.readBoolEntry( "ShowComplete", true );
     table->setShowCompleted( complete );
 
     bool showdeadline = config.readBoolEntry("ShowDeadLine", true);
     table->setShowDeadline (showdeadline);
 
     QString category = config.readEntry( "Category", QString::null );
     table->setShowCategory( category );
 
     QPEToolBar *bar = new QPEToolBar( this );
     bar->setHorizontalStretchable( TRUE );
 
     QPEMenuBar *mb = new QPEMenuBar( bar );
 
     catMenu = new QPopupMenu( this );
     QPopupMenu *edit = new QPopupMenu( this );
     QPopupMenu *options = new QPopupMenu(this );
 
     contextMenu = new QPopupMenu( this );
 
     bar = new QPEToolBar( this );
 
     QAction *a = new QAction( tr( "New Task" ), Resource::loadPixmap( "new" ),
                               QString::null, 0, this, 0 );
     connect( a, SIGNAL( activated() ),
              this, SLOT( slotNew() ) );
     a->addTo( bar );
     a->addTo( edit );
 
     a = new QAction( tr( "Edit Task" ), Resource::loadIconSet( "edit" ),
                      QString::null, 0, this, 0 );
     connect( a, SIGNAL( activated() ),
              this, SLOT( slotEdit() ) );
     a->addTo( bar );
     a->addTo( edit );
     a->addTo( contextMenu );
     a->setEnabled( FALSE );
     editAction = a;
 
     a = new QAction( QString::null, tr("View Task"), 0, this, 0 );
     a->addTo( edit );
     a->addTo( contextMenu );
     connect( a, SIGNAL( activated() ),
              this, SLOT(slotShowDetails() ) );
 
     edit->insertSeparator();
 
     a = new QAction( tr( "Delete..." ), Resource::loadIconSet( "trash" ),
                      QString::null, 0, this, 0 );
     connect( a, SIGNAL( activated() ),
              this, SLOT( slotDelete() ) );
     a->addTo( bar );
     a->addTo( edit );
     a->addTo( contextMenu );
     a->setEnabled( FALSE );
     deleteAction = a;
 
     // delete All in category is missing....
     // set All Done
     // set All Done in category
 
     a = new QAction( QString::null, tr( "Delete all..."), 0, this, 0 );
     connect(a, SIGNAL( activated() ),
             this, SLOT( slotDeleteAll() ) );
     a->addTo(edit );
     a->setEnabled( FALSE );
     deleteAllAction = a;  
 
     edit->insertSeparator();
     a = new QAction( QString::null, tr("Duplicate" ), 0, this, 0 );
     connect(a, SIGNAL( activated() ),
             this, SLOT( slotDuplicate() ) );
     a->addTo(edit );
     a->setEnabled( FALSE );
     duplicateAction = a;
     edit->insertSeparator();
 
    
 
     if ( Ir::supported() ) {
         a = new QAction( tr( "Beam" ), Resource::loadPixmap( "beam" ),
                          QString::null, 0, this, 0 );
         connect( a, SIGNAL( activated() ),
                  this, SLOT( slotBeam() ) );
         a->addTo( edit );
         a->addTo( bar );
     }
 
     a = new QAction( tr( "Find" ), Resource::loadIconSet( "mag" ),
                      QString::null, 0, this, 0 );
     connect( a, SIGNAL( activated() ),
              this, SLOT( slotFind() ) );
     a->addTo( bar );
     a->addTo( options );
     options->insertSeparator();
 
     if ( table->numRows() )
         a->setEnabled( TRUE );
     else
         a->setEnabled( FALSE );
 
     //a->setEnabled( FALSE );
     findAction = a;
 //     qDebug("mainwindow #2: t=%d", t.elapsed() );
 
     completedAction = new QAction( QString::null, tr("Completed tasks"), 0, this, 0, TRUE );
 
     showdeadlineAction = new QAction( QString::null, tr( "Show Deadline" ), 0, this, 0, TRUE );
 
     catMenu->setCheckable( true );
     populateCategories();
 
     
     completedAction->addTo( options );
     completedAction->setOn( table->showCompleted() );
     showdeadlineAction->addTo( options );
     showdeadlineAction->setOn( table->showDeadline() );
     options->insertSeparator( );
     QList<QWidget> list;
     list.append(table );
     OFontMenu *menu = new OFontMenu(this, "menu",list );
     menu->forceSize( table->horizontalHeader(), 10 );
     //catMenu->insertItem(tr("Fonts"), menu );
     list.clear();
     options->insertItem( tr("Fonts"), menu );
 
 
     mb->insertItem( tr( "Data" ), edit );
     mb->insertItem( tr( "Category" ), catMenu );
     mb->insertItem( tr( "Options"), options );
     resize( 200, 300 );
     if ( table->numRows() > 0 )
         currentEntryChanged( 0, 0 );
     connect( table, SIGNAL( signalEdit() ),
              this, SLOT( slotEdit() ) );
     connect( table, SIGNAL(signalShowMenu(const QPoint &)),
              this, SLOT( slotShowPopup(const QPoint &)) );
 
 //     qDebug("mainwindow #3: t=%d", t.elapsed() );
     table->updateVisible();
     table->setUpdatesEnabled( TRUE );
     table->setPaintingEnabled( TRUE );
     table->viewport()->setUpdatesEnabled( TRUE );
 
     connect( completedAction, SIGNAL( toggled(bool) ), this, SLOT( showCompleted(bool) ) );
     connect( showdeadlineAction, SIGNAL( toggled(bool) ), this, SLOT( showDeadline(bool) ) );
     connect( catMenu, SIGNAL(activated(int)), this, SLOT(setCategory(int)) );
     connect( table, SIGNAL( currentChanged( int, int ) ),
              this, SLOT( currentEntryChanged( int, int ) ) );
 
     connect( table, SIGNAL(showDetails(const ToDoEvent &) ),
              this, SLOT(slotShowDetails(const ToDoEvent & ) ) );
 //     qDebug("done: t=%d", t.elapsed() );
 }
 
 void TodoWindow::slotNew()
 {
     if(syncing) {
         QMessageBox::warning(this, tr("Todo"),
                              tr("Can not edit data, currently syncing"));
         return;
     }
 
     int id;
     id = -1;
     QArray<int> ids;
     ids = table->currentEntry().categories();
     if ( ids.count() )
         id = ids[0];
     NewTaskDialog e( id, this, 0, TRUE );
 
     ToDoEvent todo;
 
 #if defined(Q_WS_QWS) || defined(_WS_QWS_)
     e.showMaximized();
 #endif
     int ret = e.exec();
 //    qWarning("finished" );
     if ( ret == QDialog::Accepted ) {
         table->setPaintingEnabled( false );
         todo = e.todoEntry();
         //todo.assignUid();
         table->addEntry( todo );
         table->setPaintingEnabled( true );
         findAction->setEnabled( TRUE );
     }
     // I'm afraid we must call this every time now, otherwise
     // spend expensive time comparing all these strings...
     populateCategories();
     mStack->raiseWidget(1 );
 }
 
 TodoWindow::~TodoWindow()
 {
 }
 
 void TodoWindow::slotDelete()
 {
     if(syncing) {
         QMessageBox::warning(this, tr("Todo"),
                              tr("Can not edit data, currently syncing"));
         return;
     }
 
     if ( table->currentRow() == -1 )
         return;
 
     QString strName = table->text( table->currentRow(), 2 ).left( 30 );
 
     if ( !QPEMessageBox::confirmDelete( this, tr( "Todo" ), strName ) )
         return;
 
 
 
     table->setPaintingEnabled( false );
     table->removeCurrentEntry();
     table->setPaintingEnabled( true );
 
     if ( table->numRows() == 0 ) {
         currentEntryChanged( -1, 0 );
         findAction->setEnabled( FALSE );
     }
     mStack->raiseWidget(1);
 }
 void TodoWindow::slotDeleteAll()
 {
   if(syncing) {
     QMessageBox::warning(this, tr("Todo"),
                          tr("Can not edit data, currently syncing"));
     return;
   }
   
   //QString strName = table->text( table->currentRow(), 2 ).left( 30 );
   
   if ( !QPEMessageBox::confirmDelete( this, tr( "Todo" ), tr("Delete all tasks?") ) )
     return;
   
   
   
   table->setPaintingEnabled( false );
   table->removeAllEntries();
   table->setPaintingEnabled( true );
   
   if ( table->numRows() == 0 ) {
     currentEntryChanged( -1, 0 );
     findAction->setEnabled( FALSE );
   }
   mStack->raiseWidget(1 );
 }
 
 void TodoWindow::slotEdit()
 {
     if(syncing) {
         QMessageBox::warning(this, tr("Todo"),
                              tr("Can not edit data, currently syncing"));
         return;
     }
 
     ToDoEvent todo = table->currentEntry();
 
     NewTaskDialog e( todo, this, 0, TRUE );
     e.setCaption( tr( "Edit Task" ) );
 
 #if defined(Q_WS_QWS) || defined(_WS_QWS_)
     e.showMaximized();
 #endif
     int ret = e.exec();
 
     if ( ret == QDialog::Accepted ) {
         table->setPaintingEnabled( false );
         todo = e.todoEntry();
         table->replaceCurrentEntry( todo );
         table->setPaintingEnabled( true );
     }
     populateCategories();
     mStack->raiseWidget( 1 );
 }
 void TodoWindow::slotDuplicate()
 {
   if(syncing) {
     QMessageBox::warning(this, tr("Todo"),
                          tr("Can not edit data, currently syncing"));
     return;
   }
   ToDoEvent ev = table->currentEntry();
   ToDoEvent ev2 = ToDoEvent( ev ); // what about the uid
   int uid;
   { // uid
     Qtopia::UidGen *uidgen = new Qtopia::UidGen();
     uid = uidgen->generate();
     delete uidgen;
   }
   ev2.setUid( uid );
   table->setPaintingEnabled( false );
   table->addEntry( ev2 );
   table->setPaintingEnabled( true );
 
   mStack->raiseWidget( 1 );
 }
 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 );
         duplicateAction->setEnabled( FALSE );
         deleteAllAction->setEnabled( FALSE );
     }
 }
 
 void TodoWindow::setCategory( int c )
 {
     if ( c <= 0 ) return;
     if ( !table->isUpdatesEnabled() )
         return; 
    table->setPaintingEnabled( false );
     for ( unsigned int i = 1; i < catMenu->count(); i++ )
         catMenu->setItemChecked( i, c == (int)i );
     if ( c == 1 ) {
         table->setShowCategory( QString::null );
         setCaption( tr("Todo") + " - " + tr( "All Categories" ) );
     } else if ( c == (int)catMenu->count() - 1 ) {
         table->setShowCategory( tr( "Unfiled" ) );
         setCaption( tr("Todo") + " - " + tr( "Unfiled" ) );
     } else {
         QString cat = table->categories()[c - 2];
         table->setShowCategory( cat );
         setCaption( tr("Todo") + " - " + cat );
     }
     table->setPaintingEnabled( true );
 
     mStack->raiseWidget( 1 );
 }
 
 void TodoWindow::populateCategories()
 {
     catMenu->clear();
     int id, rememberId;
     id = 1;
     rememberId = 0;
     catMenu->insertItem( tr( "All Categories" ), id++ );
     catMenu->insertSeparator();
     QStringList categories = table->categories();
     categories.append( tr( "Unfiled" ) );
     for ( QStringList::Iterator it = categories.begin();
           it != categories.end(); ++it ) {
         catMenu->insertItem( *it, id );
         if ( *it == table->showCategory() )
             rememberId = id;
         ++id;
     }
     if ( table->showCategory().isEmpty() )
         setCategory( 1 );
     else
         setCategory( rememberId );
 }
 
 void TodoWindow::reload()
 {
     table->clear();
     table->load( todolistXMLFilename() );
     syncing = FALSE;
 }
 
 void TodoWindow::flush()
 {
     syncing = TRUE;
     table->save( todolistXMLFilename() );
 }
 
 void TodoWindow::closeEvent( QCloseEvent *e )
 {
     if( mStack->visibleWidget() != table ){
       mStack->raiseWidget( 1 );
       e->ignore();
       return;
     }
     if(syncing) {
         /* no need to save if in the middle of syncing */
         e->accept();
         return;
     }
 
     if ( table->save( todolistXMLFilename() ) ) {
         e->accept();
             // repeat for categories...
         // if writing configs fail, it will emit an
         // error, but I feel that it is "ok" for us to exit
         // espically since we aren't told if the write succeeded...
         Config config( "todo" );
         config.setGroup( "View" );
         config.writeEntry( "ShowComplete", table->showCompleted() );
         config.writeEntry( "Category", table->showCategory() );
         /* added 20.01.2k2 by se */
         config.writeEntry( "ShowDeadLine", table->showDeadline());
     } else {
         if ( QMessageBox::critical( this, tr("Out of space"),
                                     tr("Todo was unable\n"
                                        "to save your changes.\n"
                                        "Free up some space\n"
                                        "and try again.\n"
                                        "\nQuit Anyway?"),
                                     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,
                       SLOT(slotWrapAround()) );
     dlg.exec();
     if ( table->numSelections() )
         table->clearSelection();
     table->clearFindRow();
 }
 
 
 void TodoWindow::setDocument( const QString &filename )
 {
     if ( filename.find(".vcs") != int(filename.length()) - 4 ) return;
 
     ToDoDB todoDB(filename, new ToDoVCalResource() );
     QValueList<ToDoEvent> tl = todoDB.rawToDos();
     for( QValueList<ToDoEvent>::Iterator it = tl.begin(); it != tl.end(); ++it ) {
         table->addEntry( *it );
     }
 }
 
 static const char * beamfile = "/tmp/obex/todo.vcs";
 
 void TodoWindow::slotBeam()
 {
     unlink( beamfile ); // delete if exists
     ToDoEvent c = table->currentEntry();
     mkdir("/tmp/obex/", 0755);
     ToDoDB todoDB( beamfile, new ToDoVCalResource() );
     todoDB.addEvent( c );
     todoDB.save();
     Ir *ir = new Ir( this );
     connect( ir, SIGNAL( done( Ir * ) ), this, SLOT( beamDone( Ir * ) ) );
     QString description = c.description();
     ir->send( beamfile, description, "text/x-vCalendar" );
 }
 
 void TodoWindow::beamDone( Ir *ir )
 {
     delete ir;
     unlink( beamfile );
 }
 
 void TodoWindow::showDeadline( bool s )
 {
     table->setPaintingEnabled( false );
     table->setShowDeadline( s );
     table->setPaintingEnabled( true );
 }
 void TodoWindow::slotShowDetails()
 {
   ToDoEvent event = table->currentEntry();
   slotShowDetails( event );
 }
 void TodoWindow::slotShowDetails( const ToDoEvent &event )
 {
   if( mView == 0l ){
     mView = new TodoLabel(mStack);
     mStack->addWidget( mView, 2 );
   }
   mView->init( event );
   mView->sync();
   mStack->raiseWidget( 2);
 }
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
@@ -217,718 +217,719 @@ void DueTextItem::paint( QPainter *p, const QColorGroup &cg, const QRect &cr, bo
   }
   QTableItem::paint(p, cg2, cr, selected );
   cg2.setColor(QColorGroup::Text, text );
 }
 TodoTable::TodoTable( QWidget *parent, const char *name )
 // #ifdef QT_QTABLE_NOHEADER_CONSTRUCTOR
 //     : QTable( 0, 3, parent, name, TRUE ),
 // #else
     : QTable( 0, 4, parent, name ),
 // #endif
       showComp( true ),
       enablePainting( true ),
       mCat( 0 ),
       currFindRow( -2 ),
       showDeadl( true)
 {
     mCat.load( categoryFileName() );
     setSorting( TRUE );
     setSelectionMode( NoSelection );
     setColumnStretchable( 2, TRUE );
     setColumnWidth( 0, 20 );
     setColumnWidth( 1, 35 );
 
     setLeftMargin( 0 );
     verticalHeader()->hide();
     horizontalHeader()->setLabel( 0, tr( "C." ) );
     horizontalHeader()->setLabel( 1, tr( "Prior." ) );
     horizontalHeader()->setLabel( 2, tr( "Description" ) );
 
     setColumnStretchable( 3, FALSE );
     setColumnWidth( 3, 20 );
     horizontalHeader()->setLabel( 3, tr( "Deadline" ) );    
 
     if (showDeadl){
       showColumn (3);
     }else{
       hideColumn (3);
     }
 
     connect( this, SIGNAL( clicked( int, int, int, const QPoint & ) ),
              this, SLOT( slotClicked( int, int, int, const QPoint & ) ) );
     connect( this, SIGNAL( pressed( int, int, int, const QPoint & ) ),
              this, SLOT( slotPressed( int, int, int, const QPoint & ) ) );
     connect( this, SIGNAL( valueChanged( int, int ) ),
              this, SLOT( slotCheckPriority( int, int ) ) );
     connect( this, SIGNAL( currentChanged( int, int ) ),
              this, SLOT( slotCurrentChanged( int, int ) ) );
 
     menuTimer = new QTimer( this );
     connect( menuTimer, SIGNAL(timeout()), this, SLOT(slotShowMenu()) );
 
     mDayTimer = new QTimer( this );
     connect( mDayTimer, SIGNAL(timeout()), this, SLOT(slotCheckDay() ) );
     mDay = QDate::currentDate();
 }
 
 void TodoTable::addEntry( const ToDoEvent &todo )
 {
     int row = numRows();
     setNumRows( row + 1 );
     updateJournal( todo, ACTION_ADD );
     insertIntoTable( new ToDoEvent(todo), row );
     setCurrentCell(row, currentColumn());
     updateVisible();
 }
 
 void TodoTable::slotClicked( int row, int col, int, const QPoint &pos )
 {
     if ( !cellGeometry( row, col ).contains(pos) )
         return;
     // let's switch on the column number...
     switch ( col )
     {
         case 0: {
                 CheckItem *i = static_cast<CheckItem*>(item( row, col ));
                 if ( i ) {
                     int x = pos.x() - columnPos( col );
                     int y = pos.y() - rowPos( row );
                     int w = columnWidth( col );
                     int h = rowHeight( row );
                     if ( i && x >= ( w - BoxSize ) / 2 && x <= ( w - BoxSize ) / 2 + BoxSize &&
                             y >= ( h - BoxSize ) / 2 && y <= ( h - BoxSize ) / 2 + BoxSize ) {
                         i->toggle();
                     }
                     emit signalDoneChanged( i->isChecked() );
                 }
             }
             break;
         case 1:
             break;
         case 2:
           // may as well edit it...
           // menuTimer->stop();
           // emit signalEdit();
           // Show detailed view of the selected entry
           {
             menuTimer->stop();
             ToDoEvent *todo = todoList[static_cast<CheckItem*>(item(row, 0))];
             emit showDetails( *todo );
           }
           break;
         case 3: 
           // may as well edit it...
           menuTimer->stop();
           // emit signalEdit();
           break;
     }
 }
 
 void TodoTable::slotPressed( int row, int col, int, const QPoint &pos )
 {
     if ( col == 2 && cellGeometry( row, col ).contains(pos) )
         menuTimer->start( 750, TRUE );
 }
 
 void TodoTable::slotShowMenu()
 {
     emit signalShowMenu( QCursor::pos() );
 }
 
 void TodoTable::slotCurrentChanged( int, int )
 {
     menuTimer->stop();
 }
 
 void TodoTable::internalAddEntries( QList<ToDoEvent> &list )
 {
     setNumRows( list.count() );
     int row = 0;
     ToDoEvent *it;
     for ( it = list.first(); it; it = list.next() )
         insertIntoTable( it, row++ );
 }
 
 
 ToDoEvent TodoTable::currentEntry() const
 {
   //qWarning ("in currentEntry\n");
 
     QTableItem *i = item( currentRow(), 0 );
     if ( !i || rowHeight( currentRow() ) <= 0 )
         return ToDoEvent();
     ToDoEvent *todo = todoList[(CheckItem*)i];
     todo->setCompleted( ( (CheckItem*)item( currentRow(), 0 ) )->isChecked() );
     todo->setPriority( ( (ComboItem*)item( currentRow(), 1 ) )->text().toInt() );
     return *todo;
 }
 
 void TodoTable::replaceCurrentEntry( const ToDoEvent &todo, bool fromTableItem )
 {
     int row = currentRow();
     updateJournal( todo, ACTION_REPLACE);
 
     if ( !fromTableItem ) {
         journalFreeReplaceEntry( todo, row );
         updateVisible();
     }
 }
 
 void TodoTable::removeCurrentEntry()
 {
     ToDoEvent *oldTodo;
     int row = currentRow();
     CheckItem *chk;
 
     chk = static_cast<CheckItem*>(item(row, 0 ));
     if ( !chk )
         return;
     oldTodo = todoList[chk];
     todoList.remove( chk );
     oldTodo->setCompleted( chk->isChecked() );
     oldTodo->setPriority( static_cast<ComboItem*>(item(row, 1))->text().toInt() );
     realignTable( row );
     updateVisible();
     updateJournal( *oldTodo, ACTION_REMOVE);
     delete oldTodo;
 }
 
 
 bool TodoTable::save( const QString &fn )
 {
     QString strNewFile = fn + ".new";
     QFile::remove( strNewFile ); // just to be sure
     ToDoDB todoDB( strNewFile );
     for ( QMap<CheckItem*, ToDoEvent *>::Iterator it = todoList.begin();
           it != todoList.end(); ++it ) {
         if ( !item( it.key()->row(), 0 ) )
             continue;
         ToDoEvent *todo = *it;
         // sync item with table
         todo->setCompleted( ((CheckItem*)item(it.key()->row(), 0))->isChecked() );
         todo->setPriority( ((ComboItem*)item( it.key()->row(), 1))->text().toInt() );
         todoDB.addEvent( *todo );
     }
     if(!todoDB.save() ){
       QFile::remove( strNewFile );
       return false;
     };
     // now do the rename
     if ( ::rename( strNewFile, fn ) < 0 )
         qWarning( "problem renaming file %s to %s errno %d",
                   strNewFile.latin1(), fn.latin1(), errno );
 
     // remove the journal
     QFile::remove( journalFileName() );
     return true;
 }
 
 void TodoTable::load( const QString &fn )
 {
   if ( QFile::exists(journalFileName()) ) {
     applyJournal();
     QFile::remove(journalFileName() );
   }
     loadFile( fn );
 //     QTable::sortColumn(2,TRUE,TRUE);
 //     QTable::sortColumn(1,TRUE,TRUE);
     QTable::sortColumn(0,TRUE,TRUE);
     setCurrentCell( 0, 2 );
     setSorting(true );
     mDayTimer->start( 60 * 1000 ); // gone in 60 seconds?
 }
 void TodoTable::updateVisible()
 {
     if ( !isUpdatesEnabled() )
         return;
   
     if (showDeadl){
       showColumn (3);
       adjustColumn(3);
     }else{
       hideColumn (3);
       adjustColumn(2);
     }
 
     int visible = 0;
     int id = mCat.id( "Todo List", showCat );
     for ( int row = 0; row < numRows(); row++ ) {
         CheckItem *ci = (CheckItem *)item( row, 0 );
         ToDoEvent *t = todoList[ci];
         QArray<int> vlCats = t->categories();
         bool hide = false;
         if ( !showComp && ci->isChecked() )
             hide = true;
         if ( !showCat.isEmpty() ) {
             if ( showCat == tr( "Unfiled" ) ) {
                 if ( vlCats.count() > 0 )
                     hide = true;
             } else {
                 // do some comparing, we have to reverse our idea here... which idea? - zecke
                 if ( !hide ) {
                     hide = true;
                     for ( uint it = 0; it < vlCats.count(); ++it ) {
                         if ( vlCats[it] == id ) {
                             hide = false;
                             break;
                         }
                     }
                 }
             }
         }
         if ( hide ) {
             if ( currentRow() == row )
                 setCurrentCell( -1, 0 );
             if ( rowHeight( row ) > 0 )
                 hideRow( row );
         } else {
             if ( rowHeight( row ) == 0 ) {
                 showRow( row );
                 adjustRow( row );
             }
             visible++;
         }
     }
     if ( !visible )
         setCurrentCell( -1, 0 );
 }
 
 void TodoTable::viewportPaintEvent( QPaintEvent *pe )
 {
     if ( enablePainting )
         QTable::viewportPaintEvent( pe );
 }
 
 void TodoTable::setPaintingEnabled( bool e )
 {
     if ( e != enablePainting ) {
         if ( !enablePainting ) {
             enablePainting = true;
             rowHeightChanged( 0 );
             viewport()->update();
         } else {
             enablePainting = false;
         }
     }
 }
 
 void TodoTable::clear()
 {
     for ( QMap<CheckItem*, ToDoEvent *>::Iterator it = todoList.begin();
           it != todoList.end(); ++it ) {
         ToDoEvent *todo = it.data();
         updateJournal( *todo, ACTION_REMOVE );
         delete todo;
     }
     todoList.clear();
     for ( int r = 0; r < numRows(); ++r ) {
         for ( int c = 0; c < numCols(); ++c ) {
             if ( cellWidget( r, c ) )
                 clearCellWidget( r, c );
             clearCell( r, c );
         }
     }
     setNumRows( 0 );
 }
 
 void TodoTable::sortColumn( int col, bool ascending, bool /*wholeRows*/ )
 {
     // The default for wholeRows is false, however
     // for this todo table we want to exchange complete
     // rows when sorting. Also, we always want ascending, since
     // the values have a logical order.
     QTable::sortColumn( col, ascending, TRUE );
     updateVisible();
 }
 
 void TodoTable::slotCheckPriority(int row, int col )
 {
     // kludgey work around to make forward along the updated priority...
     if ( col == 1 ) {
         // let everyone know!!
         ComboItem* i = static_cast<ComboItem*>( item( row, col ) );
         emit signalPriorityChanged( i->text().toInt() );
     }
 }
 
 
 void TodoTable::updateJournal( const ToDoEvent &todo, journal_action action )
 {
     QFile f( journalFileName() );
     if ( !f.open(IO_WriteOnly|IO_Append) )
         return;
     QString buf;
     QCString str;
     buf = "<Task";
     //    todo.save( buf );
     buf += " Action=\"" + QString::number( int(action) ) + "\"";
     buf += " Uid=\"" + QString::number( todo.uid() ) + "\""; // better write the id
     buf += " Completed=\""+ QString::number((int)todo.isCompleted() ) + "\"";
     buf += " HasDate=\""+ QString::number((int)todo.hasDate() ) +"\"";
     buf += " Priority=\"" + QString::number( todo.priority() ) + "\"";
     QArray<int> arrat = todo.categories();
     QString attr;
     for(uint i=0; i < arrat.count(); i++ ){
       attr.append(QString::number(arrat[i])+";" );
     }
     if(!attr.isEmpty() ) // remove the last ;
       attr.remove(attr.length()-1, 1 );
     buf += " Categories=\"" + attr + "\"";
     buf += " Description=\"" + todo.description() + "\"";
     if(todo.hasDate() ) {
       buf += " DateYear=\""+QString::number( todo.date().year() ) + "\"";
       buf += " DateMonth=\"" + QString::number( todo.date().month() ) + "\"";
       buf += " DateDay=\"" + QString::number( todo.date().day() ) + "\"";
     }
     buf += "/>\n";
     str = buf.utf8();
     f.writeBlock( str.data(), str.length() );
     f.close();
 }
 
 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 )
 {
     QString strTodo;
     strTodo = todo.description().left(40).simplifyWhiteSpace();
     if ( row == -1 ) {
         QMapIterator<CheckItem*, ToDoEvent *> it;
         for ( it = todoList.begin(); it != todoList.end(); ++it ) {
             if ( *(*it) == todo ) {
                 row = it.key()->row();
                 it.key()->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 );
                 }
 
                 *(*it) = todo;
             }
         }
     } 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 );
 }
 
 void TodoTable::keyPressEvent( QKeyEvent *e )
 {
     if ( e->key() == Key_Space || e->key() == Key_Return ) {
         switch ( currentColumn() ) {
             case 0: {
                 CheckItem *i = static_cast<CheckItem*>(item(currentRow(),
                                                             currentColumn()));
                 if ( i )
                     i->toggle();
                 break;
             }
             case 1:
                 break;
             case 2:
                 emit signalEdit();
             default:
                 break;
         }
     } else {
         QTable::keyPressEvent( e );
     }
 }
 
 QStringList TodoTable::categories()
 {
     // This is called seldom, so calling a load in here
     // should be fine.
     mCat.load( categoryFileName() );
     QStringList categoryList = mCat.labels( "Todo List" );
     return categoryList;
 }
 
 void TodoTable::slotDoFind( const QString &findString, bool caseSensitive,
                             bool backwards, int category )
 {
     // we have to iterate through the table, this gives the illusion that
     // sorting is actually being used.
     if ( currFindRow < -1 )
         currFindRow = currentRow() - 1;
     clearSelection( TRUE );
     int rows,
         row;
     CheckItem *chk;
     QRegExp r( findString );
 
     r.setCaseSensitive( caseSensitive );
     rows = numRows();
     static bool wrapAround = true;
 
    if ( !backwards ) {
     for ( row = currFindRow + 1; row < rows; row++ ) {
         chk = static_cast<CheckItem*>( item(row, 0) );
         if ( taskCompare(*(todoList[chk]), r, category) )
             break;
     }
     } else {
          for ( row = currFindRow - 1; row > -1; row-- ) {
              chk = static_cast<CheckItem*>( item(row, 0) );
              if ( taskCompare(*(todoList[chk]), r, category) )
                 break;
          }
    }
     if ( row >= rows || row < 0 ) {
         if ( row < 0 )
             currFindRow = rows;
         else
             currFindRow = -1;
         if ( wrapAround )
             emit signalWrapAround();
         else
             emit signalNotFound();
         wrapAround = !wrapAround;
     } else {
         currFindRow = row;
         QTableSelection foundSelection;
         foundSelection.init( currFindRow, 0 );
         foundSelection.expandTo( currFindRow, numCols() - 1 );
         addSelection( foundSelection );
         setCurrentCell( currFindRow, numCols() - 1 );
         // we should always be able to wrap around and find this again,
         // so don't give confusing not found message...
         wrapAround = true;
     }
 }
 
 int TodoTable::showCategoryId() const
 {
     int id;
     id = -1;
     // if allcategories are selected, you get unfiled...
     if ( showCat != tr( "Unfiled" ) && showCat != tr( "All" ) )
         id = mCat.id( "Todo List", showCat );
     return id;
 }
 void TodoTable::applyJournal() 
 {
   // we need to hack
   QFile file( journalFileName() );
   if( file.open(IO_ReadOnly ) ) {
     QByteArray ar = file.readAll();
     file.close();
     QFile file2( journalFileName() + "_new" );
     if( file2.open(IO_WriteOnly ) ){
       QTextStream str(&file2 );
       str << QString::fromLatin1("<Tasks>") << endl;
       str << ar.data();
       str << QString::fromLatin1("</Tasks>") << endl;
       file2.close();
     }
     XMLElement *root = XMLElement::load(journalFileName()+ "_new");
     XMLElement *el = root->firstChild();
     el = el->firstChild();
     ToDoDB tododb; // allready loaded ;)
     bool ok;
     int action;
     QString dummy;
     while( el ){
       dummy = el->attribute("Action" );
       action = dummy.toInt(&ok );
       ToDoEvent ev = xmlToEvent( el );
       if(ok ){
         switch( action){
         case ACTION_ADD:
           tododb.addEvent(ev );
           break;
         case ACTION_REMOVE:
           tododb.removeEvent( ev );
           break;
         case ACTION_REPLACE:
           tododb.replaceEvent( ev );
           break;
         }
       }
       el = el->nextChild();
     }
     QFile::remove(journalFileName()+ "_new" );
     tododb.save();
   }
 }
 void TodoTable::slotCheckDay()
 {
   QDate date = QDate::currentDate();
   if( mDay.daysTo(date )!= 0 ){
     setPaintingEnabled( FALSE );
     for(int i=0; i < numRows(); i++ ){
       ToDoEvent *t = todoList[static_cast<CheckItem*>(item(i, 0))];      
       static_cast<DueTextItem*>(item(i, 3) )->setToDoEvent( t );
 
     }
     setPaintingEnabled( TRUE );
     mDay = date;
     }
   mDayTimer->start( 60 * 1000 ); // 60 seconds
 }
 // check Action and decide
 /*
 void TodoTable::doApply(XMLElement *el )
 {
   QString dummy;
   bool ok;
   int action;
   dummy = el->attribute("Action" );
   action = dummy.toInt(&ok );
   ToDoEvent ev = xmlToEvent( el );
   if( ok ){
     switch( action ){
     case ACTION_ADD:
       addEntry( ev );
       break;
     case ACTION_REMOVE:{ // find an entry with the same uid and remove it then
       break;
     }
     case ACTION_REPLACE:
       break;
     }
   }
 }
 */
 namespace {
 static bool taskCompare( const ToDoEvent &task, const QRegExp &r, int category )
 {
     bool returnMe;
     QArray<int> cats;
     cats = task.categories();
 
     returnMe = false;
     if ( (category == -1 && cats.count() == 0) || category == -2 )
         returnMe = task.match( r );
     else {
         int i;
         for ( i = 0; i < int(cats.count()); i++ ) {
             if ( cats[i] == category ) {
                 returnMe = task.match( r );
                 break;
             }
         }
     }
     return returnMe;
 }
 
 static QString journalFileName()
 {
     QString str;
     str = getenv( "HOME" );
     str += "/.opie_todojournal";
     return str;
 }
 static ToDoEvent xmlToEvent( XMLElement *element )
 {
   QString dummy;
   ToDoEvent event;
   bool ok;
   int dumInt;
   // completed
   dummy = element->attribute("Completed" );
   dumInt = dummy.toInt(&ok );
   if(ok ) event.setCompleted( dumInt == 0 ? false : true );
   // hasDate
   dummy = element->attribute("HasDate" );
   dumInt = dummy.toInt(&ok );
   if(ok ) event.setHasDate( dumInt == 0 ? false: true );
   // set the date
   bool hasDa = dumInt;
   if ( hasDa ) { //parse the date
     int year, day, month = 0;
     year = day = month;
     // year
     dummy = element->attribute("DateYear" );
     dumInt = dummy.toInt(&ok );
     if( ok ) year = dumInt;
     // month
     dummy = element->attribute("DateMonth" );
     dumInt = dummy.toInt(&ok );
     if(ok ) month = dumInt;
     dummy = element->attribute("DateDay" );
     dumInt = dummy.toInt(&ok );
     if(ok ) day = dumInt;
     // set the date
     QDate date( year, month, day );
     event.setDate( date);
   }
   dummy = element->attribute("Priority" );
   dumInt = dummy.toInt(&ok );
   if(!ok ) dumInt = ToDoEvent::NORMAL;
   event.setPriority( dumInt );
   //description
   dummy = element->attribute("Description" );
   event.setDescription( dummy );
   // category
   dummy = element->attribute("Categories" );
   QStringList ids = QStringList::split(";", dummy );
   event.setCategories( ids );     
   
   //uid
   dummy = element->attribute("Uid" );
   dumInt = dummy.toInt(&ok );
   if(ok ) event.setUid( dumInt );
   return event;
 }
 
 }
 // int TodoTable::rowHeight( int ) const
 // {
 //     return 18;
 // }
 
 // int TodoTable::rowPos( int row ) const
 // {
 //     return 18*row;
 // }
 
 // int TodoTable::rowAt( int pos ) const
 // {
 //     return QMIN( pos/18, numRows()-1 );
 // }