author | simon <simon> | 2002-12-17 13:46:35 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-17 13:46:35 (UTC) |
commit | 65c1d23402f8df58524a8e182b00745cf9a4c3af (patch) (unidiff) | |
tree | c0e6d7f7abaaf09254eda212091a04243d115a6e /core/pim | |
parent | 1e0289c2367b411fe9c4c34aff11988dc77c0f54 (diff) | |
download | opie-65c1d23402f8df58524a8e182b00745cf9a4c3af.zip opie-65c1d23402f8df58524a8e182b00745cf9a4c3af.tar.gz opie-65c1d23402f8df58524a8e182b00745cf9a4c3af.tar.bz2 |
- word puzzle fix by Carsten
-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 | |||
@@ -146,25 +146,25 @@ QString DueTextItem::key() const { | |||
146 | } | 146 | } |
147 | void DueTextItem::setCompleted( bool comp ) { | 147 | void DueTextItem::setCompleted( bool comp ) { |
148 | m_completed = comp; | 148 | m_completed = comp; |
149 | table()->updateCell( row(), col() ); | 149 | table()->updateCell( row(), col() ); |
150 | } | 150 | } |
151 | void DueTextItem::setToDoEvent( const OTodo& ev ) { | 151 | void DueTextItem::setToDoEvent( const OTodo& ev ) { |
152 | m_hasDate = ev.hasDueDate(); | 152 | m_hasDate = ev.hasDueDate(); |
153 | m_completed = ev.isCompleted(); | 153 | m_completed = ev.isCompleted(); |
154 | 154 | ||
155 | if( ev.hasDueDate() ){ | 155 | if( ev.hasDueDate() ){ |
156 | QDate today = QDate::currentDate(); | 156 | QDate today = QDate::currentDate(); |
157 | m_off = today.daysTo(ev.dueDate() ); | 157 | m_off = today.daysTo(ev.dueDate() ); |
158 | setText( QString::number(m_off) + " day(s) " ); | 158 | setText( tr( "%1 day(s)" ).arg( QString::number(m_off) ) ); |
159 | }else{ | 159 | }else{ |
160 | setText("n.d." ); | 160 | setText("n.d." ); |
161 | m_off = 0; | 161 | m_off = 0; |
162 | } | 162 | } |
163 | } | 163 | } |
164 | void DueTextItem::paint( QPainter* p, const QColorGroup &cg, | 164 | void DueTextItem::paint( QPainter* p, const QColorGroup &cg, |
165 | const QRect& cr, bool selected ) { | 165 | const QRect& cr, bool selected ) { |
166 | QColorGroup cg2(cg); | 166 | QColorGroup cg2(cg); |
167 | 167 | ||
168 | QColor text = cg.text(); | 168 | QColor text = cg.text(); |
169 | if( m_hasDate && !m_completed ){ | 169 | if( m_hasDate && !m_completed ){ |
170 | if( m_off < 0 ){ | 170 | if( m_off < 0 ){ |
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 | |||
@@ -370,25 +370,25 @@ void TableView::paintCell(QPainter* p, int row, int col, const QRect& cr, bool | |||
370 | { | 370 | { |
371 | QString text = task.summary().isEmpty() ? | 371 | QString text = task.summary().isEmpty() ? |
372 | task.description().left(20) : | 372 | task.description().left(20) : |
373 | task.summary(); | 373 | task.summary(); |
374 | p->drawText(2,2 + fm.ascent(), text); | 374 | p->drawText(2,2 + fm.ascent(), text); |
375 | } | 375 | } |
376 | break; | 376 | break; |
377 | case 3: | 377 | case 3: |
378 | { | 378 | { |
379 | QString text; | 379 | QString text; |
380 | if (task.hasDueDate()) { | 380 | if (task.hasDueDate()) { |
381 | int off = QDate::currentDate().daysTo( task.dueDate() ); | 381 | int off = QDate::currentDate().daysTo( task.dueDate() ); |
382 | text = QString::number(off) + tr(" day(s)"); | 382 | text = tr( "%1 day(s)").arg(QString::number(off)); |
383 | /* | 383 | /* |
384 | * set color if not completed | 384 | * set color if not completed |
385 | */ | 385 | */ |
386 | if (!task.isCompleted() ) { | 386 | if (!task.isCompleted() ) { |
387 | QColor color = Qt::black; | 387 | QColor color = Qt::black; |
388 | if ( off < 0 ) | 388 | if ( off < 0 ) |
389 | color = Qt::red; | 389 | color = Qt::red; |
390 | else if ( off == 0 ) | 390 | else if ( off == 0 ) |
391 | color = Qt::yellow; | 391 | color = Qt::yellow; |
392 | else if ( off > 0 ) | 392 | else if ( off > 0 ) |
393 | color = Qt::green; | 393 | color = Qt::green; |
394 | p->setPen(color ); | 394 | p->setPen(color ); |