| -rw-r--r-- | core/pim/todo/tableview.cpp | 50 |
1 files changed, 26 insertions, 24 deletions
diff --git a/core/pim/todo/tableview.cpp b/core/pim/todo/tableview.cpp index faf4611..d229f52 100644 --- a/core/pim/todo/tableview.cpp +++ b/core/pim/todo/tableview.cpp @@ -68,3 +68,3 @@ TableView::TableView( MainWindow* window, QWidget* wid ) horizontalHeader()->setLabel( 0, tr("C.") ); - horizontalHeader()->setLabel( 1, tr("Prior.") ); + horizontalHeader()->setLabel( 1, tr("Priority") ); horizontalHeader()->setLabel( 2, tr("Description" ) ); @@ -72,2 +72,4 @@ TableView::TableView( MainWindow* window, QWidget* wid ) + setShowDeadline( todoWindow()->showDeadline() ); + setSorting( TRUE ); @@ -78,7 +80,2 @@ TableView::TableView( MainWindow* window, QWidget* wid ) - if ( todoWindow()->showDeadline() ) - showColumn( 3 ); - else - hideColumn( 3 ); - connect((QTable*)this, SIGNAL( clicked( int, int, int, const QPoint& ) ), @@ -114,15 +111,2 @@ TableView::TableView( MainWindow* window, QWidget* wid ) - // 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 */ @@ -227,8 +211,24 @@ void TableView::setShowCompleted( bool b) { } -void TableView::setShowDeadline( bool b) { - qWarning("Show DeadLine %d" + b ); - if (b) - showColumn(3 ); +void TableView::setShowDeadline( bool b ) { + qWarning( "Show DeadLine %d" + b ); + if ( b ) + showColumn( 3 ); else - hideColumn(3 ); + hideColumn( 3 ); + + // Try to intelligently size columns + // TODO - would use width() below, but doesn't have valid value at time of c'tor + int col2width = 238; + int width = m_pic_completed.width(); + setColumnWidth( 0, width ); + col2width -= width; + width = fontMetrics().boundingRect( horizontalHeader()->label( 1 ) ).width() + 8; + setColumnWidth( 1, width ); + col2width -= width; + if ( b ) { + width = fontMetrics().boundingRect( horizontalHeader()->label( 3 ) ).width() + 8; + setColumnWidth( 3, width ); + col2width -= width; + } + setColumnWidth( 2, col2width ); } @@ -338,2 +338,3 @@ void TableView::paintCell(QPainter* p, int row, int col, const QRect& cr, bool p->fillRect( 0, 0, cr.width(), cr.height(), cg.brush( QColorGroup::Base ) ); + p->setPen( QPen( cg.text() ) ); } @@ -341,2 +342,3 @@ void TableView::paintCell(QPainter* p, int row, int col, const QRect& cr, bool p->fillRect( 0, 0, cr.width(), cr.height(), cg.brush( QColorGroup::Background ) ); + p->setPen( QPen( cg.buttonText() ) ); } |