We're now using a home made painting of cells

This will theoretically speed up things
Currently it's noticeable slower on SQL
Cause we do up to 80 queries for 10 different
items. As you see a cache could be the answer to these
problems.
The reason for custom drawing is speed and memory consumption.
Take the unlikely case of 10.000 items
We would have 40.000 QTableItem
but would only show 40 of them at a time.
The rest seems to be wasted

5 files changed, 126 insertions, 160 deletions

diff --git a/core/pim/todo/mainwindow.cpp b/core/pim/todo/mainwindow.cpp
index 47c0160..7e7d2f7 100644
--- a/core/pim/todo/mainwindow.cpp
+++ b/core/pim/todo/mainwindow.cpp
@@ -228,410 +228,411 @@ void MainWindow::initViews() {
     /* add QString type + QString configname to
      * the View menu
      * and subdirs for multiple views
      */
 }
 void MainWindow::initEditor() {
     m_curEdit = new Editor();
 }
 void MainWindow::initShow() {
     m_curShow = new TextViewShow(this);
     m_stack->addWidget( m_curShow->widget() , m_counter++ );
 }
 MainWindow::~MainWindow() {
     delete templateManager();
 }
 void MainWindow::connectBase( ViewBase* base) {
     base->connectShow( this, SLOT(slotShow(int) ) );
     base->connectEdit( this, SLOT(slotEdit(int) ) );
     base->connectUpdateSmall( this,
                               SLOT(slotUpate1(int, const Todo::SmallTodo&)  ));
     base->connectUpdateBig( this,
                             SLOT(slotUpate2(int, const OTodo& ) ) );
     base->connectUpdateView( this, SLOT(slotUpdate3( QWidget* ) ) ) ;
     base->connectRemove(&m_todoMgr,
                         SLOT(remove(int)) );
 }
 QPopupMenu* MainWindow::contextMenu( int uid ) {
     QPopupMenu* menu = new QPopupMenu();
 
     m_editAction->addTo( menu );
     m_deleteAction->addTo( menu );
     m_duplicateAction->addTo( menu );
     menu->insertSeparator();
 
     return menu;
 }
 QPopupMenu* MainWindow::options() {
     qWarning("Options");
     return m_options;
 }
 QPopupMenu* MainWindow::edit() {
     return m_edit;
 }
 QPopupMenu* MainWindow::view() {
     return m_view;
 }
 QToolBar* MainWindow::toolbar() {
     return m_tool;
 }
 OTodoAccess::List MainWindow::list()const {
     return m_todoMgr.list();
 }
 OTodoAccess::List MainWindow::sorted( bool asc, int sortOrder ) {
     int cat = 0;
     if ( m_curCat == tr("All Categories") )
         cat = currentCatId();
 
     int filter = 1;
 
     if (!m_completed )
         filter |= 4;
     if (m_overdue)
         filter |= 2;
 
     return m_todoMgr.sorted( asc, sortOrder, filter, cat );
 }
 OTodoAccess::List MainWindow::sorted( bool asc, int sortOrder, int addFilter) {
     int cat = 0;
     if ( m_curCat == tr("All Categories") )
         cat = currentCatId();
 
     return m_todoMgr.sorted(asc, sortOrder, addFilter,  cat );
 }
 OTodo MainWindow::event( int uid ) {
     return m_todoMgr.event( uid );
 }
 bool MainWindow::isSyncing()const {
     return m_syncing;
 }
 TemplateManager* MainWindow::templateManager() {
     return m_tempManager;
 }
 Editor* MainWindow::currentEditor() {
     return m_curEdit;
 }
 TodoShow* MainWindow::currentShow() {
     return m_curShow;
 }
 void MainWindow::slotReload() {
     m_todoMgr.reload();
     currentView()->updateView( );
     raiseCurrentView();
 }
 void MainWindow::closeEvent( QCloseEvent* e ) {
     if (m_stack->visibleWidget() == currentShow()->widget() ) {
         raiseCurrentView();
         e->ignore();
         return;
     }
     /*
      * we should have flushed and now we're still saving
      * so there is no need to flush
      */
     if (m_syncing ) {
         e->accept();
         return;
     }
     bool quit = false;
     if ( m_todoMgr.saveAll() ){
         qWarning("saved");
         quit = true;
     }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();
             quit = true;
 	}else
 	    e->ignore();
 
     }
 
     if (quit ) {
         Config config( "todo" );
         config.setGroup( "View" );
         config.writeEntry( "ShowComplete", showCompleted() );
         config.writeEntry( "Category", currentCategory() );
         config.writeEntry( "ShowDeadLine", showDeadline());
         config.writeEntry( "ShowOverDue", showOverDue() );
         /* svae templates */
         templateManager()->save();
         e->accept();
     }
 }
 void MainWindow::populateTemplates() {
     m_template->clear();
     QStringList list = templateManager()->templates();
     QStringList::Iterator it;
     for ( it = list.begin(); it != list.end(); ++it ) {
         m_template->insertItem( (*it) );
     }
 }
 /*
  * slotNewFromTemplate
  * We use the edit widget to do
  * the config but we setUid(-1)
  * to get a new uid
  */
 /*
  * first we get the name of the template
  * then we will use the TemplateManager
  */
 void MainWindow::slotNewFromTemplate( int id ) {
     QString name = m_template->text( id );
 
     OTodo event = templateManager()->templateEvent( name );
     event = currentEditor()->edit(this,
                                   event );
 
     if ( currentEditor()->accepted() ) {
         /* assign new todo */
         event.setUid( -1 );
         currentView()->addEvent( event );
         m_todoMgr.add( event );
 
         populateCategories();
     }
 }
 void MainWindow::slotNew() {
     if(m_syncing) {
 	QMessageBox::warning(this, tr("Todo"),
 			     tr("Can not edit data, currently syncing"));
 	return;
     }
 
 
     OTodo todo = currentEditor()->newTodo( currentCatId(),
                                              this );
 
     if ( currentEditor()->accepted() ) {
 	//todo.assignUid();
         currentView()->addEvent( todo );
         m_todoMgr.add( todo );
 
         // I'm afraid we must call this every time now, otherwise
         // spend expensive time comparing all these strings...
         // but only call if we changed something -zecke
         populateCategories();
     }
 
     raiseCurrentView( );
 }
 void MainWindow::slotDuplicate() {
     if(m_syncing) {
         QMessageBox::warning(this, tr("Todo"),
                              tr("Can not edit data, currently syncing"));
         return;
     }
     OTodo ev = m_todoMgr.event( currentView()->current() );
     /* let's generate a new uid */
     ev.setUid(-1);
     m_todoMgr.add( ev );
 
     currentView()->addEvent( ev );
     raiseCurrentView();
 }
 void MainWindow::slotDelete() {
     if (!currentView()->current() )
         return;
 
     if(m_syncing) {
 	QMessageBox::warning(this, tr("Todo"),
 			     tr("Can not edit data, currently syncing"));
 	return;
     }
     QString strName = currentView()->currentRepresentation();
     if (!QPEMessageBox::confirmDelete(this, tr("Todo"), strName ) )
         return;
 
     m_todoMgr.remove( currentView()->current() );
     currentView()->removeEvent( currentView()->current() );
     raiseCurrentView();
 }
 void MainWindow::slotDeleteAll() {
     if(m_syncing) {
         QMessageBox::warning(this, tr("Todo"),
                              tr("Can not edit data, currently syncing"));
         return;
     }
 
   //QString strName = table->text( table->currentRow(), 2 ).left( 30 );
 
     if ( !QPEMessageBox::confirmDelete( this, tr( "Todo" ), tr("all tasks?") ) )
         return;
 
     m_todoMgr.removeAll();
     currentView()->clear();
 
     raiseCurrentView();
 }
 void MainWindow::slotDeleteCompleted() {
     if(m_syncing) {
         QMessageBox::warning(this, tr("Todo"),
                              tr("Can not edit data, currently syncing"));
         return;
     }
 
     if ( !QPEMessageBox::confirmDelete( this, tr( "Todo" ), tr("all completed tasks?") ) )
         return;
 
-    m_todoMgr.remove( currentView()->completed() );
+    // FIXME
+    //m_todoMgr.remove( currentView()->completed() );
     currentView()->updateView( );
 }
 void MainWindow::slotFind() {
 
 }
 void MainWindow::slotEdit() {
     slotEdit( currentView()->current() );
 }
 /*
  * set the category
  */
 void MainWindow::setCategory( int c) {
     if ( c <= 0 ) return;
 
     qWarning("Iterating over cats %d", c );
     for ( unsigned int i = 1; i < m_catMenu->count(); i++ )
         m_catMenu->setItemChecked(i, c == (int)i );
 
     if (c == 1 ) {
         m_curCat = QString::null;
         setCaption( tr("Todo") + " - " + tr("All Categories" ) );
 
     }else if ( c == (int)m_catMenu->count() - 1 ) {
         m_curCat = tr("Unfiled");
         setCaption( tr("Todo") + " - " + tr("Unfiled") );
     }else {
         m_curCat = m_todoMgr.categories()[c-2];
         setCaption( tr("Todo") + " - " + m_curCat );
     }
     m_catMenu->setItemChecked( c, true );
     currentView()->setShowCategory( m_curCat );
     raiseCurrentView();
 }
 void MainWindow::slotShowDeadLine( bool dead) {
     m_deadline = dead;
     currentView()->setShowDeadline( dead );
 }
 void MainWindow::slotShowCompleted( bool show) {
     m_completed = show;
     currentView()->setShowCompleted( m_completed );
 }
 bool MainWindow::showOverDue()const {
     return m_overdue;
 }
 void MainWindow::setDocument( const QString& ) {
 
 }
 void MainWindow::slotBeam() {
 
 }
 void MainWindow::beamDone( Ir* ) {
 
 }
 
 void MainWindow::slotFlush() {
     m_syncing = FALSE;
     m_todoMgr.save();
 }
 void MainWindow::slotShowDetails() {
     slotShow( currentView()->current() );
 }
 /*
  * populate the Categories
  * Menu
  */
 void MainWindow::populateCategories() {
     if (m_todoMgr.isLoaded() )
         m_todoMgr.load();
 
     m_catMenu->clear();
     int id, rememberId;
     id = 1;
     rememberId = 1;
 
     m_catMenu->insertItem( tr( "All Categories" ), id++ );
     m_catMenu->insertSeparator();
     QStringList categories = m_todoMgr.categories();
     categories.append( tr( "Unfiled" ) );
     for ( QStringList::Iterator it = categories.begin();
 	  it != categories.end(); ++it ) {
 	m_catMenu->insertItem( *it, id );
 	if ( *it == currentCategory() )
 	    rememberId = id;
 	++id;
     }
     setCategory( rememberId );
 }
 bool MainWindow::showCompleted()const {
     return m_completed;
 }
 bool MainWindow::showDeadline()const {
     return m_deadline;
 }
 QString MainWindow::currentCategory()const {
     return m_curCat;
 }
 int MainWindow::currentCatId() {
     return m_todoMgr.catId( m_curCat );
 }
 ViewBase* MainWindow::currentView() {
     return m_curView;
 }
 void MainWindow::raiseCurrentView() {
     m_stack->raiseWidget( m_curView->widget() );
 }
 void MainWindow::slotShowDue(bool ov) {
     m_overdue = ov;
     currentView()->showOverDue( ov );
     raiseCurrentView();
 }
 void MainWindow::slotShow( int uid ) {
     qWarning("slotShow");
     currentShow()->slotShow( event( uid ) );
     m_stack->raiseWidget( currentShow()->widget() );
 }
 void MainWindow::slotEdit( int uid ) {
     if(m_syncing) {
 	QMessageBox::warning(this, tr("Todo"),
 			     tr("Can not edit data, currently syncing"));
 	return;
     }
 
     OTodo todo = m_todoMgr.event( uid );
 
     todo = currentEditor()->edit(this, todo );
 
     /* if completed */
     if ( currentEditor()->accepted() ) {
         qWarning("Replacing now" );
         m_todoMgr.update( todo.uid(), todo );
 	currentView()->replaceEvent( todo );
         populateCategories();
     }
 
     raiseCurrentView();
 }
 /*
 void MainWindow::slotUpdate1( int uid, const SmallTodo& ev) {
     m_todoMgr.update( uid, ev );
 }
 */
 void MainWindow::updateTodo(  const OTodo& ev) {
     m_todoMgr.update( ev.uid() , ev );
 }
 /* The view changed it's configuration
  * update the view menu
  */
 void MainWindow::slotUpdate3( QWidget* ) {
 
 }
 void MainWindow::updateList() {
     m_todoMgr.updateList();
 }
diff --git a/core/pim/todo/tableitems.cpp b/core/pim/todo/tableitems.cpp
index ebfefc8..86fe07d 100644
--- a/core/pim/todo/tableitems.cpp
+++ b/core/pim/todo/tableitems.cpp
@@ -1,181 +1,181 @@
 /*
                =.            This file is part of the OPIE Project
              .=l.            Copyright (c)  2002 <>
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU 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 program 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 "tableview.h"
 
 #include "tableitems.h"
 #include <string.h>
 
 using namespace Todo;
 
 CheckItem::CheckItem( QTable* t,
                       const QString& sortKey,
                       int uid,
                       const QArray<int>& lis)
     : OCheckItem(t, sortKey), m_uid(uid ), m_cat( lis )
 {
 }
 CheckItem::~CheckItem() {
 }
 void CheckItem::setChecked( bool b ) {
     OCheckItem::setChecked(b);
 }
 void CheckItem::toggle() {
     TableView* view = static_cast<TableView*>( table() );
     OTodo ev = view->find( view->current() );
     ev.setCompleted(!isChecked() );
-    view->updateFromTable( ev );
+    //view->updateFromTable( ev );
 
     OCheckItem::toggle();
     table()->updateCell( row(), col() );
 }
 int CheckItem::uid() const {
     return m_uid;
 }
 QArray<int> CheckItem::cats() {
     return m_cat;
 }
 
 /* ComboItem */
 ComboItem::ComboItem( QTable* t, EditType et )
     : QTableItem( t, et, "3" ), m_cb(0)
 {
     setReplaceable( FALSE );
 }
 ComboItem::~ComboItem() {
 
 }
 QWidget* ComboItem::createEditor()const {
     qWarning( "create editor");
     QString txt = text();
 
     ( (ComboItem*)this)-> m_cb = new QComboBox( table()->viewport() );
 
     m_cb->insertItem( "1" );
     m_cb->insertItem( "2" );
     m_cb->insertItem( "3" );
     m_cb->insertItem( "4" );
     m_cb->insertItem( "5" );
     m_cb->setCurrentItem( txt.toInt() - 1 );
 
     return m_cb;
 }
 void ComboItem::setContentFromEditor( QWidget* w) {
     TableView* view = static_cast<TableView*>( table() );
     OTodo ev = view->find( view->current() );
 
     if ( w->inherits( "QComboBox" ) )
         setText( ( (QComboBox*)w )->currentText() );
     else
         QTableItem::setContentFromEditor( w );
 
     ev.setPriority( text().toInt() );
-    view->updateFromTable( ev );
+    //view->updateFromTable( ev );
 }
 void ComboItem::setText( const QString& s ) {
     if ( m_cb )
         m_cb->setCurrentItem( s.toInt()-1 );
 
     QTableItem::setText( s );
 }
 QString ComboItem::text()const {
     if ( m_cb)
         return m_cb->currentText();
 
     return QTableItem::text();
 }
 
 /* TodoTextItem */
 TodoTextItem::~TodoTextItem() {
 
 }
 TodoTextItem::TodoTextItem( QTable* t,
                             const QString& string )
     : QTableItem( t,  QTableItem::Never, string )
 {}
 
 /* DueTextItem */
 DueTextItem::DueTextItem( QTable* t, const OTodo& ev)
     : QTableItem(t, Never, QString::null )
 {
     setToDoEvent( ev );
 }
 DueTextItem::~DueTextItem() {
 
 }
 QString DueTextItem::key() const {
     QString key;
 
     if( m_hasDate ){
         if(m_off == 0 ){
             key.append("b");
         }else if( m_off > 0 ){
             key.append("c");
         }else if( m_off < 0 ){
             key.append("a");
         }
         key.append(QString::number(m_off ) );
     }else{
         key.append("d");
     }
     return key;
 }
 void DueTextItem::setCompleted( bool comp ) {
     m_completed = comp;
     table()->updateCell( row(), col() );
 }
 void DueTextItem::setToDoEvent( const OTodo& ev ) {
     m_hasDate = ev.hasDueDate();
     m_completed = ev.isCompleted();
 
     if( ev.hasDueDate() ){
         QDate today = QDate::currentDate();
         m_off = today.daysTo(ev.dueDate() );
         setText( QString::number(m_off)  + " day(s) " );
     }else{
         setText("n.d." );
         m_off = 0;
     }
 }
 void DueTextItem::paint( QPainter* p, const QColorGroup &cg,
                          const QRect& cr, bool selected ) {
     QColorGroup cg2(cg);
 
     QColor text = cg.text();
     if( m_hasDate && !m_completed ){
         if( m_off < 0 ){
             cg2.setColor(QColorGroup::Text, QColor(red ) );
         }else if( m_off == 0 ){
             cg2.setColor(QColorGroup::Text, QColor(yellow) ); // orange isn't predefined
         }else if( m_off > 0){
             cg2.setColor(QColorGroup::Text, QColor(green ) );
         }
     }
     QTableItem::paint(p, cg2, cr, selected );
     /* restore default color */
     cg2.setColor(QColorGroup::Text, text );
 }
diff --git a/core/pim/todo/tableview.cpp b/core/pim/todo/tableview.cpp
index eaaf1bc..5594b13 100644
--- a/core/pim/todo/tableview.cpp
+++ b/core/pim/todo/tableview.cpp
@@ -1,368 +1,359 @@
 /*
                =.            This file is part of the OPIE Project
              .=l.            Copyright (c)  2002 <>
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU 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 program 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 <qtimer.h>
 #include <qpoint.h>
 #include <qpopupmenu.h>
 
 #include "mainwindow.h"
 //#include "tableitems.h"
 #include "tableview.h"
 
 using namespace Todo;
 
+namespace {
+    static const int BoxSize = 14;
+    static const int RowHeight = 20;
+}
+
 
 TableView::TableView( MainWindow* window, QWidget* wid )
     : QTable(  wid ), TodoView( window ) {
     setUpdatesEnabled( false );
     viewport()->setUpdatesEnabled( false );
     m_enablePaint = false;
     setNumRows(0);
     setNumCols(4);
 
     setSorting( TRUE );
     setSelectionMode( NoSelection );
     setColumnStretchable( 2, TRUE );
     setColumnWidth(0, 20 );
     setColumnWidth(1, 35 );
 
     setLeftMargin( 0 );
     verticalHeader()->hide();
 
     horizontalHeader()->setLabel(0, tr("C.") );
     horizontalHeader()->setLabel(1, tr("Prior.") );
     horizontalHeader()->setLabel(2, tr("Description" ) );
 
     setColumnStretchable(3, FALSE );
     setColumnWidth(3, 20 );
     horizontalHeader()->setLabel(3, tr("Deadline") );
 
     if ( todoWindow()->showDeadline() )
         showColumn( 3);
     else
         hideColumn(3 );
 
     connect((QTable*)this, SIGNAL( clicked( int, int, int, const QPoint& ) ),
             this, SLOT( slotClicked(int, int, int, const QPoint& ) ) );
     connect((QTable*)this, SIGNAL( pressed( int, int, int, const QPoint& ) ),
             this, SLOT( slotPressed(int, int, int, const QPoint& ) ) );
     connect((QTable*)this, SIGNAL(valueChanged(int, int) ),
             this, SLOT( slotValueChanged(int, int) ) );
     connect((QTable*)this, SIGNAL(currentChanged(int, int) ),
             this, SLOT( slotCurrentChanged(int, int) ) );
 
     m_menuTimer = new QTimer( this );
     connect( m_menuTimer, SIGNAL(timeout()),
              this, SLOT(slotShowMenu()) );
 
     m_enablePaint = true;
     setUpdatesEnabled( true );
     viewport()->setUpdatesEnabled( true );
     viewport()->update();
 }
 /* a new day has started
  * update the day
  */
 void TableView::newDay() {
     clear();
     updateView();
 }
 TableView::~TableView() {
 
 }
 void TableView::slotShowMenu() {
     QPopupMenu *menu = todoWindow()->contextMenu( current() );
     menu->exec(QCursor::pos() );
     delete menu;
 }
-OTodo TableView::find(int uid ) {
-    OTodo ev = TodoView::event( uid );
-    return ev;
-}
-void TableView::updateFromTable( const OTodo& ev, CheckItem* item ) {
-    TodoView::update( ev.uid(), ev );
-
-    /* update the other columns */
-    /* if completed or not we need to update
-     * the table
-     *
-     * We've two cases
-     * either item or !item
-     * this makes cases more easy
-     */
-    if ( !item ) {
-        item = m_cache[ev.uid()];
-    }
-    DueTextItem *due = dueItem( item->row() );
-    due->setCompleted( ev.isCompleted() );
-}
 QString TableView::type() const {
     return QString::fromLatin1( tr("Table View") );
 }
 int TableView::current() {
     int cur = 0;
-    CheckItem* i = checkItem( currentRow() );
-    if (i )
-        cur = i->uid();
-
+    // FIXME
     return cur;
 }
 QString TableView::currentRepresentation() {
     return text( currentRow(), 2);
 }
 /* show overdue */
 void TableView::showOverDue( bool ) {
     clear();
     updateView();
 }
 
 void TableView::updateView( ) {
     setSortOrder( 0 );
     setAscending( true );
     sort();
     OTodoAccess::List::Iterator it, end;
     it = sorted().begin();
     end = sorted().end();
+
     qWarning("setTodos");
     QTime time;
     time.start();
     m_enablePaint = false;
     setUpdatesEnabled( false );
     viewport()->setUpdatesEnabled( false );
-    clear();
-    QString currentCat = todoWindow()->currentCategory();
-    bool showCompleted = todoWindow()->showCompleted();
-    bool showOverDue   = todoWindow()->showOverDue();
-    qWarning( "Current Category:" + todoWindow()->currentCategory() );
-    int id = todoWindow()->currentCatId();
+
     QTime t;
     t.start();
     setNumRows( it.count() );
-    uint i = 0;
-    for (; it != end; ++it ) {
-        OTodo todo = (*it);
-        /* test if the categories match */
-        if ( !currentCat.isEmpty() &&
-             !todo.categories().contains( id ) ) {
-            continue;
-        }
-        /* the item is completed but we shouldn't show it */
-        if ( !showCompleted && todo.isCompleted() ) {
-            qWarning("isCompleted ");
-            continue;
-        }
-        /* the item is not overdue but we should only show overdue */
-        if ( showOverDue && !todo.isOverdue() ) {
-            continue;
-        }
-        /* now it's fine to add it */
-        insertTodo(  todo, i );
-	i++;
-    }
-    setNumRows( i );
     int elc = time.elapsed();
     qWarning("Adding took %d", elc/1000 );
     setUpdatesEnabled( true );
     viewport()->setUpdatesEnabled( true );
     viewport()->update();
+
     m_enablePaint = true;
     int el = time.elapsed();
     qWarning("adding took %d", el/1000 );
 }
-void TableView::setTodo( int uid, const OTodo& ev ) {
-    QMap<int, CheckItem*>::Iterator it = m_cache.find( uid );
-
-    if ( it != m_cache.end() ) {
-        int row = it.data()->row();
-
-        /* update checked */
-        CheckItem* check = checkItem(row );
-        if (check)
-            check->setChecked( ev.isCompleted() );
-
-        /* update the text */
-        QString sum = ev.summary();
-        setText(row, 2, sum.isEmpty() ?
-                ev.description().left(40).simplifyWhiteSpace() :
-                sum );
-
-        /* update priority */
-        setText(row, 1, QString::number( ev.priority() ) );
+void TableView::setTodo( int, const OTodo&) {
+    sort();
 
-        /* update DueDate */
-        DueTextItem *due = dueItem( row );
-        due->setToDoEvent( ev );
-    }
+    /* repaint */
+    QTable::update();
 }
-void TableView::addEvent( const OTodo& ev) {
-    int row= numRows();
-    setNumRows( row + 1 );
-    insertTodo( ev, row );
+void TableView::addEvent( const OTodo&) {
+    sort();
+
+    QTable::update();
 }
 /*
  * find the event
  * and then replace the complete row
  */
 void TableView::replaceEvent( const OTodo& ev) {
-    setTodo( ev.uid(), ev );
+    addEvent( ev );
 }
 /*
  * re aligning table can be slow too
  * FIXME: look what performs better
  * either this or the old align table
  */
 void TableView::removeEvent( int ) {
-    clear();
     updateView();
 }
 void TableView::setShowCompleted( bool b) {
     qWarning("Show Completed %d" + b );
     updateView();
 }
 void TableView::setShowDeadline( bool b) {
     qWarning("Show DeadLine %d" + b );
     if (b)
         showColumn(3 );
     else
         hideColumn(3 );
 }
 void TableView::setShowCategory( const QString& ) {
     qWarning("setShowCategory");
     updateView();
 }
 void TableView::clear() {
-    m_cache.clear();
-    int rows = numRows();
-    for (int r = 0; r < rows; r++ ) {
-        for (int c = 0; c < numCols(); c++ ) {
-            if ( cellWidget(r, c) )
-                clearCellWidget(r, c );
-            clearCell(r, c);
-        }
-    }
-    setNumRows( 0);
-}
-QArray<int> TableView::completed() {
-    int row = numRows();
-    QArray<int> ids( row );
-
-    int j=0;
-    for (int i = 0; i < row; i++ ) {
-        CheckItem* item = checkItem(i );
-        if (item->isChecked() ) {
-            ids[j] = item->uid();
-            j++;
-        }
-    }
-    ids.resize( j );
-    return ids;
+    setNumRows(0);
 }
 void TableView::slotClicked(int row, int col, int,
                             const QPoint& point) {
     if ( !cellGeometry(row, col ).contains(point ) )
         return;
+    int ui=0; // FIXME = uid(row);
 
 
     switch( col ) {
     case 0: {
-        CheckItem* item = checkItem( row );
+        // FIXME
+        CheckItem* item = 0l;
         /*
          * let's see if we centered clicked
          */
         if ( item ) {
             int x = point.x() -columnPos( col );
             int y = point.y() -rowPos( row );
             int w = columnWidth( col );
             int h = rowHeight( row );
             if ( x >= ( w - OCheckItem::BoxSize ) / 2 &&
                  x <= ( w - OCheckItem::BoxSize ) / 2 + OCheckItem::BoxSize &&
                  y >= ( h - OCheckItem::BoxSize ) / 2 &&
                  y <= ( h - OCheckItem::BoxSize ) / 2 + OCheckItem::BoxSize )
                 item->toggle();
         }
     }
         break;
 
     case 1:
         break;
 
     case 2: {
         m_menuTimer->stop();
-        showTodo( checkItem(row)->uid() );
+        showTodo( ui );
         break;
     }
     case 3: {
         m_menuTimer->stop();
-        TodoView::edit( checkItem(row)->uid() );
+        TodoView::edit( ui );
         break;
     }
     }
 
 
 }
 void TableView::slotPressed(int row, int col, int,
                             const QPoint& point) {
 
     /* TextColumn column */
     if ( col == 2 && cellGeometry( row, col ).contains( point ) )
         m_menuTimer->start( 750, TRUE );
 }
 void TableView::slotValueChanged( int, int ) {
     qWarning("Value Changed");
 }
 void TableView::slotCurrentChanged(int, int ) {
     m_menuTimer->stop();
 }
-/*
- * hardcode to column 0
- */
-CheckItem* TableView::checkItem( int row ) {
-    CheckItem *i = static_cast<CheckItem*>( item( row, 0 ) );
-    return i;
-}
-DueTextItem* TableView::dueItem( int row ) {
-    DueTextItem* i = static_cast<DueTextItem*> ( item(row, 3 ) );
-    return i;
-}
 QWidget* TableView::widget() {
     return this;
 }
 /*
  * We need to overwrite sortColumn
  * because we want to sort whole row
  * based
+ * We event want to set the setOrder
+ * to a sort() and update()
  */
 void TableView::sortColumn( int row, bool asc, bool ) {
     QTable::sortColumn( row, asc, TRUE );
 
 }
 void TableView::viewportPaintEvent( QPaintEvent* e) {
     qWarning("Paint event" );
     if (m_enablePaint )
         QTable::viewportPaintEvent( e );
 }
+/*
+ * This segment is copyrighted by TT
+ * it was taken from their todolist
+ * application this code is GPL
+ */
+void TableView::paintCell(QPainter* p,  int row, int col, const QRect& cr, bool ) {
+    const QColorGroup &cg = colorGroup();
+
+    p->save();
+
+    OTodo task = sorted()[row];
+
+    p->fillRect( 0, 0, cr.width(), cr.height(), cg.brush( QColorGroup::Base ) );
+
+    QPen op = p->pen();
+    p->setPen(cg.mid());
+    p->drawLine( 0, cr.height() - 1, cr.width() - 1, cr.height() - 1 );
+    p->drawLine( cr.width() - 1, 0, cr.width() - 1, cr.height() - 1 );
+    p->setPen(op);
+
+    QFont f = p->font();
+    QFontMetrics fm(f);
+
+    switch(col) {
+	case 0:
+	    {
+		// completed field
+		int marg = ( cr.width() - BoxSize ) / 2;
+		int x = 0;
+		int y = ( cr.height() - BoxSize ) / 2;
+		p->setPen( QPen( cg.text() ) );
+		p->drawRect( x + marg, y, BoxSize, BoxSize );
+		p->drawRect( x + marg+1, y+1, BoxSize-2, BoxSize-2 );
+		p->setPen( darkGreen );
+		x += 1;
+		y += 1;
+		if ( task.isCompleted() ) {
+		    QPointArray a( 9*2 );
+		    int i, xx, yy;
+		    xx = x+2+marg;
+		    yy = y+4;
+		    for ( i=0; i<4; i++ ) {
+			a.setPoint( 2*i,   xx, yy );
+			a.setPoint( 2*i+1, xx, yy+2 );
+			xx++; yy++;
+		    }
+		    yy -= 2;
+		    for ( i=4; i<9; i++ ) {
+			a.setPoint( 2*i,   xx, yy );
+			a.setPoint( 2*i+1, xx, yy+2 );
+			xx++; yy--;
+		    }
+		    p->drawLineSegments( a );
+		}
+	    }
+	    break;
+	case 1:
+	    // priority field
+	    {
+		QString text = QString::number(task.priority());
+		p->drawText(2,2 + fm.ascent(), text);
+	    }
+	    break;
+	case 2:
+	    // description field
+	    {
+		QString text = task.summary().isEmpty() ?
+                               task.description() :
+                               task.summary();
+		p->drawText(2,2 + fm.ascent(), text);
+	    }
+	    break;
+	case 3:
+	    {
+		QString text;
+		if (task.hasDueDate()) {
+		    text = "HAS";
+		} else {
+		    text = tr("None");
+		}
+		p->drawText(2,2 + fm.ascent(), text);
+	    }
+	    break;
+    }
+    p->restore();
+}
diff --git a/core/pim/todo/tableview.h b/core/pim/todo/tableview.h
index 1fa21b2..b608204 100644
--- a/core/pim/todo/tableview.h
+++ b/core/pim/todo/tableview.h
@@ -1,119 +1,93 @@
 /*
                =.            This file is part of the OPIE Project
              .=l.            Copyright (c)  2002 <>
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU 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 program 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.
 
 */
 
 #ifndef OPIE_TABLE_VIEW_H
 #define OPIE_TABLE_VIEW_H
 
 #include <qtable.h>
 #include <qmap.h>
 
 #include "tableitems.h"
 #include "todoview.h"
 
 class QTimer;
 
 namespace Todo {
     class CheckItem;
     class DueTextItem;
     class TableView : public QTable, public TodoView {
         Q_OBJECT
     public:
         TableView( MainWindow*, QWidget* parent );
         ~TableView();
 
-        void updateFromTable( const OTodo&, CheckItem* = 0 );
-        OTodo find(int uid);
 
         QString type()const;
         int current();
         QString currentRepresentation();
 
+        void clear();
         void showOverDue( bool );
         void updateView();
         void setTodo( int uid, const OTodo& );
         void addEvent( const OTodo& event );
         void replaceEvent( const OTodo& );
         void removeEvent( int uid );
         void setShowCompleted( bool );
         void setShowDeadline( bool );
 
         void setShowCategory(const QString& =QString::null );
-        void clear();
         void newDay();
-        QArray<int> completed();
         QWidget* widget();
         void sortColumn(int, bool, bool );
+
+        /*
+         * we do our drawing ourselves
+         * because we don't want to have
+         * 40.000 QTableItems for 10.000
+         * OTodos where we only show 10 at a time!
+         */
+        void paintCell(QPainter* p, int row, int col,  const QRect&, bool );
     private:
         /* reimplented for internal reasons */
         void viewportPaintEvent( QPaintEvent* );
-        inline void insertTodo( const OTodo&, int row );
-        CheckItem* checkItem( int row );
-        DueTextItem* dueItem( int row );
         QTimer *m_menuTimer;
-        QMap<int, CheckItem*> m_cache;
         bool m_enablePaint:1;
 
 private slots:
         void slotShowMenu();
         void slotClicked(int, int, int,
                          const QPoint& );
         void slotPressed(int, int, int,
                          const QPoint& );
         void slotValueChanged(int, int);
         void slotCurrentChanged(int, int );
     };
-    inline void TableView::insertTodo( const OTodo& event, int row ) {
-
-
-        QString sortKey =  (char) ( (event.isCompleted() ? 'a' : 'A' )
-                                    + event.priority() )
-                           +  Qtopia::buildSortKey( event.description() );
-        CheckItem *chk = new CheckItem( this, sortKey, event.uid(), event.categories() );
-        chk->setChecked( event.isCompleted() );
-
-        ComboItem *cmb = new ComboItem(this,  QTableItem::WhenCurrent );
-        cmb->setText( QString::number( event.priority() ) );
-
-        QString sum = event.summary();
-        QTableItem* ti = new TodoTextItem( this, sum.isEmpty() ?
-                                           event.description().left(40).simplifyWhiteSpace() :
-                                           sum );
-        ti->setReplaceable( FALSE );
-
-        DueTextItem *due = new DueTextItem(this, event );
-
-        setItem( row, 0, chk );
-        setItem( row, 1, cmb );
-        setItem( row, 2, ti  );
-        setItem( row, 3, due );
-
-        m_cache.insert( event.uid(), chk );
-    }
 };
 
 #endif
diff --git a/core/pim/todo/todoview.h b/core/pim/todo/todoview.h
index 81ace3a..9408ef1 100644
--- a/core/pim/todo/todoview.h
+++ b/core/pim/todo/todoview.h
@@ -1,188 +1,188 @@
 /*
                =.            This file is part of the OPIE Project
              .=l.            Copyright (c)  2002 <>
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU 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 program 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.
 
 */
 
 #ifndef TODO_VIEW_H
 #define TODO_VIEW_H
 
 #include <qarray.h>
 #include <qstring.h>
 #include <qvaluelist.h>
 #include <qwidget.h>
 
 #include <opie/otodoaccess.h>
 
 #include "smalltodo.h"
 
 
 namespace Todo {
 
     /**
      * According to tronical it's not possible
      * to have Q_OBJECT in a template at all
      * so this is a hack widget not meant
      * to be public
      */
     class InternQtHack : public QObject {
         Q_OBJECT
     public:
         InternQtHack() : QObject() {};
         void emitShow(int uid) { emit showTodo(uid);  }
         void emitEdit(int uid) { emit edit(uid ); }
         void emitUpdate( int uid,
                          const SmallTodo& to) {
             emit update(uid, to );
         }
         void emitUpdate( int uid,
                          const OTodo& ev ){
             emit update(uid, ev );
         }
         void emitRemove( int uid ) {
             emit remove( uid );
         }
         void emitUpdate( QWidget* wid ) {
             emit update( wid );
         }
     signals:
         void showTodo(int uid );
         void edit(int uid );
         void update( int uid, const Todo::SmallTodo& );
         void update( int uid, const OTodo& );
         /* sorry you need to cast */;
         void update( QWidget* wid );
         void remove( int uid );
 
     };
     class MainWindow;
 
     /**
      * due to inheretince problems we need this base class
      */
     class ViewBase {
     public:
         virtual QWidget* widget() = 0;
         virtual QString type()const = 0;
         virtual int current() = 0;
         virtual QString currentRepresentation() = 0;
         virtual void showOverDue( bool ) = 0;
 
         /*
          * update the view
          */
         virtual void updateView() = 0;
 
         virtual void addEvent( const OTodo& ) = 0;
         virtual void replaceEvent( const OTodo& ) = 0;
         virtual void removeEvent( int uid ) = 0;
         virtual void setShowCompleted( bool ) = 0;
         virtual void setShowDeadline( bool ) = 0;
         virtual void setShowCategory( const QString& = QString::null ) = 0;
         virtual void clear() = 0;
-        virtual QArray<int> completed() = 0;
+/*        virtual QArray<int> completed() = 0; */
         virtual void newDay() = 0;
 
         virtual void connectShow( QObject*, const char* ) = 0;
         virtual void connectEdit( QObject*, const char* ) = 0;
         virtual void connectUpdateSmall( QObject*, const char* ) = 0;
         virtual void connectUpdateBig( QObject*, const char* ) = 0;
         virtual void connectUpdateView( QObject*, const char*) = 0;
         virtual void connectRemove( QObject*, const char* ) = 0;
 
     };
 
     /**
      * A base class for all TodoView which are showing
      * a list of todos.
      * Either in a QTable, QListView or any other QWidget
      * derived class
      * Through the MainWindow( dispatcher ) one can access
      * the relevant informations
      *
      * It's not possible to have signal and slots from within
      * templates this way you've to register for a signal
      */
     class TodoView : public ViewBase{
 
     public:
         /**
          * c'tor
          */
         TodoView( MainWindow* win );
 
         /**
          *d'tor
          */
         virtual ~TodoView();
 
         /* connect to the show signal */
         void connectShow(QObject* obj,
                          const char* slot );
 
         /* connect to edit */
         void connectEdit( QObject* obj,
                           const char* slot );
         void connectUpdateSmall( QObject* obj,
                                  const char* slot );
         void connectUpdateBig( QObject* obj,
                                const char* slot ) ;
         void connectUpdateView( QObject* obj,
                                 const char* slot );
         void connectRemove( QObject* obj,
                             const char* slot );
     protected:
         MainWindow* todoWindow();
         OTodo event(int uid );
         OTodoAccess::List list();
         OTodoAccess::List sorted();
         void sort();
         void sort(int sort );
         void setSortOrder( int order );
         void setAscending( bool );
 
         /*
           These things needs to be implemented
           in a implementation
     signals:
         */
     protected:
         void showTodo( int uid ) { hack->emitShow(uid); }
         void edit( int uid ) { hack->emitEdit(uid); }
         void update(int uid, const SmallTodo& to );
         void update(int uid, const OTodo& ev);
         void remove( int uid ) {
             hack->emitRemove( uid );
         }
     private:
         InternQtHack* hack;
         MainWindow *m_main;
         OTodoAccess::List m_sort;
         bool m_asc : 1;
         int m_sortOrder;
     };
 };
 
 #endif