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
@@ -4,7 +4,9 @@ TODO for today:
 
-* 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??)
 
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 +1,10 @@
+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
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
@@ -5,3 +5,3 @@ Maintainer: Maximilian Reiß <max.reiss@gmx.de>
 Architecture: arm
-Version: 0.2.4
+Version: 0.2.5
 Depends: opie-base ($QPE_VERSION)
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
@@ -28,2 +28,3 @@
 #include <qpe/qprocess.h>
+#include <qpe/resource.h>
 
@@ -38,2 +39,3 @@
 #include <qtimer.h>
+#include <qpixmap.h>
 
@@ -60,8 +62,3 @@ Today::Today( QWidget* parent,  const char* name, WFlags fl )
   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() ) );
  
@@ -78,3 +75,3 @@ void Today::draw()
   // how often refresh
-  QTimer::singleShot( 30*1000, this, SLOT(draw()) );
+  QTimer::singleShot( 5*1000, this, SLOT(draw()) );
 
@@ -84,2 +81,8 @@ 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
@@ -149,2 +152,3 @@ void Today::startConfig()
 
+
 /*
@@ -160,3 +164,3 @@ void Today::getDates()
   // if 24 h format
-  //  bool ampm = config.readBoolEntry( "AMPM", TRUE );
+  //bool ampm = config.readBoolEntry( "AMPM", TRUE );
   
@@ -182,16 +186,20 @@ void Today::getDates()
             {
-               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)
                 {
@@ -203,2 +211,6 @@ void Today::getDates()
               msg += "<B>" + (*it).description() + "</B>";
+              if ( (*it).event().hasAlarm() )
+                {
+                  msg += " <b>[with alarm]</b>";
+                }
               // include location or not
@@ -232,3 +244,2 @@ void Today::getDates()
  * Parse in the todolist.xml
- * 
  */
@@ -264,3 +275,4 @@ QList<TodoItem> Today::loadTodo(const char *filename)
              {
-              if(!attlist[i]->name) continue;
+              // SEGFAULT HERE WITH MORE THAN 7 ENTRIES
+              if(!attlist[j]->name) continue;
               if(!strcmp(attlist[j]->name, "Description"))
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
@@ -29,3 +29,4 @@
 #include <qpixmap.h>
-//#include <qscrollview.h>
+#include <qscrollview.h>
+#include <qvbox.h>
 
@@ -52,13 +53,13 @@ TodayBase::TodayBase( QWidget* parent,  const char* name, WFlags fl )
   
-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);
 
@@ -66,4 +67,4 @@ this->setPalette(pal);
   
-
   Frame4 = new QFrame( this, "Frame4" );
+  Frame4->setPalette( pal );
   Frame4->setFrameShape( QScrollView::StyledPanel );
@@ -104,3 +105,3 @@ this->setPalette(pal);
   TextLabel1->setBackgroundOrigin( QLabel::ParentOrigin );
-  TextLabel1->setTextFormat( QLabel::AutoText );
+  TextLabel1->setTextFormat( RichText );
    
@@ -113,5 +114,3 @@ this->setPalette(pal);
   TodoButton->setGeometry( QRect( 2, 4, 36, 32 ) );
-  //TodoButton->setBackgroundMode(NoBackground);
   TodoButton->setPalette( pal );
-  //TodoButton->setBackgroundOrigin( QPushButton::WidgetOrigin );
   TodoButton->setPixmap( todo  );
@@ -127,3 +126,2 @@ this->setPalette(pal);
   PushButton1->setGeometry( QRect( 216, 68, 25, 21 ) ); 
-  //PushButton1->setBackgroundOrigin( QPushButton::WidgetOrigin );
   PushButton1->setPixmap( config  );
@@ -137,7 +135,5 @@ this->setPalette(pal);
   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 );
@@ -147,10 +143,7 @@ this->setPalette(pal);
   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);
 
@@ -160,7 +153,6 @@ this->setPalette(pal);
   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);
 }
@@ -172,3 +164,2 @@ 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
@@ -31,2 +31,3 @@ public:
 
+    //QScrollView* Frame4;
     QFrame* Frame4;