author | zecke <zecke> | 2002-03-21 00:26:39 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-03-21 00:26:39 (UTC) |
commit | 8bfe366ce8667addc539f11fc560250c306340ae (patch) (unidiff) | |
tree | 4b890a47d86621d3e1f0aacde2485457862f02c8 /core/pim/todo/todotable.cpp | |
parent | e8f15a98c611b0c6030e8210672b249b42107526 (diff) | |
download | opie-8bfe366ce8667addc539f11fc560250c306340ae.zip opie-8bfe366ce8667addc539f11fc560250c306340ae.tar.gz opie-8bfe366ce8667addc539f11fc560250c306340ae.tar.bz2 |
Move todolist to tododb
Please test todolist
-rw-r--r-- | core/pim/todo/todotable.cpp | 274 |
1 files changed, 44 insertions, 230 deletions
diff --git a/core/pim/todo/todotable.cpp b/core/pim/todo/todotable.cpp index 77d3389..2bb95a2 100644 --- a/core/pim/todo/todotable.cpp +++ b/core/pim/todo/todotable.cpp | |||
@@ -20,6 +20,7 @@ | |||
20 | 20 | ||
21 | #include "todotable.h" | 21 | #include "todotable.h" |
22 | 22 | ||
23 | #include <opie/tododb.h> | ||
23 | #include <qpe/categoryselect.h> | 24 | #include <qpe/categoryselect.h> |
24 | #include <qpe/xmlreader.h> | 25 | #include <qpe/xmlreader.h> |
25 | 26 | ||
@@ -39,7 +40,7 @@ | |||
39 | 40 | ||
40 | 41 | ||
41 | 42 | ||
42 | static bool taskCompare( const Task &task, const QRegExp &r, int category ); | 43 | static bool taskCompare( const ToDoEvent &task, const QRegExp &r, int category ); |
43 | 44 | ||
44 | static QString journalFileName(); | 45 | static QString journalFileName(); |
45 | 46 | ||
@@ -62,7 +63,7 @@ void CheckItem::setChecked( bool b ) | |||
62 | void CheckItem::toggle() | 63 | void CheckItem::toggle() |
63 | { | 64 | { |
64 | TodoTable *parent = static_cast<TodoTable*>(table()); | 65 | TodoTable *parent = static_cast<TodoTable*>(table()); |
65 | Task newTodo = parent->currentEntry(); | 66 | ToDoEvent newTodo = parent->currentEntry(); |
66 | checked = !checked; | 67 | checked = !checked; |
67 | newTodo.setCompleted( checked ); | 68 | newTodo.setCompleted( checked ); |
68 | table()->updateCell( row(), col() ); | 69 | table()->updateCell( row(), col() ); |
@@ -133,7 +134,7 @@ QWidget *ComboItem::createEditor() const | |||
133 | void ComboItem::setContentFromEditor( QWidget *w ) | 134 | void ComboItem::setContentFromEditor( QWidget *w ) |
134 | { | 135 | { |
135 | TodoTable *parent = static_cast<TodoTable*>(table()); | 136 | TodoTable *parent = static_cast<TodoTable*>(table()); |
136 | Task newTodo = parent->currentEntry(); | 137 | ToDoEvent newTodo = parent->currentEntry(); |
137 | 138 | ||
138 | if ( w->inherits( "QComboBox" ) ) | 139 | if ( w->inherits( "QComboBox" ) ) |
139 | setText( ( (QComboBox*)w )->currentText() ); | 140 | setText( ( (QComboBox*)w )->currentText() ); |
@@ -194,12 +195,12 @@ TodoTable::TodoTable( QWidget *parent, const char *name ) | |||
194 | connect( menuTimer, SIGNAL(timeout()), this, SLOT(slotShowMenu()) ); | 195 | connect( menuTimer, SIGNAL(timeout()), this, SLOT(slotShowMenu()) ); |
195 | } | 196 | } |
196 | 197 | ||
197 | void TodoTable::addEntry( const Task &todo ) | 198 | void TodoTable::addEntry( const ToDoEvent &todo ) |
198 | { | 199 | { |
199 | int row = numRows(); | 200 | int row = numRows(); |
200 | setNumRows( row + 1 ); | 201 | setNumRows( row + 1 ); |
201 | updateJournal( todo, ACTION_ADD ); | 202 | updateJournal( todo, ACTION_ADD ); |
202 | insertIntoTable( new Task(todo), row ); | 203 | insertIntoTable( new ToDoEvent(todo), row ); |
203 | setCurrentCell(row, currentColumn()); | 204 | setCurrentCell(row, currentColumn()); |
204 | updateVisible(); | 205 | updateVisible(); |
205 | } | 206 | } |
@@ -252,28 +253,28 @@ void TodoTable::slotCurrentChanged( int, int ) | |||
252 | menuTimer->stop(); | 253 | menuTimer->stop(); |
253 | } | 254 | } |
254 | 255 | ||
255 | void TodoTable::internalAddEntries( QList<Task> &list ) | 256 | void TodoTable::internalAddEntries( QList<ToDoEvent> &list ) |
256 | { | 257 | { |
257 | setNumRows( list.count() ); | 258 | setNumRows( list.count() ); |
258 | int row = 0; | 259 | int row = 0; |
259 | Task *it; | 260 | ToDoEvent *it; |
260 | for ( it = list.first(); it; it = list.next() ) | 261 | for ( it = list.first(); it; it = list.next() ) |
261 | insertIntoTable( it, row++ ); | 262 | insertIntoTable( it, row++ ); |
262 | } | 263 | } |
263 | 264 | ||
264 | 265 | ||
265 | Task TodoTable::currentEntry() const | 266 | ToDoEvent TodoTable::currentEntry() const |
266 | { | 267 | { |
267 | QTableItem *i = item( currentRow(), 0 ); | 268 | QTableItem *i = item( currentRow(), 0 ); |
268 | if ( !i || rowHeight( currentRow() ) <= 0 ) | 269 | if ( !i || rowHeight( currentRow() ) <= 0 ) |
269 | return Task(); | 270 | return ToDoEvent(); |
270 | Task *todo = todoList[(CheckItem*)i]; | 271 | ToDoEvent *todo = todoList[(CheckItem*)i]; |
271 | todo->setCompleted( ( (CheckItem*)item( currentRow(), 0 ) )->isChecked() ); | 272 | todo->setCompleted( ( (CheckItem*)item( currentRow(), 0 ) )->isChecked() ); |
272 | todo->setPriority( ( (ComboItem*)item( currentRow(), 1 ) )->text().toInt() ); | 273 | todo->setPriority( ( (ComboItem*)item( currentRow(), 1 ) )->text().toInt() ); |
273 | return *todo; | 274 | return *todo; |
274 | } | 275 | } |
275 | 276 | ||
276 | void TodoTable::replaceCurrentEntry( const Task &todo, bool fromTableItem ) | 277 | void TodoTable::replaceCurrentEntry( const ToDoEvent &todo, bool fromTableItem ) |
277 | { | 278 | { |
278 | int row = currentRow(); | 279 | int row = currentRow(); |
279 | updateJournal( todo, ACTION_REPLACE, row ); | 280 | updateJournal( todo, ACTION_REPLACE, row ); |
@@ -286,7 +287,7 @@ void TodoTable::replaceCurrentEntry( const Task &todo, bool fromTableItem ) | |||
286 | 287 | ||
287 | void TodoTable::removeCurrentEntry() | 288 | void TodoTable::removeCurrentEntry() |
288 | { | 289 | { |
289 | Task *oldTodo; | 290 | ToDoEvent *oldTodo; |
290 | int row = currentRow(); | 291 | int row = currentRow(); |
291 | CheckItem *chk; | 292 | CheckItem *chk; |
292 | 293 | ||
@@ -307,45 +308,22 @@ void TodoTable::removeCurrentEntry() | |||
307 | bool TodoTable::save( const QString &fn ) | 308 | bool TodoTable::save( const QString &fn ) |
308 | { | 309 | { |
309 | QString strNewFile = fn + ".new"; | 310 | QString strNewFile = fn + ".new"; |
310 | QFile f( strNewFile ); | 311 | QFile::remove( strNewFile ); // just to be sure |
311 | if ( !f.open( IO_WriteOnly|IO_Raw ) ) | 312 | ToDoDB todoDB( strNewFile ); |
312 | return false; | 313 | for ( QMap<CheckItem*, ToDoEvent *>::Iterator it = todoList.begin(); |
313 | |||
314 | QString buf("<!DOCTYPE Tasks>\n<Tasks>\n"); | ||
315 | QCString str; | ||
316 | int total_written; | ||
317 | |||
318 | for ( QMap<CheckItem*, Task *>::Iterator it = todoList.begin(); | ||
319 | it != todoList.end(); ++it ) { | 314 | it != todoList.end(); ++it ) { |
320 | if ( !item( it.key()->row(), 0 ) ) | 315 | if ( !item( it.key()->row(), 0 ) ) |
321 | continue; | 316 | continue; |
322 | Task *todo = *it; | 317 | ToDoEvent *todo = *it; |
323 | // sync item with table | 318 | // sync item with table |
324 | todo->setCompleted( ((CheckItem*)item(it.key()->row(), 0))->isChecked() ); | 319 | todo->setCompleted( ((CheckItem*)item(it.key()->row(), 0))->isChecked() ); |
325 | todo->setPriority( ((ComboItem*)item( it.key()->row(), 1))->text().toInt() ); | 320 | todo->setPriority( ((ComboItem*)item( it.key()->row(), 1))->text().toInt() ); |
326 | buf += "<Task"; | 321 | todoDB.addEvent( *todo ); |
327 | todo->save( buf ); | ||
328 | buf += " />\n"; | ||
329 | str = buf.utf8(); | ||
330 | total_written = f.writeBlock( str.data(), str.length() ); | ||
331 | if ( total_written != int(str.length()) ) { | ||
332 | f.close(); | ||
333 | QFile::remove( strNewFile ); | ||
334 | return false; | ||
335 | } | ||
336 | buf = ""; | ||
337 | } | ||
338 | |||
339 | buf += "</Tasks>\n"; | ||
340 | str = buf.utf8(); | ||
341 | total_written = f.writeBlock( str.data(), str.length() ); | ||
342 | if ( total_written != int(str.length()) ) { | ||
343 | f.close(); | ||
344 | QFile::remove( strNewFile ); | ||
345 | return false; | ||
346 | } | 322 | } |
347 | f.close(); | 323 | if(!todoDB.save() ){ |
348 | 324 | QFile::remove( strNewFile ); | |
325 | return false; | ||
326 | }; | ||
349 | // now do the rename | 327 | // now do the rename |
350 | if ( ::rename( strNewFile, fn ) < 0 ) | 328 | if ( ::rename( strNewFile, fn ) < 0 ) |
351 | qWarning( "problem renaming file %s to %s errno %d", | 329 | qWarning( "problem renaming file %s to %s errno %d", |
@@ -380,7 +358,7 @@ void TodoTable::updateVisible() | |||
380 | int id = mCat.id( "Todo List", showCat ); | 358 | int id = mCat.id( "Todo List", showCat ); |
381 | for ( int row = 0; row < numRows(); row++ ) { | 359 | for ( int row = 0; row < numRows(); row++ ) { |
382 | CheckItem *ci = (CheckItem *)item( row, 0 ); | 360 | CheckItem *ci = (CheckItem *)item( row, 0 ); |
383 | Task *t = todoList[ci]; | 361 | ToDoEvent *t = todoList[ci]; |
384 | QArray<int> vlCats = t->categories(); | 362 | QArray<int> vlCats = t->categories(); |
385 | bool hide = false; | 363 | bool hide = false; |
386 | if ( !showComp && ci->isChecked() ) | 364 | if ( !showComp && ci->isChecked() ) |
@@ -440,9 +418,9 @@ void TodoTable::setPaintingEnabled( bool e ) | |||
440 | 418 | ||
441 | void TodoTable::clear() | 419 | void TodoTable::clear() |
442 | { | 420 | { |
443 | for ( QMap<CheckItem*, Task *>::Iterator it = todoList.begin(); | 421 | for ( QMap<CheckItem*, ToDoEvent *>::Iterator it = todoList.begin(); |
444 | it != todoList.end(); ++it ) { | 422 | it != todoList.end(); ++it ) { |
445 | Task *todo = *it; | 423 | ToDoEvent *todo = *it; |
446 | delete todo; | 424 | delete todo; |
447 | } | 425 | } |
448 | todoList.clear(); | 426 | todoList.clear(); |
@@ -477,7 +455,7 @@ void TodoTable::slotCheckPriority(int row, int col ) | |||
477 | } | 455 | } |
478 | 456 | ||
479 | 457 | ||
480 | void TodoTable::updateJournal( const Task &todo, journal_action action, int row ) | 458 | void TodoTable::updateJournal( const ToDoEvent &todo, journal_action action, int row ) |
481 | { | 459 | { |
482 | QFile f( journalFileName() ); | 460 | QFile f( journalFileName() ); |
483 | if ( !f.open(IO_WriteOnly|IO_Append) ) | 461 | if ( !f.open(IO_WriteOnly|IO_Append) ) |
@@ -485,7 +463,7 @@ void TodoTable::updateJournal( const Task &todo, journal_action action, int row | |||
485 | QString buf; | 463 | QString buf; |
486 | QCString str; | 464 | QCString str; |
487 | buf = "<Task"; | 465 | buf = "<Task"; |
488 | todo.save( buf ); | 466 | // todo.save( buf ); |
489 | buf += " Action=\"" + QString::number( int(action) ) + "\""; | 467 | buf += " Action=\"" + QString::number( int(action) ) + "\""; |
490 | buf += " Row=\"" + QString::number( row ) + "\""; | 468 | buf += " Row=\"" + QString::number( row ) + "\""; |
491 | buf += "/>\n"; | 469 | buf += "/>\n"; |
@@ -502,192 +480,28 @@ void TodoTable::rowHeightChanged( int row ) | |||
502 | 480 | ||
503 | void TodoTable::loadFile( const QString &strFile, bool fromJournal ) | 481 | void TodoTable::loadFile( const QString &strFile, bool fromJournal ) |
504 | { | 482 | { |
505 | QFile f( strFile ); | ||
506 | if ( !f.open(IO_ReadOnly) ) | ||
507 | return; | ||
508 | |||
509 | int action, row; | ||
510 | action = 0; row = 0; | ||
511 | |||
512 | enum Attribute { | ||
513 | FCompleted = 0, | ||
514 | FHasDate, | ||
515 | FPriority, | ||
516 | FCategories, | ||
517 | FDescription, | ||
518 | FDateYear, | ||
519 | FDateMonth, | ||
520 | FDateDay, | ||
521 | FUid, | ||
522 | FAction, | ||
523 | FRow | ||
524 | }; | ||
525 | |||
526 | QAsciiDict<int> dict( 31 ); | ||
527 | QList<Task> list; | ||
528 | dict.setAutoDelete( TRUE ); | ||
529 | dict.insert( "Completed", new int(FCompleted) ); | ||
530 | dict.insert( "HasDate", new int(FHasDate) ); | ||
531 | dict.insert( "Priority", new int(FPriority) ); | ||
532 | dict.insert( "Categories", new int(FCategories) ); | ||
533 | dict.insert( "Description", new int(FDescription) ); | ||
534 | dict.insert( "DateYear", new int(FDateYear) ); | ||
535 | dict.insert( "DateMonth", new int(FDateMonth) ); | ||
536 | dict.insert( "DateDay", new int(FDateDay) ); | ||
537 | dict.insert( "Uid", new int(FUid) ); | ||
538 | dict.insert( "Action", new int(FAction) ); | ||
539 | dict.insert( "Row", new int(FRow) ); | ||
540 | |||
541 | QByteArray ba = f.readAll(); | ||
542 | f.close(); | ||
543 | char* dt = ba.data(); | ||
544 | int len = ba.size(); | ||
545 | bool hasDueDate = FALSE; | ||
546 | |||
547 | action = ACTION_ADD; | ||
548 | int i = 0; | ||
549 | char *point; | ||
550 | while ( ( point = strstr( dt+i, "<Task " ) ) != NULL ) { | ||
551 | // new Task | ||
552 | i = point - dt; | ||
553 | Task *todo = new Task; | ||
554 | int dtY = 0, dtM = 0, dtD = 0; | ||
555 | |||
556 | i += 5; | ||
557 | |||
558 | while( 1 ) { | ||
559 | while ( i < len && (dt[i] == ' ' || dt[i] == '\n' || dt[i] == '\r') ) | ||
560 | ++i; | ||
561 | if ( i >= len-2 || (dt[i] == '/' && dt[i+1] == '>') ) | ||
562 | break; | ||
563 | // we have another attribute, read it. | ||
564 | int j = i; | ||
565 | while ( j < len && dt[j] != '=' ) | ||
566 | ++j; | ||
567 | char *attr = dt+i; | ||
568 | dt[j] = '\0'; | ||
569 | i = ++j; // skip = | ||
570 | while ( i < len && dt[i] != '"' ) | ||
571 | ++i; | ||
572 | j = ++i; | ||
573 | bool haveUtf = FALSE; | ||
574 | bool haveEnt = FALSE; | ||
575 | while ( j < len && dt[j] != '"' ) { | ||
576 | if ( ((unsigned char)dt[j]) > 0x7f ) | ||
577 | haveUtf = TRUE; | ||
578 | if ( dt[j] == '&' ) | ||
579 | haveEnt = TRUE; | ||
580 | ++j; | ||
581 | } | ||
582 | if ( i == j ) { | ||
583 | // empty value | ||
584 | i = j + 1; | ||
585 | continue; | ||
586 | } | ||
587 | QCString value( dt+i, j-i+1 ); | ||
588 | i = j + 1; | ||
589 | int *lookup = dict[ attr ]; | ||
590 | if ( !lookup ) { | ||
591 | todo->setCustomField(attr, value); | ||
592 | continue; | ||
593 | } | ||
594 | switch( *lookup ) { | ||
595 | case FCompleted: | ||
596 | todo->setCompleted( value.toInt() ); | ||
597 | break; | ||
598 | case FHasDate: | ||
599 | // leave... | ||
600 | hasDueDate = value.toInt(); | ||
601 | break; | ||
602 | case FPriority: | ||
603 | todo->setPriority( value.toInt() ); | ||
604 | break; | ||
605 | case FCategories: { | ||
606 | //QString str = Qtopia::plainString( value ); | ||
607 | todo->setCategories( Qtopia::Record::idsFromString( value ) ); | ||
608 | break; | ||
609 | } | ||
610 | case FDescription: | ||
611 | { | ||
612 | QString str = (haveUtf ? QString::fromUtf8( value ) | ||
613 | : QString::fromLatin1( value ) ); | ||
614 | if ( haveEnt ) | ||
615 | str = Qtopia::plainString( str ); | ||
616 | todo->setDescription( str ); | ||
617 | break; | ||
618 | } | ||
619 | case FDateYear: | ||
620 | dtY = value.toInt(); | ||
621 | break; | ||
622 | case FDateMonth: | ||
623 | dtM = value.toInt(); | ||
624 | break; | ||
625 | case FDateDay: | ||
626 | dtD = value.toInt(); | ||
627 | break; | ||
628 | case FUid: | ||
629 | todo->setUid( value.toInt() ); | ||
630 | break; | ||
631 | case FAction: | ||
632 | action = value.toInt(); | ||
633 | break; | ||
634 | case FRow: | ||
635 | row = value.toInt(); | ||
636 | break; | ||
637 | default: | ||
638 | qDebug( "huh??? missing enum? -- attr.: %s", attr ); | ||
639 | break; | ||
640 | } | ||
641 | } | ||
642 | |||
643 | if ( dtY != 0 && dtM != 0 && dtD != 0 ) | ||
644 | todo->setDueDate( QDate( dtY, dtM, dtD), hasDueDate ); | ||
645 | else | ||
646 | todo->setHasDueDate( hasDueDate ); | ||
647 | |||
648 | // if ( categoryList.find( todo.category() ) == categoryList.end() ) | ||
649 | // categoryList.append( todo.category() ); | ||
650 | |||
651 | 483 | ||
652 | // sadly we can't delay adding of items from the journal to get | 484 | QList<ToDoEvent> list; |
653 | // the proper effect, but then, the journal should _never_ be | 485 | ToDoDB todoDB; |
654 | // that huge | 486 | QValueList<ToDoEvent> vaList = todoDB.rawToDos(); |
655 | 487 | for(QValueList<ToDoEvent>::ConstIterator it = vaList.begin(); it != vaList.end(); ++it ){ | |
656 | switch( action ) { | 488 | list.append( new ToDoEvent( (*it) ) ); |
657 | case ACTION_ADD: | 489 | } |
658 | if ( fromJournal ) { | 490 | vaList.clear(); |
659 | int myrows = numRows(); | 491 | // qDebug("parsing done=%d", t.elapsed() ); |
660 | setNumRows( myrows + 1 ); | 492 | if ( list.count() > 0 ) { |
661 | insertIntoTable( todo, myrows ); | 493 | internalAddEntries( list ); |
662 | delete todo; | 494 | list.clear(); |
663 | } else | 495 | } |
664 | list.append( todo ); | ||
665 | break; | ||
666 | case ACTION_REMOVE: | ||
667 | journalFreeRemoveEntry( row ); | ||
668 | break; | ||
669 | case ACTION_REPLACE: | ||
670 | journalFreeReplaceEntry( *todo, row ); | ||
671 | delete todo; | ||
672 | break; | ||
673 | default: | ||
674 | break; | ||
675 | } | ||
676 | } | ||
677 | // qDebug("parsing done=%d", t.elapsed() ); | ||
678 | if ( list.count() > 0 ) { | ||
679 | internalAddEntries( list ); | ||
680 | list.clear(); | ||
681 | } | ||
682 | // qDebug("loading done: t=%d", t.elapsed() ); | 496 | // qDebug("loading done: t=%d", t.elapsed() ); |
683 | } | 497 | } |
684 | 498 | ||
685 | void TodoTable::journalFreeReplaceEntry( const Task &todo, int row ) | 499 | void TodoTable::journalFreeReplaceEntry( const ToDoEvent &todo, int row ) |
686 | { | 500 | { |
687 | QString strTodo; | 501 | QString strTodo; |
688 | strTodo = todo.description().left(40).simplifyWhiteSpace(); | 502 | strTodo = todo.description().left(40).simplifyWhiteSpace(); |
689 | if ( row == -1 ) { | 503 | if ( row == -1 ) { |
690 | QMapIterator<CheckItem*, Task *> it; | 504 | QMapIterator<CheckItem*, ToDoEvent *> it; |
691 | for ( it = todoList.begin(); it != todoList.end(); ++it ) { | 505 | for ( it = todoList.begin(); it != todoList.end(); ++it ) { |
692 | if ( *(*it) == todo ) { | 506 | if ( *(*it) == todo ) { |
693 | row = it.key()->row(); | 507 | row = it.key()->row(); |
@@ -698,13 +512,13 @@ void TodoTable::journalFreeReplaceEntry( const Task &todo, int row ) | |||
698 | } | 512 | } |
699 | } | 513 | } |
700 | } else { | 514 | } else { |
701 | Task *t = todoList[static_cast<CheckItem*>(item(row, 0))]; | 515 | ToDoEvent *t = todoList[static_cast<CheckItem*>(item(row, 0))]; |
702 | todoList.remove( static_cast<CheckItem*>(item(row, 0)) ); | 516 | todoList.remove( static_cast<CheckItem*>(item(row, 0)) ); |
703 | delete t; | 517 | delete t; |
704 | static_cast<CheckItem*>(item(row, 0))->setChecked( todo.isCompleted() ); | 518 | static_cast<CheckItem*>(item(row, 0))->setChecked( todo.isCompleted() ); |
705 | static_cast<ComboItem*>(item(row, 1))->setText( QString::number(todo.priority()) ); | 519 | static_cast<ComboItem*>(item(row, 1))->setText( QString::number(todo.priority()) ); |
706 | item( row, 2 )->setText( strTodo ); | 520 | item( row, 2 )->setText( strTodo ); |
707 | todoList.insert( static_cast<CheckItem*>(item(row,0)), new Task(todo) ); | 521 | todoList.insert( static_cast<CheckItem*>(item(row,0)), new ToDoEvent(todo) ); |
708 | } | 522 | } |
709 | } | 523 | } |
710 | 524 | ||
@@ -814,7 +628,7 @@ int TodoTable::showCategoryId() const | |||
814 | return id; | 628 | return id; |
815 | } | 629 | } |
816 | 630 | ||
817 | static bool taskCompare( const Task &task, const QRegExp &r, int category ) | 631 | static bool taskCompare( const ToDoEvent &task, const QRegExp &r, int category ) |
818 | { | 632 | { |
819 | bool returnMe; | 633 | bool returnMe; |
820 | QArray<int> cats; | 634 | QArray<int> cats; |