summaryrefslogtreecommitdiff
authorsimon <simon>2002-12-17 13:46:35 (UTC)
committer simon <simon>2002-12-17 13:46:35 (UTC)
commit65c1d23402f8df58524a8e182b00745cf9a4c3af (patch) (side-by-side diff)
treec0e6d7f7abaaf09254eda212091a04243d115a6e
parent1e0289c2367b411fe9c4c34aff11988dc77c0f54 (diff)
downloadopie-65c1d23402f8df58524a8e182b00745cf9a4c3af.zip
opie-65c1d23402f8df58524a8e182b00745cf9a4c3af.tar.gz
opie-65c1d23402f8df58524a8e182b00745cf9a4c3af.tar.bz2
- word puzzle fix by Carsten
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/pim/todo/tableitems.cpp2
-rw-r--r--core/pim/todo/tableview.cpp2
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
@@ -94,88 +94,88 @@ void ComboItem::setContentFromEditor( QWidget* w) {
QTableItem::setContentFromEditor( w );
ev.setPriority( text().toInt() );
//view->updateFromTable( ev );
}
void ComboItem::setText( const QString& s ) {
if ( m_cb )
m_cb->setCurrentItem( s.toInt()-1 );
QTableItem::setText( s );
}
QString ComboItem::text()const {
if ( m_cb)
return m_cb->currentText();
return QTableItem::text();
}
/* 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
@@ -318,129 +318,129 @@ void TableView::paintCell(QPainter* p, int row, int col, const QRect& cr, bool
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);
QFont f = p->font();
QFontMetrics fm(f);
switch(col) {
case 0:
{
// completed field
int marg = ( cr.width() - BoxSize ) / 2;
int x = 0;
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 ) {
QWidget* wid = cellWidget(row, 1 );
if ( wid->inherits("QComboBox") ) {
int pri = ((QComboBox*)wid)->currentItem() + 1;
OTodo todo = sorted()[row];
if ( todo.priority() != pri ) {
todo.setPriority( pri );
TodoView::update( todo.uid(), todo );
updateView();
}
}
}else if ( col == 2) {
QWidget* wid = cellWidget(row, 2);
if ( wid->inherits("QLineEdit") ) {
QString text = ((QLineEdit*)wid)->text();
OTodo todo = sorted()[row];
if ( todo.summary() != text ) {