vCal Resource for the tododb

7 files changed, 175 insertions, 7 deletions

diff --git a/core/pim/todo/mainwindow.cpp b/core/pim/todo/mainwindow.cpp
index fb85a09..6709811 100644
--- a/core/pim/todo/mainwindow.cpp
+++ b/core/pim/todo/mainwindow.cpp
@@ -1,229 +1,233 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
+#define QTOPIA_INTERNAL_FD
+
 #include "mainwindow.h"
 #include "todoentryimpl.h"
 #include "todotable.h"
 
 #include <qpe/qpeapplication.h>
 #include <qpe/config.h>
 #include <qpe/finddialog.h>
 #include <qpe/global.h>
 #include <qpe/ir.h>
 #include <qpe/qpemenubar.h>
 #include <qpe/qpemessagebox.h>
 #include <qpe/resource.h>
 #include <qpe/task.h>
 #include <qpe/qpetoolbar.h>
 
 #include <qaction.h>
 #include <qarray.h>
 #include <qdatastream.h>
 #include <qdatetime.h>
 #include <qfile.h>
 #include <qmessagebox.h>
 #include <qpopupmenu.h>
 
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <fcntl.h>
 #include <unistd.h>
 
 #include <stdlib.h>
 
 static QString todolistXMLFilename()
 {
     return Global::applicationFileName("todolist","todolist.xml");
 }
 
 static QString categoriesXMLFilename()
 {
     return Global::applicationFileName("todolist","categories.xml");
 }
 
 TodoWindow::TodoWindow( QWidget *parent, const char *name, WFlags f = 0 ) :
     QMainWindow( parent, name, f ), syncing(FALSE)
 {
 //     QTime t;
 //     t.start();
     
     setCaption( tr("Todo") );
     QString str;
     table = new TodoTable( this );
     table->setColumnWidth( 2, 10 );
     table->setPaintingEnabled( FALSE );
     table->setUpdatesEnabled( FALSE );
     table->viewport()->setUpdatesEnabled( FALSE );
 
     {
         str = todolistXMLFilename();
         if ( str.isNull() )
             QMessageBox::critical( this,
                                    tr("Out of Space"),
                                    tr("Unable to create startup files\n"
                                       "Free up some space\n"
                                       "before you enter any data") );
         else
             table->load( str );
     }
 
     // repeat for categories...
     str = categoriesXMLFilename();
     if ( str.isNull() )
         QMessageBox::critical( this,
                                tr( "Out of Space" ),
                                tr( "Unable to create startup files\n"
                                    "Free up some space\n"
                                    "before you enter any data") );
 
     setCentralWidget( table );
     setToolBarsMovable( FALSE );
 
 //     qDebug("after load: t=%d", t.elapsed() );
     
     Config config( "todo" );
     config.setGroup( "View" );
     bool complete = config.readBoolEntry( "ShowComplete", true );
     table->setShowCompleted( complete );
     QString category = config.readEntry( "Category", QString::null );
     table->setShowCategory( category );
 
     QPEToolBar *bar = new QPEToolBar( this );
     bar->setHorizontalStretchable( TRUE );
 
     QPEMenuBar *mb = new QPEMenuBar( bar );
 
     catMenu = new QPopupMenu( this );
     QPopupMenu *edit = new QPopupMenu( this );
     contextMenu = new QPopupMenu( this );
 
     bar = new QPEToolBar( this );
 
     QAction *a = new QAction( tr( "New Task" ), Resource::loadPixmap( "new" ),
                               QString::null, 0, this, 0 );
     connect( a, SIGNAL( activated() ),
              this, SLOT( slotNew() ) );
     a->addTo( bar );
     a->addTo( edit );
+
     a = new QAction( tr( "Edit" ), Resource::loadIconSet( "edit" ),
                      QString::null, 0, this, 0 );
     connect( a, SIGNAL( activated() ),
              this, SLOT( slotEdit() ) );
     a->addTo( bar );
     a->addTo( edit );
     a->addTo( contextMenu );
     a->setEnabled( FALSE );
     editAction = a;
+
     a = new QAction( tr( "Delete" ), Resource::loadIconSet( "trash" ),
                      QString::null, 0, this, 0 );
     connect( a, SIGNAL( activated() ),
              this, SLOT( slotDelete() ) );
     a->addTo( bar );
     a->addTo( edit );
     a->addTo( contextMenu );
     a->setEnabled( FALSE );
     deleteAction = a;
 
     if ( Ir::supported() ) {
         a = new QAction( tr( "Beam" ), Resource::loadPixmap( "beam" ),
                          QString::null, 0, this, 0 );
         connect( a, SIGNAL( activated() ),
                  this, SLOT( slotBeam() ) );
         a->addTo( edit );
         a->addTo( bar );
     }
 
     a = new QAction( tr( "Find" ), Resource::loadIconSet( "mag" ),
                      QString::null, 0, this, 0 );
     connect( a, SIGNAL( activated() ),
              this, SLOT( slotFind() ) );
     a->addTo( bar );
     a->addTo( edit );
     if ( table->numRows() )
         a->setEnabled( TRUE );
     else
         a->setEnabled( FALSE );
 
     //a->setEnabled( FALSE );
     findAction = a;
 //     qDebug("mainwindow #2: t=%d", t.elapsed() );
 
     completedAction = new QAction( QString::null, tr("Completed tasks"), 0, this, 0, TRUE );
 
     catMenu->setCheckable( true );
     populateCategories();
 
     mb->insertItem( tr( "Task" ), edit );
     mb->insertItem( tr( "View" ), catMenu );
 
     resize( 200, 300 );
     if ( table->numRows() > 0 )
         currentEntryChanged( 0, 0 );
     connect( table, SIGNAL( signalEdit() ),
              this, SLOT( slotEdit() ) );
     connect( table, SIGNAL(signalShowMenu(const QPoint &)),
              this, SLOT( slotShowPopup(const QPoint &)) );
 
 //     qDebug("mainwindow #3: t=%d", t.elapsed() );
     table->updateVisible();
     table->setUpdatesEnabled( TRUE );
     table->setPaintingEnabled( TRUE );
     table->viewport()->setUpdatesEnabled( TRUE );
 
     connect( completedAction, SIGNAL( toggled(bool) ), this, SLOT( showCompleted(bool) ) );
     connect( catMenu, SIGNAL(activated(int)), this, SLOT(setCategory(int)) );
     connect( table, SIGNAL( currentChanged( int, int ) ),
              this, SLOT( currentEntryChanged( int, int ) ) );
 
 //     qDebug("done: t=%d", t.elapsed() );
 }
 
 void TodoWindow::slotNew()
 {
     if(syncing) {
         QMessageBox::warning(this, tr("Todo"),
                              tr("Can not edit data, currently syncing"));
         return;
     }
 
     int id;
     id = -1;
     QArray<int> ids;
     ids = table->currentEntry().categories();
     if ( ids.count() )
         id = ids[0];
     NewTaskDialog e( id, this, 0, TRUE );
 
     Task todo;
 
 #if defined(Q_WS_QWS) || defined(_WS_QWS_)
     e.showMaximized();
 #endif
     int ret = e.exec();
 
     if ( ret == QDialog::Accepted ) {
         table->setPaintingEnabled( false );
         todo = e.todoEntry();
         todo.assignUid();
         table->addEntry( todo );
         table->setPaintingEnabled( true );
         findAction->setEnabled( TRUE );
     }
     // I'm afraid we must call this every time now, otherwise
@@ -233,215 +237,215 @@ void TodoWindow::slotNew()
 
 TodoWindow::~TodoWindow()
 {
 }
 
 void TodoWindow::slotDelete()
 {
     if(syncing) {
         QMessageBox::warning(this, tr("Todo"),
                              tr("Can not edit data, currently syncing"));
         return;
     }
 
     if ( table->currentRow() == -1 )
         return;
 
     QString strName = table->text( table->currentRow(), 2 ).left( 30 );
 
     if ( !QPEMessageBox::confirmDelete( this, tr( "Todo" ), strName ) )
         return;
 
 
 
     table->setPaintingEnabled( false );
     table->removeCurrentEntry();
     table->setPaintingEnabled( true );
 
     if ( table->numRows() == 0 ) {
         currentEntryChanged( -1, 0 );
         findAction->setEnabled( FALSE );
     }
 }
 
 void TodoWindow::slotEdit()
 {
     if(syncing) {
         QMessageBox::warning(this, tr("Todo"),
                              tr("Can not edit data, currently syncing"));
         return;
     }
 
     Task todo = table->currentEntry();
 
     NewTaskDialog e( todo, this, 0, TRUE );
     e.setCaption( tr( "Edit Task" ) );
 
 #if defined(Q_WS_QWS) || defined(_WS_QWS_)
     e.showMaximized();
 #endif
     int ret = e.exec();
 
     if ( ret == QDialog::Accepted ) {
         table->setPaintingEnabled( false );
         todo = e.todoEntry();
         table->replaceCurrentEntry( todo );
         table->setPaintingEnabled( true );
     }
     populateCategories();
 
 }
 
 void TodoWindow::slotShowPopup( const QPoint &p )
 {
     contextMenu->popup( p );
 }
 
 void TodoWindow::showCompleted( bool s )
 {
     if ( !table->isUpdatesEnabled() )
         return;
     table->setPaintingEnabled( false );
     table->setShowCompleted( s );
     table->setPaintingEnabled( true );
 }
 
 void TodoWindow::currentEntryChanged( int r, int )
 {
     if ( r != -1 && table->rowHeight( r ) > 0 ) {
         editAction->setEnabled( TRUE );
         deleteAction->setEnabled( TRUE );
     } else {
         editAction->setEnabled( FALSE );
         deleteAction->setEnabled( FALSE );
     }
 }
 
 void TodoWindow::setCategory( int c )
 {
     if ( c <= 0 ) return;
     if ( !table->isUpdatesEnabled() )
         return; 
    table->setPaintingEnabled( false );
     for ( unsigned int i = 1; i < catMenu->count(); i++ )
         catMenu->setItemChecked( i, c == (int)i );
     if ( c == 1 ) {
         table->setShowCategory( QString::null );
-        setCaption( tr("Todo") + " - " + tr( "All" ) );
+        setCaption( tr("Todo") + " - " + tr( "All Categories" ) );
     } else if ( c == (int)catMenu->count() - 1 ) {
         table->setShowCategory( tr( "Unfiled" ) );
         setCaption( tr("Todo") + " - " + tr( "Unfiled" ) );
     } else {
         QString cat = table->categories()[c - 2];
         table->setShowCategory( cat );
         setCaption( tr("Todo") + " - " + cat );
     }
     table->setPaintingEnabled( true );
 }
 
 void TodoWindow::populateCategories()
 {
     catMenu->clear();
 
     completedAction->addTo( catMenu );
     completedAction->setOn( table->showCompleted() );
 
     int id,
         rememberId;
     id = 1;
-    catMenu->insertItem( tr( "All" ), id++ );
+    catMenu->insertItem( tr( "All Categories" ), id++ );
 //    catMenu->insertSeparator();
     QStringList categories = table->categories();
     categories.append( tr( "Unfiled" ) );
     for ( QStringList::Iterator it = categories.begin();
           it != categories.end(); ++it ) {
         catMenu->insertItem( *it, id );
         if ( *it == table->showCategory() )
             rememberId = id;
         ++id;
     }
     if ( table->showCategory().isEmpty() )
         setCategory( 1 );
     else
         setCategory( rememberId );
 }
 
 void TodoWindow::reload()
 {
     table->clear();
     table->load( todolistXMLFilename() );
     syncing = FALSE;
 }
 
 void TodoWindow::flush()
 {
     syncing = TRUE;
     table->save( todolistXMLFilename() );
 }
 
 void TodoWindow::closeEvent( QCloseEvent *e )
 {
     if(syncing) {
         /* no need to save if in the middle of syncing */
         e->accept();
         return;
     }
 
     if ( table->save( todolistXMLFilename() ) ) {
         e->accept();
             // repeat for categories...
         // if writing configs fail, it will emit an
         // error, but I feel that it is "ok" for us to exit
         // espically since we aren't told if the write succeeded...
         Config config( "todo" );
         config.setGroup( "View" );
         config.writeEntry( "ShowComplete", table->showCompleted() );
         config.writeEntry( "Category", table->showCategory() );
     } else {
         if ( QMessageBox::critical( this, tr("Out of space"),
                                     tr("Todo was unable\n"
                                        "to save your changes.\n"
                                        "Free up some space\n"
                                        "and try again.\n"
                                        "\nQuit Anyway?"),
                                     QMessageBox::Yes|QMessageBox::Escape,
                                     QMessageBox::No|QMessageBox::Default)
              != QMessageBox::No )
             e->accept();
         else
             e->ignore();
     }
 }
 
 void TodoWindow::slotFind()
 {
     // put everything back to view all for searching...
     if ( !catMenu->isItemChecked( 0 ) )
         setCategory( 0 );
 
     FindDialog dlg( "Todo List",  this );
     QObject::connect( &dlg,
                       SIGNAL(signalFindClicked(const QString &,
                                                bool, bool, int)),
                       table,
                       SLOT(slotDoFind(const QString&, bool, bool, int)) );
     QObject::connect( table, SIGNAL(signalNotFound()), &dlg,
                       SLOT(slotNotFound()) );
     QObject::connect( table, SIGNAL(signalWrapAround()), &dlg,
                       SLOT(slotWrapAround()) );
     dlg.exec();
     if ( table->numSelections() )
         table->clearSelection();
     table->clearFindRow();
 }
 
 
 void TodoWindow::setDocument( const QString &filename )
 {
     if ( filename.find(".vcs") != int(filename.length()) - 4 ) return;
 
     QValueList<Task> tl = Task::readVCalendar( filename );
     for( QValueList<Task>::Iterator it = tl.begin(); it != tl.end(); ++it ) {
         table->addEntry( *it );
     }
 }
 
diff --git a/core/pim/todo/mainwindow.h b/core/pim/todo/mainwindow.h
index f4fcd1b..856dcb4 100644
--- a/core/pim/todo/mainwindow.h
+++ b/core/pim/todo/mainwindow.h
@@ -1,73 +1,74 @@
 /**********************************************************************
+   Copyright (C) 2002 Holger 'zecke' Freyther <freyther@kde.org>
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of Qtopia and Opi Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
 #include <qmainwindow.h>
 
 class TodoTable;
 class QAction;
 class QPopupMenu;
 class Ir;
 
 class TodoWindow : public QMainWindow
 {
     Q_OBJECT
 
 public:
     TodoWindow( QWidget *parent = 0, const char *name = 0, WFlags f = 0 );
     ~TodoWindow();
 
 public slots:
     void flush();
     void reload();
 
 protected slots:
     void slotNew();
     void slotDelete();
     void slotEdit();
     void slotShowPopup( const QPoint & );
     void showCompleted( bool );
     void currentEntryChanged( int r, int c );
     void setCategory( int );
     void slotFind();
     void setDocument( const QString & );
     void slotBeam();
     void beamDone( Ir * );
     
 protected:
     void closeEvent( QCloseEvent *e );
 
 private:
     void populateCategories();
 
 private:
     TodoTable *table;
     QAction *editAction,
             *deleteAction,
         *findAction,
         * completedAction;
     QPopupMenu *contextMenu, *catMenu;
 
     bool syncing;
 };
 
 #endif
diff --git a/core/pim/todo/todoentryimpl.cpp b/core/pim/todo/todoentryimpl.cpp
index 79206de..c957715 100644
--- a/core/pim/todo/todoentryimpl.cpp
+++ b/core/pim/todo/todoentryimpl.cpp
@@ -40,103 +40,103 @@
 
 
 NewTaskDialog::NewTaskDialog( const Task& 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();
     else
         date = QDate::currentDate();
 
     init();
     comboPriority->setCurrentItem( task.priority() - 1 );
 
     checkCompleted->setChecked( task.isCompleted() );
     checkDate->setChecked( task.hasDueDate() );
     buttonDate->setText( TimeString::longDateString( date ) );
 
     txtTodo->setText( task.description() );
 }
 
 /*
  *  Constructs a NewTaskDialog which is a child of 'parent', with the
  *  name 'name' and widget flags set to 'f'
  *
  *  The dialog will by default be modeless, unless you set 'modal' to
  *  TRUE to construct a modal dialog.
  */
 NewTaskDialog::NewTaskDialog( int id, QWidget* parent,  const char* name, bool modal,
                               WFlags fl )
     : NewTaskDialogBase( parent, name, modal, fl ),
       date( QDate::currentDate() )
 {
     if ( id != -1 ) {
         QArray<int> ids( 1 );
         ids[0] = id;
         todo.setCategories( ids );
     }
     init();
 }
 
 void NewTaskDialog::init()
 {
     QPopupMenu *m1 = new QPopupMenu( this );
     picker = new DateBookMonth( m1, 0, TRUE );
     m1->insertItem( picker );
     buttonDate->setPopup( m1 );
     comboCategory->setCategories( todo.categories(), "Todo List", tr("Todo List") );
 
     connect( picker, SIGNAL( dateClicked( int, int, int ) ),
              this, SLOT( dateChanged( int, int, int ) ) );
 
     buttonDate->setText( TimeString::longDateString( date ) );
     picker->setDate( date.year(), date.month(), date.day() );
 }
 
 /*
  *  Destroys the object and frees any allocated resources
  */
 NewTaskDialog::~NewTaskDialog()
 {
     // no need to delete child widgets, Qt does it all for us
 }
 void NewTaskDialog::dateChanged( int y, int m, int d )
 {
     date = QDate( y, m, d );
     buttonDate->setText( TimeString::longDateString( date ) );
 }
 
 /*!
 */
 
 Task 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;
 }
 
 
 /*!
 
 */
 
 void NewTaskDialog::accept()
 {
     QString strText = txtTodo->text();
-    if ( !strText || strText == "") {
+    if ( strText.isEmpty() ) {
        // hmm... just decline it then, the user obviously didn't care about it
        QDialog::reject();
        return;
     }
     QDialog::accept();
 }
diff --git a/libopie/libopie.pro b/libopie/libopie.pro
index fb00422..1c0bf7b 100644
--- a/libopie/libopie.pro
+++ b/libopie/libopie.pro
@@ -1,7 +1,7 @@
 TEMPLATE        = lib
 CONFIG          += qte warn_on release
         HEADERS = $(OPIEDIR)/include/opie/xmltree.h
-        SOURCES         = xmltree.cc tododb.cpp todoevent.cpp
+        SOURCES         = xmltree.cc tododb.cpp todoevent.cpp todovcalresource.cpp
         TARGET  = opie
 INCLUDEPATH += $(OPIEDIR)/include
 DESTDIR         = $(QTDIR)/lib$(PROJMAK)
diff --git a/libopie/tododb.cpp b/libopie/tododb.cpp
index b1b35d0..f9756c6 100644
--- a/libopie/tododb.cpp
+++ b/libopie/tododb.cpp
@@ -45,173 +45,181 @@ public:
       tasks->save(stream );
       delete tasks;
       file.close();
       return true;
     }
     return false;
   }
   QValueList<ToDoEvent> load( const QString &name ){
     qWarning("loading tododb" );
     QValueList<ToDoEvent> m_todos;
     XMLElement *root = XMLElement::load( name );
     if(root != 0l ){ // start parsing
       qWarning("ToDoDB::load tagName(): %s", root->tagName().latin1()  );
         //if( root->tagName() == QString::fromLatin1("Tasks" ) ){// Start
       XMLElement *element = root->firstChild();
       element = element->firstChild();
       while( element ){
         qWarning("ToDoDB::load element tagName() : %s", element->tagName().latin1() );
         QString dummy;
         ToDoEvent event;
         bool ok;
         int dumInt;
         // completed
         dummy = element->attribute("Completed" );
         dumInt = dummy.toInt(&ok );
         if(ok ) event.setCompleted( dumInt == 0 ? false : true );
         // hasDate
         dummy = element->attribute("HasDate" );
         dumInt = dummy.toInt(&ok );
         if(ok ) event.setHasDate( dumInt == 0 ? false: true );
         // set the date
         bool hasDa = dumInt;
         if ( hasDa ) { //parse the date
           int year, day, month = 0;
           year = day = month;
           // year
           dummy = element->attribute("DateYear" );
           dumInt = dummy.toInt(&ok );
           if( ok ) year = dumInt;
           // month
           dummy = element->attribute("DateMonth" );
           dumInt = dummy.toInt(&ok );
           if(ok ) month = dumInt;
           dummy = element->attribute("DateDay" );
           dumInt = dummy.toInt(&ok );
           if(ok ) day = dumInt;
           // set the date
           QDate date( year, month, day );
           event.setDate( date);
         }
         dummy = element->attribute("Priority" );
         dumInt = dummy.toInt(&ok );
         if(!ok ) dumInt = ToDoEvent::NORMAL;
         event.setPriority( dumInt );
         //description
         dummy = element->attribute("Description" );
         event.setDescription( dummy );
         // category
         dummy = element->attribute("Categories" );
         dumInt = dummy.toInt(&ok );
         if(ok ) {
           QArray<int> arrat(1);
           arrat[0] = dumInt;
           event.setCategory( Qtopia::Record::idsToString( arrat ) );
         }
         //uid
         dummy = element->attribute("Uid" );
         dumInt = dummy.toInt(&ok );
         if(ok ) event.setUid( dumInt );
         m_todos.append( event );
         element = element->nextChild(); // next element
       }
       //}
     }else {
       qWarning("could not load" );
     }
     delete root;
     qWarning("returning" );
     return m_todos;
   }
 };
 
 }
 
 ToDoDB::ToDoDB(const QString &fileName = QString::null, ToDoResource *res ){
     m_fileName = fileName;
     if( fileName.isEmpty() && res == 0 ){
         m_fileName = Global::applicationFileName("todolist","todolist.xml");
         res = new FileToDoResource();
         //qWarning("%s", m_fileName.latin1() );
     }else if(res == 0 ){ // let's create a ToDoResource for xml
       res = new FileToDoResource();
     }
     m_res = res;
     load();
 }
+ToDoResource* ToDoDB::resource(){
+  return m_res;
+};
+void ToDoDB::setResource( ToDoResource *res )
+{
+  delete m_res;
+  m_res = res;
+}
 ToDoDB::~ToDoDB()
 {
   delete m_res;
 }
 QValueList<ToDoEvent> ToDoDB::effectiveToDos(const QDate &from, const QDate &to,
                                              bool all )
 {
     QValueList<ToDoEvent> events;
     for( QValueList<ToDoEvent>::Iterator it = m_todos.begin(); it!= m_todos.end(); ++it ){
         if( (*it).hasDate() ){
             if( (*it).date() >= from && (*it).date() <= to )
                 events.append( (*it) );
         }else if( all ){
             events.append( (*it) );
         }
     }
     return events;
 }
 QValueList<ToDoEvent> ToDoDB::effectiveToDos(const QDate &from,
                                              bool all)
 {
     return effectiveToDos( from, QDate::currentDate(), all );
 }
 QValueList<ToDoEvent> ToDoDB::overDue()
 {
     QValueList<ToDoEvent> events;
     for( QValueList<ToDoEvent>::Iterator it = m_todos.begin(); it!= m_todos.end(); ++it ){   
         if( (*it).isOverdue() )
             events.append((*it) );
     }
     return events;
 }
 QValueList<ToDoEvent> ToDoDB::rawToDos()
 {
     return m_todos;
 }
 void ToDoDB::addEvent( const ToDoEvent &event )
 {
     m_todos.append( event );
 }
 void ToDoDB::editEvent( const ToDoEvent &event )
 {
     m_todos.remove( event );
     m_todos.append( event );
 }
 void ToDoDB::removeEvent( const ToDoEvent &event )
 {
     m_todos.remove( event );
 }
 void ToDoDB::reload()
 {
     load();
 }
 void ToDoDB::setFileName(const QString &file )
 {
     m_fileName =file;
 }
 QString ToDoDB::fileName()const
 {
     return m_fileName;
 }
 void ToDoDB::load()
 {
   m_todos = m_res->load( m_fileName );    
 }
 bool ToDoDB::save()
 {
   return m_res->save( m_fileName, m_todos );
 }
 
 
 
 
 
 
 
 
diff --git a/libopie/todoevent.cpp b/libopie/todoevent.cpp
index 4cfe1c0..5fa4472 100644
--- a/libopie/todoevent.cpp
+++ b/libopie/todoevent.cpp
@@ -1,150 +1,152 @@
 
 #include <opie/todoevent.h>
 #include <qpe/palmtopuidgen.h>
+#include <qpe/stringutil.h>
+//#include <qpe/palmtoprecord.h>
 
 ToDoEvent::ToDoEvent(bool completed, int priority, const QString &category, 
                const QString &description, bool hasDate, QDate date, int uid )
 {
     qWarning("todoEvent c'tor" );
     m_date = date;
     m_isCompleted = completed;
     m_hasDate = hasDate;
     m_priority = priority;
     m_category = category;
-    m_desc = description;
+    m_desc = Qtopia::simplifyMultiLineSpace(description );
     if (uid == -1 ) {
         Qtopia::UidGen *uidgen = new Qtopia::UidGen();
         uid = uidgen->generate();
         delete uidgen;
     }// generate the ids
     m_uid = uid; 
 }
 bool ToDoEvent::isCompleted() const
 {
     return m_isCompleted;
 }
 bool ToDoEvent::hasDate() const
 {
     return m_hasDate;
 }
 int ToDoEvent::priority()const
 {
     return m_priority;
 }
 QString ToDoEvent::category()const
 {
     return m_category;
 }
 QDate ToDoEvent::date()const
 {
     return m_date;
 }
 QString ToDoEvent::description()const
 {
     return m_desc;
 }
 void ToDoEvent::setCompleted( bool completed )
 {
     m_isCompleted = completed;
 }
 void ToDoEvent::setHasDate( bool hasDate )
 {
     m_hasDate = hasDate;
 }
 void ToDoEvent::setDescription(const QString &desc )
 {
-    m_desc = desc;
+    m_desc = Qtopia::simplifyMultiLineSpace(desc );
 }
 void ToDoEvent::setCategory( const QString &cat )
 {
     m_category = cat;
 }
 void ToDoEvent::setPriority(int prio )
 {
     m_priority = prio;
 }
 void ToDoEvent::setDate( QDate date )
 {
     m_date = date;
 }
 bool ToDoEvent::isOverdue( )
 {
     if( m_hasDate )
         return QDate::currentDate() > m_date;
     return false;
 }
 bool ToDoEvent::operator<( const ToDoEvent &toDoEvent )const{
     if( !hasDate() && !toDoEvent.hasDate() ) return true;
     if( !hasDate() && toDoEvent.hasDate() ) return true;
     if( hasDate() && toDoEvent.hasDate() ){
         if( date() == toDoEvent.date() ){ // let's the priority decide
             return priority() < toDoEvent.priority();
         }else{
             return date() < toDoEvent.date();
         }
     }
     return false;
 }
 bool ToDoEvent::operator<=(const ToDoEvent &toDoEvent )const
 {
     if( !hasDate() && !toDoEvent.hasDate() ) return true;
     if( !hasDate() && toDoEvent.hasDate() ) return true;
     if( hasDate() && toDoEvent.hasDate() ){
         if( date() == toDoEvent.date() ){ // let's the priority decide
             return priority() <= toDoEvent.priority();
         }else{
             return date() <= toDoEvent.date();
         }
     }
     return true;
 }
 bool ToDoEvent::operator>(const ToDoEvent &toDoEvent )const
 {
     if( !hasDate() && !toDoEvent.hasDate() ) return false;
     if( !hasDate() && toDoEvent.hasDate() ) return false;
     if( hasDate() && toDoEvent.hasDate() ){
         if( date() == toDoEvent.date() ){ // let's the priority decide
             return priority() > toDoEvent.priority();
         }else{
             return date() > toDoEvent.date();
         }
     }
     return false;
 }
 bool ToDoEvent::operator>=(const ToDoEvent &toDoEvent )const
 {
     if( !hasDate() && !toDoEvent.hasDate() ) return true;
     if( !hasDate() && toDoEvent.hasDate() ) return false;
     if( hasDate() && toDoEvent.hasDate() ){
         if( date() == toDoEvent.date() ){ // let's the priority decide
             return priority() > toDoEvent.priority();
         }else{
             return date() > toDoEvent.date();
         }
     }
     return true;
 }
 bool ToDoEvent::operator==(const ToDoEvent &toDoEvent )const
 {
     if( m_date == toDoEvent.m_date && m_isCompleted == toDoEvent.m_isCompleted && m_hasDate == toDoEvent.m_hasDate && m_priority == toDoEvent.m_priority && m_category == toDoEvent.m_category && m_desc == toDoEvent.m_category )
         return true;
     return false;
 }
 ToDoEvent &ToDoEvent::operator=(const ToDoEvent &item )
 {
     m_date = item.m_date;
     m_isCompleted = item.m_isCompleted;
     m_hasDate = item.m_hasDate;
     m_priority = item.m_priority;
     m_category = item.m_category;
     m_desc = item.m_desc;
     return *this;
 }
 
 
 
 
 
 
 
 
diff --git a/libopie/todovcalresource.cpp b/libopie/todovcalresource.cpp
new file mode 100644
index 0000000..a6afe68
--- a/dev/null
+++ b/libopie/todovcalresource.cpp
@@ -0,0 +1,153 @@
+/*
+               =.            This file is part of the OPIE Project
+             .=l.      Copyright (c)  2002 Holger Freyther <freyther@kde.org>
+           .>+-=       the use of vobject was inspired by libkcal
+ _;:,     .>    :=|.         This library is free software; you can 
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.        
+    .i_,=:_.      -<s.       This library is distributed in the hope that  
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
+    : ..    .:,     . . .    without even the implied warranty of
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
+..}^=.=       =       ;      Library General Public License for more
+++=   -.     .`     .:       details.
+ :     =  ...= . :.=-        
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB. 
+                             If not, write to the Free Software Foundation,
+                             Inc., 59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+
+*/
+
+#include <qfile.h>
+#include <qvaluelist.h>
+#include <opie/todoevent.h>
+#include <opie/todovcalresource.h>
+
+#include "../library/backend/vobject_p.h"
+#include "../library/backend/timeconversion.h"
+#include "../library/backend/qfiledirect_p.h"
+
+static VObject *vobjByEvent( const ToDoEvent &event )
+{
+  VObject *task = newVObject( VCTodoProp );
+  if( task == 0 )
+    return 0l;
+  if( event.hasDate() )
+    addPropValue( task, VCDueProp, TimeConversion::toISO8601( event.date() ) );
+
+  if( event.isCompleted() )
+    addPropValue( task, VCStatusProp, "COMPLETED");
+
+  QString string = QString::number(event.priority() );
+  addPropValue( task, VCPriorityProp, string.local8Bit() );
+  addPropValue( task, VCCategoriesProp, event.category().local8Bit() );
+  addPropValue( task, VCDescriptionProp, event.description().local8Bit() );
+  addPropValue( task, VCSummaryProp, event.description().left(15).local8Bit() );
+  return task;
+};
+
+static ToDoEvent eventByVObj( VObject *obj ){
+  ToDoEvent event;
+  VObject *ob;
+  QCString name;
+  // no uid, attendees, ... and no fun
+  // description
+  if( ( ob = isAPropertyOf( obj, VCDescriptionProp )) != 0 ){
+    name = vObjectStringZValue( ob );
+    event.setDescription( name );
+  } 
+  // completed
+  if( ( ob = isAPropertyOf( obj, VCStatusProp )) != 0 ){
+    name = vObjectStringZValue( ob );
+    if( name == "COMPLETED" ){
+      event.setCompleted( true );
+    }else{
+      event.setCompleted( false );
+    }
+  }else
+    event.setCompleted( false );
+  // priority
+  if ((ob = isAPropertyOf(obj, VCPriorityProp))) {
+    name = vObjectStringZValue( ob );
+    bool ok;
+    event.setPriority(name.toInt(&ok) );
+  }
+  //due date
+  if((ob = isAPropertyOf(obj, VCDueProp)) ){
+    event.setHasDate( true );
+    name = vObjectStringZValue( ob );
+    event.setDate( TimeConversion::fromISO8601( name).date() );
+  } 
+  // categories
+  if((ob = isAPropertyOf( obj, VCCategoriesProp )) != 0 ){
+    name = vObjectStringZValue( ob );
+    qWarning("Categories:%s", name.data() );
+  }
+
+  return event;
+};
+
+
+QValueList<ToDoEvent> ToDoVCalResource::load(const QString &file) 
+{
+  QValueList<ToDoEvent> events;
+  VObject *vcal = 0l;
+  vcal = Parse_MIME_FromFileName( (char *)file.utf8().data()  ); // from vobject
+  if(!vcal )
+    return events;
+  // start parsing
+
+  VObjectIterator it;
+  VObject *vobj;
+  initPropIterator(&it, vcal);
+
+  while( moreIteration( &it ) ) {
+    vobj = ::nextVObject( &it );
+    QCString name = ::vObjectName( vobj );
+    //QCString objVal = ::vObjectStringZValue( vobj );
+    // let's find out the type
+    if( name == VCTodoProp ){
+      events.append( eventByVObj( vobj ) );
+
+    } // parse the value
+  }
+  return events;
+}
+bool ToDoVCalResource::save(const QString &fileName, const QValueList<ToDoEvent>&list )
+{
+  QFileDirect file ( fileName );
+  if(!file.open(IO_WriteOnly ) )
+    return false;
+  // obj
+  VObject *obj;
+  obj = newVObject( VCCalProp );
+  addPropValue( obj, VCVersionProp, "1.0" );
+  VObject *vo;
+  for(QValueList<ToDoEvent>::ConstIterator it = list.begin(); it != list.end(); ++it ){
+    vo = vobjByEvent( (*it) );
+    addVObjectProp(obj, vo );
+  }
+  writeVObject( file.directHandle(), obj );
+  cleanVObject( obj );
+  cleanStrTbl();
+
+  return true;
+}
+
+
+
+
+
+
+
+
+
+