Main task view updates.

5 files changed, 65 insertions, 67 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
@@ -212,6 +212,4 @@ void MainWindow::initConfig() {
 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 );
 
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
@@ -142,9 +142,2 @@ private slots:
             *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;
 
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
@@ -16,3 +16,3 @@ QuickEditImpl::QuickEditImpl( QWidget* parent, bool visible )
     // 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" );
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
@@ -37,2 +37,3 @@
 #include <qpe/config.h>
+#include <qpe/resource.h>
 
@@ -66,13 +67,2 @@ TableView::TableView( MainWindow* window, QWidget* wid )
 
-    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.") );
@@ -80,6 +70,9 @@ TableView::TableView( MainWindow* window, QWidget* wid )
     horizontalHeader()->setLabel(2, tr("Description" ) );
+    horizontalHeader()->setLabel( 3, tr("Deadline") );
 
-//    setColumnStretchable(3, FALSE );
+    setSorting( TRUE );
+    setSelectionMode( NoSelection );
 
-    horizontalHeader()->setLabel(3, tr("Deadline") );
+    setLeftMargin( 0 );
+    verticalHeader()->hide();
 
@@ -111,2 +104,25 @@ TableView::TableView( MainWindow* window, QWidget* wid )
 
+    // 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 */
@@ -317,9 +333,19 @@ void TableView::paintCell(QPainter* p,  int row, int col, const QRect& cr, bool
 
+    // 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);
 
@@ -328,6 +354,2 @@ void TableView::paintCell(QPainter* p,  int row, int col, const QRect& cr, bool
 
-    switch(col) {
-        case 0:
-        {
-            // completed field
             int marg = ( cr.width() - BoxSize ) / 2;
@@ -335,25 +357,11 @@ void TableView::paintCell(QPainter* p,  int row, int col, const QRect& cr, bool
             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;
+
+    switch(col) {
+    case 0:  // completed field
+    {
+        //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() ) {
-                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 );
+            p->drawPixmap( x + marg, y, m_pic_completed );
             }
@@ -361,11 +369,8 @@ void TableView::paintCell(QPainter* p,  int row, int col, const QRect& cr, bool
         break;
-    case 1:
-        // priority field
+    case 1:  // priority field
     {
-        QString text = QString::number(task.priority());
-        p->drawText(2,2 + fm.ascent(), text);
+       p->drawPixmap( x + marg, y, m_pic_priority[ task.priority() - 1 ] );
     }
     break;
-    case 2:
-        // description field
+    case 2:  // description field
     {
@@ -410,7 +415,5 @@ QWidget* TableView::createEditor(int row, int col, bool )const {
         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 );
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
@@ -33,2 +33,3 @@
 #include <qmap.h>
+#include <qpixmap.h>
 
@@ -82,2 +83,5 @@ namespace Todo {
 
+        QPixmap m_pic_completed;
+        QPixmap m_pic_priority[ 5 ];
+
     protected: