From 8bfe366ce8667addc539f11fc560250c306340ae Mon Sep 17 00:00:00 2001 From: zecke Date: Thu, 21 Mar 2002 00:26:39 +0000 Subject: Move todolist to tododb Please test todolist --- (limited to 'core') diff --git a/core/pim/todo/mainwindow.cpp b/core/pim/todo/mainwindow.cpp index 6709811..f3afa5f 100644 --- a/core/pim/todo/mainwindow.cpp +++ b/core/pim/todo/mainwindow.cpp @@ -24,6 +24,9 @@ #include "todoentryimpl.h" #include "todotable.h" +#include +#include + #include #include #include @@ -32,7 +35,7 @@ #include #include #include -#include +//#include #include #include @@ -215,17 +218,17 @@ void TodoWindow::slotNew() id = ids[0]; NewTaskDialog e( id, this, 0, TRUE ); - Task todo; + ToDoEvent todo; #if defined(Q_WS_QWS) || defined(_WS_QWS_) e.showMaximized(); #endif int ret = e.exec(); - + qWarning("finished" ); if ( ret == QDialog::Accepted ) { table->setPaintingEnabled( false ); todo = e.todoEntry(); - todo.assignUid(); + //todo.assignUid(); table->addEntry( todo ); table->setPaintingEnabled( true ); findAction->setEnabled( TRUE ); @@ -275,7 +278,7 @@ void TodoWindow::slotEdit() return; } - Task todo = table->currentEntry(); + ToDoEvent todo = table->currentEntry(); NewTaskDialog e( todo, this, 0, TRUE ); e.setCaption( tr( "Edit Task" ) ); @@ -349,8 +352,7 @@ void TodoWindow::populateCategories() completedAction->addTo( catMenu ); completedAction->setOn( table->showCompleted() ); - int id, - rememberId; + int id, rememberId; id = 1; catMenu->insertItem( tr( "All Categories" ), id++ ); // catMenu->insertSeparator(); @@ -443,8 +445,9 @@ void TodoWindow::setDocument( const QString &filename ) { if ( filename.find(".vcs") != int(filename.length()) - 4 ) return; - QValueList tl = Task::readVCalendar( filename ); - for( QValueList::Iterator it = tl.begin(); it != tl.end(); ++it ) { + ToDoDB todoDB(filename, new ToDoVCalResource() ); + QValueList tl = todoDB.rawToDos(); + for( QValueList::Iterator it = tl.begin(); it != tl.end(); ++it ) { table->addEntry( *it ); } } @@ -454,9 +457,11 @@ static const char * beamfile = "/tmp/obex/todo.vcs"; void TodoWindow::slotBeam() { unlink( beamfile ); // delete if exists - Task c = table->currentEntry(); + ToDoEvent c = table->currentEntry(); mkdir("/tmp/obex/", 0755); - Task::writeVCalendar( beamfile, c ); + ToDoDB todoDB( beamfile, new ToDoVCalResource() ); + todoDB.addEvent( c ); + todoDB.save(); Ir *ir = new Ir( this ); connect( ir, SIGNAL( done( Ir * ) ), this, SLOT( beamDone( Ir * ) ) ); QString description = c.description(); diff --git a/core/pim/todo/todo.pro b/core/pim/todo/todo.pro index 18f70fe..7f9ddd5 100644 --- a/core/pim/todo/todo.pro +++ b/core/pim/todo/todo.pro @@ -14,7 +14,7 @@ INTERFACES = todoentry.ui TARGET = todolist INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include -LIBS += -lqpe +LIBS += -lqpe -lopie TRANSLATIONS = ../i18n/de/todolist.ts TRANSLATIONS += ../i18n/pt_BR/todolist.ts diff --git a/core/pim/todo/todoentryimpl.cpp b/core/pim/todo/todoentryimpl.cpp index c957715..1dc1d44 100644 --- a/core/pim/todo/todoentryimpl.cpp +++ b/core/pim/todo/todoentryimpl.cpp @@ -20,12 +20,15 @@ #include "todoentryimpl.h" +#include +#include + #include #include #include #include -#include #include +#include #include #include @@ -39,14 +42,15 @@ #include -NewTaskDialog::NewTaskDialog( const Task& task, QWidget *parent, +NewTaskDialog::NewTaskDialog( const ToDoEvent& task, QWidget *parent, const char *name, bool modal, WFlags fl ) : NewTaskDialogBase( parent, name, modal, fl ), todo( task ) { - todo.setCategories( task.categories() ); - if ( todo.hasDueDate() ) - date = todo.dueDate(); + qWarning("setting category" ); + todo.setCategory( task.category() ); + if ( todo.hasDate() ) + date = todo.date(); else date = QDate::currentDate(); @@ -54,7 +58,7 @@ NewTaskDialog::NewTaskDialog( const Task& task, QWidget *parent, comboPriority->setCurrentItem( task.priority() - 1 ); checkCompleted->setChecked( task.isCompleted() ); - checkDate->setChecked( task.hasDueDate() ); + checkDate->setChecked( task.hasDate() ); buttonDate->setText( TimeString::longDateString( date ) ); txtTodo->setText( task.description() ); @@ -75,7 +79,7 @@ NewTaskDialog::NewTaskDialog( int id, QWidget* parent, const char* name, bool m if ( id != -1 ) { QArray ids( 1 ); ids[0] = id; - todo.setCategories( ids ); + todo.setCategory( Qtopia::Record::idsToString( ids ) ); } init(); } @@ -100,6 +104,7 @@ void NewTaskDialog::init() */ 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 ) @@ -111,18 +116,29 @@ void NewTaskDialog::dateChanged( int y, int m, int d ) /*! */ -Task NewTaskDialog::todoEntry() +ToDoEvent NewTaskDialog::todoEntry() { - todo.setDueDate( date, checkDate->isChecked() ); - if ( comboCategory->currentCategory() != -1 ) { - todo.setCategories( comboCategory->currentCategories() ); - } - todo.setPriority( comboPriority->currentItem() + 1 ); - todo.setCompleted( checkCompleted->isChecked() ); - - todo.setDescription( txtTodo->text() ); - - return todo; + qWarning("todoEntry()" ); + if( checkDate->isChecked() ){ + todo.setDate( date ); + todo.setHasDate( true ); + }else{ + todo.setHasDate( false ); + } + qWarning("todoEntry::category()" ); + if ( comboCategory->currentCategory() != -1 ) { + QArray arr = comboCategory->currentCategories(); + int id = arr[0]; + qWarning("id 0: %d",id ); + todo.setCategory( Qtopia::Record::idsToString( arr ) ); + qWarning("saving category"); + } + todo.setPriority( comboPriority->currentItem() + 1 ); + todo.setCompleted( checkCompleted->isChecked() ); + + todo.setDescription( txtTodo->text() ); + + return todo; } @@ -132,6 +148,7 @@ Task 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 diff --git a/core/pim/todo/todoentryimpl.h b/core/pim/todo/todoentryimpl.h index 932d66e..6407eb4 100644 --- a/core/pim/todo/todoentryimpl.h +++ b/core/pim/todo/todoentryimpl.h @@ -23,7 +23,7 @@ #include "todoentry.h" -#include +#include #include #include @@ -37,13 +37,13 @@ class NewTaskDialog : public NewTaskDialogBase Q_OBJECT public: - NewTaskDialog( const Task &task, QWidget *parent = 0, const char* name = 0, + NewTaskDialog( const ToDoEvent &task, QWidget *parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); NewTaskDialog( int id, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~NewTaskDialog(); - Task todoEntry(); + ToDoEvent todoEntry(); protected slots: void dateChanged( int y, int m, int d ); @@ -53,7 +53,7 @@ protected: private: void init(); - Task todo; + ToDoEvent todo; QDate date; DateBookMonth *picker; }; 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 @@ #include "todotable.h" +#include #include #include @@ -39,7 +40,7 @@ -static bool taskCompare( const Task &task, const QRegExp &r, int category ); +static bool taskCompare( const ToDoEvent &task, const QRegExp &r, int category ); static QString journalFileName(); @@ -62,7 +63,7 @@ void CheckItem::setChecked( bool b ) void CheckItem::toggle() { TodoTable *parent = static_cast(table()); - Task newTodo = parent->currentEntry(); + ToDoEvent newTodo = parent->currentEntry(); checked = !checked; newTodo.setCompleted( checked ); table()->updateCell( row(), col() ); @@ -133,7 +134,7 @@ QWidget *ComboItem::createEditor() const void ComboItem::setContentFromEditor( QWidget *w ) { TodoTable *parent = static_cast(table()); - Task newTodo = parent->currentEntry(); + ToDoEvent newTodo = parent->currentEntry(); if ( w->inherits( "QComboBox" ) ) setText( ( (QComboBox*)w )->currentText() ); @@ -194,12 +195,12 @@ TodoTable::TodoTable( QWidget *parent, const char *name ) connect( menuTimer, SIGNAL(timeout()), this, SLOT(slotShowMenu()) ); } -void TodoTable::addEntry( const Task &todo ) +void TodoTable::addEntry( const ToDoEvent &todo ) { int row = numRows(); setNumRows( row + 1 ); updateJournal( todo, ACTION_ADD ); - insertIntoTable( new Task(todo), row ); + insertIntoTable( new ToDoEvent(todo), row ); setCurrentCell(row, currentColumn()); updateVisible(); } @@ -252,28 +253,28 @@ void TodoTable::slotCurrentChanged( int, int ) menuTimer->stop(); } -void TodoTable::internalAddEntries( QList &list ) +void TodoTable::internalAddEntries( QList &list ) { setNumRows( list.count() ); int row = 0; - Task *it; + ToDoEvent *it; for ( it = list.first(); it; it = list.next() ) insertIntoTable( it, row++ ); } -Task TodoTable::currentEntry() const +ToDoEvent TodoTable::currentEntry() const { QTableItem *i = item( currentRow(), 0 ); if ( !i || rowHeight( currentRow() ) <= 0 ) - return Task(); - Task *todo = todoList[(CheckItem*)i]; + 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 Task &todo, bool fromTableItem ) +void TodoTable::replaceCurrentEntry( const ToDoEvent &todo, bool fromTableItem ) { int row = currentRow(); updateJournal( todo, ACTION_REPLACE, row ); @@ -286,7 +287,7 @@ void TodoTable::replaceCurrentEntry( const Task &todo, bool fromTableItem ) void TodoTable::removeCurrentEntry() { - Task *oldTodo; + ToDoEvent *oldTodo; int row = currentRow(); CheckItem *chk; @@ -307,45 +308,22 @@ void TodoTable::removeCurrentEntry() bool TodoTable::save( const QString &fn ) { QString strNewFile = fn + ".new"; - QFile f( strNewFile ); - if ( !f.open( IO_WriteOnly|IO_Raw ) ) - return false; - - QString buf("\n\n"); - QCString str; - int total_written; - - for ( QMap::Iterator it = todoList.begin(); + QFile::remove( strNewFile ); // just to be sure + ToDoDB todoDB( strNewFile ); + for ( QMap::Iterator it = todoList.begin(); it != todoList.end(); ++it ) { if ( !item( it.key()->row(), 0 ) ) continue; - Task *todo = *it; + 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() ); - buf += "save( buf ); - buf += " />\n"; - str = buf.utf8(); - total_written = f.writeBlock( str.data(), str.length() ); - if ( total_written != int(str.length()) ) { - f.close(); - QFile::remove( strNewFile ); - return false; - } - buf = ""; - } - - buf += "\n"; - str = buf.utf8(); - total_written = f.writeBlock( str.data(), str.length() ); - if ( total_written != int(str.length()) ) { - f.close(); - QFile::remove( strNewFile ); - return false; + todoDB.addEvent( *todo ); } - f.close(); - + 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", @@ -380,7 +358,7 @@ void TodoTable::updateVisible() int id = mCat.id( "Todo List", showCat ); for ( int row = 0; row < numRows(); row++ ) { CheckItem *ci = (CheckItem *)item( row, 0 ); - Task *t = todoList[ci]; + ToDoEvent *t = todoList[ci]; QArray vlCats = t->categories(); bool hide = false; if ( !showComp && ci->isChecked() ) @@ -440,9 +418,9 @@ void TodoTable::setPaintingEnabled( bool e ) void TodoTable::clear() { - for ( QMap::Iterator it = todoList.begin(); + for ( QMap::Iterator it = todoList.begin(); it != todoList.end(); ++it ) { - Task *todo = *it; + ToDoEvent *todo = *it; delete todo; } todoList.clear(); @@ -477,7 +455,7 @@ void TodoTable::slotCheckPriority(int row, int col ) } -void TodoTable::updateJournal( const Task &todo, journal_action action, int row ) +void TodoTable::updateJournal( const ToDoEvent &todo, journal_action action, int row ) { QFile f( journalFileName() ); if ( !f.open(IO_WriteOnly|IO_Append) ) @@ -485,7 +463,7 @@ void TodoTable::updateJournal( const Task &todo, journal_action action, int row QString buf; QCString str; buf = " dict( 31 ); - QList list; - dict.setAutoDelete( TRUE ); - dict.insert( "Completed", new int(FCompleted) ); - dict.insert( "HasDate", new int(FHasDate) ); - dict.insert( "Priority", new int(FPriority) ); - dict.insert( "Categories", new int(FCategories) ); - dict.insert( "Description", new int(FDescription) ); - dict.insert( "DateYear", new int(FDateYear) ); - dict.insert( "DateMonth", new int(FDateMonth) ); - dict.insert( "DateDay", new int(FDateDay) ); - dict.insert( "Uid", new int(FUid) ); - dict.insert( "Action", new int(FAction) ); - dict.insert( "Row", new int(FRow) ); - - QByteArray ba = f.readAll(); - f.close(); - char* dt = ba.data(); - int len = ba.size(); - bool hasDueDate = FALSE; - - action = ACTION_ADD; - int i = 0; - char *point; - while ( ( point = strstr( dt+i, "= len-2 || (dt[i] == '/' && dt[i+1] == '>') ) - break; - // we have another attribute, read it. - int j = i; - while ( j < len && dt[j] != '=' ) - ++j; - char *attr = dt+i; - dt[j] = '\0'; - i = ++j; // skip = - while ( i < len && dt[i] != '"' ) - ++i; - j = ++i; - bool haveUtf = FALSE; - bool haveEnt = FALSE; - while ( j < len && dt[j] != '"' ) { - if ( ((unsigned char)dt[j]) > 0x7f ) - haveUtf = TRUE; - if ( dt[j] == '&' ) - haveEnt = TRUE; - ++j; - } - if ( i == j ) { - // empty value - i = j + 1; - continue; - } - QCString value( dt+i, j-i+1 ); - i = j + 1; - int *lookup = dict[ attr ]; - if ( !lookup ) { - todo->setCustomField(attr, value); - continue; - } - switch( *lookup ) { - case FCompleted: - todo->setCompleted( value.toInt() ); - break; - case FHasDate: - // leave... - hasDueDate = value.toInt(); - break; - case FPriority: - todo->setPriority( value.toInt() ); - break; - case FCategories: { - //QString str = Qtopia::plainString( value ); - todo->setCategories( Qtopia::Record::idsFromString( value ) ); - break; - } - case FDescription: - { - QString str = (haveUtf ? QString::fromUtf8( value ) - : QString::fromLatin1( value ) ); - if ( haveEnt ) - str = Qtopia::plainString( str ); - todo->setDescription( str ); - break; - } - case FDateYear: - dtY = value.toInt(); - break; - case FDateMonth: - dtM = value.toInt(); - break; - case FDateDay: - dtD = value.toInt(); - break; - case FUid: - todo->setUid( value.toInt() ); - break; - case FAction: - action = value.toInt(); - break; - case FRow: - row = value.toInt(); - break; - default: - qDebug( "huh??? missing enum? -- attr.: %s", attr ); - break; - } - } - - if ( dtY != 0 && dtM != 0 && dtD != 0 ) - todo->setDueDate( QDate( dtY, dtM, dtD), hasDueDate ); - else - todo->setHasDueDate( hasDueDate ); - -// if ( categoryList.find( todo.category() ) == categoryList.end() ) -// categoryList.append( todo.category() ); - - // sadly we can't delay adding of items from the journal to get - // the proper effect, but then, the journal should _never_ be - // that huge - - switch( action ) { - case ACTION_ADD: - if ( fromJournal ) { - int myrows = numRows(); - setNumRows( myrows + 1 ); - insertIntoTable( todo, myrows ); - delete todo; - } else - list.append( todo ); - break; - case ACTION_REMOVE: - journalFreeRemoveEntry( row ); - break; - case ACTION_REPLACE: - journalFreeReplaceEntry( *todo, row ); - delete todo; - break; - default: - break; - } - } -// qDebug("parsing done=%d", t.elapsed() ); - if ( list.count() > 0 ) { - internalAddEntries( list ); - list.clear(); - } + QList list; + ToDoDB todoDB; + QValueList vaList = todoDB.rawToDos(); + for(QValueList::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 Task &todo, int row ) +void TodoTable::journalFreeReplaceEntry( const ToDoEvent &todo, int row ) { QString strTodo; strTodo = todo.description().left(40).simplifyWhiteSpace(); if ( row == -1 ) { - QMapIterator it; + QMapIterator it; for ( it = todoList.begin(); it != todoList.end(); ++it ) { if ( *(*it) == todo ) { row = it.key()->row(); @@ -698,13 +512,13 @@ void TodoTable::journalFreeReplaceEntry( const Task &todo, int row ) } } } else { - Task *t = todoList[static_cast(item(row, 0))]; + ToDoEvent *t = todoList[static_cast(item(row, 0))]; todoList.remove( static_cast(item(row, 0)) ); delete t; static_cast(item(row, 0))->setChecked( todo.isCompleted() ); static_cast(item(row, 1))->setText( QString::number(todo.priority()) ); item( row, 2 )->setText( strTodo ); - todoList.insert( static_cast(item(row,0)), new Task(todo) ); + todoList.insert( static_cast(item(row,0)), new ToDoEvent(todo) ); } } @@ -814,7 +628,7 @@ int TodoTable::showCategoryId() const return id; } -static bool taskCompare( const Task &task, const QRegExp &r, int category ) +static bool taskCompare( const ToDoEvent &task, const QRegExp &r, int category ) { bool returnMe; QArray cats; diff --git a/core/pim/todo/todotable.h b/core/pim/todo/todotable.h index 4f3a064..2746ce7 100644 --- a/core/pim/todo/todotable.h +++ b/core/pim/todo/todotable.h @@ -23,7 +23,8 @@ #include #include -#include +//#include +#include #include #include @@ -86,11 +87,11 @@ class TodoTable : public QTable public: TodoTable( QWidget *parent = 0, const char * name = 0 ); - void addEntry( const Task &todo ); + void addEntry( const ToDoEvent &todo ); void clearFindRow() { currFindRow = -2; } - Task currentEntry() const; - void replaceCurrentEntry( const Task &todo, bool fromTableItem = false ); + ToDoEvent currentEntry() const; + void replaceCurrentEntry( const ToDoEvent &todo, bool fromTableItem = false ); QStringList categories(); @@ -128,11 +129,11 @@ protected: private: void updateVisible(); void viewportPaintEvent( QPaintEvent * ); - void internalAddEntries( QList &list); - inline void insertIntoTable( Task *todo, int row ); - void updateJournal( const Task &todo, journal_action action, int row = -1); + void internalAddEntries( QList &list); + inline void insertIntoTable( ToDoEvent *todo, int row ); + void updateJournal( const ToDoEvent &todo, journal_action action, int row = -1); void mergeJournal(); - void journalFreeReplaceEntry( const Task &todo, int row ); + void journalFreeReplaceEntry( const ToDoEvent &todo, int row ); void journalFreeRemoveEntry( int row ); inline void realignTable( int row ); void loadFile( const QString &strFile, bool fromJournal = false ); @@ -150,7 +151,7 @@ private slots: private: friend class TodoWindow; - QMap todoList; + QMap todoList; QStringList categoryList; bool showComp; QString showCat; @@ -161,7 +162,7 @@ private: }; -inline void TodoTable::insertIntoTable( Task *todo, int row ) +inline void TodoTable::insertIntoTable( ToDoEvent *todo, int row ) { QString sortKey = (char) ((todo->isCompleted() ? 'a' : 'A') + todo->priority() ) -- cgit v0.9.0.2