ported todoy to tododb wich is now in libopie

6 files changed, 52 insertions, 103 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
@@ -1,14 +1,12 @@
 TODO for today: 
 
 * start the app on  "resume" (partly done)
 
 * show alarm icons on alarm events (partly done)
 
 * add am/pm mode instead of 24 h, take system default
 
 * 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,32 +1,40 @@
+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.
 * Today now apparently sorts the dates _allways_ right, i would assume it 
 to be a qt bug
 
 0.2.8
 
 * Appointments are now clickable (connection to datebook still missing)
 * autostart support (opie only)
 
 0.2.7
 
 * check if todolist.xml was changed before parsing it
 * check only every 30 sec for changes.
 * some visual stuff
 * as usual many little improvements .-)
 
 0.2.6
 
 * added scrollbars to dates and todo
 * all day detection
 * some smaller bugfixes
 
 0.2.5
 
 * some other minor fixes regarding autoupdate
 * fixed segfault with todolist > 7 entries
 * fixed the "ugly grey border around buttons" issue
 * fixed the "empty calendar field" "bug"
 * shown only later appointments as option
 
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
@@ -1,10 +1,10 @@
 Files: bin/today apps/Applications/today.desktop pics/today
 Priority: optional
 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
 Description: today screen
  A short overview over current appointments and tasks.
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
@@ -1,113 +1,112 @@
 /*
  * today.cpp : main class
  *
  * ---------------------
  *
  * begin       : Sun 10 17:20:00 CEST 2002
  * copyright   : (c) 2002 by Maximilian Reiß
  * email       : max.reiss@gmx.de
  *
  */
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #include "today.h"
-#include "minidom.h"
-#include "TodoItem.h"
 
-#include <qpe/datebookdb.h>
 #include <qpe/timestring.h>
 #include <qpe/config.h>
 #include <qpe/qcopenvelope_qws.h> 
 #include <qpe/qprocess.h>
 #include <qpe/resource.h>
 #include <qpe/contact.h>
 #include <qpe/global.h>
 
 #include <qdir.h>
 #include <qfile.h>
 #include <qdatetime.h> 
 #include <qtextstream.h>
 #include <qcheckbox.h>
 #include <qspinbox.h>
 #include <qpushbutton.h>
 #include <qlabel.h>
 #include <qtimer.h>
 #include <qpixmap.h>
 #include <qfileinfo.h>
 #include <qlayout.h>
 #include <qtl.h>
 
 //#include <iostream.h>
 #include <unistd.h>
 #include <stdlib.h>
 
 int MAX_LINES_TASK;
 int MAX_CHAR_CLIP;
 int MAX_LINES_MEET;
 int SHOW_LOCATION;
 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' 
  */
 Today::Today( QWidget* parent,  const char* name, WFlags fl )
   : TodayBase( parent, name, fl ), AllDateBookEvents(NULL) {
   QObject::connect( (QObject*)PushButton1, SIGNAL( clicked() ), this, SLOT(startConfig() ) );
   QObject::connect( (QObject*)TodoButton, SIGNAL( clicked() ), this, SLOT(startTodo() ) );
   QObject::connect( (QObject*)DatesButton, SIGNAL( clicked() ), this, SLOT(startDatebook() ) );
   QObject::connect( (QObject*)MailButton, SIGNAL( clicked() ), this, SLOT(startMail() ) );
   
 #if defined(Q_WS_QWS) 
 #if !defined(QT_NO_COP)
   QCopChannel *todayChannel = new QCopChannel("QPE/Today" , this );
   connect (todayChannel, SIGNAL( received(const QCString &, const QByteArray &)),
 	   this, SLOT ( channelReceived(const QCString &, const QByteArray &)) );
 #endif  
 #endif 
   
-  draw();
   setOwnerField();
+  todo = new ToDoDB;
+  getTodo();
+  draw();
   autoStart();
 }
 
 /*
  * Qcop receive method.
  */
 void Today::channelReceived(const QCString &msg, const QByteArray & data) {
   QDataStream stream(data, IO_ReadOnly );
   if ( msg == "message(QString)" ) {
     QString message;
     stream >> message;
     setOwnerField(message);
   }
 
 }
 
 /*
  * Initialises the owner field with the default value, the username
  */ 
 void Today::setOwnerField() {
   QString file = Global::applicationFileName("addressbook", "businesscard.vcf");
   if (QFile::exists(file)) {
     Contact cont = Contact::readVCard(file)[0];
     QString returnString = cont.fullName();
     OwnerField->setText( tr ("<b>Owned by " + returnString + "</b>"));
   } else {
     OwnerField->setText( tr ("<b>Please fill out the business card </b>"));
   }
 }
 
 /*
  * Set the owner field with a given QString, for example per qcop.
@@ -115,103 +114,109 @@ void Today::setOwnerField() {
 void Today::setOwnerField(QString &message) {
   if (!message.isEmpty()) {
     OwnerField->setText("<b>" + message + "</b>");
   }
 }  
 
 /*
  * Autostart, uses the new (opie only) autostart method in the launcher code.
  * If registered against that today ist started on each resume.
  */
 void Today::autoStart() {
   Config cfg("today");
   cfg.setGroup("Autostart"); 
   AUTOSTART = cfg.readNumEntry("autostart",1);
   if (AUTOSTART) {
     QCopEnvelope e("QPE/System", "autoStart(QString,QString)");
     e << QString("add");
     e << QString("today");
   } else {
     QCopEnvelope e("QPE/System", "autoStart(QString,QString)");
     e << QString("remove");
     e << QString("today");
   }
 }
 
 /*
  * Repaint method. Reread all fields.
  */
 void Today::draw() {
   init();
   getDates();
   getMail();
+ 
+  // 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() ) );
 }
 
 /* 
  * Check if the todolist.xml was modified (if there are new entries.
  * Returns true if it was modified.
  */
 bool Today::checkIfModified() {
   
   QDir dir;
   QString homedir = dir.homeDirPath (); 
   QString time;
     
   Config cfg("today");
   cfg.setGroup("Files");
   time = cfg.readEntry("todolisttimestamp", "");
 
   QFileInfo file = (homedir +"/Applications/todolist/todolist.xml");
   QDateTime fileTime  = file.lastModified();
   if (time.compare(fileTime.toString()) == 0) {
     return false;
   } else {
     cfg.writeEntry("todolisttimestamp", fileTime.toString() );
     cfg.write(); 
     return true;
   }
 }
 
 
 /*
  * Init stuff needed for today. Reads the config file.
  */
 void Today::init() {
   QDate date = QDate::currentDate();
   QString time = (tr( date.toString()) );
   
-  TextLabel1->setText(time);
+  TextLabel1->setText(QString("<font color=#FFFFFF>" + time + "</font>"));
   db = new DateBookDB;
   
   // read config
   Config cfg("today");
   cfg.setGroup("BaseConfig"); 
   
   // -- config file section --
   // how many lines should be showed in the task section
   MAX_LINES_TASK = cfg.readNumEntry("maxlinestask",5);
   // after how many chars should the be cut off on tasks and notes
   MAX_CHAR_CLIP = cfg.readNumEntry("maxcharclip",40);
   // how many lines should be showed in the datebook section
   MAX_LINES_MEET = cfg.readNumEntry("maxlinesmeet",5);
   // If location is to be showed too, 1 to activate it.
   SHOW_LOCATION = cfg.readNumEntry("showlocation",1);
   // if notes should be shown 
   SHOW_NOTES = cfg.readNumEntry("shownotes",0);
   // should only later appointments be shown or all for the current day.
   ONLY_LATER = cfg.readNumEntry("onlylater",1);
 }
 
 
 /*
  * The method for the configuration dialog.
  */
 void Today::startConfig() {
 
   conf = new todayconfig ( this, "", true );
   // read the config
   Config cfg("today");
   cfg.setGroup("BaseConfig"); 
   
@@ -293,177 +298,117 @@ void Today::getDates() {
 	  count++;
 	  DateBookEvent *l=new DateBookEvent(*it, AllDateBookEvents);
 	  layoutDates->addWidget(l);
 	  connect (l, SIGNAL(editEvent(const Event &)),
 		   this, SLOT(editEvent(const Event &)));
 	} else if ((time.toString() <= TimeString::dateString((*it).event().end())) ) {
 	  count++;
 	  
 	  // show only later appointments
 	  DateBookEventLater *l=new DateBookEventLater(*it, AllDateBookEvents);
 	  layoutDates->addWidget(l);
 	  connect (l, SIGNAL(editEvent(const Event &)),
 		   this, SLOT(editEvent(const Event &)));
 	} 
       }
     }
     if (ONLY_LATER && count==0) {
 	QLabel* noMoreEvents = new QLabel(AllDateBookEvents);
 	noMoreEvents->setText("No more appointments today");
 	layoutDates->addWidget(noMoreEvents);
     } 	
   } else {
     QLabel* noEvents = new QLabel(AllDateBookEvents);
     noEvents->setText("No appointments today");
     layoutDates->addWidget(noEvents);
   }
   
   layoutDates->addItem(new QSpacerItem(1,1, QSizePolicy::Minimum, QSizePolicy::Expanding));
   sv1->addChild(AllDateBookEvents);
   AllDateBookEvents->show();
 }
   
-/*
- * 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() {
   Config cfg("opiemail");
   cfg.setGroup("today"); 
   
   // how many lines should be showed in the task section
   int NEW_MAILS = cfg.readNumEntry("newmails",0);
   int OUTGOING = cfg.readNumEntry("outgoing",0);
   
   QString output = tr("<b>%1</b> new mail(s), <b>%2</b> outgoing").arg(NEW_MAILS).arg(OUTGOING);
   
   MailField->setText(output);
 }
 
 
 /*
  * Get the todos
  */
 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;
+  int ammount = 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>")));
+  // 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 ) {
       output = tr("There is <b> 1</b> active task:  <br>" );
     } else {
       output = tr("There are <b> %1</b> active tasks: <br>").arg(count);
     }
     output += tmpout;
   } else {
     output = tr("No active tasks");
   }
   
   TodoField->setText(tr(output));
 }
 
 /*
  * launches datebook
  */
 void Today::startDatebook() { 
   QCopEnvelope e("QPE/System", "execute(QString)");
   e << QString("datebook");
 }
 
 /*
  * starts the edit dialog as known from datebook
  */ 
 void Today::editEvent(const Event &e) {
   startDatebook();
   
   //Dissabled for now as uid's not working properly
   /*  
     while(!QCopChannel::isRegistered("QPE/Datebook")) sleep(1);
     QCopEnvelope env("QPE/Datebook", "editEvent(int)");
@@ -474,65 +419,65 @@ void Today::editEvent(const Event &e) {
 /*
  * launches todolist
  */ 
 void Today::startTodo() {
   QCopEnvelope e("QPE/System", "execute(QString)");
   e << QString("todolist");
 }
 
 /*
  * launch opiemail
  */
 void Today::startMail() {
   QCopEnvelope e("QPE/System", "execute(QString)");
   e << QString("opiemail");
 }
 
 
 Today::~Today() {
 }
 
 
 
 /*
  * Gets the events for the current day, if it should get all dates 
  */
 DateBookEvent::DateBookEvent(const EffectiveEvent &ev, 
 					   QWidget* parent = 0, 
 					   const char* name = 0, 
 					   WFlags fl = 0) :
   ClickableLabel(parent,name,fl), event(ev) {
   
   QString msg;
-  QTime time = QTime::currentTime();
+  //QTime time = QTime::currentTime();
   
   if (!ONLY_LATER) {
     msg += "<B>" + (ev).description() + "</B>";
     if ( (ev).event().hasAlarm() ) {
       msg += " <b>[with alarm]</b>";
     }
     // include location or not
     if (SHOW_LOCATION == 1) {
       msg += "<BR><i>" + (ev).location();
       msg += "</i>";
     }
     
     if ( (TimeString::timeString(QTime((ev).event().start().time()) ) == "00:00") &&  (TimeString::timeString(QTime((ev).event().end().time()) ) == "23:59") ) {
       msg += "<br>All day";
     }  else {
       // start time of event
       msg += "<br>" + TimeString::timeString(QTime((ev).event().start().time()) )
         // end time of event
         + "<b> - </b>" + TimeString::timeString(QTime((ev).event().end().time()) );
     }
     
     // include possible note or not
     if (SHOW_NOTES == 1) {
       msg += "<br> <i>note</i>:" +((ev).notes()).mid(0, MAX_CHAR_CLIP) + "<br>";
     }
   }
   setText(msg);
   connect(this, SIGNAL(clicked()), this, SLOT(editMe()));
   setAlignment( int( QLabel::WordBreak | QLabel::AlignLeft ) );
 }
 
 
@@ -542,50 +487,47 @@ DateBookEventLater::DateBookEventLater(const EffectiveEvent &ev,
 				       WFlags fl = 0) :
   ClickableLabel(parent,name,fl), event(ev) {
   
   QString msg;
   QTime time = QTime::currentTime();
   
   if ((time.toString() <= TimeString::dateString((ev).event().end())) ) {
     // show only later appointments
     msg += "<B>" + (ev).description() + "</B>";
     if ( (ev).event().hasAlarm() ) {
       msg += " <b>[with alarm]</b>";
     }
     // include location or not
     if (SHOW_LOCATION == 1) {
       msg += "<BR><i>" + (ev).location();
       msg += "</i>";
     }
     
     if ( (TimeString::timeString(QTime((ev).event().start().time()) ) == "00:00") &&  (TimeString::timeString(QTime((ev).event().end().time()) ) == "23:59") ) {
       msg += "<br>All day";
     } else {
       // start time of event
       msg += "<br>" + TimeString::timeString(QTime((ev).event().start().time()) )
         // end time of event
         + "<b> - </b>" + TimeString::timeString(QTime((ev).event().end().time()) );
     }
     // include possible note or not
     if (SHOW_NOTES == 1) {
       msg += "<br> <i>note</i>:" +((ev).notes()).mid(0, MAX_CHAR_CLIP) + "<br>";
     }
   } 
   
-  // if (msg.isEmpty()) {
-  //  msg = tr("No more appointments today");
-  // }
   setText(msg);
   connect(this, SIGNAL(clicked()), this, SLOT(editMe()));
   setAlignment( int( QLabel::WordBreak | QLabel::AlignLeft ) );
 }
 
 
 void DateBookEvent::editMe() {
   emit editEvent(event.event());
 }
 
 void DateBookEventLater::editMe() {
   emit editEvent(event.event());
 }
 
 
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
@@ -1,97 +1,98 @@
 /*
  * today.h
  *
  * ---------------------
  *
  * begin       : Sun 10 17:20:00 CEST 2002
  * copyright   : (c) 2002 by Maximilian Reiß
  * email       : max.reiss@gmx.de
  *
  */
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 
 #ifndef TODAY_H
 #define TODAY_H
 
 #include <qpe/datebookdb.h>
 #include <qpe/event.h>
 
+#include <opie/tododb.h>
+
 #include <qdatetime.h>
 #include <qlist.h> 
 
-#include "TodoItem.h"
 #include "todayconfig.h"
 #include "todaybase.h"
 #include "clickablelabel.h"
 
 class QVBoxLayout;
 
 class Today : public TodayBase {
   Q_OBJECT
     
     public:
   Today( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
   ~Today();
   
   private slots:
     void startConfig();
     void startTodo();
     void startDatebook();
     void startMail();
     void draw();
     void editEvent(const Event &e);
  private:
     void init();
     void getDates();
     void getTodo();
     void getMail();
     void autoStart();
     bool checkIfModified();
     void setOwnerField();
     void setOwnerField(QString &string);
-    QList<TodoItem> loadTodo(const char *filename);
 private slots:
     void channelReceived(const QCString &msg, const QByteArray & data);
 
  private:
     DateBookDB *db;
+    ToDoDB *todo;
     todayconfig *conf;
     QWidget* AllDateBookEvents;
     //Config cfg;
     int MAX_LINES_TASK;
     int MAX_CHAR_CLIP;
     int MAX_LINES_MEET;
     int SHOW_LOCATION; 
     int SHOW_NOTES;
 };
 
 class DateBookEvent: public ClickableLabel {
   Q_OBJECT
 public:
     DateBookEvent(const EffectiveEvent &ev, 
 			 QWidget* parent = 0, const char* name = 0, 
 			 WFlags fl = 0);
 signals:
     void editEvent(const Event &e);
 private slots:
     void editMe();
 private:
     const EffectiveEvent event;
 };
 
 class DateBookEventLater: public ClickableLabel {
   Q_OBJECT
 public:
     DateBookEventLater(const EffectiveEvent &ev, 
 			 QWidget* parent = 0, const char* name = 0, 
 			 WFlags fl = 0);
 signals:
     void editEvent(const Event &e);
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,13 +1,13 @@
 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
 TRANSLATIONS    = ../i18n/pt_BR/today.ts