ported todoy to tododb wich is now in libopie

6 files changed, 59 insertions, 110 deletions

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
@@ -9,6 +9,4 @@ 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,2 +1,10 @@
+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
 
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
@@ -4,5 +4,5 @@ Section: opie/applications
 Maintainer: Maximilian Reiß <max.reiss@gmx.de>
 Architecture: arm
-Version: 0.2.9-$SUB_VERSION
+Version: 0.3.0-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION)
 License: GPL
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
@@ -19,8 +19,5 @@
 
 #include "today.h"
-#include "minidom.h"
-#include "TodoItem.h"
 
-#include <qpe/datebookdb.h>
 #include <qpe/timestring.h>
 #include <qpe/config.h>
@@ -57,6 +54,6 @@ int SHOW_NOTES;
 int ONLY_LATER;
 int AUTOSTART;
-
 int NEW_START=1;
+
 /* 
  *  Constructs a Example which is a child of 'parent', with the 
@@ -78,6 +75,8 @@ Today::Today( QWidget* parent,  const char* name, WFlags fl )
 #endif 
   
-  draw();
   setOwnerField();
+  todo = new ToDoDB;
+  getTodo();
+  draw();
   autoStart();
 }
@@ -145,7 +144,13 @@ void Today::draw() {
   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() ) );
 }
 
@@ -183,7 +188,7 @@ void Today::init() {
   QString time = (tr( date.toString()) );
   
-  TextLabel1->setText(time);
+  TextLabel1->setText(QString("<font color=#FFFFFF>" + time + "</font>"));
   db = new DateBookDB;
-  
+   
   // read config
   Config cfg("today");
@@ -264,5 +269,5 @@ void Today::startConfig() {
 void Today::getDates() {
   QDate date = QDate::currentDate();
-
+  
   if (AllDateBookEvents) delete AllDateBookEvents;
   AllDateBookEvents = new QWidget( );
@@ -323,68 +328,4 @@ 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;
-}
-
 
 void Today::getMail() {
@@ -407,33 +348,37 @@ 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<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++;
       }
     }
   }
   
+    
   if (count > 0) {
     if( count == 1 ) {
@@ -504,5 +449,5 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev,
   
   QString msg;
-  QTime time = QTime::currentTime();
+  //QTime time = QTime::currentTime();
   
   if (!ONLY_LATER) {
@@ -572,7 +517,4 @@ DateBookEventLater::DateBookEventLater(const EffectiveEvent &ev,
   } 
   
-  // if (msg.isEmpty()) {
-  //  msg = tr("No more appointments today");
-  // }
   setText(msg);
   connect(this, SIGNAL(clicked()), this, SLOT(editMe()));
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
@@ -25,8 +25,9 @@
 #include <qpe/event.h>
 
+#include <opie/tododb.h>
+
 #include <qdatetime.h>
 #include <qlist.h> 
 
-#include "TodoItem.h"
 #include "todayconfig.h"
 #include "todaybase.h"
@@ -58,10 +59,10 @@ class Today : public TodayBase {
     void setOwnerField();
     void setOwnerField(QString &string);
-    QList<TodoItem> 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;
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
@@ -2,10 +2,10 @@ 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