-rw-r--r-- | core/pim/today/today.cpp | 140 |
1 files changed, 41 insertions, 99 deletions
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 @@ -20,6 +20,3 @@ #include "today.h" -#include "minidom.h" -#include "TodoItem.h" -#include <qpe/datebookdb.h> #include <qpe/timestring.h> @@ -58,4 +55,4 @@ int ONLY_LATER; int AUTOSTART; - int NEW_START=1; + /* @@ -79,4 +76,6 @@ Today::Today( QWidget* parent, const char* name, WFlags fl ) - draw(); setOwnerField(); + todo = new ToDoDB; + getTodo(); + draw(); autoStart(); @@ -146,5 +145,11 @@ void Today::draw() { 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() ) ); } @@ -184,5 +189,5 @@ void Today::init() { - TextLabel1->setText(time); + TextLabel1->setText(QString("<font color=#FFFFFF>" + time + "</font>")); db = new DateBookDB; - + // read config @@ -265,3 +270,3 @@ void Today::getDates() { QDate date = QDate::currentDate(); - + if (AllDateBookEvents) delete AllDateBookEvents; @@ -324,66 +329,2 @@ void Today::getDates() { -/* - * Parse in the todolist.xml - */ -QList<TodoItem> 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<TodoItem> 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; -} - @@ -408,9 +349,2 @@ 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; @@ -418,17 +352,27 @@ void Today::getTodo() { 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<TodoItem> 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 += "<b>- </b>" + QString(((item)->getDescription().mid(0, MAX_CHAR_CLIP) + ("<br>"))); + int ammount = 0; + + // get overdue todos first + QValueList<ToDoEvent> overDueList = todo->overDue(); + qBubbleSort(overDueList); + for ( QValueList<ToDoEvent>::Iterator it=overDueList.begin(); + it!=overDueList.end(); ++it ) { + if (!(*it).isCompleted() && ( ammount < MAX_LINES_TASK) ) { + tmpout += "<font color=#e00000><b>-" +((*it).description()).mid(0, MAX_CHAR_CLIP) + "</b></font><br>"; + ammount++; + } } + + // get total number of still open todos + QValueList<ToDoEvent> open = todo->rawToDos(); + qBubbleSort(open); + for ( QValueList<ToDoEvent>::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 += "<b>-</b>" + ((*it).description()).mid(0, MAX_CHAR_CLIP) + "<br>"; + ammount++; } @@ -437,2 +381,3 @@ void Today::getTodo() { + if (count > 0) { @@ -505,3 +450,3 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev, QString msg; - QTime time = QTime::currentTime(); + //QTime time = QTime::currentTime(); @@ -573,5 +518,2 @@ DateBookEventLater::DateBookEventLater(const EffectiveEvent &ev, - // if (msg.isEmpty()) { - // msg = tr("No more appointments today"); - // } setText(msg); |