8 files changed, 78 insertions, 38 deletions

diff --git a/core/pim/todo/mainwindow.cpp b/core/pim/todo/mainwindow.cpp
index a8f4c9c..47c0160 100644
--- a/core/pim/todo/mainwindow.cpp
+++ b/core/pim/todo/mainwindow.cpp
@@ -216,26 +216,24 @@ void MainWindow::initUI() {
 
     connect(m_catMenu, SIGNAL(activated(int) ),
             this, SLOT(setCategory(int) ) );
     connect(m_template, SIGNAL(activated(int) ),
             this, SLOT(slotNewFromTemplate(int) ) );
 }
 void MainWindow::initViews() {
     TableView* tableView = new TableView( this, this );
     m_stack->addWidget( tableView,  m_counter++ );
     m_views.append( tableView );
     m_curView = tableView;
     connectBase( tableView );
-// tableView->setTodos( begin(), end() ); we call populateCategories
-
     /* 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++ );
 }
@@ -267,48 +265,66 @@ 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::Iterator MainWindow::begin() {
-    return m_todoMgr.begin();
+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::Iterator MainWindow::end() {
-    return m_todoMgr.end();
+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()->setTodos( begin(), end() );
+    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
      */
@@ -457,25 +473,25 @@ void MainWindow::slotDeleteAll() {
 }
 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() );
-    currentView()->setTodos( begin(), end() );
+    currentView()->updateView( );
 }
 void MainWindow::slotFind() {
 
 }
 void MainWindow::slotEdit() {
     slotEdit( currentView()->current() );
 }
 /*
  * set the category
  */
 void MainWindow::setCategory( int c) {
     if ( c <= 0 ) return;
diff --git a/core/pim/todo/mainwindow.h b/core/pim/todo/mainwindow.h
index 43666f0..598c3af 100644
--- a/core/pim/todo/mainwindow.h
+++ b/core/pim/todo/mainwindow.h
@@ -61,27 +61,27 @@ namespace Todo {
                     const char* name = 0 );
         ~MainWindow();
 
         /** return a context menu for an OTodo */
         QPopupMenu* contextMenu(int uid );
         QPopupMenu* options();
         QPopupMenu* edit();
         QPopupMenu* view();
         QToolBar*   toolbar();
 
 
         void updateList();
-        OTodoAccess::List::Iterator begin();
-        OTodoAccess::List::Iterator  end();
-//        OTodoAccess::List::Iterator &iterator();
+        OTodoAccess::List list()const;
+        OTodoAccess::List sorted( bool asc, int sortOrder );
+        OTodoAccess::List sorted( bool asc, int sortOrder, int addFilter );
 
         OTodo event(int uid );
 
         bool isSyncing()const;
         bool showCompleted()const;
         bool showDeadline()const;
         bool showOverDue()const;
         QString currentCategory()const;
         int currentCatId();
         TemplateManager* templateManager();
 
         void updateTodo( const OTodo& );
diff --git a/core/pim/todo/tableview.cpp b/core/pim/todo/tableview.cpp
index 8cd2e7e..097af39 100644
--- a/core/pim/todo/tableview.cpp
+++ b/core/pim/todo/tableview.cpp
@@ -81,25 +81,25 @@ TableView::TableView( MainWindow* window, QWidget* wid )
              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();
-    setTodos( begin(),end() );
+    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;
@@ -129,29 +129,31 @@ int TableView::current() {
     CheckItem* i = checkItem( currentRow() );
     if (i )
         cur = i->uid();
 
     return cur;
 }
 QString TableView::currentRepresentation() {
     return text( currentRow(), 2);
 }
 /* show overdue */
 void TableView::showOverDue( bool ) {
     clear();
-    setTodos( begin(), end() );
+    updateView();
 }
 
-void TableView::setTodos( OTodoAccess::List::Iterator it,
-                          OTodoAccess::List::Iterator end ) {
+void TableView::updateView( ) {
+    OTodoAccess::List::Iterator it, end;
+    it = list().begin();
+    end = list().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();
@@ -224,40 +226,40 @@ void TableView::addEvent( const OTodo& ev) {
  * and then replace the complete row
  */
 void TableView::replaceEvent( const OTodo& ev) {
     setTodo( ev.uid(), 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();
-    setTodos( begin(), end() );
+    updateView();
 }
 void TableView::setShowCompleted( bool b) {
     qWarning("Show Completed %d" + b );
-    setTodos( begin(), end() );
+    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");
-    setTodos( begin(), end() );
+    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);
diff --git a/core/pim/todo/tableview.h b/core/pim/todo/tableview.h
index 721b40b..1fa21b2 100644
--- a/core/pim/todo/tableview.h
+++ b/core/pim/todo/tableview.h
@@ -45,26 +45,25 @@ namespace Todo {
     public:
         TableView( MainWindow*, QWidget* parent );
         ~TableView();
 
         void updateFromTable( const OTodo&, CheckItem* = 0 );
         OTodo find(int uid);
 
         QString type()const;
         int current();
         QString currentRepresentation();
 
         void showOverDue( bool );
-        void setTodos( OTodoAccess::List::Iterator it,
-                       OTodoAccess::List::Iterator end );
+        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();
diff --git a/core/pim/todo/todomanager.cpp b/core/pim/todo/todomanager.cpp
index 8e3fa88..ebf9e8a 100644
--- a/core/pim/todo/todomanager.cpp
+++ b/core/pim/todo/todomanager.cpp
@@ -40,33 +40,32 @@ TodoManager::TodoManager( QObject *obj )
     int el = time.elapsed();
     qWarning("QTimer for loading %d", el/1000 );
 }
 TodoManager::~TodoManager() {
     delete m_db;
 }
 OTodo TodoManager::event(int uid ) {
     return m_db->find( uid );
 }
 void TodoManager::updateList() {
     m_list = m_db->allRecords();
 }
-OTodoAccess::List::Iterator TodoManager::begin() {
-    m_it = m_list.begin();
-    return m_it;
+OTodoAccess::List TodoManager::list() const{
+    return m_list;
 }
-OTodoAccess::List::Iterator TodoManager::end() {
-    return m_list.end();
+OTodoAccess::List TodoManager::sorted( bool asc, int so, int f, int cat ) {
+    return m_db->sorted( asc, so, f, cat );
 }
 OTodoAccess::List::Iterator TodoManager::overDue() {
-    int filter = 2 & 1;
+    int filter = 2 | 1;
     m_list = m_db->sorted(m_asc, m_sortOrder, filter,  m_ca );
     m_it = m_list.begin();
     return m_it;
 }
 OTodoAccess::List::Iterator TodoManager::fromTo( const QDate& start,
                                       const QDate& end ) {
     m_list = m_db->effectiveToDos( start, end );
     m_it = m_list.begin();
     return m_it;
 }
 OTodoAccess::List::Iterator TodoManager::query( const OTodo& ev, int query ) {
     m_list = m_db->queryByExample( ev, query );
diff --git a/core/pim/todo/todomanager.h b/core/pim/todo/todomanager.h
index 1f9e288..b03b598 100644
--- a/core/pim/todo/todomanager.h
+++ b/core/pim/todo/todomanager.h
@@ -47,27 +47,26 @@ namespace Todo {
     public:
         bool isLoaded()const;
         void load();
         TodoManager(QObject* obj = 0);
         ~TodoManager();
 
         QStringList categories()/*const*/;
         int catId(const QString&);
         OTodo event(int uid );
 
         void updateList();
         /** returns the iterator sorted if set sorted*/
-        OTodoAccess::List::Iterator begin();
-        OTodoAccess::List::Iterator end();
-        OTodoAccess::List& list();
+        OTodoAccess::List list()const;
+        OTodoAccess::List sorted( bool asc, int so, int f,  int cat );
 
         OTodoAccess::List::Iterator overDue();
         OTodoAccess::List::Iterator fromTo( const QDate& start,
                                  const QDate& end );
         OTodoAccess::List::Iterator query( const OTodo& ev, int query );
 
         void setCategory( bool sort, int category = -1);
         void setShowOverDue(  bool show );
         void setSortOrder( int sortOrder );
         void setSortASC( bool );
         void sort();
 
diff --git a/core/pim/todo/todoview.cpp b/core/pim/todo/todoview.cpp
index 5362b23..b77baed 100644
--- a/core/pim/todo/todoview.cpp
+++ b/core/pim/todo/todoview.cpp
@@ -1,22 +1,24 @@
 #include "mainwindow.h"
 
 #include "todoview.h"
 
 using namespace Todo;
 
 TodoView::TodoView( MainWindow* win )
     : m_main( win )
 {
     hack = new InternQtHack;
+    m_asc = false;
+    m_sortOrder = -1;
 }
 TodoView::~TodoView() {
     delete hack;
 };
 
 void TodoView::connectShow(QObject* obj,
                            const char* slot ) {
     QObject::connect( hack, SIGNAL(showTodo(int) ),
                       obj, slot );
 }
 void TodoView::connectEdit( QObject* obj,
                             const char* slot ) {
@@ -39,24 +41,37 @@ void TodoView::connectUpdateView( QObject* obj,
                       obj, slot );
 }
 void TodoView::connectRemove( QObject* obj,
                               const char* slot ) {
     QObject::connect( hack, SIGNAL(remove(int) ),
                       obj, slot );
 }
 MainWindow* TodoView::todoWindow() {
     return m_main;
 }
 
 OTodo TodoView::event(int uid ) { return m_main->event( uid ); }
-OTodoAccess::List::Iterator TodoView::begin() {
-    m_main->updateList();
-    return m_main->begin();
+OTodoAccess::List TodoView::list(){
+    todoWindow()->updateList();
+    return todoWindow()->list();
+}
+OTodoAccess::List TodoView::sorted(){
+    return m_sort;
+}
+void TodoView::sort() {
+    m_sort = todoWindow()->sorted(m_asc,m_sortOrder );
+}
+void TodoView::sort(int sort) {
+    m_sort = todoWindow()->sorted(m_asc, m_sortOrder, sort );
+}
+void TodoView::setSortOrder( int order ) {
+    m_sortOrder = order;
+}
+void TodoView::setAscending( bool b ) {
+    m_asc = b;
 }
-OTodoAccess::List::Iterator TodoView::end() { return m_main->end(); }
-
 void TodoView::update(int uid, const SmallTodo& to ) {
     //m_main->slotUpate1( uid, to );
 }
 void TodoView::update(int uid, const OTodo& ev ) {
     m_main->updateTodo( ev );
 }
diff --git a/core/pim/todo/todoview.h b/core/pim/todo/todoview.h
index e4985a7..81ace3a 100644
--- a/core/pim/todo/todoview.h
+++ b/core/pim/todo/todoview.h
@@ -80,26 +80,29 @@ namespace Todo {
     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;
-        virtual void setTodos( OTodoAccess::List::Iterator it,
-                               OTodoAccess::List::Iterator end ) = 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 void newDay() = 0;
 
         virtual void connectShow( QObject*, const char* ) = 0;
@@ -144,35 +147,42 @@ namespace Todo {
                           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::Iterator begin();
-        OTodoAccess::List::Iterator end();
+        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