-rw-r--r-- | korganizer/kolistview.cpp | 10 | ||||
-rw-r--r-- | korganizer/main.cpp | 2 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 31 | ||||
-rw-r--r-- | korganizer/mainwindow.h | 1 |
4 files changed, 42 insertions, 2 deletions
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp index c705c73..0b2f9a4 100644 --- a/korganizer/kolistview.cpp +++ b/korganizer/kolistview.cpp @@ -66,8 +66,10 @@ #include "kolistview.h" #include "koeventviewer.h" +extern QPixmap* sgListViewCompletedPix[6]; + class KOListViewWhatsThis :public QWhatsThis { public: KOListViewWhatsThis( QWidget *wid, KOListView* view ) : QWhatsThis( wid ), _wid(wid),_view (view) { }; @@ -151,9 +153,14 @@ bool ListItemVisitor::visit(Event *e) } bool ListItemVisitor::visit(Todo *t) { - mItem->setText(0,i18n("Todo: %1").arg(t->summary())); + mItem->setText(0,t->summary()); + if ( t->isCompleted() ) { + mItem->setSortKey(0,"99"+ t->summary().left(10)); + } else + mItem->setSortKey(0,QString::number( t->percentComplete() )+ t->summary().left(10)); + mItem->setPixmap( 0, *(sgListViewCompletedPix[t->percentComplete()/20])); if (t->hasStartDate()) { mItem->setText(1,t->dtStartDateStr()); if (t->doesFloat()) { mItem->setText(2,"---"); @@ -237,8 +244,9 @@ bool ListItemVisitor::visit(Journal * j) KOListView::KOListView(Calendar *calendar, QWidget *parent, const char *name) : KOEventView(calendar, parent, name) { + mActiveItem = 0; mListView = new KOListViewListView(this); mListView->addColumn(i18n("Summary")); mListView->addColumn(i18n("Start Date")); diff --git a/korganizer/main.cpp b/korganizer/main.cpp index ee9589c..2bf46b9 100644 --- a/korganizer/main.cpp +++ b/korganizer/main.cpp @@ -21,8 +21,10 @@ #include <stdio.h> #include "mainwindow.h" #include <libkdepim/kpimglobalprefs.h> void dumpMissing(); + + int main( int argc, char **argv ) { #ifndef DESKTOP_VERSION QPEApplication a( argc, argv ); diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index f945383..0367bea 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp @@ -128,13 +128,42 @@ public: QCheckBox* mWriteBackFuture; QSpinBox* mWriteBackFutureWeeks; }; +QPixmap* sgListViewCompletedPix[6]; + + int globalFlagBlockStartup; MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : QMainWindow( parent, name ) { - + sgListViewCompletedPix[5] = &listviewPix; + sgListViewCompletedPix[0] = &listviewPix0; + sgListViewCompletedPix[1] = &listviewPix20; + sgListViewCompletedPix[2] = &listviewPix40; + sgListViewCompletedPix[3] = &listviewPix60; + sgListViewCompletedPix[4] = &listviewPix80; + if ( sgListViewCompletedPix[5]->height() < 5 ) { + int size = 12; + sgListViewCompletedPix[5]->resize( 11, 11 ); + sgListViewCompletedPix[5]->fill( Qt::white ); + QPainter p ( sgListViewCompletedPix[5] ); + p.drawRect( 0,0,11,11); + int half = size/2; + int heihei = size/2; + int x = 1; + p.drawLine ( 2, 5, 4 , 7 ) ; + p.drawLine ( 4 , 7 , 8, 3) ; + int iii = 0; + for ( iii = 0; iii < 5; ++iii ) { + sgListViewCompletedPix[iii]->resize( 11, 11 ); + sgListViewCompletedPix[iii]->fill( Qt::white ); + QPainter p ( sgListViewCompletedPix[iii] ); + p.drawRect( 0,0,11,11); + if ( iii ) + p.fillRect( 1,1,iii*2,9,Qt::gray ); + } + } mClosed = false; //QString confFile = KStandardDirs::appDir() + "config/korganizerrc"; QString confFile = locateLocal("config","korganizerrc"); QFileInfo finf ( confFile ); diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h index 1105783..9a8bc7f 100644 --- a/korganizer/mainwindow.h +++ b/korganizer/mainwindow.h @@ -161,8 +161,9 @@ class MainWindow : public QMainWindow QTimer mSaveTimer; //bool mBlockSaveFlag; bool mCalendarModifiedFlag; QPixmap loadPixmap( QString ); + QPixmap listviewPix, listviewPix0, listviewPix20, listviewPix40, listviewPix60, listviewPix80; }; #endif |