journal is in place again

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
@@ -273,9 +273,9 @@ void TodoWindow::slotNew()
 #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();
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
@@ -46,9 +46,8 @@ 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
@@ -103,9 +102,8 @@ void NewTaskDialog::init()
  *  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 )
 {
@@ -117,21 +115,18 @@ void NewTaskDialog::dateChanged( int y, int m, int d )
 */
 
 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() );
@@ -147,9 +142,8 @@ ToDoEvent NewTaskDialog::todoEntry()
 */
 
 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();
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
@@ -351,9 +351,9 @@ ToDoEvent TodoTable::currentEntry() const
 
 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();
@@ -374,9 +374,9 @@ void TodoTable::removeCurrentEntry()
     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;
 }
 
 
@@ -410,13 +410,13 @@ bool TodoTable::save( const QString &fn )
 }
 
 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 );
@@ -500,10 +500,10 @@ void TodoTable::setPaintingEnabled( bool e )
 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 ) {
@@ -536,9 +536,9 @@ void TodoTable::slotCheckPriority(int row, int col )
     }
 }
 
 
-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;
@@ -576,9 +576,9 @@ 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;
@@ -753,17 +753,37 @@ void TodoTable::applyJournal()
     }
     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;
@@ -783,8 +803,9 @@ void TodoTable::doApply(XMLElement *el )
       break;
     }
   }
 }
+*/
 namespace {
 static bool taskCompare( const ToDoEvent &task, const QRegExp &r, int category )
 {
     bool returnMe;
@@ -862,9 +883,8 @@ static ToDoEvent xmlToEvent( XMLElement *element )
   //uid
   dummy = element->attribute("Uid" );
   dumInt = dummy.toInt(&ok );
   if(ok ) event.setUid( dumInt );
-  
   return event;
 }
 
 }
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
@@ -150,15 +150,14 @@ 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 );