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 | |
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/TODO | 2 | ||||
-rw-r--r-- | core/pim/todo/mainwindow.cpp | 2 | ||||
-rw-r--r-- | core/pim/todo/todoentryimpl.cpp | 6 | ||||
-rw-r--r-- | core/pim/todo/todotable.cpp | 42 | ||||
-rw-r--r-- | core/pim/todo/todotable.h | 5 |
5 files changed, 35 insertions, 22 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,3 +1,3 @@ --fix the journal +-fix the journal (wip ) -fix day wrapping update all DueDateItems -when checking the C. box update the deadline 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 @@ -275,5 +275,5 @@ void TodoWindow::slotNew() #endif int ret = e.exec(); - qWarning("finished" ); +// qWarning("finished" ); if ( ret == QDialog::Accepted ) { table->setPaintingEnabled( false ); 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 @@ -48,5 +48,4 @@ NewTaskDialog::NewTaskDialog( const ToDoEvent& task, QWidget *parent, todo( task ) { - qWarning("setting category" ); todo.setCategories( task.allCategories() ); if ( todo.hasDate() ) @@ -105,5 +104,4 @@ void NewTaskDialog::init() NewTaskDialog::~NewTaskDialog() { - qWarning("d'tor" ); // no need to delete child widgets, Qt does it all for us } @@ -119,5 +117,4 @@ void NewTaskDialog::dateChanged( int y, int m, int d ) ToDoEvent NewTaskDialog::todoEntry() { - qWarning("todoEntry()" ); if( checkDate->isChecked() ){ todo.setDate( date ); @@ -126,10 +123,8 @@ ToDoEvent NewTaskDialog::todoEntry() 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 ); } @@ -149,5 +144,4 @@ ToDoEvent NewTaskDialog::todoEntry() void NewTaskDialog::accept() { - qWarning("accept" ); QString strText = txtTodo->text(); if ( strText.isEmpty() ) { 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 @@ -353,5 +353,5 @@ void TodoTable::replaceCurrentEntry( const ToDoEvent &todo, bool fromTableItem ) { int row = currentRow(); - updateJournal( todo, ACTION_REPLACE, row ); + updateJournal( todo, ACTION_REPLACE); if ( !fromTableItem ) { @@ -376,5 +376,5 @@ void TodoTable::removeCurrentEntry() realignTable( row ); updateVisible(); - updateJournal( *oldTodo, ACTION_REMOVE, row ); + updateJournal( *oldTodo, ACTION_REMOVE); delete oldTodo; } @@ -412,9 +412,9 @@ bool TodoTable::save( const QString &fn ) void TodoTable::load( const QString &fn ) { - loadFile( fn, false ); if ( QFile::exists(journalFileName()) ) { applyJournal( ); - save( fn ); + QFile::remove(journalFileName() ); } + loadFile( fn ); // QTable::sortColumn(2,TRUE,TRUE); // QTable::sortColumn(1,TRUE,TRUE); @@ -502,6 +502,6 @@ 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; } @@ -538,5 +538,5 @@ 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() ); @@ -578,5 +578,5 @@ void TodoTable::rowHeightChanged( int row ) } -void TodoTable::loadFile( const QString &strFile, bool fromJournal ) +void TodoTable::loadFile( const QString &/*we use the standard*/ ) { @@ -755,13 +755,33 @@ void TodoTable::applyJournal() 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 ) { @@ -785,4 +805,5 @@ void TodoTable::doApply(XMLElement *el ) } } +*/ namespace { static bool taskCompare( const ToDoEvent &task, const QRegExp &r, int category ) @@ -864,5 +885,4 @@ static ToDoEvent xmlToEvent( XMLElement *element ) 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 @@ -152,11 +152,10 @@ private: 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: |