| -rw-r--r-- | korganizer/kolistview.cpp | 7 | ||||
| -rw-r--r-- | korganizer/mainwindow.cpp | 13 | ||||
| -rw-r--r-- | korganizer/mainwindow.h | 2 |
3 files changed, 18 insertions, 4 deletions
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp index 5690bdb..5f90dc6 100644 --- a/korganizer/kolistview.cpp +++ b/korganizer/kolistview.cpp @@ -69,4 +69,5 @@ extern QPixmap* sgListViewCompletedPix[6]; +extern QPixmap* sgListViewJournalPix; class KOListViewWhatsThis :public QWhatsThis @@ -164,5 +165,5 @@ bool ListItemVisitor::visit(Todo *t) mItem->setSortKey(0,"99"+ t->summary().left(10)); } else - mItem->setSortKey(0,QString::number( t->percentComplete() )+ t->summary().left(10)); + mItem->setSortKey(0,QString::number( t->percentComplete()+1 )+ t->summary().left(10)); mItem->setPixmap( 0, *(sgListViewCompletedPix[t->percentComplete()/20])); if (t->hasStartDate()) { @@ -226,4 +227,5 @@ bool ListItemVisitor::visit(Journal * j) QString des; + mItem->setPixmap( 0, *sgListViewJournalPix); if ( !j->summary().isEmpty() ) { des = j->summary(); @@ -234,5 +236,6 @@ bool ListItemVisitor::visit(Journal * j) des.replace (QRegExp ("\\r"),"" ); } - mItem->setText(0,i18n("Journal: ")+des.left(25)); + mItem->setText(0,des.left(25)); + mItem->setSortKey(0,"0"+ des.left(25)); mItem->setText(1,j->dtStartDateStr()); mItem->setText(2,"---"); diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index e960424..9c2ac82 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp @@ -132,4 +132,5 @@ public: QPixmap* sgListViewCompletedPix[6]; +QPixmap* sgListViewJournalPix; @@ -144,6 +145,6 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) : sgListViewCompletedPix[3] = &listviewPix60; sgListViewCompletedPix[4] = &listviewPix80; - if ( sgListViewCompletedPix[5]->height() < 5 ) { //int size = 12; + { sgListViewCompletedPix[5]->resize( 11, 11 ); sgListViewCompletedPix[5]->fill( Qt::white ); @@ -161,4 +162,14 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) : p.fillRect( 1,1,iii*2,9,Qt::gray ); } + sgListViewJournalPix = &journalPix; + sgListViewJournalPix->resize( 11, 11 ); + sgListViewJournalPix->fill( Qt::white ); + { + QPainter p ( sgListViewJournalPix ); + p.drawRect( 0,0,11,11); + p.drawLine( 2,3,5,3); + p.drawLine( 2,5,8,5); + p.drawLine( 2,7,6,7); + } } mClosed = false; diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h index adab95d..41d5807 100644 --- a/korganizer/mainwindow.h +++ b/korganizer/mainwindow.h @@ -167,5 +167,5 @@ class MainWindow : public QMainWindow bool mCalendarModifiedFlag; QPixmap loadPixmap( QString ); - QPixmap listviewPix, listviewPix0, listviewPix20, listviewPix40, listviewPix60, listviewPix80; + QPixmap listviewPix, listviewPix0, listviewPix20, listviewPix40, listviewPix60, listviewPix80, journalPix; }; |