6 files changed, 73 insertions, 58 deletions

diff --git a/core/pim/today/TODO b/core/pim/today/TODO
index 91c933b..95b9b51 100644
--- a/core/pim/today/TODO
+++ b/core/pim/today/TODO
@@ -1,15 +1,17 @@
 TODO for today: 
 
 * start the app on  "resume"
 
-* autoupdate
+* show alarm icons on alarm events
 
-        * fix 23 pm bug          (done??)
+* problems with updating
+
+* add am/pm mode instead of 24 h, take system default
 
-* add mail support
+        * fix 23 pm bug          (done??)
 
 * scrollbar?
 
 * qcop integration for updating events?
 
 * sort todos by pri.
\ No newline at end of file
diff --git a/core/pim/today/changelog b/core/pim/today/changelog
index dd4cfc1..3f99052 100644
--- a/core/pim/today/changelog
+++ b/core/pim/today/changelog
@@ -1,12 +1,21 @@
+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
+
+
 0.2.4
 
 * added support for email 
 * autoupdates after 1 min
 * QCopEnvelope instead of system()
 * starting to use qvbox in gui
 
 
 0.2.3
 
 * the 4 am release
 * several bugfixes
diff --git a/core/pim/today/opie-today.control b/core/pim/today/opie-today.control
index 3362a54..72e8f2b 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_icon.png pics/today/today_logo.png pics/today/config.png pics/today/mail.png
 Priority: optional
 Section: opie/applications
 Maintainer: Maximilian Reiß <max.reiss@gmx.de>
 Architecture: arm
-Version: 0.2.4
+Version: 0.2.5
 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 7a2d0c9..bed3a74 100644
--- a/core/pim/today/today.cpp
+++ b/core/pim/today/today.cpp
@@ -17,80 +17,83 @@
  *                                                                         *
  ***************************************************************************/
 
 #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 <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 <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;
 /* 
  *  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 )
 {
   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*)DatesButton, SIGNAL( clicked() ), this, SLOT(startMail() ) );
-
-  QDate date = QDate::currentDate();
-  QString time = (date.toString());
-  TextLabel1->setText(time);
-  db = new DateBookDB;
+  QObject::connect( (QObject*)MailButton, SIGNAL( clicked() ), this, SLOT(startMail() ) );
  
   draw();
 }
 
 
 void Today::draw()
 {
   init();
   getDates();
   getMail();
   getTodo(); 
   // how often refresh
-  QTimer::singleShot( 30*1000, this, SLOT(draw()) );
+  QTimer::singleShot( 5*1000, this, SLOT(draw()) );
 
 }
 
 void Today::init()
 {
+  QDate date = QDate::currentDate();
+  QString time = (date.toString());
+  
+  TextLabel1->setText("<qt><font color=white>" +time + "<font></qt>");
+  db = new DateBookDB;
+  
   // read config
   Config cfg("today");
   cfg.setGroup("BaseConfig"); 
 
   // 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",30);
   // 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);
@@ -138,78 +141,87 @@ void Today::startConfig()
   cfg.writeEntry("maxcharclip", maxcharclip); 
   cfg.writeEntry("maxlinesmeet",maxmeet);
   cfg.writeEntry("showlocation",location);
   cfg.writeEntry("shownotes", notes);
   cfg.writeEntry("onlylater", onlylater);
   // sync it to "disk"
   cfg.write(); 
   
   draw();
 }
 
 
+
 /*
  *  Get all events that are in the datebook xml file for today
  */
 void Today::getDates()
 {
   QDate date = QDate::currentDate();
   QTime time = QTime::currentTime();
   QValueList<EffectiveEvent> list = db->getEffectiveEvents(date, date);
 
   Config config( "qpe" );
   // if 24 h format
-  //  bool ampm = config.readBoolEntry( "AMPM", TRUE );
+  //bool ampm = config.readBoolEntry( "AMPM", TRUE );
   
   int count=0;
   
   if ( list.count() > 0 ) {
     QString msg;
     
     for ( QValueList<EffectiveEvent>::ConstIterator it=list.begin();
           it!=list.end(); ++it ) {
       
       count++;
       
       if ( count <= MAX_LINES_MEET ) 
         {
           //only get events past current time (start or end??)
           //cout << time.toString() << endl;
           //cout << TimeString::dateString((*it).event().end()) << endl;
           // still some bug in here, 1 h off 
 
           // decide if to get all day or only later appointments
           if (!ONLY_LATER)
             {
-               msg += "<B>" + (*it).description() + "</B>";
-               // include location or not
-               if (SHOW_LOCATION == 1) 
-                 {
+              msg += "<B>" + (*it).description() + "</B>";
+              if ( (*it).event().hasAlarm() )
+                {
+                  msg += " <b>[with alarm]</b>";
+                }
+              // include location or not
+              if (SHOW_LOCATION == 1) 
+                {
                   msg+= "<BR>" + (*it).location();
-                 }
-               msg += "<BR>"
-                 // start time of event
-                 + TimeString::timeString(QTime((*it).event().start().time()) )
-                 // end time of event
-                 + "<b> - </b>" + TimeString::timeString(QTime((*it).event().end().time()) )
-                 + "<BR>";
-               // include possible note or not
-               if (SHOW_NOTES == 1)
+                }
+              msg += "<BR>"
+                // start time of event
+                + TimeString::timeString(QTime((*it).event().start().time()) )
+                // end time of event
+                + "<b> - </b>" + TimeString::timeString(QTime((*it).event().end().time()) )
+                + "<BR>";
+              // include possible note or not
+              if (SHOW_NOTES == 1)
                 {
                   msg += " <i>note</i>:" +((*it).notes()).mid(0, MAX_CHAR_CLIP) + "<br>";
                 }
             }
           else if ((time.toString() <= TimeString::dateString((*it).event().end())) )
             {
               msg += "<B>" + (*it).description() + "</B>";
+              if ( (*it).event().hasAlarm() )
+                {
+                  msg += " <b>[with alarm]</b>";
+                }
               // include location or not
               if (SHOW_LOCATION == 1) 
                 {
                   msg+= "<BR>" + (*it).location();
                 }
               msg += "<BR>"
                 // start time of event
                 + TimeString::timeString(QTime((*it).event().start().time()) )
                 // end time of event
                 + "<b> - </b>" + TimeString::timeString(QTime((*it).event().end().time()) )
                 + "<BR>";
               // include possible note or not
@@ -221,25 +233,24 @@ void Today::getDates()
         }
     }
     if (msg.isEmpty())
       {
         msg = "No more appointments today";
       }
     DatesField->setText(msg);
   }
 }
 
 /*
  * 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;
@@ -253,25 +264,26 @@ QList<TodoItem> Today::loadTodo(const char *filename)
     {
       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[i]->name) continue;
+              // SEGFAULT HERE WITH MORE THAN 7 ENTRIES
+              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();
                     }
diff --git a/core/pim/today/todaybase.cpp b/core/pim/today/todaybase.cpp
index b0de1bf..32b45f7 100644
--- a/core/pim/today/todaybase.cpp
+++ b/core/pim/today/todaybase.cpp
@@ -18,63 +18,64 @@
 
 #include "todaybase.h"
 
 #include <qframe.h>
 #include <qlabel.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
 #include <qvariant.h>
 #include <qtooltip.h>
 #include <qwhatsthis.h>
 #include <qimage.h>
 #include <qpixmap.h>
-//#include <qscrollview.h>
+#include <qscrollview.h>
+#include <qvbox.h>
 
 #include <qpe/resource.h>
 
 /* 
  *  Constructs a TodayBase which is a child of 'parent', with the 
  *  name 'name' and widget flags set to 'f' 
  */
 TodayBase::TodayBase( QWidget* parent,  const char* name, WFlags fl )
   : QWidget( parent, name, fl )
 {
   // logo
   QPixmap logo = Resource::loadPixmap( "today/today_logo");
   // datebook
   QPixmap datebook = Resource::loadPixmap("DateBook");
   // todo
   QPixmap todo = Resource::loadPixmap( "TodoList" );
   // config icon
   QPixmap config = Resource::loadPixmap( "today/config" );
   // mail icon
   QPixmap mail = Resource::loadPixmap( "today/mail" );
   
   
-QPalette pal2;
- QColorGroup cg;
- cg.setColor( QColorGroup::Text, white );
- cg.setBrush( QColorGroup::Background, QBrush( QColor( 238, 238, 230), logo ) );
- pal2.setActive( cg );
-
-
-QPalette pal = this->palette();
-QColor col = pal.color(QPalette::Active, QColorGroup::Background);
-pal.setColor(QPalette::Active, QColorGroup::Button, col);
-this->setPalette(pal);
+  QPalette pal2;
+  QColorGroup cg;
+  cg.setColor( QColorGroup::Text, white );
+  cg.setBrush( QColorGroup::Background, QBrush( QColor( 238, 238, 230), logo ) );
+  pal2.setActive( cg );
+  
+  
+  QPalette pal = this->palette();
+  QColor col = pal.color(QPalette::Active, QColorGroup::Background);
+  pal.setColor(QPalette::Active, QColorGroup::Button, col);
+  this->setPalette(pal);
 
   QVBoxLayout * layout = new QVBoxLayout(this);
   
-
   Frame4 = new QFrame( this, "Frame4" );
+  Frame4->setPalette( pal );
   Frame4->setFrameShape( QScrollView::StyledPanel );
   Frame4->setFrameShadow( QScrollView::Sunken );
   Frame4->setBackgroundOrigin( QScrollView::ParentOrigin );
 
   // hehe, qt is ...
   getridoffuckingstrippeldlinesbutton =  new QPushButton (Frame4, "asdfsad" );
   getridoffuckingstrippeldlinesbutton->setGeometry( QRect( -5, 10, 0, 0 ) );
 
   DatesButton = new QPushButton (Frame4, "DatesButton" );
   DatesButton->setGeometry( QRect( 2, 4, 36, 32 ) );
   DatesButton->setBackgroundOrigin( QPushButton::WidgetOrigin );
   DatesButton->setPalette( pal );
@@ -93,83 +94,73 @@ this->setPalette(pal);
   Frame->setFrameShadow( QFrame::Raised );
   Frame->setLineWidth( 0 );
   Frame->setMaximumHeight(50);
   Frame->setMinimumHeight(50);
   
   // date
   TextLabel1 = new QLabel( Frame, "TextLabel1" );
   TextLabel1->setGeometry( QRect( 10, 35, 168, 12 ) ); 
   QFont TextLabel1_font(  TextLabel1->font() );
   TextLabel1_font.setBold( TRUE );
   TextLabel1->setFont( TextLabel1_font ); 
   TextLabel1->setBackgroundOrigin( QLabel::ParentOrigin );
-  TextLabel1->setTextFormat( QLabel::AutoText );
+  TextLabel1->setTextFormat( RichText );
    
   // todo
   Frame15 = new QFrame( this, "Frame15" );
   Frame15->setFrameShape( QFrame::StyledPanel );
   Frame15->setFrameShadow( QFrame::Sunken );
   
   TodoButton = new QPushButton (Frame15, "TodoButton" );
   TodoButton->setGeometry( QRect( 2, 4, 36, 32 ) );
-  //TodoButton->setBackgroundMode(NoBackground);
   TodoButton->setPalette( pal );
-  //TodoButton->setBackgroundOrigin( QPushButton::WidgetOrigin );
   TodoButton->setPixmap( todo  );
   TodoButton->setFlat( TRUE );
 
   TodoField = new QLabel( Frame15, "TodoField" );
   TodoField->setGeometry( QRect( 40, 4, 196, 120 ) ); 
   TodoField->setFrameShadow( QLabel::Plain );
   TodoField->setText( tr( "No current todos" ) );
   TodoField->setAlignment( int( QLabel::AlignTop | QLabel::AlignLeft ) );
 
   PushButton1 = new QPushButton (Frame15, "PushButton1" );
   PushButton1->setGeometry( QRect( 216, 68, 25, 21 ) ); 
-  //PushButton1->setBackgroundOrigin( QPushButton::WidgetOrigin );
   PushButton1->setPixmap( config  );
   PushButton1->setPalette( pal );
   PushButton1->setAutoDefault( TRUE );
   PushButton1->setFlat( TRUE );
 
   // mail
   MailFrame = new QFrame( this ,"MailFrame" );
   MailFrame->setFrameShape( QScrollView::StyledPanel );
   MailFrame->setFrameShadow( QScrollView::Sunken );
-  //MailFrame->setBackgroundOrigin( QScrollView::ParentOrigin );
-
+  
   MailButton = new QPushButton (MailFrame, "MailButton" );
-  MailButton->setGeometry( QRect( 2, 10, 36, 19 ) );
-  //MailButton->setBackgroundOrigin( QPushButton::WidgetOrigin );
+  MailButton->setGeometry( QRect( 2, 3, 36, 19 ) );
   MailButton->setPalette( pal );
   MailButton->setPixmap( mail  );
   MailButton->setFlat( TRUE );
 
   MailField = new QLabel( MailFrame, "DatesField" );
-  MailField->setGeometry( QRect( 40, 10, 203, 120 ) ); 
+  MailField->setGeometry( QRect( 40, 4, 203, 120 ) ); 
   MailField->setText( tr( "Opiemail not installed" ) );
   MailField->setAlignment( int( QLabel::AlignTop | QLabel::AlignLeft ) );
-  MailField->setMaximumHeight(15);
-  MailField->setMinimumHeight(10);
-
-
-  
+  MailField->setMaximumHeight(40);
+  MailField->setMinimumHeight(30);
 
   layout->addWidget(Frame);
   layout->addWidget(Frame4);
   layout->addWidget(MailFrame);
   layout->addWidget(Frame15);
-  //layout->addWidget(split);
 
-  layout->setStretchFactor(Frame4,4);
+  layout->setStretchFactor(Frame4,5);
   layout->setStretchFactor(MailFrame,1);
-  layout->setStretchFactor(Frame15,3);
+  layout->setStretchFactor(Frame15,4);
 }
 
 /*  
  *  Destroys the object and frees any allocated resources
  */
 TodayBase::~TodayBase()
 {
-
 }
 
diff --git a/core/pim/today/todaybase.h b/core/pim/today/todaybase.h
index c84cc67..13fbb8d 100644
--- a/core/pim/today/todaybase.h
+++ b/core/pim/today/todaybase.h
@@ -20,24 +20,25 @@ class QGridLayout;
 class QFrame;
 class QLabel;
 class QPushButton;
 
 class TodayBase : public QWidget
 { 
     Q_OBJECT
 
 public:
     TodayBase( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
     ~TodayBase();
 
+    //QScrollView* Frame4;
     QFrame* Frame4;
     QPushButton* DatesButton;
     QLabel* DatesField;
     QLabel* Frame;
     QFrame* MailFrame;
     QLabel* TextLabel1;
     QFrame* Frame15;
     QLabel* TodoField;
     QLabel* MailField;
     QPushButton* PushButton1;
     QPushButton* TodoButton;
     QPushButton* MailButton;