MainWindow setReadAhead added

Tableview we now try to read ahead in timerEvent..
the TodoView interface needs an update on this matter too...
besides that I'm quite happy with the speed and go on to implement new
features

4 files changed, 60 insertions, 2 deletions

diff --git a/core/pim/todo/mainwindow.cpp b/core/pim/todo/mainwindow.cpp
index 2994915..a6d657c 100644
--- a/core/pim/todo/mainwindow.cpp
+++ b/core/pim/todo/mainwindow.cpp
@@ -668,12 +668,16 @@ void MainWindow::slotUpdate1( int uid, const SmallTodo& 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();
 }
+void MainWindow::setReadAhead( uint count ) {
+    if (m_todoMgr.todoDB() )
+        m_todoMgr.todoDB()->setReadAhead( count );
+}
diff --git a/core/pim/todo/mainwindow.h b/core/pim/todo/mainwindow.h
index 8d0c29f..5a18e64 100644
--- a/core/pim/todo/mainwindow.h
+++ b/core/pim/todo/mainwindow.h
@@ -78,24 +78,25 @@ namespace Todo {
 
         bool isSyncing()const;
         bool showCompleted()const;
         bool showDeadline()const;
         bool showOverDue()const;
         QString currentCategory()const;
         int currentCatId();
         TemplateManager* templateManager();
 
         void updateTodo( const OTodo& );
         void populateTemplates();
         Editor* currentEditor();
+        void setReadAhead(uint count );
 private slots:
         void populateCategories();
         void slotReload();
         void slotFlush();
 
     protected:
         void closeEvent( QCloseEvent* e );
 
     private:
         void receiveFile( const QString& filename );
         void connectBase( ViewBase* );
         void initUI();
diff --git a/core/pim/todo/tableview.cpp b/core/pim/todo/tableview.cpp
index 5d82eb2..f4b898f 100644
--- a/core/pim/todo/tableview.cpp
+++ b/core/pim/todo/tableview.cpp
@@ -117,24 +117,31 @@ int TableView::current() {
     return uid;
 }
 QString TableView::currentRepresentation() {
     return text( currentRow(), 2);
 }
 /* show overdue */
 void TableView::showOverDue( bool ) {
     clear();
     updateView();
 }
 
 void TableView::updateView( ) {
+    m_row = false;
+    startTimer( 2000 );
+    /* FIXME we want one page to be read!
+     *
+     * Calculate that screensize
+     */
+    todoWindow()->setReadAhead( 4 );
     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 );
 
@@ -151,25 +158,26 @@ void TableView::updateView( ) {
     int el = time.elapsed();
     qWarning("adding took %d", el/1000 );
 }
 void TableView::setTodo( int, const OTodo&) {
     sort();
 
     /* repaint */
     QTable::update();
 }
 void TableView::addEvent( const OTodo&) {
     sort();
 
-    QTable::update();
+    /* fix problems of not showing the 'Haken' */
+    QTable::repaint();
 }
 /*
  * find the event
  * and then replace the complete row
  */
 void TableView::replaceEvent( const OTodo& ev) {
     addEvent( ev );
 }
 /*
  * re aligning table can be slow too
  * FIXME: look what performs better
  * either this or the old align table
@@ -344,25 +352,39 @@ void TableView::paintCell(QPainter* p,  int row, int col, const QRect& cr, bool
 	    // 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";
+		    int off = QDate::currentDate().daysTo( task.dueDate() );
+                    text = QString::number(off) + tr(" day(s)");
+                    /*
+                     * set color if not completed
+                     */
+                    if (!task.isCompleted() ) {
+                        QColor color = Qt::black;
+                        if ( off < 0 )
+                            color = Qt::red;
+                        else if ( off == 0 )
+                            color = Qt::yellow;
+                        else if ( off > 0 )
+                            color = Qt::green;
+                        p->setPen(color  );
+                    }
 		} else {
 		    text = tr("None");
 		}
 		p->drawText(2,2 + fm.ascent(), text);
 	    }
 	    break;
     }
     p->restore();
 }
 QWidget* TableView::createEditor(int row, int col, bool )const {
     switch( col ) {
     case 1: {
@@ -389,12 +411,40 @@ void TableView::setCellContentFromEditor(int row, int col ) {
             OTodo todo = sorted()[row];
             if ( todo.priority() != pri ) {
                 todo.setPriority( pri  );
                 TodoView::update( todo.uid(), todo );
                 updateView();
             }
         }
     }
 }
 void TableView::slotPriority() {
     setCellContentFromEditor( currentRow(), currentColumn() );
 }
+/*
+ * We'll use the TimerEvent to read ahead or to keep the cahce always
+ * filled enough.
+ * We will try to read ahead 4 items in both ways
+ * up and down. On odd or even we will currentRow()+-4 or +-9
+ *
+ */
+void TableView::timerEvent( QTimerEvent* ev ) {
+    int row = currentRow();
+    qWarning("TimerEvent %d", row);
+    if ( m_row ) {
+        int ro = row-4;
+        if (ro < 0 ) ro = 0;
+        sorted()[ro];
+
+        ro = row+4;
+        sorted()[ro];
+    } else {
+        int ro = row + 8;
+        sorted()[ro];
+
+        ro = row-8;
+        if (ro < 0 ) ro = 0;
+        sorted()[ro];
+    }
+
+    m_row = !m_row;
+}
diff --git a/core/pim/todo/tableview.h b/core/pim/todo/tableview.h
index bf41aea..fe65ca9 100644
--- a/core/pim/todo/tableview.h
+++ b/core/pim/todo/tableview.h
@@ -73,28 +73,31 @@ namespace Todo {
          * 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* );
         QTimer *m_menuTimer;
         bool m_enablePaint:1;
         QString m_oleCat;
         bool m_first : 1;
 
     protected:
+        void timerEvent( QTimerEvent* e );
         QWidget* createEditor(int row, int col, bool initFromCell )const;
         void setCellContentFromEditor( int row, int col );
 
 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 );
         void slotPriority();
+    private:
+        bool m_row : 1;
     };
 };
 
 #endif