author | drw <drw> | 2002-12-22 15:54:54 (UTC) |
---|---|---|
committer | drw <drw> | 2002-12-22 15:54:54 (UTC) |
commit | 043abeb16589fa2aaa0881d2781bb46fa99007b6 (patch) (side-by-side diff) | |
tree | 9a36c9bf485dd72d021b57a3de56b2f27f2e7f96 | |
parent | 255d01d91f79b27765a03e100a6704fb43e1a9c1 (diff) | |
download | opie-043abeb16589fa2aaa0881d2781bb46fa99007b6.zip opie-043abeb16589fa2aaa0881d2781bb46fa99007b6.tar.gz opie-043abeb16589fa2aaa0881d2781bb46fa99007b6.tar.bz2 |
Main todo view text color and column width fixes.
-rw-r--r-- | core/pim/todo/tableview.cpp | 40 |
1 files changed, 21 insertions, 19 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 @@ -65,23 +65,20 @@ TableView::TableView( MainWindow* window, QWidget* wid ) setNumRows(0); setNumCols(4); horizontalHeader()->setLabel( 0, tr("C.") ); - horizontalHeader()->setLabel( 1, tr("Prior.") ); + horizontalHeader()->setLabel( 1, tr("Priority") ); horizontalHeader()->setLabel( 2, tr("Description" ) ); horizontalHeader()->setLabel( 3, tr("Deadline") ); + setShowDeadline( todoWindow()->showDeadline() ); + setSorting( TRUE ); setSelectionMode( NoSelection ); setLeftMargin( 0 ); verticalHeader()->hide(); - if ( todoWindow()->showDeadline() ) - showColumn( 3 ); - else - 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& ) ) ); @@ -111,21 +108,8 @@ TableView::TableView( MainWindow* window, QWidget* wid ) 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 @@ -230,8 +214,24 @@ void TableView::setShowDeadline( bool b) { if (b) showColumn(3 ); else 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 ); } void TableView::setShowCategory( const QString& str) { qWarning("setShowCategory"); if ( str != m_oleCat || m_first ) @@ -335,11 +335,13 @@ void TableView::paintCell(QPainter* p, int row, int col, const QRect& cr, bool // Paint alternating background bars if ( (row % 2 ) == 0 ) { p->fillRect( 0, 0, cr.width(), cr.height(), cg.brush( QColorGroup::Base ) ); + p->setPen( QPen( cg.text() ) ); } else { p->fillRect( 0, 0, cr.width(), cr.height(), cg.brush( QColorGroup::Background ) ); + p->setPen( QPen( cg.buttonText() ) ); } // Paint grid //p->fillRect( 0, 0, cr.width(), cr.height(), cg.brush( QColorGroup::Base ) ); |