Main task view updates.

5 files changed, 75 insertions, 77 deletions

diff --git a/core/pim/todo/mainwindow.cpp b/core/pim/todo/mainwindow.cpp
index f0aa455..0ccf73e 100644
--- a/core/pim/todo/mainwindow.cpp
+++ b/core/pim/todo/mainwindow.cpp
@@ -85,260 +85,258 @@ MainWindow::MainWindow( QWidget* parent,
 }
 void MainWindow::initTemplate() {
     m_curTempEd = new TemplateEditor( this, templateManager() );
 }
 void MainWindow::initActions() {
     
     // Data menu
     m_edit->insertItem(tr("New from template"), m_template,
                        -1, 0 );
     
     QAction* a = new QAction( tr("New Task" ), Resource::loadPixmap( "new" ),
                               QString::null, 0, this, 0 );
     connect(a, SIGNAL( activated() ),
             this, SLOT( slotNew() ) );
     a->addTo(m_tool );
     a->addTo(m_edit );
 
     a = new QAction( tr("Edit Task"), Resource::loadIconSet( "edit" ),
                      QString::null, 0, this, 0 );
     connect(a, SIGNAL(activated() ),
             this, SLOT( slotEdit() ) );
     a->addTo( m_tool );
     a->addTo( m_edit );
     m_editAction = a;
 
     a = new QAction( QString::null, tr("View Task"), 0, this, 0 );
     connect(a, SIGNAL( activated() ),
             this, SLOT( slotShowDetails() ) );
     a->addTo( m_edit );
 
     m_edit->insertSeparator();
 
     a = new QAction( tr("Delete..."),  Resource::loadIconSet( "trash" ),
                      QString::null, 0, this, 0 );
     connect(a, SIGNAL(activated() ),
             this, SLOT(slotDelete() ) );
     a->addTo( m_tool );
     a->addTo( m_edit );
     m_deleteAction = a;
 
     a = new QAction( QString::null, tr("Delete all..."), 0, this, 0 );
     connect(a, SIGNAL( activated() ),
             this, SLOT( slotDeleteAll() ) );
     a->addTo(m_edit );
     m_deleteAllAction = a;
 
     a = new QAction( QString::null, tr("Delete completed"),
                      0, this, 0 );
     connect(a, SIGNAL( activated() ),
             this, SLOT( slotDeleteCompleted() ) );
     a->addTo(m_edit );
     a->setEnabled( TRUE );
     m_deleteCompleteAction = a;
 
     m_edit->insertSeparator();
 
     a = new QAction( QString::null, tr("Duplicate"), 0, this, 0 );
     connect(a, SIGNAL( activated() ),
             this, SLOT( slotDuplicate() ) );
     a->addTo(m_edit );
     m_duplicateAction = a;
 
     m_edit->insertSeparator();
 
     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( m_edit );
 	a->addTo( m_tool );
     }
 
     // Options menu
     a = new QAction( tr("Find"), Resource::loadIconSet( "mag" ),
                      QString::null, 0, this, 0 );
     connect(a, SIGNAL( activated() ), this, SLOT( slotFind() ) );
     a->addTo( m_options );
     m_findAction = a;
 
     m_options->insertSeparator();
 
     m_completedAction = new QAction( QString::null, tr("Show completed tasks"),
                                      0, this, 0, TRUE );
     m_completedAction->addTo( m_options );
     m_completedAction->setOn( showCompleted() );
     connect(m_completedAction, SIGNAL( toggled(bool) ), this, SLOT(slotShowCompleted(bool) ) );
 
     a = new QAction( QString::null, tr("Show only over-due tasks"),
                      0, this, 0, TRUE );
     a->addTo( m_options );
     a->setOn( showOverDue() );
     connect(a, SIGNAL(toggled(bool)), this, SLOT(slotShowDue(bool) ) );
 
     m_showDeadLineAction = new QAction( QString::null, tr("Show task deadlines"),
                                         0, this, 0, TRUE );
     m_showDeadLineAction->addTo( m_options );
     m_showDeadLineAction->setOn( showDeadline() );
     connect(m_showDeadLineAction, SIGNAL(toggled(bool) ), this, SLOT( slotShowDeadLine( bool ) ) );
 
     m_showQuickTaskAction = new QAction( QString::null, tr("Show quick task bar"),
                                      0, this, 0, TRUE );
     m_showQuickTaskAction->addTo( m_options );
     m_showQuickTaskAction->setOn( showQuickTask() );
     connect(m_showQuickTaskAction, SIGNAL( toggled(bool) ), this, SLOT(slotShowQuickTask(bool) ) );
 
     m_options->insertSeparator();
 
     m_bar->insertItem( tr("Data") ,m_edit );
     m_bar->insertItem( tr("Category"),  m_catMenu );
     m_bar->insertItem( tr("Options"), m_options );
 
     m_curQuick = new QuickEditImpl( this, m_quicktask );
     addToolBar( (QPEToolBar *)m_curQuick->widget(), tr( "QuickEdit" ), QMainWindow::Top, TRUE );
     m_curQuick->signal()->connect( this, SLOT(slotQuickEntered() ) );
 
 }
 /* m_curCat from Config */
 void MainWindow::initConfig() {
     Config config( "todo" );
     config.setGroup( "View" );
     m_completed =  config.readBoolEntry( "ShowComplete", TRUE );
     m_curCat = config.readEntry( "Category",    QString::null );
     m_deadline =  config.readBoolEntry( "ShowDeadLine", TRUE);
     m_overdue = config.readBoolEntry("ShowOverDue", FALSE );
     m_quicktask = config.readBoolEntry("ShowQuickTask", TRUE);
 }
 void MainWindow::initUI() {
-    m_mainBox = new QVBox(this, "main box ");
-
-    m_stack = new QWidgetStack(m_mainBox,  "main stack");
-    setCentralWidget( m_mainBox );
+    m_stack = new QWidgetStack(this,  "main stack");
+    setCentralWidget( m_stack );
 
     setToolBarsMovable( FALSE );
 
     m_tool = new QPEToolBar( this );
     m_tool->setHorizontalStretchable( TRUE );
 
     m_bar = new QMenuBar( m_tool );
 
     /** QPopupMenu */
     m_edit = new QPopupMenu( this );
     m_options = new QPopupMenu( this );
     m_catMenu = new QPopupMenu( this );
     m_template = new QPopupMenu( this );
 
     m_catMenu->setCheckable( TRUE );
     m_template->setCheckable( TRUE );
 
     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, m_stack );
     m_stack->addWidget( tableView,  m_counter++ );
     m_views.append( tableView );
     m_curView = tableView;
     connectBase( tableView );
     /* 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* ) {
     // once templates and signals mix we'll use it again
 }
 QPopupMenu* MainWindow::contextMenu( int , bool recur ) {
     QPopupMenu* menu = new QPopupMenu();
 
     m_editAction->addTo( menu );
     m_deleteAction->addTo( menu );
     m_duplicateAction->addTo( menu );
 
     menu->insertSeparator();
 
     /*
      * if this event recurs we allow
      * to detach it.
      * remove all
      */
     if ( recur ) {
         ; // FIXME
     }
 
     return menu;
 }
 QPopupMenu* MainWindow::options() {
     qWarning("Options");
     return m_options;
 }
 QPopupMenu* MainWindow::edit() {
     return m_edit;
 }
 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
diff --git a/core/pim/todo/mainwindow.h b/core/pim/todo/mainwindow.h
index 86b9ac2..d756d64 100644
--- a/core/pim/todo/mainwindow.h
+++ b/core/pim/todo/mainwindow.h
@@ -15,192 +15,185 @@
     =_        +     =;=|`    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_MAIN_WINDOW_H
 #define TODO_MAIN_WINDOW_H
 
 #include <qlist.h>
 
 #include <opie/otodoaccess.h>
 #include <opie/otodo.h>
 #include <opie/opimmainwindow.h>
 
 #include "smalltodo.h"
 #include "todoview.h"
 #include "quickedit.h"
 #include "todomanager.h"
 
 class QPopupMenu;
 class QMenuBar;
 class QToolBar;
 class QAction;
 class QWidgetStack;
 class Ir;
 class QVBox;
 class QLineEdit;
 
 namespace Todo {
     typedef TodoView View;
     class TemplateManager;
     class Editor;
     class TodoShow;
     class TemplateEditor;
     struct QuickEditBase;
 
     class MainWindow : public OPimMainWindow {
         Q_OBJECT
         friend class TodoView; // avoid QObject here....
     public:
         MainWindow( QWidget *parent = 0,
                     const char* name = 0 );
         ~MainWindow();
 
         /** return a context menu for an OTodo */
         QPopupMenu* contextMenu(int uid, bool doesRecur = FALSE );
         QPopupMenu* options();
         QPopupMenu* edit();
         QToolBar*   toolbar();
 
 
         void updateList();
         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;
         bool showQuickTask()const;
         QString currentCategory()const;
         int currentCatId();
         TemplateManager* templateManager();
         QuickEditBase* quickEditor();
 
         void updateTodo( const OTodo& );
         void populateTemplates();
         Editor* currentEditor();
         void setReadAhead(uint count );
 private slots:
         void slotQuickEntered();
         void populateCategories();
         void slotReload();
         void slotFlush();
 
     protected:
         void closeEvent( QCloseEvent* e );
 
     private:
         void receiveFile( const QString& filename );
         void connectBase( ViewBase* );
         void initUI();
         void initActions();
         void initConfig();
         void initViews();
         void initEditor();
         void initShow();
         void initTemplate();
         void raiseCurrentView();
         ViewBase* currentView();
         ViewBase* m_curView;
         QuickEditBase* m_curQuick;
         Editor* m_curEdit;
         TodoShow* currentShow();
         TodoShow* m_curShow;
         TemplateEditor* currentTemplateEditor();
         TemplateEditor* m_curTempEd;
 
         QMenuBar* m_bar;
         QToolBar* m_tool;
         QAction* m_editAction,
             *m_deleteAction,
             *m_findAction,
             *m_completedAction,
             *m_showDeadLineAction,
             *m_deleteAllAction,
             *m_deleteCompleteAction,
             *m_duplicateAction,
             *m_showOverDueAction,
             *m_showQuickTaskAction,
             *m_effectiveAction;
         QWidgetStack *m_stack;
         QPopupMenu* m_catMenu,
             *m_edit,
             *m_options,
             *m_template;
-        /* box with two rows
-         * top will be the quick edit
-         * this will bite my ass once
-         * we want to have all parts
-         * exchangeable
-         */
-        QVBox* m_mainBox;
 
         bool m_syncing:1;
         bool m_deadline:1;
         bool m_completed:1;
         bool m_overdue:1;
         bool m_quicktask:1;
         TodoManager m_todoMgr;
         QString m_curCat;
         QList<ViewBase> m_views;
         uint m_counter;
         TemplateManager* m_tempManager;
 
 
      private slots:
         void slotShow(int);
         void slotEdit(int);
         void slotUpdate3( QWidget* );
         void slotComplete( int uid );
         void slotComplete( const OTodo& ev );
         void slotNewFromTemplate(int id );
         void slotNew();
         void slotDuplicate();
 
         void slotDelete();
         void slotDeleteAll();
         void slotDeleteCompleted();
 
         void slotEdit();
         void slotFind();
 
         void setCategory( int );
 
         void slotShowDeadLine( bool );
         void slotShowCompleted( bool );
         void slotShowQuickTask( bool );
 
         void setDocument( const QString& );
 
 
         void slotBeam();
         void beamDone( Ir* );
         void slotShowDetails();
         void slotShowDue( bool );
         /* reimplementation from opimmainwindow */
     protected slots:
         void flush();
         void reload();
         int create();
         bool remove( int uid );
         void beam(int uid, int transport = IrDa );
         void show( int uid );
         void edit( int uid );
         void add( const OPimRecord& );
     };
 };
 
 #endif
diff --git a/core/pim/todo/quickeditimpl.cpp b/core/pim/todo/quickeditimpl.cpp
index 8d0a9fd..cadec03 100644
--- a/core/pim/todo/quickeditimpl.cpp
+++ b/core/pim/todo/quickeditimpl.cpp
@@ -1,106 +1,106 @@
 #include <qaction.h>
 #include <qlineedit.h>
 
 #include <qpe/resource.h>
 
 #include <opie/oclickablelabel.h>
 
 #include "mainwindow.h"
 #include "quickeditimpl.h"
 
 
 QuickEditImpl::QuickEditImpl( QWidget* parent, bool visible )
     : QPEToolBar( (QMainWindow *)parent ), Todo::QuickEdit( (Todo::MainWindow *)parent ) {
     setHorizontalStretchable( TRUE );
 
     // Load priority icons
-    // TODO - probably should be done globally somewhere else
+    // TODO - probably should be done globally somewhere else, see also tableview.cpp/h
     priority1 = Resource::loadPixmap( "todo/priority1" );
     priority3 = Resource::loadPixmap( "todo/priority3" );
     priority5 = Resource::loadPixmap( "todo/priority5" );
 	
 	
 	// TODO - come up with icons and replace text priority values
     m_lbl = new OClickableLabel( this );
     m_lbl->setMinimumWidth(15);
     m_lbl->setPixmap( priority3 );
     connect(m_lbl, SIGNAL(clicked() ), this, SLOT(slotPrio()) );
 
     m_edit = new QLineEdit( this );
     setStretchableWidget( m_edit );
 
     QAction *a = new QAction( tr( "More" ), Resource::loadPixmap( "todo/more" ), QString::null, 0, this, 0 );
     connect( a, SIGNAL( activated() ), this, SLOT( slotMore() ) );
     a->addTo( this );
 
     a = new QAction( tr( "Enter" ), Resource::loadPixmap( "enter" ), QString::null, 0, this, 0 );
     connect( a, SIGNAL( activated() ), this, SLOT( slotEnter() ) );
     a->addTo( this );
 
     a = new QAction( tr( "Cancel" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 );
     connect( a, SIGNAL( activated() ), this, SLOT( slotCancel() ) );
     a->addTo( this );
 
     m_visible = visible;
     if ( !m_visible ) {
         hide();
     }
     
     m_menu = 0l;
     reinit();
 }
 QuickEditImpl::~QuickEditImpl() {
 
 }
 OTodo QuickEditImpl::todo()const {
     return m_todo;
 }
 QWidget* QuickEditImpl::widget() {
     return this;
 }
 void QuickEditImpl::slotEnter() {
     OTodo todo;
 
 
     if (!m_edit->text().isEmpty() ) {
         todo.setUid(1 ); // new uid
         todo.setPriority( m_state );
         todo.setSummary( m_edit->text() );
         if ( ((Todo::MainWindow *)parent())->currentCatId() != 0 )
             todo.setCategories( ((Todo::MainWindow *)parent())->currentCatId() );
 
         m_todo = todo;
        commit();
     }
     m_todo = todo;
     reinit();
 }
 void QuickEditImpl::slotPrio() {
     m_state -= 2;
     if ( m_state < 1 )
         m_state = 5;
 
     switch( m_state ) {
     case 1:
         m_lbl->setPixmap( priority1 );
         break;
     case 5:
         m_lbl->setPixmap( priority5 );
         break;
     case 3:
     default:
         m_lbl->setPixmap( priority3 );
         break;
     }
 }
 void QuickEditImpl::slotMore() {
     // TODO - implement
 }
 void QuickEditImpl::slotCancel() {
     reinit();
 }
 void QuickEditImpl::reinit() {
     m_state = 3;
     m_lbl->setPixmap( priority3 );
     m_edit->clear();
 }
diff --git a/core/pim/todo/tableview.cpp b/core/pim/todo/tableview.cpp
index a8cc271..faf4611 100644
--- a/core/pim/todo/tableview.cpp
+++ b/core/pim/todo/tableview.cpp
@@ -1,525 +1,528 @@
 /*
                =.            This file is part of the OPIE Project
              .=l.            Copyright (c)  2002 <zecke>
            .>+-=
  _;:,     .>    :=|.         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 <stdlib.h>
 #include <cmath>
 
 #include <qcombobox.h>
 #include <qlineedit.h>
 #include <qtimer.h>
 #include <qpoint.h>
 #include <qpopupmenu.h>
 
 #include <qpe/config.h>
+#include <qpe/resource.h>
 
 #include <opie/orecur.h>
 
 #include "mainwindow.h"
 //#include "tableitems.h"
 #include "tableview.h"
 
 using namespace Todo;
 
 namespace {
     static const int BoxSize = 14;
     static const int RowHeight = 20;
 }
 
 
 void TableView::initConfig() {
     Config config( "todo" );
     config.setGroup( "Options" );
     m_completeStrokeWidth = config.readNumEntry( "CompleteStrokeWidth", 8 );
 }
 
 TableView::TableView( MainWindow* window, QWidget* wid )
     : QTable(  wid ), TodoView( window ) {
     setUpdatesEnabled( false );
     viewport()->setUpdatesEnabled( false );
     m_enablePaint = false;
     setNumRows(0);
     setNumCols(4);
 
+    horizontalHeader()->setLabel( 0, tr("C.") );
+    horizontalHeader()->setLabel( 1, tr("Prior.") );
+    horizontalHeader()->setLabel( 2, tr("Description" ) );
+    horizontalHeader()->setLabel( 3, tr("Deadline") );
+
     setSorting( TRUE );
     setSelectionMode( NoSelection );
-//    setColumnStretchable( 2, TRUE );
-    setColumnStretchable( 3, FALSE );
-    setColumnWidth(0, 20 );
-    setColumnWidth(1, 35 );
-    setColumnWidth(3, 18 );
-
+    
     setLeftMargin( 0 );
     verticalHeader()->hide();
 
-    horizontalHeader()->setLabel(0, tr("C.") );
-    horizontalHeader()->setLabel(1, tr("Prior.") );
-    horizontalHeader()->setLabel(2, tr("Description" ) );
-
-//    setColumnStretchable(3, FALSE );
-
-    horizontalHeader()->setLabel(3, tr("Deadline") );
-
     if ( todoWindow()->showDeadline() )
-        showColumn( 3);
+        showColumn( 3 );
     else
-        hideColumn(3 );
+        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();
     setSortOrder( 0 );
     setAscending( TRUE );
     m_first = true;
 
+    // Load icons
+    // TODO - probably should be done globally somewhere else, see also quickeditimpl.cpp/h
+    m_pic_completed = Resource::loadPixmap( "todo/completed" );
+    QString namestr;
+    for ( unsigned int i = 1; i < 6; i++ ) {
+        namestr = "todo/priority";
+        namestr.append( QString::number( i ) );
+        m_pic_priority[ i - 1 ] = Resource::loadPixmap( namestr );
+    }
+
+    // Try to intelligently size columns
+    int col2width = 240;
+    int width = m_pic_completed.width();
+    setColumnWidth( 0, width );
+    col2width -= width;
+    width = fontMetrics().boundingRect( horizontalHeader()->label( 1 ) ).width()+8;
+    setColumnWidth( 1, width );
+    col2width -= width;
+    width = fontMetrics().boundingRect( horizontalHeader()->label( 3 ) ).width()+8;
+    setColumnWidth( 3, width );
+    col2width -= width;
+    setColumnWidth( 2, col2width - 2 );
+
     /* now let's init the config */
     initConfig();
 }
 /* a new day has started
  * update the day
  */
 void TableView::newDay() {
     clear();
     updateView();
 }
 TableView::~TableView() {
 
 }
 void TableView::slotShowMenu() {
     QPopupMenu *menu = todoWindow()->contextMenu( current(), sorted()[currentRow()].recurrence().doesRecur() );
     menu->exec(QCursor::pos() );
     delete menu;
 }
 QString TableView::type() const {
     return QString::fromLatin1( tr("Table View") );
 }
 int TableView::current() {
     int uid = sorted().uidAt(currentRow() );
 
     return uid;
 }
 QString TableView::currentRepresentation() {
     OTodo to = sorted()[currentRow()];
     return to.summary().isEmpty() ? to.description().left(20) : to.summary() ;
 }
 /* show overdue */
 void TableView::showOverDue( bool ) {
     clear();
     updateView();
 }
 
 void TableView::updateView( ) {
     qWarning("update view");
     m_row = false;
     static int id;
     id = startTimer(4000 );
     /* 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 );
 
     setNumRows( it.count() );
     if ( it.count() == 0 )
         killTimer(id);
 
 //    int elc = time.elapsed();
     setUpdatesEnabled( true );
     viewport()->setUpdatesEnabled( true );
     viewport()->update();
 
     m_enablePaint = true;
 //    int el = time.elapsed();
 }
 void TableView::setTodo( int, const OTodo&) {
     sort();
 
     /* repaint */
     repaint();
 }
 void TableView::addEvent( const OTodo&) {
 
     /* fix problems of not showing the 'Haken' */
     updateView();
 }
 /*
  * 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
  */
 void TableView::removeEvent( int ) {
     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& str) {
     qWarning("setShowCategory");
     if ( str != m_oleCat || m_first )
         updateView();
 
     m_oleCat = str;
     m_first = false;
 
 }
 void TableView::clear() {
     setNumRows(0);
 }
 void TableView::slotClicked(int row, int col, int,
                             const QPoint& point) {
     if ( !cellGeometry(row, col ).contains(point ) )
         return;
 
     int ui= sorted().uidAt( row );
 
 
     switch( col ) {
     case 0:{
          int x = point.x() -columnPos( col );
          int y = point.y() -rowPos( row );
          int w = columnWidth( col );
          int h = rowHeight( row );
          if ( x >= ( w - BoxSize ) / 2 &&
               x <= ( w - BoxSize ) / 2 + BoxSize &&
               y >= ( h - BoxSize ) / 2 &&
               y <= ( h - BoxSize ) / 2 + BoxSize ) {
              TodoView::complete(sorted()[row] );
          }
     }
         break;
 
     case 1:
         break;
 
     case 2: {
         m_menuTimer->stop();
         showTodo( ui );
         break;
     }
     case 3: {
         m_menuTimer->stop();
         TodoView::edit( ui );
         break;
     }
     }
 
 
 }
 void TableView::slotPressed(int row, int col, int,
                             const QPoint& point) {
 
     qWarning("pressed row %d  col %d   x:%d+y:%d", row,col,point.x(),point.y() );
     m_prevP = 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();
 }
 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 col, bool asc, bool ) {
     qWarning("bool %d", asc );
     setSortOrder( col );
     setAscending( asc );
     updateView();
 }
 void TableView::viewportPaintEvent( QPaintEvent* e) {
     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 ) );
+    // TODO - give user option for grid or bars?
+
+    // Paint alternating background bars
+    if (  (row % 2 ) == 0 ) {
+        p->fillRect( 0, 0, cr.width(), cr.height(), cg.brush( QColorGroup::Base ) );
+    }
+    else {
+        p->fillRect( 0, 0, cr.width(), cr.height(), cg.brush( QColorGroup::Background ) );
+    }
 
-    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);
+    // Paint grid
+    //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);
 
+    int marg = ( cr.width() - BoxSize ) / 2;
+    int x = 0;
+    int y = ( cr.height() - BoxSize ) / 2;
+
     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
+    case 0:  // completed field
     {
-        QString text = QString::number(task.priority());
-        p->drawText(2,2 + fm.ascent(), text);
+        //p->setPen( QPen( cg.text() ) );
+        //p->drawRect( x + marg, y, BoxSize, BoxSize );
+        //p->drawRect( x + marg+1, y+1, BoxSize-2, BoxSize-2 );
+        if ( task.isCompleted() ) {
+            p->drawPixmap( x + marg, y, m_pic_completed );
+        }       
     }
     break;
-    case 2:
-        // description field
+    case 1:  // priority field
+    {
+       p->drawPixmap( x + marg, y, m_pic_priority[ task.priority() - 1 ] );
+    }
+    break;
+    case 2:  // description field
     {
         QString text = task.summary().isEmpty() ?
                        task.description().left(20) :
                        task.summary();
         p->drawText(2,2 + fm.ascent(), text);
     }
     break;
     case 3:
     {
         QString text;
         if (task.hasDueDate()) {
             int off = QDate::currentDate().daysTo( task.dueDate() );
             text = tr( "%1 day(s)").arg(QString::number(off));
             /*
              * 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: {
         /* the priority stuff */
         QComboBox* combo = new QComboBox( viewport() );
-        combo->insertItem( "1" );
-        combo->insertItem( "2" );
-        combo->insertItem( "3" );
-        combo->insertItem( "4" );
-        combo->insertItem( "5" );
+        for ( int i = 0; i < 5; i++ ) {
+            combo->insertItem( m_pic_priority[ i ] );
+        }
         combo->setCurrentItem( sorted()[row].priority()-1 );
         return combo;
     }
         /* summary */
     case 2:{
         QLineEdit* edit = new QLineEdit( viewport() );
         edit->setText( sorted()[row].summary() );
         return edit;
     }
     case 0:
     default:
         return 0l;
     }
 }
 void TableView::setCellContentFromEditor(int row, int col ) {
     if ( col == 1 ) {
         QWidget* wid = cellWidget(row, 1 );
         if ( wid->inherits("QComboBox") ) {
             int pri = ((QComboBox*)wid)->currentItem() + 1;
             OTodo todo = sorted()[row];
             if ( todo.priority() != pri ) {
                 todo.setPriority( pri  );
                 TodoView::update( todo.uid(), todo );
                 updateView();
             }
         }
     }else if ( col == 2) {
         QWidget* wid = cellWidget(row, 2);
         if ( wid->inherits("QLineEdit") ) {
             QString text = ((QLineEdit*)wid)->text();
             OTodo todo = sorted()[row];
             if ( todo.summary() != text ) {
                 todo.setSummary( text );
                 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 ) {
 //    qWarning("sorted %d", sorted().count() );
     if (sorted().count() == 0 )
         return;
 
     int row = currentRow();
     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;
 }
 
 // We want  a strike through completed ;)
 // durchstreichen to complete
 /*
  * MouseTracking is off this mean we only receive
  * these events if the mouse button is pressed
  * We've the previous point saved
  * We check if the previous and current Point are
  * in the same row.
  * Then we check if they're some pixel horizontal away
  * if the distance between the two points is greater than
  * 8 we mark the underlying todo as completed and do a repaint
  *
  * BUG: When clicking on the Due column and it's scrollable
  * the todo is marked as completed...
  * REASON: QTable is doing auto scrolling which leads to a move
  * in the x coordinate and this way it's able to pass the
  * m_completeStrokeWidth criteria
  * WORKAROUND: strike through needs to strike through the same
  * row and two columns!
  */
 void TableView::contentsMouseReleaseEvent( QMouseEvent* e) {
     int row = rowAt(m_prevP.y());
     int colOld = columnAt(m_prevP.x() );
     int colNew = columnAt(e->x() );
     qWarning("colNew: %d colOld: %d", colNew, colOld );
     if ( row == rowAt( e->y() ) && row != -1 &&
          colOld != colNew ) {
         TodoView::complete( sorted()[row] );
         return;
     }
     QTable::contentsMouseReleaseEvent( e );
 }
 void TableView::contentsMouseMoveEvent( QMouseEvent* e ) {
     m_menuTimer->stop();
     QTable::contentsMouseMoveEvent( e );
 }
diff --git a/core/pim/todo/tableview.h b/core/pim/todo/tableview.h
index a27c698..2b6ea2b 100644
--- a/core/pim/todo/tableview.h
+++ b/core/pim/todo/tableview.h
@@ -1,107 +1,111 @@
 /*
                =.            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 <qpixmap.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();
 
 
         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 newDay();
         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* );
         QTimer *m_menuTimer;
         bool m_enablePaint:1;
         QString m_oleCat;
         bool m_first : 1;
 
+        QPixmap m_pic_completed;
+        QPixmap m_pic_priority[ 5 ];
+
     protected:
         void contentsMouseReleaseEvent( QMouseEvent* );
         void contentsMouseMoveEvent( QMouseEvent* );
         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:
         void initConfig();
         int m_completeStrokeWidth;
         bool m_row : 1;
         QPoint m_prevP;
     };
 };
 
 #endif