1 files changed, 23 insertions, 17 deletions

diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp
index ad1ec90..62becb0 100644
--- a/core/pim/today/today.cpp
+++ b/core/pim/today/today.cpp
@@ -1,70 +1,67 @@
 /*
  * 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 <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 <qpe/qpeapplication.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;
 QString AUTOSTART_TIMER;
 int NEXTDAYS=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() ) );
@@ -363,110 +360,119 @@ void Today::getMail() {
   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() {
 
   QString output;
   QString tmpout;
   int count = 0;
   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++;
-    }
+      if (!(*it).isCompleted() && ( ammount < MAX_LINES_TASK) ) {
+          QString desc = (*it).summary();
+          if( desc.isEmpty() ) {
+              desc = (*it).description();
+          }
+          tmpout += "<font color=#e00000><b>-" + desc.mid(0, MAX_CHAR_CLIP) + "</b></font><br>";
+
+          ammount++;
+      }
   }
 
   // get total number of still open todos
   QValueList<ToDoEvent> openTodo = todo->rawToDos();
   qBubbleSort(openTodo);
   for ( QValueList<ToDoEvent>::Iterator it=openTodo.begin();
         it!=openTodo.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 (!(*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) ) {
+              QString desc = (*it).summary();
+              if( desc.isEmpty() ) {
+                  desc = (*it).description();
+              }
+              tmpout += "<b>-</b>" + desc.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));
 }
 
 
 void Today::startAddressbook() {
    QCopEnvelope e("QPE/System", "execute(QString)");
     e << QString("addressbook");
 }
 
 extern QPEApplication *todayApp;
 
 /*
  * launch addressbook (personal card)
  */
 void Today::editCard() {
 
     startAddressbook();
 
     while( !QCopChannel::isRegistered("QPE/Addressbook")) todayApp->processEvents();
     QCopEnvelope v("QPE/Addressbook", "editPersonalAndClose()");
 }
 
 /*
  * launches datebook
  */
 void Today::startDatebook() {
-  QCopEnvelope e("QPE/System", "execute(QString)");
-  e << QString("datebook");
+    QCopEnvelope e("QPE/System", "execute(QString)");
+    e << QString("datebook");
 }
 
 /*
  * starts the edit dialog as known from datebook
  */
 void Today::editEvent(const Event &e) {
   startDatebook();
 
   while(!QCopChannel::isRegistered("QPE/Datebook")) todayApp->processEvents();
   QCopEnvelope env("QPE/Datebook", "editEvent(int)");
   env << e.uid();
 }
 
 /*
  * launches todolist
  */
 void Today::startTodo() {
   QCopEnvelope e("QPE/System", "execute(QString)");
   e << QString("todolist");
 }
 
 /*
  * launch opiemail
  */