author | zecke <zecke> | 2002-04-13 19:58:17 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-04-13 19:58:17 (UTC) |
commit | 244495af9bd629fe565b5c753d066cc4fde684ae (patch) (side-by-side diff) | |
tree | 8f20084c688b627223a431f02875703418e6d999 /core/pim/todo | |
parent | 84f5e0817231fa3721c781b0538659f5a7149349 (diff) | |
download | opie-244495af9bd629fe565b5c753d066cc4fde684ae.zip opie-244495af9bd629fe565b5c753d066cc4fde684ae.tar.gz opie-244495af9bd629fe565b5c753d066cc4fde684ae.tar.bz2 |
Fix Stefan Eilers patch
Extend the due column
better sorting
and colors ;)
-rw-r--r-- | core/pim/todo/mainwindow.cpp | 4 | ||||
-rw-r--r-- | core/pim/todo/todotable.cpp | 98 | ||||
-rw-r--r-- | core/pim/todo/todotable.h | 43 |
3 files changed, 87 insertions, 58 deletions
diff --git a/core/pim/todo/mainwindow.cpp b/core/pim/todo/mainwindow.cpp index 33f13aa..a34bcf2 100644 --- a/core/pim/todo/mainwindow.cpp +++ b/core/pim/todo/mainwindow.cpp @@ -109,9 +109,8 @@ TodoWindow::TodoWindow( QWidget *parent, const char *name, WFlags f = 0 ) : config.setGroup( "View" ); bool complete = config.readBoolEntry( "ShowComplete", true ); table->setShowCompleted( complete ); - /* added 20.01.2k2 by se */ bool showdeadline = config.readBoolEntry("ShowDeadLine", true); table->setShowDeadline (showdeadline); QString category = config.readEntry( "Category", QString::null ); @@ -180,9 +179,8 @@ TodoWindow::TodoWindow( QWidget *parent, const char *name, WFlags f = 0 ) : // qDebug("mainwindow #2: t=%d", t.elapsed() ); completedAction = new QAction( QString::null, tr("Completed tasks"), 0, this, 0, TRUE ); - /* added 20.01.2k2 by se */ showdeadlineAction = new QAction( QString::null, tr( "Show Deadline" ), 0, this, 0, TRUE ); catMenu->setCheckable( true ); populateCategories(); @@ -363,9 +361,9 @@ void TodoWindow::populateCategories() completedAction->addTo( catMenu ); completedAction->setOn( table->showCompleted() ); showdeadlineAction->addTo( catMenu ); showdeadlineAction->setOn( table->showDeadline() ); - + catMenu->insertSeparator(); int id, rememberId; id = 1; catMenu->insertItem( tr( "All Categories" ), id++ ); // catMenu->insertSeparator(); diff --git a/core/pim/todo/todotable.cpp b/core/pim/todo/todotable.cpp index 3cd0c0e..2acd03c 100644 --- a/core/pim/todo/todotable.cpp +++ b/core/pim/todo/todotable.cpp @@ -159,11 +159,59 @@ QString ComboItem::text() const if ( cb ) return cb->currentText(); return QTableItem::text(); } - - - +DueTextItem::DueTextItem( QTable *t, ToDoEvent *ev ) + : QTableItem(t, Never, QString::null ) +{ + setToDoEvent( ev ); +} +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::setToDoEvent( const ToDoEvent *ev ) +{ + m_hasDate = ev->hasDate(); + m_completed = ev->isCompleted(); + if( ev->hasDate() ){ + QDate today = QDate::currentDate(); + m_off = today.daysTo(ev->date() ); + setText( QString::number(m_off) + " day(s) " ); + }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 ); + cg2.setColor(QColorGroup::Text, text ); +} TodoTable::TodoTable( QWidget *parent, const char *name ) // #ifdef QT_QTABLE_NOHEADER_CONSTRUCTOR // : QTable( 0, 3, parent, name, TRUE ), // #else @@ -246,15 +294,15 @@ void TodoTable::slotClicked( int row, int col, int, const QPoint &pos ) case 1: break; case 2: // may as well edit it... - menuTimer->stop(); + // menuTimer->stop(); // emit signalEdit(); - break; - case 3: /* added 20.01.2k2 by se */ + // fall through + case 3: // may as well edit it... menuTimer->stop(); - emit signalEdit(); + // emit signalEdit(); break; } } @@ -367,18 +415,16 @@ void TodoTable::load( const QString &fn ) // QTable::sortColumn(2,TRUE,TRUE); // QTable::sortColumn(1,TRUE,TRUE); QTable::sortColumn(0,TRUE,TRUE); setCurrentCell( 0, 2 ); + setSorting(true ); } void TodoTable::updateVisible() { if ( !isUpdatesEnabled() ) return; - -// qDebug("--> updateVisible!"); - - /* added 20.01.2k2 by se */ + if (showDeadl){ showColumn (3); adjustColumn(3); }else{ @@ -399,9 +445,9 @@ void TodoTable::updateVisible() if ( showCat == tr( "Unfiled" ) ) { if ( vlCats.count() > 0 ) hide = true; } else { - // do some comparing, we have to reverse our idea here... + // do some comparing, we have to reverse our idea here... which idea - zecke if ( !hide ) { hide = true; for ( uint it = 0; it < vlCats.count(); ++it ) { if ( vlCats[it] == id ) { @@ -465,15 +511,15 @@ void TodoTable::clear() } setNumRows( 0 ); } -void TodoTable::sortColumn( int col, bool /*ascending*/, bool /*wholeRows*/ ) +void TodoTable::sortColumn( int col, bool ascending, bool /*wholeRows*/ ) { // The default for wholeRows is false, however // for this todo table we want to exchange complete // rows when sorting. Also, we always want ascending, since // the values have a logical order. - QTable::sortColumn( col, TRUE, TRUE ); + QTable::sortColumn( col, ascending, TRUE ); updateVisible(); } void TodoTable::slotCheckPriority(int row, int col ) @@ -496,9 +542,9 @@ void TodoTable::updateJournal( const ToDoEvent &/*todo*/, journal_action action, QCString str; buf = "<Task"; // todo.save( buf ); buf += " Action=\"" + QString::number( int(action) ) + "\""; - buf += " Row=\"" + QString::number( row ) + "\""; + buf += " Row=\"" + QString::number( row ) + "\""; // better write the id buf += "/>\n"; str = buf.utf8(); f.writeBlock( str.data(), str.length() ); f.close(); @@ -540,19 +586,10 @@ void TodoTable::journalFreeReplaceEntry( const ToDoEvent &todo, int row ) it.key()->setChecked( todo.isCompleted() ); static_cast<ComboItem*>(item(row, 1))->setText( QString::number(todo.priority()) ); item( row, 2 )->setText( strTodo ); - /* added 20.01.2k2 by se */ if (showDeadl){ - if (todo.hasDate()){ - QDate *today = new QDate (QDate::currentDate()); - if (today){ - item (row, 3)->setText (tr ("%1").arg(today->daysTo(todo.date()))); - delete (today); - } - }else{ - item (row, 3)->setText ("n.d."); - } + static_cast<DueTextItem*>(item(row,3))->setToDoEvent(&todo ); } *(*it) = todo; } @@ -564,19 +601,10 @@ void TodoTable::journalFreeReplaceEntry( const ToDoEvent &todo, int row ) static_cast<CheckItem*>(item(row, 0))->setChecked( todo.isCompleted() ); static_cast<ComboItem*>(item(row, 1))->setText( QString::number(todo.priority()) ); item( row, 2 )->setText( strTodo ); - /* added 20.01.2k2 by se */ if (showDeadl){ - if (todo.hasDate()){ - QDate *today = new QDate (QDate::currentDate()); - if (today){ - item (row, 3)->setText (tr ("%1").arg(today->daysTo(todo.date()))); - delete (today); - } - }else{ - item (row, 3)->setText ("n.d."); - } + static_cast<DueTextItem*>(item(row,3))->setToDoEvent(&todo ); } todoList.insert( static_cast<CheckItem*>(item(row,0)), new ToDoEvent(todo) ); } diff --git a/core/pim/todo/todotable.h b/core/pim/todo/todotable.h index 288ff90..32df514 100644 --- a/core/pim/todo/todotable.h +++ b/core/pim/todo/todotable.h @@ -76,8 +76,21 @@ public: QString key () const { return Qtopia::buildSortKey( text() ); } }; +class DueTextItem : public QTableItem +{ + public: + DueTextItem( QTable *t, ToDoEvent *ev ); + QString key() const; + void setToDoEvent( const ToDoEvent *ev ); + void paint( QPainter *p, const QColorGroup &cg, const QRect &cr, bool selected ); + private: + int m_off; + bool m_hasDate:1; + bool m_completed:1; + +}; enum journal_action { ACTION_ADD, ACTION_REMOVE, ACTION_REPLACE }; @@ -97,9 +110,8 @@ public: void setShowCompleted( bool sc ) { showComp = sc; updateVisible(); } bool showCompleted() const { return showComp; } - /* added 20.01.2k2 by se */ void setShowDeadline (bool sd) {showDeadl = sd; updateVisible();} bool showDeadline() const { return showDeadl;} void setShowCategory( const QString &c ) { showCat = c; updateVisible(); } @@ -162,11 +174,9 @@ private: QTimer *menuTimer; bool enablePainting; Categories mCat; int currFindRow; - - /* added 20.01.2k2 by se */ - bool showDeadl; + bool showDeadl:1; }; inline void TodoTable::insertIntoTable( ToDoEvent *todo, int row ) @@ -180,21 +190,10 @@ inline void TodoTable::insertIntoTable( ToDoEvent *todo, int row ) cmb->setText( QString::number( todo->priority() ) ); QTableItem *ti = new TodoTextItem( this, todo->description().left(40).simplifyWhiteSpace() ); ti->setReplaceable( false ); - /* added 20.01.2k2 by se */ - QTableItem *dl = NULL; - if (todo->hasDate()){ - QDate *today = new QDate (QDate::currentDate()); - if (today){ - dl = new TodoTextItem (this, tr ("%1"). - arg(today->daysTo(todo->date()))); - delete (today); - } - }else{ - dl = new TodoTextItem (this,"n.d."); - } - setItem( row, 3, dl); + DueTextItem *due = new DueTextItem(this, todo ); + setItem( row, 3, due); setItem( row, 0, chk ); setItem( row, 1, cmb ); setItem( row, 2, ti ); @@ -204,11 +203,12 @@ inline void TodoTable::insertIntoTable( ToDoEvent *todo, int row ) } inline void TodoTable::realignTable( int row ) { - QTableItem *ti1, - *ti2, - *ti3; + QTableItem *ti1, + *ti2, + *ti3, + *ti4; int totalRows = numRows(); for ( int curr = row; curr < totalRows - 1; curr++ ) { // this is bad, we must take the item out and then // set it. In the end, it behaves no worse (time wise) @@ -216,14 +216,17 @@ inline void TodoTable::realignTable( int row ) // the table re-reading in the file and resetting the table ti1 = item( curr + 1, 0 ); ti2 = item( curr + 1, 1 ); ti3 = item( curr + 1, 2 ); + ti4 = item( curr + 1, 3 ); takeItem( ti1 ); takeItem( ti2 ); takeItem( ti3 ); + takeItem( ti4 ); setItem( curr, 0, ti1 ); setItem( curr, 1, ti2 ); setItem( curr, 2, ti3 ); + setItem( curr, 3, ti4 ); } setNumRows( totalRows - 1 ); } |