2 files changed, 103 insertions, 68 deletions

diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp
index bed3a74..9e5c27e 100644
--- a/core/pim/today/today.cpp
+++ b/core/pim/today/today.cpp
@@ -1,411 +1,409 @@
 /*
  * 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 <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*)MailButton, SIGNAL( clicked() ), this, SLOT(startMail() ) );
  
   draw();
 }
 
 
 void Today::draw()
 {
   init();
   getDates();
   getMail();
   getTodo(); 
   // how often refresh
   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);
   // if notes should be shown 
   SHOW_NOTES = cfg.readNumEntry("shownotes",0);
   ONLY_LATER = cfg.readNumEntry("onlylater",1);
 
 }
 
 void Today::startConfig() 
 {
   conf = new todayconfig ( this, "", true );
   
   
   //Config cfg = new Config("today");
 
   // read the config
   Config cfg("today");
   cfg.setGroup("BaseConfig"); 
   
   //init();
    
   conf->SpinBox1->setValue(MAX_LINES_MEET);
   // location show box
   conf->CheckBox1->setChecked(SHOW_LOCATION);
   // notes show box
   conf->CheckBox2->setChecked(SHOW_NOTES);
   // task lines
   conf->SpinBox2->setValue(MAX_LINES_TASK);
   // clip when?
   conf->SpinBox7->setValue(MAX_CHAR_CLIP);
   // only later
   conf->CheckBox3->setChecked(ONLY_LATER);
   
   conf->exec();
   
   int maxlinestask = conf->SpinBox2->value();
   int maxmeet = conf->SpinBox1->value();
   int location = conf->CheckBox1->isChecked();
   int notes = conf->CheckBox2->isChecked();
   int maxcharclip = conf->SpinBox7->value();
   int onlylater = conf->CheckBox3->isChecked();
 
   cfg.writeEntry("maxlinestask",maxlinestask);
   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 );
   
   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>";
               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 += " <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
               if (SHOW_NOTES == 1)
                 {
                   msg += " <i>note</i>:" +((*it).notes()).mid(0, MAX_CHAR_CLIP) + "<br>";
                 }
             }
         }
     }
     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;
   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]))
              {
               // 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();
                     }
                 }
               // 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 mails, <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;
   
   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>")));
                 }
             }
         }
     }
   
   if (count > 0) 
     {
       output = QString("There are <b> %1</b> active tasks: <br>").arg(count);
       output += tmpout;
     }
   else 
     {
       output = ("No active tasks");
     }
   
   TodoField->setText(output);
 }
 
 /*
  * launches datebook
  */
 void Today::startDatebook()
 { 
   QCopEnvelope e("QPE/System", "execute(QString)");
   e << QString("datebook");
 }
 
 /*
  * 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");
 }
 
 /*  
  *  Destroys the object and frees any allocated resources
  */
 Today::~Today()
 {
   // no need to delete child widgets, Qt does it all for us
 }
diff --git a/core/pim/today/todaybase.cpp b/core/pim/today/todaybase.cpp
index 32b45f7..ff6001a 100644
--- a/core/pim/today/todaybase.cpp
+++ b/core/pim/today/todaybase.cpp
@@ -1,166 +1,203 @@
 /*
  * todaybase.cpp *
  * ---------------------
  *
  * 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 "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 <qvbox.h>
+#include <qapplication.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 );
-  
+  QPixmap logo = Resource::loadPixmap( "today/today_logo"); // logo
+  QPixmap datebook = Resource::loadPixmap("DateBook"); // datebook
+  QPixmap todo = Resource::loadPixmap( "TodoList" );   // todo
+  QPixmap config = Resource::loadPixmap( "today/config" );  // config icon
+  QPixmap mail = Resource::loadPixmap( "today/mail" ); // mail icon
   
   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);
+  QWidget *d = QApplication::desktop();
+  int w=d->width();                 
+  int h=d->height();                
+  resize( w , h ); // not good, what happens on rotation
   
-  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 =  new QPushButton (this, "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 );
-  DatesButton->setPixmap( datebook  );
-  DatesButton->setFlat( TRUE );
 
-  DatesField = new QLabel( Frame4, "DatesField" );
-  DatesField->setGeometry( QRect( 40, 4, 203, 120 ) ); 
-  DatesField->setText( tr( "No appointments today" ) );
-  DatesField->setAlignment( int( QLabel::AlignTop | QLabel::AlignLeft ) );
 
+  QVBoxLayout * layout = new QVBoxLayout(this);
+  
+  
+
+  // --- logo Section ---
+  QPalette pal2;
+  QColorGroup cg;
+  cg.setColor( QColorGroup::Text, white );
+  cg.setBrush( QColorGroup::Background, QBrush( QColor( 238, 238, 230), logo ) );
+  pal2.setActive( cg );
   // today logo
   Frame = new QLabel( this, "Frame" );
   Frame->setPalette( pal2 );
   Frame->setFrameShape( QFrame::StyledPanel );
   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( RichText );
-   
-  // todo
-  Frame15 = new QFrame( this, "Frame15" );
-  Frame15->setFrameShape( QFrame::StyledPanel );
-  Frame15->setFrameShadow( QFrame::Sunken );
+
+
+  // --- dates section ---
+  Frame4 = new QFrame( this, "Frame4" );
+  Frame4->setPalette( pal );
+  Frame4->setFrameShape( QScrollView::StyledPanel );
+  Frame4->setFrameShadow( QScrollView::Sunken );
+  Frame4->setBackgroundOrigin( QScrollView::ParentOrigin );
+  Frame4->setFrameStyle( QFrame::NoFrame );
+  Frame4->setGeometry (QRect( 0, 0, this->width() , this->height()) ); 
   
-  TodoButton = new QPushButton (Frame15, "TodoButton" );
-  TodoButton->setGeometry( QRect( 2, 4, 36, 32 ) );
-  TodoButton->setPalette( pal );
-  TodoButton->setPixmap( todo  );
-  TodoButton->setFlat( TRUE );
+  QScrollView* sv1 = new QScrollView( Frame4 );
+  sv1->setResizePolicy(QScrollView::AutoOneFit);
+  sv1->setHScrollBarMode( QScrollView::AlwaysOff );
+  // need to find a better way!!!
+  sv1->setGeometry (QRect( 40, 2, Frame4->width()-40 , (Frame4->height()/3)+20  ) ); 
+  sv1->setFrameShape(QFrame::NoFrame);
+ 
+  DatesButton = new QPushButton (Frame4, "DatesButton" );
+  DatesButton->setGeometry( QRect( 2, 4, 36, 32 ) );
+  DatesButton->setBackgroundOrigin( QPushButton::WidgetOrigin );
+  DatesButton->setPalette( pal );
+  DatesButton->setPixmap( datebook  );
+  DatesButton->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 ) );
+  DatesField = new QLabel( sv1->viewport(), "DatesField" );
+  sv1->addChild(DatesField);
+  DatesField->setText( tr( "No appointments today" ) );
+  DatesField->setAlignment( int( QLabel::AlignTop | QLabel::AlignLeft ) );
 
-  PushButton1 = new QPushButton (Frame15, "PushButton1" );
-  PushButton1->setGeometry( QRect( 216, 68, 25, 21 ) ); 
-  PushButton1->setPixmap( config  );
-  PushButton1->setPalette( pal );
-  PushButton1->setAutoDefault( TRUE );
-  PushButton1->setFlat( TRUE );
 
-  // mail
+ // --- mail section ---
   MailFrame = new QFrame( this ,"MailFrame" );
-  MailFrame->setFrameShape( QScrollView::StyledPanel );
-  MailFrame->setFrameShadow( QScrollView::Sunken );
+  //MailFrame->setPalette( pal );
+  MailFrame->setBackgroundOrigin( QScrollView::ParentOrigin );
+  //MailFrame->setFrameShape( QScrollView::StyledPanel );
+  //MailFrame->setFrameShadow( QScrollView::Sunken );
+  MailFrame->setGeometry (QRect( 0, 0, this->width() , 15) ); 
+  MailFrame->setFrameStyle( QFrame::NoFrame );
   
+  QFrame* Line1 = new QFrame( MailFrame);
+  Line1->setGeometry( QRect( 0, 0, MailFrame->width(), 5 ) );
+  Line1->setFrameStyle( QFrame::HLine | QFrame::Sunken );
+
   MailButton = new QPushButton (MailFrame, "MailButton" );
   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, 4, 203, 120 ) ); 
+  MailField = new QLabel( MailFrame, "MailField" );
+  MailField->setGeometry( QRect( 40, 4, MailFrame->width(), 12) ); 
   MailField->setText( tr( "Opiemail not installed" ) );
   MailField->setAlignment( int( QLabel::AlignTop | QLabel::AlignLeft ) );
   MailField->setMaximumHeight(40);
-  MailField->setMinimumHeight(30);
+  MailField->setMinimumHeight(15);
+
+  
+  // --- todo section --
+  Frame15 = new QFrame( this, "Frame15" );
+  //Frame15->setFrameShape( QFrame::StyledPanel );
+  //Frame15->setFrameShadow( QFrame::Sunken );
+  Frame15->setFrameStyle( QFrame::NoFrame );
+  Frame15->setGeometry (QRect( 40, 3, this->width() , this->height()) ); 
+
+  QFrame* Line2 = new QFrame( Frame15);
+  Line2->setGeometry( QRect( 0, 0, MailFrame->width(), 5 ) );
+  Line2->setFrameStyle( QFrame::HLine | QFrame::Sunken );
+
+  TodoButton = new QPushButton (Frame15, "TodoButton" );
+  TodoButton->setGeometry( QRect( 2, 4, 36, 32 ) );
+  TodoButton->setPalette( pal );
+  TodoButton->setPixmap( todo  );
+  TodoButton->setFlat( TRUE );
+
+  QScrollView* sv2 = new QScrollView( Frame15 );
+  sv2->setResizePolicy(QScrollView::AutoOneFit);
+  sv2->setHScrollBarMode( QScrollView::AlwaysOff );
+  sv2->setGeometry (QRect( 40, 3, Frame15->width()-40 , (Frame15->height()/3) ) ); 
+  sv2->setFrameShape(QFrame::NoFrame);
+
+  TodoField = new QLabel( sv2->viewport(), "TodoField" );
+  sv2->addChild(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( 2, 68, 25, 21 ) ); 
+  PushButton1->setPixmap( config  );
+  PushButton1->setPalette( pal );
+  PushButton1->setAutoDefault( TRUE );
+  PushButton1->setFlat( TRUE );
 
+  // -- layout --
   layout->addWidget(Frame);
   layout->addWidget(Frame4);
   layout->addWidget(MailFrame);
   layout->addWidget(Frame15);
 
   layout->setStretchFactor(Frame4,5);
   layout->setStretchFactor(MailFrame,1);
   layout->setStretchFactor(Frame15,4);
 }
 
 /*  
  *  Destroys the object and frees any allocated resources
  */
 TodayBase::~TodayBase()
 {
 }