summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/todo/mainwindow.cpp6
-rw-r--r--core/pim/todo/mainwindow.h7
-rw-r--r--core/pim/todo/quickeditimpl.cpp2
-rw-r--r--core/pim/todo/tableview.cpp133
-rw-r--r--core/pim/todo/tableview.h4
5 files changed, 75 insertions, 77 deletions
diff --git a/core/pim/todo/mainwindow.cpp b/core/pim/todo/mainwindow.cpp
index f0aa455..0ccf73e 100644
--- a/core/pim/todo/mainwindow.cpp
+++ b/core/pim/todo/mainwindow.cpp
@@ -209,12 +209,10 @@ void MainWindow::initConfig() {
m_overdue = config.readBoolEntry("ShowOverDue", FALSE );
m_quicktask = config.readBoolEntry("ShowQuickTask", TRUE);
}
void MainWindow::initUI() {
- m_mainBox = new QVBox(this, "main box ");
-
- m_stack = new QWidgetStack(m_mainBox, "main stack");
- setCentralWidget( m_mainBox );
+ m_stack = new QWidgetStack(this, "main stack");
+ setCentralWidget( m_stack );
setToolBarsMovable( FALSE );
m_tool = new QPEToolBar( this );
diff --git a/core/pim/todo/mainwindow.h b/core/pim/todo/mainwindow.h
index 86b9ac2..d756d64 100644
--- a/core/pim/todo/mainwindow.h
+++ b/core/pim/todo/mainwindow.h
@@ -139,15 +139,8 @@ private slots:
QPopupMenu* m_catMenu,
*m_edit,
*m_options,
*m_template;
- /* box with two rows
- * top will be the quick edit
- * this will bite my ass once
- * we want to have all parts
- * exchangeable
- */
- QVBox* m_mainBox;
bool m_syncing:1;
bool m_deadline:1;
bool m_completed:1;
diff --git a/core/pim/todo/quickeditimpl.cpp b/core/pim/todo/quickeditimpl.cpp
index 8d0a9fd..cadec03 100644
--- a/core/pim/todo/quickeditimpl.cpp
+++ b/core/pim/todo/quickeditimpl.cpp
@@ -13,9 +13,9 @@ QuickEditImpl::QuickEditImpl( QWidget* parent, bool visible )
: QPEToolBar( (QMainWindow *)parent ), Todo::QuickEdit( (Todo::MainWindow *)parent ) {
setHorizontalStretchable( TRUE );
// Load priority icons
- // TODO - probably should be done globally somewhere else
+ // TODO - probably should be done globally somewhere else, see also tableview.cpp/h
priority1 = Resource::loadPixmap( "todo/priority1" );
priority3 = Resource::loadPixmap( "todo/priority3" );
priority5 = Resource::loadPixmap( "todo/priority5" );
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 @@
#include <qpoint.h>
#include <qpopupmenu.h>
#include <qpe/config.h>
+#include <qpe/resource.h>
#include <opie/orecur.h>
#include "mainwindow.h"
@@ -63,31 +64,23 @@ TableView::TableView( MainWindow* window, QWidget* wid )
m_enablePaint = false;
setNumRows(0);
setNumCols(4);
+ horizontalHeader()->setLabel( 0, tr("C.") );
+ horizontalHeader()->setLabel( 1, tr("Prior.") );
+ horizontalHeader()->setLabel( 2, tr("Description" ) );
+ horizontalHeader()->setLabel( 3, tr("Deadline") );
+
setSorting( TRUE );
setSelectionMode( NoSelection );
-// setColumnStretchable( 2, TRUE );
- setColumnStretchable( 3, FALSE );
- setColumnWidth(0, 20 );
- setColumnWidth(1, 35 );
- setColumnWidth(3, 18 );
-
+
setLeftMargin( 0 );
verticalHeader()->hide();
- horizontalHeader()->setLabel(0, tr("C.") );
- horizontalHeader()->setLabel(1, tr("Prior.") );
- horizontalHeader()->setLabel(2, tr("Description" ) );
-
-// setColumnStretchable(3, FALSE );
-
- horizontalHeader()->setLabel(3, tr("Deadline") );
-
if ( todoWindow()->showDeadline() )
- showColumn( 3);
+ showColumn( 3 );
else
- hideColumn(3 );
+ hideColumn( 3 );
connect((QTable*)this, SIGNAL( clicked( int, int, int, const QPoint& ) ),
this, SLOT( slotClicked(int, int, int, const QPoint& ) ) );
connect((QTable*)this, SIGNAL( pressed( int, int, int, const QPoint& ) ),
@@ -108,8 +101,31 @@ TableView::TableView( MainWindow* window, QWidget* wid )
setSortOrder( 0 );
setAscending( TRUE );
m_first = true;
+ // Load icons
+ // TODO - probably should be done globally somewhere else, see also quickeditimpl.cpp/h
+ m_pic_completed = Resource::loadPixmap( "todo/completed" );
+ QString namestr;
+ for ( unsigned int i = 1; i < 6; i++ ) {
+ namestr = "todo/priority";
+ namestr.append( QString::number( i ) );
+ m_pic_priority[ i - 1 ] = Resource::loadPixmap( namestr );
+ }
+
+ // Try to intelligently size columns
+ int col2width = 240;
+ int width = m_pic_completed.width();
+ setColumnWidth( 0, width );
+ col2width -= width;
+ width = fontMetrics().boundingRect( horizontalHeader()->label( 1 ) ).width()+8;
+ setColumnWidth( 1, width );
+ col2width -= width;
+ width = fontMetrics().boundingRect( horizontalHeader()->label( 3 ) ).width()+8;
+ setColumnWidth( 3, width );
+ col2width -= width;
+ setColumnWidth( 2, col2width - 2 );
+
/* now let's init the config */
initConfig();
}
/* a new day has started
@@ -314,61 +330,50 @@ void TableView::paintCell(QPainter* p, int row, int col, const QRect& cr, bool
p->save();
OTodo task = sorted()[row];
- p->fillRect( 0, 0, cr.width(), cr.height(), cg.brush( QColorGroup::Base ) );
+ // TODO - give user option for grid or bars?
+
+ // Paint alternating background bars
+ if ( (row % 2 ) == 0 ) {
+ p->fillRect( 0, 0, cr.width(), cr.height(), cg.brush( QColorGroup::Base ) );
+ }
+ else {
+ p->fillRect( 0, 0, cr.width(), cr.height(), cg.brush( QColorGroup::Background ) );
+ }
- 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);
+ // Paint grid
+ //p->fillRect( 0, 0, cr.width(), cr.height(), cg.brush( QColorGroup::Base ) );
+ //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);
+ int marg = ( cr.width() - BoxSize ) / 2;
+ int x = 0;
+ int y = ( cr.height() - BoxSize ) / 2;
+
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
+ case 0: // completed field
{
- QString text = QString::number(task.priority());
- p->drawText(2,2 + fm.ascent(), text);
+ //p->setPen( QPen( cg.text() ) );
+ //p->drawRect( x + marg, y, BoxSize, BoxSize );
+ //p->drawRect( x + marg+1, y+1, BoxSize-2, BoxSize-2 );
+ if ( task.isCompleted() ) {
+ p->drawPixmap( x + marg, y, m_pic_completed );
+ }
}
break;
- case 2:
- // description field
+ case 1: // priority field
+ {
+ p->drawPixmap( x + marg, y, m_pic_priority[ task.priority() - 1 ] );
+ }
+ break;
+ case 2: // description field
{
QString text = task.summary().isEmpty() ?
task.description().left(20) :
task.summary();
@@ -407,13 +412,11 @@ 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" );
+ for ( int i = 0; i < 5; i++ ) {
+ combo->insertItem( m_pic_priority[ i ] );
+ }
combo->setCurrentItem( sorted()[row].priority()-1 );
return combo;
}
/* summary */
diff --git a/core/pim/todo/tableview.h b/core/pim/todo/tableview.h
index a27c698..2b6ea2b 100644
--- a/core/pim/todo/tableview.h
+++ b/core/pim/todo/tableview.h
@@ -30,8 +30,9 @@
#define OPIE_TABLE_VIEW_H
#include <qtable.h>
#include <qmap.h>
+#include <qpixmap.h>
#include "todoview.h"
class QTimer;
@@ -79,8 +80,11 @@ namespace Todo {
bool m_enablePaint:1;
QString m_oleCat;
bool m_first : 1;
+ QPixmap m_pic_completed;
+ QPixmap m_pic_priority[ 5 ];
+
protected:
void contentsMouseReleaseEvent( QMouseEvent* );
void contentsMouseMoveEvent( QMouseEvent* );
void timerEvent( QTimerEvent* e );