1 files changed, 16 insertions, 11 deletions

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
@@ -3,57 +3,60 @@
 **
 ** 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 <opie/tododb.h>
+#include <opie/todovcalresource.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/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()
 {
@@ -194,59 +197,59 @@ TodoWindow::TodoWindow( QWidget *parent, const char *name, WFlags f = 0 ) :
     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;
+    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 );
     }
     // I'm afraid we must call this every time now, otherwise
     // spend expensive time comparing all these strings...
     populateCategories();
 }
 
 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;
 
@@ -254,49 +257,49 @@ void TodoWindow::slotDelete()
 
     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();
+    ToDoEvent 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 );
 }
 
@@ -328,50 +331,49 @@ void TodoWindow::setCategory( int c )
    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 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;
+    int id, rememberId;
     id = 1;
     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;
 }
@@ -422,49 +424,52 @@ void TodoWindow::slotFind()
     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 ) {
+    ToDoDB todoDB(filename, new ToDoVCalResource() );
+    QValueList<ToDoEvent> tl = todoDB.rawToDos();
+    for( QValueList<ToDoEvent>::Iterator it = tl.begin(); it != tl.end(); ++it ) {
         table->addEntry( *it );
     }
 }
 
 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();
     ir->send( beamfile, description, "text/x-vCalendar" );
 }
 
 void TodoWindow::beamDone( Ir *ir )
 {
     delete ir;
     unlink( beamfile );
 }