some new features like clickable appointments, but not connected to datebook yet

8 files changed, 147 insertions, 81 deletions

diff --git a/core/pim/today/TODO b/core/pim/today/TODO
index 5876e2b..a3b01d2 100644
--- a/core/pim/today/TODO
+++ b/core/pim/today/TODO
@@ -1,13 +1,14 @@
 TODO for today: 
 
-* start the app on  "resume"
+* start the app on  "resume" (partly done)
 
-* show alarm icons on alarm events
+* show alarm icons on alarm events (partly done)
 
 * add am/pm mode instead of 24 h, take system default
 
-* fix 23 pm bug		 (done??)
-
 * qcop integration for updating events?
 
-* sort todos by pri.
\ No newline at end of file
+* 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 7111154..333326d 100644
--- a/core/pim/today/changelog
+++ b/core/pim/today/changelog
@@ -1,12 +1,16 @@
+
+* 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
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp
index d715fc1..69bcb68 100644
--- a/core/pim/today/today.cpp
+++ b/core/pim/today/today.cpp
@@ -30,55 +30,58 @@
 
 #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 <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 ) {
   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() ) );
  
   
   autoStart();
   draw();
 }
 
-
 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");
@@ -194,104 +197,64 @@ void Today::startConfig() {
   // sync it to "disk"
   cfg.write(); 
   autoStart();
   draw();
 }
 
 
 /*
  *  Get all events that are in the datebook xml file for today
  */
 void Today::getDates() {
   QDate date = QDate::currentDate();
-  QTime time = QTime::currentTime();
+  QWidget* AllDateBookEvents = new QWidget( );
+  QVBoxLayout* layoutDates = new QVBoxLayout(AllDateBookEvents);
+  //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 ) {
-  //cout << time.toString() << endl;
-  //cout << TimeString::dateString((*it).event().end()) << endl;
-  
-  // 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><i>" + (*it).location();
-      msg += "</i>";
-    }
-    
-    if ( (TimeString::timeString(QTime((*it).event().start().time()) ) == "00:00") &&  (TimeString::timeString(QTime((*it).event().end().time()) ) == "23:59") ) {
-      msg += "<br>All day";
-    }  else {
-      // start time of event
-      msg += "<br>" + TimeString::timeString(QTime((*it).event().start().time()) )
-        // end time of event
-        + "<b> - </b>" + TimeString::timeString(QTime((*it).event().end().time()) );
-    }
-    msg += "<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><i>" + (*it).location();
-      msg += "</i>";
-    }
-    
-    if ( (TimeString::timeString(QTime((*it).event().start().time()) ) == "00:00") &&  (TimeString::timeString(QTime((*it).event().end().time()) ) == "23:59") ) {
-      msg += "<br>All day";
-    } else {
-      // start time of event
-      msg += "<br>" + TimeString::timeString(QTime((*it).event().start().time()) )
-        // end time of event
-        + "<b> - </b>" + TimeString::timeString(QTime((*it).event().end().time()) );
-    }
-    msg += "<BR>";
-    // include possible note or not
-    if (SHOW_NOTES == 1) {
-      msg += " <i>note</i>:" +((*it).notes()).mid(0, MAX_CHAR_CLIP) + "<br>";
-    }
-  }
+	
+	
+	DateBookEvent *l=new DateBookEvent(*it, AllDateBookEvents);
+	layoutDates->addWidget(l);
+	connect (l, SIGNAL(editEvent(const Event &)),
+		 this, SIGNAL(editEvent(const Event &)));
       }
-    }
-    if (msg.isEmpty()) {
-      msg = tr("No more appointments today");
-    }
-    DatesField->setText(msg);
+ 
+   }	
+    layoutDates->addItem(new QSpacerItem(1,1, QSizePolicy::Minimum, QSizePolicy::Expanding));
+    sv1->addChild(AllDateBookEvents);
+    
+    //if (msg.isEmpty()) {
+    //    msg = tr("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;
@@ -362,27 +325,28 @@ void Today::getMail() {
 
   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()) {
+  if (!checkIfModified() && !NEW_START) {
     return;
   }
+  NEW_START=0;
 
   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");
     
@@ -432,12 +396,83 @@ void Today::startTodo() {
  */
 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
 }
+
+
+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();
+  
+  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()) );
+    }
+    msg += "<BR>";
+    // include possible note or not
+    if (SHOW_NOTES == 1) {
+      msg += " <i>note</i>:" +((ev).notes()).mid(0, MAX_CHAR_CLIP) + "<br>";
+    }
+  } else if ((time.toString() <= TimeString::dateString((ev).event().end())) ) {
+    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 ) );
+}
+
+void DateBookEvent::editMe() {
+  emit editEvent(event.event());
+}
+
+
+
diff --git a/core/pim/today/today.h b/core/pim/today/today.h
index b3b7d01..0a0837c 100644
--- a/core/pim/today/today.h
+++ b/core/pim/today/today.h
@@ -11,35 +11,39 @@
 /***************************************************************************
  *                                                                         *
  *   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 "todaybase.h"
 
 #include <qpe/datebookdb.h>
+#include <qpe/event.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
-{
+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();
@@ -52,14 +56,29 @@ class Today : public TodayBase
     bool checkIfModified();
     QList<TodoItem> loadTodo(const char *filename);
  private:
     DateBookDB *db;
     todayconfig *conf;
     //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;
+};
+
 #endif // TODAY_H
 
diff --git a/core/pim/today/today.pro b/core/pim/today/today.pro
index 7d56e71..454b3ff 100644
--- a/core/pim/today/today.pro
+++ b/core/pim/today/today.pro
@@ -1,11 +1,12 @@
 TEMPLATE	= app
 #CONFIG		= qt warn_on debug
 CONFIG		= qt warn_on release
-HEADERS		= today.h TodoItem.h minidom.h todaybase.h todayconfig.h
-SOURCES		= main.cpp today.cpp todaybase.cpp todayconfig.cpp minidom.c TodoItem.cpp
+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
+
 INCLUDEPATH	+= $(OPIEDIR)/include
 DEPENDPATH	+= $(OPIEDIR)/include
 LIBS            += -lqpe
 INTERFACES	= 
 TARGET		= today
 DESTDIR		= $(OPIEDIR)/bin
diff --git a/core/pim/today/todaybase.cpp b/core/pim/today/todaybase.cpp
index 5c1dc24..552e2eb 100644
--- a/core/pim/today/todaybase.cpp
+++ b/core/pim/today/todaybase.cpp
@@ -42,24 +42,25 @@ TodayBase::TodayBase( QWidget* parent,  const char* name, WFlags fl )
 {
   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);
 
+
   QWidget *d = QApplication::desktop();
   int w=d->width();                 
   int h=d->height();                
   resize( w , h ); 
   
   // hehe, qt is ...
   getridoffuckingstrippeldlinesbutton =  new QPushButton (this, "asdfsad" );
   getridoffuckingstrippeldlinesbutton->setGeometry( QRect( -5, 10, 0, 0 ) );
 
   QVBoxLayout * layout = new QVBoxLayout(this);
 
   // --- logo Section ---
@@ -86,45 +87,48 @@ TodayBase::TodayBase( QWidget* parent,  const char* name, WFlags fl )
   TextLabel1->setTextFormat( RichText );
 
 
   // --- 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()) ); 
   
-  QScrollView* sv1 = new QScrollView( Frame4 );
+  // QScrollView* sv1 = new QScrollView( Frame4 );
+  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 );
 
-  DatesField = new QLabel( sv1->viewport(), "DatesField" );
-  sv1->addChild(DatesField);
-  DatesField->setText( tr( "No appointments today" ) );
-  DatesField->setAlignment( int( QLabel::AlignTop | QLabel::AlignLeft ) );
+  //DatesField = new QLabel( sv1->viewport(), "DatesField" );
+  //DatesField = new QVBox(sv1->viewport());
+  //QWidget *dummy = new QWidget(sv1->viewport());
+  //sv1->addChild(DatesField);
+  //DatesField->setText( tr( "No appointments today" ) );
+  // DatesField->setAlignment( int( QLabel::AlignTop | QLabel::AlignLeft ) );
 
 
- // --- mail section ---
+ // --- mail section ---)
   MailFrame = new QFrame( this ,"MailFrame" );
   MailFrame->setBackgroundOrigin( QScrollView::ParentOrigin );
   MailFrame->setGeometry (QRect( 0, 0, this->width() , 15) ); 
   MailFrame->setFrameStyle( QFrame::NoFrame );
   
   QFrame* Line1 = new QFrame( MailFrame);
   Line1->setGeometry( QRect( -5, 0, MailFrame->width()+5, 5 ) );
   Line1->setFrameStyle( QFrame::HLine | QFrame::Sunken );
 
   MailButton = new QPushButton (MailFrame, "MailButton" );
   MailButton->setGeometry( QRect( 2, 3, 36, 19 ) );
   MailButton->setPalette( pal );
diff --git a/core/pim/today/todaybase.h b/core/pim/today/todaybase.h
index 13fbb8d..8840125 100644
--- a/core/pim/today/todaybase.h
+++ b/core/pim/today/todaybase.h
@@ -5,46 +5,48 @@
 **      by:  The User Interface Compiler (uic)
 **
 ** WARNING! All changes made in this file will be lost!
 ****************************************************************************/
 #ifndef TODAYBASE_H
 #define TODAYBASE_H
 
 #include <qvariant.h>
 #include <qwidget.h>
 #include <qscrollview.h>
 #include <qsplitter.h>
 
-class QVBoxLayout; 
+class QVBox; 
 class QHBoxLayout; 
 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* DatesField;
     QLabel* Frame;
     QFrame* MailFrame;
     QLabel* TextLabel1;
+    QScrollView* sv1;
+    QVBox* DatesField;
     QFrame* Frame15;
     QLabel* TodoField;
     QLabel* MailField;
     QPushButton* PushButton1;
     QPushButton* TodoButton;
     QPushButton* MailButton;
     QPushButton* getridoffuckingstrippeldlinesbutton;
 
 protected:
 
 
 };
diff --git a/core/pim/today/todayconfig.h b/core/pim/today/todayconfig.h
index 020097d..4739b5a 100644
--- a/core/pim/today/todayconfig.h
+++ b/core/pim/today/todayconfig.h
@@ -2,25 +2,25 @@
 ** Form interface generated from reading ui file 'todayconfig.ui'
 **
 ** Created: Thu Feb 14 15:04:33 2002
 **      by:  The User Interface Compiler (uic)
 **
 ** WARNING! All changes made in this file will be lost!
 ****************************************************************************/
 #ifndef TODAYCONFIG_H
 #define TODAYCONFIG_H
 
 #include <qvariant.h>
 #include <qdialog.h>
-class QVBoxLayout; 
+//class QVBoxLayout; 
 class QHBoxLayout; 
 class QGridLayout; 
 class QCheckBox;
 class QFrame;
 class QLabel;
 class QSpinBox;
 class QTabWidget;
 class QWidget;
 
 class todayconfig : public QDialog
 { 
     Q_OBJECT