author | zecke <zecke> | 2002-04-15 20:55:49 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-04-15 20:55:49 (UTC) |
commit | 943f0de13f6b017e67d0289c7273ddbf496a2cff (patch) (side-by-side diff) | |
tree | ed28fa2c3632ce672b31edff10ecf08356d35f64 /core/pim/todo/todotable.cpp | |
parent | e010d922ac415558e5efd35e69e39e45908b5501 (diff) | |
download | opie-943f0de13f6b017e67d0289c7273ddbf496a2cff.zip opie-943f0de13f6b017e67d0289c7273ddbf496a2cff.tar.gz opie-943f0de13f6b017e67d0289c7273ddbf496a2cff.tar.bz2 |
journal is in place again
-rw-r--r-- | core/pim/todo/todotable.cpp | 48 |
1 files changed, 34 insertions, 14 deletions
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; } } |