-rw-r--r-- | core/pim/todo/tableitems.cpp | 2 | ||||
-rw-r--r-- | core/pim/todo/tableview.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/pim/todo/tableitems.cpp b/core/pim/todo/tableitems.cpp index 86fe07d..a636de6 100644 --- a/core/pim/todo/tableitems.cpp +++ b/core/pim/todo/tableitems.cpp @@ -110,72 +110,72 @@ QString ComboItem::text()const { } /* TodoTextItem */ TodoTextItem::~TodoTextItem() { } TodoTextItem::TodoTextItem( QTable* t, const QString& string ) : QTableItem( t, QTableItem::Never, string ) {} /* DueTextItem */ DueTextItem::DueTextItem( QTable* t, const OTodo& ev) : QTableItem(t, Never, QString::null ) { setToDoEvent( ev ); } DueTextItem::~DueTextItem() { } QString DueTextItem::key() const { QString key; if( m_hasDate ){ if(m_off == 0 ){ key.append("b"); }else if( m_off > 0 ){ key.append("c"); }else if( m_off < 0 ){ key.append("a"); } key.append(QString::number(m_off ) ); }else{ key.append("d"); } return key; } void DueTextItem::setCompleted( bool comp ) { m_completed = comp; table()->updateCell( row(), col() ); } void DueTextItem::setToDoEvent( const OTodo& ev ) { m_hasDate = ev.hasDueDate(); m_completed = ev.isCompleted(); if( ev.hasDueDate() ){ QDate today = QDate::currentDate(); m_off = today.daysTo(ev.dueDate() ); - setText( QString::number(m_off) + " day(s) " ); + setText( tr( "%1 day(s)" ).arg( QString::number(m_off) ) ); }else{ setText("n.d." ); m_off = 0; } } void DueTextItem::paint( QPainter* p, const QColorGroup &cg, const QRect& cr, bool selected ) { QColorGroup cg2(cg); QColor text = cg.text(); if( m_hasDate && !m_completed ){ if( m_off < 0 ){ cg2.setColor(QColorGroup::Text, QColor(red ) ); }else if( m_off == 0 ){ cg2.setColor(QColorGroup::Text, QColor(yellow) ); // orange isn't predefined }else if( m_off > 0){ cg2.setColor(QColorGroup::Text, QColor(green ) ); } } QTableItem::paint(p, cg2, cr, selected ); /* restore default color */ cg2.setColor(QColorGroup::Text, text ); } diff --git a/core/pim/todo/tableview.cpp b/core/pim/todo/tableview.cpp index 2434150..f59971e 100644 --- a/core/pim/todo/tableview.cpp +++ b/core/pim/todo/tableview.cpp @@ -334,97 +334,97 @@ 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; 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 { QString text = QString::number(task.priority()); p->drawText(2,2 + fm.ascent(), text); } 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 = QString::number(off) + tr(" day(s)"); + 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" ); 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 ) { |