5 files changed, 38 insertions, 25 deletions

diff --git a/core/pim/todo/TODO b/core/pim/todo/TODO
index 040f163..7601dd2 100644
--- a/core/pim/todo/TODO
+++ b/core/pim/todo/TODO
@@ -1,4 +1,4 @@
--fix the journal
+-fix the journal (wip )
 -fix day wrapping update all DueDateItems
 -when checking the C. box update the deadline
 -TodoLabel : public TextView
diff --git a/core/pim/todo/mainwindow.cpp b/core/pim/todo/mainwindow.cpp
index 883d78c..fc17c5f 100644
--- a/core/pim/todo/mainwindow.cpp
+++ b/core/pim/todo/mainwindow.cpp
@@ -149,257 +149,257 @@ TodoWindow::TodoWindow( QWidget *parent, const char *name, WFlags f = 0 ) :
     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 ) ) );
 
 //     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" );
+//    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();
 }
 
 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 );
     }
 }
 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("Should I delete all tasks?") ) )
     return;
   
   
   
   table->setPaintingEnabled( false );
   table->removeAllEntries();
   table->setPaintingEnabled( true );
   
   if ( table->numRows() == 0 ) {
     currentEntryChanged( -1, 0 );
     findAction->setEnabled( FALSE );
   }
 }
 
 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();
 
 }
 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 );
   table->setPaintingEnabled( false );
   table->addEntry( ev2 );
   table->setPaintingEnabled( true );
 }
 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 );
 }
 
 void TodoWindow::currentEntryChanged( int r, int )
 {
     if ( r != -1 && table->rowHeight( r ) > 0 ) {
         editAction->setEnabled( TRUE );
         deleteAction->setEnabled( TRUE );
diff --git a/core/pim/todo/todoentryimpl.cpp b/core/pim/todo/todoentryimpl.cpp
index f938d61..26a685c 100644
--- a/core/pim/todo/todoentryimpl.cpp
+++ b/core/pim/todo/todoentryimpl.cpp
@@ -1,159 +1,153 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #include "todoentryimpl.h"
 
 #include <opie/todoevent.h>
 #include <opie/tododb.h>
 
 #include <qpe/categoryselect.h>
 #include <qpe/datebookmonth.h>
 #include <qpe/global.h>
 #include <qpe/imageedit.h>
 #include <qpe/timestring.h>
 #include <qpe/palmtoprecord.h>
 
 #include <qmessagebox.h>
 #include <qpopupmenu.h>
 #include <qtoolbutton.h>
 #include <qcombobox.h>
 #include <qcheckbox.h>
 #include <qlineedit.h>
 #include <qmultilineedit.h>
 #include <qlabel.h>
 #include <qtimer.h>
 #include <qapplication.h>
 
 
 NewTaskDialog::NewTaskDialog( const ToDoEvent& task, QWidget *parent,
                               const char *name, bool modal, WFlags fl )
     : NewTaskDialogBase( parent, name, modal, fl ),
       todo( task )
 {
-    qWarning("setting category" );
     todo.setCategories( task.allCategories() );
     if ( todo.hasDate() )
         date = todo.date();
     else
         date = QDate::currentDate();
 
     init();
     comboPriority->setCurrentItem( task.priority() - 1 );
 
     checkCompleted->setChecked( task.isCompleted() );
     checkDate->setChecked( task.hasDate() );
     buttonDate->setText( TimeString::longDateString( date ) );
 
     txtTodo->setText( task.description() );
 }
 
 /*
  *  Constructs a NewTaskDialog which is a child of 'parent', with the
  *  name 'name' and widget flags set to 'f'
  *
  *  The dialog will by default be modeless, unless you set 'modal' to
  *  TRUE to construct a modal dialog.
  */
 NewTaskDialog::NewTaskDialog( int id, QWidget* parent,  const char* name, bool modal,
                               WFlags fl )
     : NewTaskDialogBase( parent, name, modal, fl ),
       date( QDate::currentDate() )
 {
     if ( id != -1 ) {
         QArray<int> ids( 1 );
         ids[0] = id;
         todo.setCategory( Qtopia::Record::idsToString( ids ) );
     }
     init();
 }
 
 void NewTaskDialog::init()
 {
     QPopupMenu *m1 = new QPopupMenu( this );
     picker = new DateBookMonth( m1, 0, TRUE );
     m1->insertItem( picker );
     buttonDate->setPopup( m1 );
     comboCategory->setCategories( todo.categories(), "Todo List", tr("Todo List") );
 
     connect( picker, SIGNAL( dateClicked( int, int, int ) ),
              this, SLOT( dateChanged( int, int, int ) ) );
 
     buttonDate->setText( TimeString::longDateString( date ) );
     picker->setDate( date.year(), date.month(), date.day() );
 }
 
 /*
  *  Destroys the object and frees any allocated resources
  */
 NewTaskDialog::~NewTaskDialog()
 {
-    qWarning("d'tor" );
     // no need to delete child widgets, Qt does it all for us
 }
 void NewTaskDialog::dateChanged( int y, int m, int d )
 {
     date = QDate( y, m, d );
     buttonDate->setText( TimeString::longDateString( date ) );
 }
 
 /*!
 */
 
 ToDoEvent NewTaskDialog::todoEntry()
 {
-  qWarning("todoEntry()" );
   if( checkDate->isChecked() ){
     todo.setDate( date );
     todo.setHasDate( true );
   }else{
     todo.setHasDate( false );
   }
-  qWarning("todoEntry::category()" );
   if ( comboCategory->currentCategory() != -1 ) {
     QArray<int> arr = comboCategory->currentCategories();
     QStringList list;
     list = QStringList::split(";", Qtopia::Record::idsToString( arr )) ;
-    qWarning("saving category");
     todo.setCategories( list );
   }
   todo.setPriority( comboPriority->currentItem() + 1 );
   todo.setCompleted( checkCompleted->isChecked() );
   
   todo.setDescription( txtTodo->text() );
   
   return todo;
 }
 
 
 /*!
 
 */
 
 void NewTaskDialog::accept()
 {
-    qWarning("accept" );
     QString strText = txtTodo->text();
     if ( strText.isEmpty() ) {
        // hmm... just decline it then, the user obviously didn't care about it
        QDialog::reject();
        return;
     }
     QDialog::accept();
 }
diff --git a/core/pim/todo/todotable.cpp b/core/pim/todo/todotable.cpp
index 401d2c8..96cd860 100644
--- a/core/pim/todo/todotable.cpp
+++ b/core/pim/todo/todotable.cpp
@@ -227,659 +227,679 @@ TodoTable::TodoTable( QWidget *parent, const char *name )
       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()) );
 }
 
 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();
           // fall through
         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
 {
   printf ("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, row );
+    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, row );
+    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 )
 {
-    loadFile( fn, false );
-    if ( QFile::exists(journalFileName()) ) {
-        applyJournal(  );
-        save( 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 );
 }
 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;
-        updateJournal( todo, ACTION_REMOVE, 0 );
+        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, int row )
+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 &strFile, bool fromJournal )
+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) ) );
   }   
   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) );
     }
 }
 
 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 ){
-      qWarning("journal: %s %s", el->attribute("Uid" ).latin1(), el->tagName().latin1() );
-      doApply( 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();
   }
 }
 // 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 );
 // }
 
diff --git a/core/pim/todo/todotable.h b/core/pim/todo/todotable.h
index 6917e04..6e371e8 100644
--- a/core/pim/todo/todotable.h
+++ b/core/pim/todo/todotable.h
@@ -26,213 +26,212 @@
 //#include <qpe/task.h>
 #include <opie/todoevent.h>
 
 #include <qtable.h>
 #include <qmap.h>
 #include <qguardedptr.h>
 
 class Node;
 class QComboBox;
 class QTimer;
 
 class CheckItem : public QTableItem
 {
 public:
     CheckItem( QTable *t, const QString &sortkey );
 
     void setChecked( bool b );
     void toggle();
     bool isChecked() const;
     void setKey( const QString &key ) { sortKey = key; }
     QString key() const;
 
     void paint( QPainter *p, const QColorGroup &cg, const QRect &cr, bool selected );
 
 private:
     bool checked;
     QString sortKey;
 };
 
 class ComboItem : public QTableItem
 {
 public:
     ComboItem( QTable *t, EditType et );
     QWidget *createEditor() const;
     void setContentFromEditor( QWidget *w );
     void setText( const QString &s );
     int alignment() const { return Qt::AlignCenter; }
 
     QString text() const;
 
 private:
     QGuardedPtr<QComboBox> cb;
 
 };
 
 class TodoTextItem : public QTableItem
 {
 public:
     TodoTextItem( QTable *t, const QString & str ) 
         :QTableItem( t, QTableItem::Never, str ) {}
 
     QString key () const { return Qtopia::buildSortKey( text() ); }
 };
 
 class DueTextItem : public QTableItem
 {
  public:
   DueTextItem( QTable *t, ToDoEvent *ev );
   QString key() const;
   void setToDoEvent( const ToDoEvent *ev );
   void paint( QPainter *p, const QColorGroup &cg, const QRect &cr, bool selected );
  private:
   int m_off;
   bool m_hasDate:1;
   bool m_completed:1;
 
 };
 
 
 enum journal_action { ACTION_ADD=0, ACTION_REMOVE, ACTION_REPLACE };
 
 class XMLElement;
 class TodoTable : public QTable
 {
     Q_OBJECT
 
 public:
     TodoTable( QWidget *parent = 0, const char * name = 0 );
     void addEntry( const ToDoEvent &todo );
     void clearFindRow() { currFindRow = -2; }
 
     ToDoEvent currentEntry() const;
     void replaceCurrentEntry( const ToDoEvent &todo, bool fromTableItem = false );
 
     QStringList categories();
 
     void setShowCompleted( bool sc ) { showComp = sc; updateVisible(); }
     bool showCompleted() const { return showComp; }
 
     void setShowDeadline (bool sd) {showDeadl = sd; updateVisible();}
     bool showDeadline() const { return showDeadl;}
 
     void setShowCategory( const QString &c ) { showCat = c; updateVisible(); }
     const QString &showCategory() const { return showCat; }
     int showCategoryId() const;
 
     bool save( const QString &fn );
     void load( const QString &fn );
     void applyJournal( );
     void clear();
     void removeCurrentEntry();
     void removeAllEntries() { clear(); };
     //void removeAllEntriesInCategory(const QString &category );
 
     void setPaintingEnabled( bool e );
 
     virtual void sortColumn( int col, bool ascending, bool /*wholeRows*/ );
 
 //     int rowHeight( int ) const;
 //     int rowPos( int row ) const;
 //     virtual int rowAt( int pos ) const;
 
 signals:
     void signalEdit();
     void signalDoneChanged( bool b );
     void signalPriorityChanged( int i );
     void signalShowMenu( const QPoint & );
     void signalNotFound();
     void signalWrapAround();
 
 protected:
     void keyPressEvent( QKeyEvent *e );
 
 private:
     void updateVisible();
     void viewportPaintEvent( QPaintEvent * );
     void internalAddEntries( QList<ToDoEvent> &list);
     inline void insertIntoTable( ToDoEvent *todo, int row );
-    void updateJournal( const ToDoEvent &todo, journal_action action, int row = -1);
+    void updateJournal( const ToDoEvent &todo, journal_action action);
     void mergeJournal();
     void journalFreeReplaceEntry( const ToDoEvent &todo, int row );
     void journalFreeRemoveEntry( int row );
     inline void realignTable( int row );
-    void loadFile( const QString &strFile, bool fromJournal = false );
-    void doApply(XMLElement *el );
+    void loadFile( const QString &strFile);
 
 private slots:
     void slotClicked( int row, int col, int button, const QPoint &pos );
     void slotPressed( int row, int col, int button, const QPoint &pos );
     void slotCheckPriority(int row, int col );
     void slotCurrentChanged(int row, int col );
     void slotDoFind( const QString &findString, bool caseSensetive,
                      bool backwards, int category );
     void slotShowMenu();
     void rowHeightChanged( int row );
 
 private:
     friend class TodoWindow;
 
     QMap<CheckItem*, ToDoEvent *> todoList;
     QStringList categoryList;
     bool showComp;
     QString showCat;
     QTimer *menuTimer;
     bool enablePainting;
     Categories mCat;
     int currFindRow;
     bool showDeadl:1;
 };
 
 
 inline void TodoTable::insertIntoTable( ToDoEvent *todo, int row )
 {
     QString sortKey = (char) ((todo->isCompleted() ? 'a' : 'A') 
                               + todo->priority() ) 
                       + Qtopia::buildSortKey( todo->description() );
     CheckItem *chk = new CheckItem( this, sortKey );
     chk->setChecked( todo->isCompleted() );
     ComboItem *cmb = new ComboItem( this, QTableItem::WhenCurrent );
     cmb->setText( QString::number( todo->priority() ) );
     QTableItem *ti = new TodoTextItem( this, todo->description().left(40).simplifyWhiteSpace() );
     ti->setReplaceable( false );
 
     DueTextItem *due = new DueTextItem(this, todo );
     setItem( row, 3, due);
     
     setItem( row, 0, chk );
     setItem( row, 1, cmb );
     setItem( row, 2, ti );
 
 
     todoList.insert( chk, todo );
 }
 
 inline void TodoTable::realignTable( int row )
 {
   QTableItem *ti1,
     *ti2,
     *ti3,
     *ti4;
     int totalRows = numRows();
     for ( int curr = row; curr < totalRows - 1; curr++ ) {
         // this is bad, we must take the item out and then
         // set it. In the end, it behaves no worse (time wise)
         // then the old way of saving the entries to file, clearing
         // the table re-reading in the file and resetting the table
         ti1 = item( curr + 1, 0 );
         ti2 = item( curr + 1, 1 );
         ti3 = item( curr + 1, 2 );
         ti4 = item( curr + 1, 3 );
         takeItem( ti1 );
         takeItem( ti2 );
         takeItem( ti3 );
         takeItem( ti4 );
         setItem( curr, 0, ti1 );
         setItem( curr, 1, ti2 );
         setItem( curr, 2, ti3 );
         setItem( curr, 3, ti4 );
     }
     setNumRows( totalRows - 1 );
 }
 
 #endif