From 79d96ab3393af185b0f0d705e1b7ae74ee801241 Mon Sep 17 00:00:00 2001 From: harlekin Date: Wed, 20 Mar 2002 09:26:50 +0000 Subject: ported todoy to tododb wich is now in libopie --- diff --git a/core/pim/today/TODO b/core/pim/today/TODO index a3b01d2..0ff4758 100644 --- a/core/pim/today/TODO +++ b/core/pim/today/TODO @@ -8,7 +8,5 @@ TODO for today: * qcop integration for updating events? -* sort todos by pri. - * make Opiezilla a clickable label wich is allway on the far right side of the screen , klick will open credits ,) \ No newline at end of file diff --git a/core/pim/today/changelog b/core/pim/today/changelog index d0dd966..8ccff3c 100644 --- a/core/pim/today/changelog +++ b/core/pim/today/changelog @@ -1,3 +1,11 @@ +0.3.0 + +* today uses now tododb from libopie. So major changes in the todo part: + - overdue items on top + - then sorted by date, then by priority +* some cleanups +* speed optimisations + 0.2.9 * Many bugfixes. diff --git a/core/pim/today/opie-today.control b/core/pim/today/opie-today.control index 0c55e59..9d8444e 100644 --- a/core/pim/today/opie-today.control +++ b/core/pim/today/opie-today.control @@ -3,7 +3,7 @@ Priority: optional Section: opie/applications Maintainer: Maximilian Reiß Architecture: arm -Version: 0.2.9-$SUB_VERSION +Version: 0.3.0-$SUB_VERSION Depends: opie-base ($QPE_VERSION) License: GPL Description: today screen diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp index 1936518..2dc96fc 100644 --- a/core/pim/today/today.cpp +++ b/core/pim/today/today.cpp @@ -18,10 +18,7 @@ ***************************************************************************/ #include "today.h" -#include "minidom.h" -#include "TodoItem.h" -#include #include #include #include @@ -56,8 +53,8 @@ int SHOW_NOTES; // show only later dates int ONLY_LATER; int AUTOSTART; - int NEW_START=1; + /* * Constructs a Example which is a child of 'parent', with the * name 'name' and widget flags set to 'f' @@ -77,8 +74,10 @@ Today::Today( QWidget* parent, const char* name, WFlags fl ) #endif #endif - draw(); setOwnerField(); + todo = new ToDoDB; + getTodo(); + draw(); autoStart(); } @@ -144,9 +143,15 @@ void Today::draw() { init(); getDates(); getMail(); - getTodo(); + + // if the todolist.xml file was not modified in between, do not parse it. + if (checkIfModified()) { + todo = new ToDoDB; + getTodo(); + } + // how often refresh - QTimer::singleShot( 10*1000, this, SLOT(draw() ) ); + QTimer::singleShot( 20*1000, this, SLOT(draw() ) ); } /* @@ -182,9 +187,9 @@ void Today::init() { QDate date = QDate::currentDate(); QString time = (tr( date.toString()) ); - TextLabel1->setText(time); + TextLabel1->setText(QString("" + time + "")); db = new DateBookDB; - + // read config Config cfg("today"); cfg.setGroup("BaseConfig"); @@ -263,7 +268,7 @@ void Today::startConfig() { */ void Today::getDates() { QDate date = QDate::currentDate(); - + if (AllDateBookEvents) delete AllDateBookEvents; AllDateBookEvents = new QWidget( ); QVBoxLayout* layoutDates = new QVBoxLayout(AllDateBookEvents); @@ -322,70 +327,6 @@ void Today::getDates() { AllDateBookEvents->show(); } -/* - * Parse in the todolist.xml - */ -QList Today::loadTodo(const char *filename) { - DOM *todo; - ELE *tasks; - ELE **tasklist; - ATT **attlist; - int i, j; - char *description; - int completed; - int priority; - TodoItem *tmp; - QList loadtodolist; - - todo = minidom_load(filename); - - tasks = todo->el; - tasks = tasks->el[0]; /*!DOCTYPE-quickhack*/ - if(tasks) { - tasklist = tasks->el; - i = 0; - while((tasklist) && (tasklist[i])) { - attlist = tasklist[i]->at; - j = 0; - description = NULL; - priority = -1; - completed = -1; - while((attlist) && (attlist[j])) { - if(!attlist[j]->name) { - continue; - } - if(!strcmp(attlist[j]->name, "Description")) { - description = attlist[j]->value; - } - // get Completed tag (0 or 1) - if(!strcmp(attlist[j]->name, "Completed")) { - QString s = attlist[j]->name; - if(s == "Completed") { - completed = QString(attlist[j]->value).toInt(); - } - } - // get Priority (1 to 5) - if(!strcmp(attlist[j]->name, "Priority")) { - QString s = attlist[j]->name; - if(s == "Priority") { - priority = QString(attlist[j]->value).toInt(); - } - } - j++; - } - if(description) { - tmp = new TodoItem(description, completed, priority); - loadtodolist.append(tmp); - } - i++; - } - } - - minidom_free(todo); - - return loadtodolist; -} - void Today::getMail() { Config cfg("opiemail"); @@ -406,35 +347,39 @@ void Today::getMail() { */ void Today::getTodo() { - // if the todolist.xml file was not modified in between, do not parse it. - if (!checkIfModified() && !NEW_START) { - return; - } - // since it was the new start or the return from config dialog, set it to 0 again. - NEW_START=0; - QString output; QString tmpout; int count = 0; - - QDir dir; - QString homedir = dir.homeDirPath (); - // see if todolist.xml does exist. - QFile f(homedir +"/Applications/todolist/todolist.xml"); - if ( f.exists() ) { - QList todolist = loadTodo(homedir +"/Applications/todolist/todolist.xml"); - - TodoItem *item; - for( item = todolist.first(); item; item = todolist.next()) { - if (!(item->getCompleted() == 1) ) { - count++; - if (count <= MAX_LINES_TASK) { - tmpout += "- " + QString(((item)->getDescription().mid(0, MAX_CHAR_CLIP) + ("
"))); + int ammount = 0; + + // get overdue todos first + QValueList overDueList = todo->overDue(); + qBubbleSort(overDueList); + for ( QValueList::Iterator it=overDueList.begin(); + it!=overDueList.end(); ++it ) { + if (!(*it).isCompleted() && ( ammount < MAX_LINES_TASK) ) { + tmpout += "-" +((*it).description()).mid(0, MAX_CHAR_CLIP) + "
"; + ammount++; + } } + + // get total number of still open todos + QValueList open = todo->rawToDos(); + qBubbleSort(open); + for ( QValueList::Iterator it=open.begin(); + it!=open.end(); ++it ) { + if (!(*it).isCompleted()){ + count +=1; + // not the overdues, we allready got them, and not if we are + // over the maxlines + if (!(*it).isOverdue() && ( ammount < MAX_LINES_TASK) ) { + tmpout += "-" + ((*it).description()).mid(0, MAX_CHAR_CLIP) + "
"; + ammount++; } } } + if (count > 0) { if( count == 1 ) { output = tr("There is 1 active task:
" ); @@ -503,7 +448,7 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev, ClickableLabel(parent,name,fl), event(ev) { QString msg; - QTime time = QTime::currentTime(); + //QTime time = QTime::currentTime(); if (!ONLY_LATER) { msg += "" + (ev).description() + ""; @@ -571,9 +516,6 @@ DateBookEventLater::DateBookEventLater(const EffectiveEvent &ev, } } - // if (msg.isEmpty()) { - // msg = tr("No more appointments today"); - // } setText(msg); connect(this, SIGNAL(clicked()), this, SLOT(editMe())); setAlignment( int( QLabel::WordBreak | QLabel::AlignLeft ) ); diff --git a/core/pim/today/today.h b/core/pim/today/today.h index 6dec2c2..6048781 100644 --- a/core/pim/today/today.h +++ b/core/pim/today/today.h @@ -24,10 +24,11 @@ #include #include +#include + #include #include -#include "TodoItem.h" #include "todayconfig.h" #include "todaybase.h" #include "clickablelabel.h" @@ -57,12 +58,12 @@ class Today : public TodayBase { bool checkIfModified(); void setOwnerField(); void setOwnerField(QString &string); - QList loadTodo(const char *filename); -private slots: - void channelReceived(const QCString &msg, const QByteArray & data); - + private slots: + void channelReceived(const QCString &msg, const QByteArray & data); + private: DateBookDB *db; + ToDoDB *todo; todayconfig *conf; QWidget* AllDateBookEvents; //Config cfg; diff --git a/core/pim/today/today.pro b/core/pim/today/today.pro index e61480c..b20baea 100644 --- a/core/pim/today/today.pro +++ b/core/pim/today/today.pro @@ -1,12 +1,12 @@ TEMPLATE = app #CONFIG = qt warn_on debug CONFIG = qt warn_on release -HEADERS = today.h TodoItem.h minidom.h todaybase.h todayconfig.h clickablelabel.h -SOURCES = main.cpp today.cpp todaybase.cpp todayconfig.cpp minidom.c TodoItem.cpp clickablelabel.cpp +HEADERS = today.h todaybase.h todayconfig.h clickablelabel.h +SOURCES = main.cpp today.cpp todaybase.cpp todayconfig.cpp clickablelabel.cpp INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include -LIBS += -lqpe +LIBS += -lqpe -lopie INTERFACES = TARGET = today DESTDIR = $(OPIEDIR)/bin -- cgit v0.9.0.2