author | drw <drw> | 2002-12-21 17:29:01 (UTC) |
---|---|---|
committer | drw <drw> | 2002-12-21 17:29:01 (UTC) |
commit | 491ac1e10a2caceb5003b0649f0cb0131e9b81fd (patch) (unidiff) | |
tree | 17e44a870b7ccb3ea200d370ebf782bb64d53fb5 /core/pim/todo/tableview.cpp | |
parent | 4700aa526ff4869486c23b3cfddcfa9b39ef9ae4 (diff) | |
download | opie-491ac1e10a2caceb5003b0649f0cb0131e9b81fd.zip opie-491ac1e10a2caceb5003b0649f0cb0131e9b81fd.tar.gz opie-491ac1e10a2caceb5003b0649f0cb0131e9b81fd.tar.bz2 |
Main task view updates.
-rw-r--r-- | core/pim/todo/tableview.cpp | 133 |
1 files changed, 68 insertions, 65 deletions
diff --git a/core/pim/todo/tableview.cpp b/core/pim/todo/tableview.cpp index a8cc271..faf4611 100644 --- a/core/pim/todo/tableview.cpp +++ b/core/pim/todo/tableview.cpp | |||
@@ -34,8 +34,9 @@ | |||
34 | #include <qpoint.h> | 34 | #include <qpoint.h> |
35 | #include <qpopupmenu.h> | 35 | #include <qpopupmenu.h> |
36 | 36 | ||
37 | #include <qpe/config.h> | 37 | #include <qpe/config.h> |
38 | #include <qpe/resource.h> | ||
38 | 39 | ||
39 | #include <opie/orecur.h> | 40 | #include <opie/orecur.h> |
40 | 41 | ||
41 | #include "mainwindow.h" | 42 | #include "mainwindow.h" |
@@ -63,31 +64,23 @@ TableView::TableView( MainWindow* window, QWidget* wid ) | |||
63 | m_enablePaint = false; | 64 | m_enablePaint = false; |
64 | setNumRows(0); | 65 | setNumRows(0); |
65 | setNumCols(4); | 66 | setNumCols(4); |
66 | 67 | ||
68 | horizontalHeader()->setLabel( 0, tr("C.") ); | ||
69 | horizontalHeader()->setLabel( 1, tr("Prior.") ); | ||
70 | horizontalHeader()->setLabel( 2, tr("Description" ) ); | ||
71 | horizontalHeader()->setLabel( 3, tr("Deadline") ); | ||
72 | |||
67 | setSorting( TRUE ); | 73 | setSorting( TRUE ); |
68 | setSelectionMode( NoSelection ); | 74 | setSelectionMode( NoSelection ); |
69 | // setColumnStretchable( 2, TRUE ); | 75 | |
70 | setColumnStretchable( 3, FALSE ); | ||
71 | setColumnWidth(0, 20 ); | ||
72 | setColumnWidth(1, 35 ); | ||
73 | setColumnWidth(3, 18 ); | ||
74 | |||
75 | setLeftMargin( 0 ); | 76 | setLeftMargin( 0 ); |
76 | verticalHeader()->hide(); | 77 | verticalHeader()->hide(); |
77 | 78 | ||
78 | horizontalHeader()->setLabel(0, tr("C.") ); | ||
79 | horizontalHeader()->setLabel(1, tr("Prior.") ); | ||
80 | horizontalHeader()->setLabel(2, tr("Description" ) ); | ||
81 | |||
82 | // setColumnStretchable(3, FALSE ); | ||
83 | |||
84 | horizontalHeader()->setLabel(3, tr("Deadline") ); | ||
85 | |||
86 | if ( todoWindow()->showDeadline() ) | 79 | if ( todoWindow()->showDeadline() ) |
87 | showColumn( 3); | 80 | showColumn( 3 ); |
88 | else | 81 | else |
89 | hideColumn(3 ); | 82 | hideColumn( 3 ); |
90 | 83 | ||
91 | connect((QTable*)this, SIGNAL( clicked( int, int, int, const QPoint& ) ), | 84 | connect((QTable*)this, SIGNAL( clicked( int, int, int, const QPoint& ) ), |
92 | this, SLOT( slotClicked(int, int, int, const QPoint& ) ) ); | 85 | this, SLOT( slotClicked(int, int, int, const QPoint& ) ) ); |
93 | connect((QTable*)this, SIGNAL( pressed( int, int, int, const QPoint& ) ), | 86 | connect((QTable*)this, SIGNAL( pressed( int, int, int, const QPoint& ) ), |
@@ -108,8 +101,31 @@ TableView::TableView( MainWindow* window, QWidget* wid ) | |||
108 | setSortOrder( 0 ); | 101 | setSortOrder( 0 ); |
109 | setAscending( TRUE ); | 102 | setAscending( TRUE ); |
110 | m_first = true; | 103 | m_first = true; |
111 | 104 | ||
105 | // Load icons | ||
106 | // TODO - probably should be done globally somewhere else, see also quickeditimpl.cpp/h | ||
107 | m_pic_completed = Resource::loadPixmap( "todo/completed" ); | ||
108 | QString namestr; | ||
109 | for ( unsigned int i = 1; i < 6; i++ ) { | ||
110 | namestr = "todo/priority"; | ||
111 | namestr.append( QString::number( i ) ); | ||
112 | m_pic_priority[ i - 1 ] = Resource::loadPixmap( namestr ); | ||
113 | } | ||
114 | |||
115 | // Try to intelligently size columns | ||
116 | int col2width = 240; | ||
117 | int width = m_pic_completed.width(); | ||
118 | setColumnWidth( 0, width ); | ||
119 | col2width -= width; | ||
120 | width = fontMetrics().boundingRect( horizontalHeader()->label( 1 ) ).width()+8; | ||
121 | setColumnWidth( 1, width ); | ||
122 | col2width -= width; | ||
123 | width = fontMetrics().boundingRect( horizontalHeader()->label( 3 ) ).width()+8; | ||
124 | setColumnWidth( 3, width ); | ||
125 | col2width -= width; | ||
126 | setColumnWidth( 2, col2width - 2 ); | ||
127 | |||
112 | /* now let's init the config */ | 128 | /* now let's init the config */ |
113 | initConfig(); | 129 | initConfig(); |
114 | } | 130 | } |
115 | /* a new day has started | 131 | /* a new day has started |
@@ -314,61 +330,50 @@ void TableView::paintCell(QPainter* p, int row, int col, const QRect& cr, bool | |||
314 | p->save(); | 330 | p->save(); |
315 | 331 | ||
316 | OTodo task = sorted()[row]; | 332 | OTodo task = sorted()[row]; |
317 | 333 | ||
318 | p->fillRect( 0, 0, cr.width(), cr.height(), cg.brush( QColorGroup::Base ) ); | 334 | // TODO - give user option for grid or bars? |
335 | |||
336 | // Paint alternating background bars | ||
337 | if ( (row % 2 ) == 0 ) { | ||
338 | p->fillRect( 0, 0, cr.width(), cr.height(), cg.brush( QColorGroup::Base ) ); | ||
339 | } | ||
340 | else { | ||
341 | p->fillRect( 0, 0, cr.width(), cr.height(), cg.brush( QColorGroup::Background ) ); | ||
342 | } | ||
319 | 343 | ||
320 | QPen op = p->pen(); | 344 | // Paint grid |
321 | p->setPen(cg.mid()); | 345 | //p->fillRect( 0, 0, cr.width(), cr.height(), cg.brush( QColorGroup::Base ) ); |
322 | p->drawLine( 0, cr.height() - 1, cr.width() - 1, cr.height() - 1 ); | 346 | //QPen op = p->pen(); |
323 | p->drawLine( cr.width() - 1, 0, cr.width() - 1, cr.height() - 1 ); | 347 | //p->setPen(cg.mid()); |
324 | p->setPen(op); | 348 | //p->drawLine( 0, cr.height() - 1, cr.width() - 1, cr.height() - 1 ); |
349 | //p->drawLine( cr.width() - 1, 0, cr.width() - 1, cr.height() - 1 ); | ||
350 | //p->setPen(op); | ||
325 | 351 | ||
326 | QFont f = p->font(); | 352 | QFont f = p->font(); |
327 | QFontMetrics fm(f); | 353 | QFontMetrics fm(f); |
328 | 354 | ||
355 | int marg = ( cr.width() - BoxSize ) / 2; | ||
356 | int x = 0; | ||
357 | int y = ( cr.height() - BoxSize ) / 2; | ||
358 | |||
329 | switch(col) { | 359 | switch(col) { |
330 | case 0: | 360 | case 0: // completed field |
331 | { | ||
332 | // completed field | ||
333 | int marg = ( cr.width() - BoxSize ) / 2; | ||
334 | int x = 0; | ||
335 | int y = ( cr.height() - BoxSize ) / 2; | ||
336 | p->setPen( QPen( cg.text() ) ); | ||
337 | p->drawRect( x + marg, y, BoxSize, BoxSize ); | ||
338 | p->drawRect( x + marg+1, y+1, BoxSize-2, BoxSize-2 ); | ||
339 | p->setPen( darkGreen ); | ||
340 | x += 1; | ||
341 | y += 1; | ||
342 | if ( task.isCompleted() ) { | ||
343 | QPointArray a( 9*2 ); | ||
344 | int i, xx, yy; | ||
345 | xx = x+2+marg; | ||
346 | yy = y+4; | ||
347 | for ( i=0; i<4; i++ ) { | ||
348 | a.setPoint( 2*i, xx, yy ); | ||
349 | a.setPoint( 2*i+1, xx, yy+2 ); | ||
350 | xx++; yy++; | ||
351 | } | ||
352 | yy -= 2; | ||
353 | for ( i=4; i<9; i++ ) { | ||
354 | a.setPoint( 2*i, xx, yy ); | ||
355 | a.setPoint( 2*i+1, xx, yy+2 ); | ||
356 | xx++; yy--; | ||
357 | } | ||
358 | p->drawLineSegments( a ); | ||
359 | } | ||
360 | } | ||
361 | break; | ||
362 | case 1: | ||
363 | // priority field | ||
364 | { | 361 | { |
365 | QString text = QString::number(task.priority()); | 362 | //p->setPen( QPen( cg.text() ) ); |
366 | p->drawText(2,2 + fm.ascent(), text); | 363 | //p->drawRect( x + marg, y, BoxSize, BoxSize ); |
364 | //p->drawRect( x + marg+1, y+1, BoxSize-2, BoxSize-2 ); | ||
365 | if ( task.isCompleted() ) { | ||
366 | p->drawPixmap( x + marg, y, m_pic_completed ); | ||
367 | } | ||
367 | } | 368 | } |
368 | break; | 369 | break; |
369 | case 2: | 370 | case 1: // priority field |
370 | // description field | 371 | { |
372 | p->drawPixmap( x + marg, y, m_pic_priority[ task.priority() - 1 ] ); | ||
373 | } | ||
374 | break; | ||
375 | case 2: // description field | ||
371 | { | 376 | { |
372 | QString text = task.summary().isEmpty() ? | 377 | QString text = task.summary().isEmpty() ? |
373 | task.description().left(20) : | 378 | task.description().left(20) : |
374 | task.summary(); | 379 | task.summary(); |
@@ -407,13 +412,11 @@ QWidget* TableView::createEditor(int row, int col, bool )const { | |||
407 | switch( col ) { | 412 | switch( col ) { |
408 | case 1: { | 413 | case 1: { |
409 | /* the priority stuff */ | 414 | /* the priority stuff */ |
410 | QComboBox* combo = new QComboBox( viewport() ); | 415 | QComboBox* combo = new QComboBox( viewport() ); |
411 | combo->insertItem( "1" ); | 416 | for ( int i = 0; i < 5; i++ ) { |
412 | combo->insertItem( "2" ); | 417 | combo->insertItem( m_pic_priority[ i ] ); |
413 | combo->insertItem( "3" ); | 418 | } |
414 | combo->insertItem( "4" ); | ||
415 | combo->insertItem( "5" ); | ||
416 | combo->setCurrentItem( sorted()[row].priority()-1 ); | 419 | combo->setCurrentItem( sorted()[row].priority()-1 ); |
417 | return combo; | 420 | return combo; |
418 | } | 421 | } |
419 | /* summary */ | 422 | /* summary */ |