-rw-r--r-- | core/pim/todo/todotable.cpp | 4 | ||||
-rw-r--r-- | core/pim/todo/todotable.h | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/core/pim/todo/todotable.cpp b/core/pim/todo/todotable.cpp index 779b28c..15f733b 100644 --- a/core/pim/todo/todotable.cpp +++ b/core/pim/todo/todotable.cpp | |||
@@ -222,24 +222,25 @@ void DueTextItem::paint( QPainter *p, const QColorGroup &cg, const QRect &cr, bo | |||
222 | TodoTable::TodoTable( QWidget *parent, const char *name ) | 222 | TodoTable::TodoTable( QWidget *parent, const char *name ) |
223 | // #ifdef QT_QTABLE_NOHEADER_CONSTRUCTOR | 223 | // #ifdef QT_QTABLE_NOHEADER_CONSTRUCTOR |
224 | // : QTable( 0, 3, parent, name, TRUE ), | 224 | // : QTable( 0, 3, parent, name, TRUE ), |
225 | // #else | 225 | // #else |
226 | : QTable( 0, 4, parent, name ), | 226 | : QTable( 0, 4, parent, name ), |
227 | // #endif | 227 | // #endif |
228 | showComp( true ), | 228 | showComp( true ), |
229 | enablePainting( true ), | 229 | enablePainting( true ), |
230 | mCat( 0 ), | 230 | mCat( 0 ), |
231 | currFindRow( -2 ), | 231 | currFindRow( -2 ), |
232 | showDeadl( true) | 232 | showDeadl( true) |
233 | { | 233 | { |
234 | setNumRows(0); | ||
234 | mCat.load( categoryFileName() ); | 235 | mCat.load( categoryFileName() ); |
235 | setSorting( TRUE ); | 236 | setSorting( TRUE ); |
236 | setSelectionMode( NoSelection ); | 237 | setSelectionMode( NoSelection ); |
237 | setColumnStretchable( 2, TRUE ); | 238 | setColumnStretchable( 2, TRUE ); |
238 | setColumnWidth( 0, 20 ); | 239 | setColumnWidth( 0, 20 ); |
239 | setColumnWidth( 1, 35 ); | 240 | setColumnWidth( 1, 35 ); |
240 | 241 | ||
241 | setLeftMargin( 0 ); | 242 | setLeftMargin( 0 ); |
242 | verticalHeader()->hide(); | 243 | verticalHeader()->hide(); |
243 | horizontalHeader()->setLabel( 0, tr( "C." ) ); | 244 | horizontalHeader()->setLabel( 0, tr( "C." ) ); |
244 | horizontalHeader()->setLabel( 1, tr( "Prior." ) ); | 245 | horizontalHeader()->setLabel( 1, tr( "Prior." ) ); |
245 | horizontalHeader()->setLabel( 2, tr( "Description" ) ); | 246 | horizontalHeader()->setLabel( 2, tr( "Description" ) ); |
@@ -443,24 +444,27 @@ void TodoTable::updateVisible() | |||
443 | showColumn (3); | 444 | showColumn (3); |
444 | adjustColumn(3); | 445 | adjustColumn(3); |
445 | }else{ | 446 | }else{ |
446 | hideColumn (3); | 447 | hideColumn (3); |
447 | adjustColumn(2); | 448 | adjustColumn(2); |
448 | } | 449 | } |
449 | 450 | ||
450 | int visible = 0; | 451 | int visible = 0; |
451 | int id = mCat.id( "Todo List", showCat ); | 452 | int id = mCat.id( "Todo List", showCat ); |
452 | for ( int row = 0; row < numRows(); row++ ) { | 453 | for ( int row = 0; row < numRows(); row++ ) { |
453 | CheckItem *ci = (CheckItem *)item( row, 0 ); | 454 | CheckItem *ci = (CheckItem *)item( row, 0 ); |
454 | ToDoEvent *t = todoList[ci]; | 455 | ToDoEvent *t = todoList[ci]; |
456 | if (!t) | ||
457 | continue; | ||
458 | |||
455 | QArray<int> vlCats = t->categories(); | 459 | QArray<int> vlCats = t->categories(); |
456 | bool hide = false; | 460 | bool hide = false; |
457 | if ( !showComp && ci->isChecked() ) | 461 | if ( !showComp && ci->isChecked() ) |
458 | hide = true; | 462 | hide = true; |
459 | if ( !showCat.isEmpty() ) { | 463 | if ( !showCat.isEmpty() ) { |
460 | if ( showCat == tr( "Unfiled" ) ) { | 464 | if ( showCat == tr( "Unfiled" ) ) { |
461 | if ( vlCats.count() > 0 ) | 465 | if ( vlCats.count() > 0 ) |
462 | hide = true; | 466 | hide = true; |
463 | } else { | 467 | } else { |
464 | // do some comparing, we have to reverse our idea here... which idea? - zecke | 468 | // do some comparing, we have to reverse our idea here... which idea? - zecke |
465 | if ( !hide ) { | 469 | if ( !hide ) { |
466 | hide = true; | 470 | hide = true; |
diff --git a/core/pim/todo/todotable.h b/core/pim/todo/todotable.h index 7539df1..387dddb 100644 --- a/core/pim/todo/todotable.h +++ b/core/pim/todo/todotable.h | |||
@@ -183,27 +183,24 @@ private: | |||
183 | QTimer *menuTimer; | 183 | QTimer *menuTimer; |
184 | QDate mDay; | 184 | QDate mDay; |
185 | QTimer *mDayTimer; // see if the day changed | 185 | QTimer *mDayTimer; // see if the day changed |
186 | bool enablePainting; | 186 | bool enablePainting; |
187 | Categories mCat; | 187 | Categories mCat; |
188 | int currFindRow; | 188 | int currFindRow; |
189 | bool showDeadl:1; | 189 | bool showDeadl:1; |
190 | }; | 190 | }; |
191 | 191 | ||
192 | 192 | ||
193 | inline void TodoTable::insertIntoTable( ToDoEvent *todo, int row ) | 193 | inline void TodoTable::insertIntoTable( ToDoEvent *todo, int row ) |
194 | { | 194 | { |
195 | int rows = numRows(); | ||
196 | ++rows; | ||
197 | setNumRows( rows ); | ||
198 | QString sortKey = (char) ((todo->isCompleted() ? 'a' : 'A') | 195 | QString sortKey = (char) ((todo->isCompleted() ? 'a' : 'A') |
199 | + todo->priority() ) | 196 | + todo->priority() ) |
200 | + Qtopia::buildSortKey( todo->description() ); | 197 | + Qtopia::buildSortKey( todo->description() ); |
201 | CheckItem *chk = new CheckItem( this, sortKey ); | 198 | CheckItem *chk = new CheckItem( this, sortKey ); |
202 | chk->setChecked( todo->isCompleted() ); | 199 | chk->setChecked( todo->isCompleted() ); |
203 | ComboItem *cmb = new ComboItem( this, QTableItem::WhenCurrent ); | 200 | ComboItem *cmb = new ComboItem( this, QTableItem::WhenCurrent ); |
204 | cmb->setText( QString::number( todo->priority() ) ); | 201 | cmb->setText( QString::number( todo->priority() ) ); |
205 | QString sum = todo->summary(); | 202 | QString sum = todo->summary(); |
206 | QTableItem *ti = new TodoTextItem( this, sum.isEmpty() ? todo->description().left(40).simplifyWhiteSpace() : sum ); | 203 | QTableItem *ti = new TodoTextItem( this, sum.isEmpty() ? todo->description().left(40).simplifyWhiteSpace() : sum ); |
207 | ti->setReplaceable( false ); | 204 | ti->setReplaceable( false ); |
208 | 205 | ||
209 | DueTextItem *due = new DueTextItem(this, todo ); | 206 | DueTextItem *due = new DueTextItem(this, todo ); |