2 files changed, 61 insertions, 13 deletions

diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp
index d10082f..1cdc6b4 100644
--- a/core/pim/today/today.cpp
+++ b/core/pim/today/today.cpp
@@ -70,5 +70,4 @@ Today::Today( QWidget* parent,  const char* name, WFlags fl )
  
-  
-  autoStart();
   draw();
+  autoStart();
 }
@@ -96,3 +95,3 @@ void Today::draw() {
   // how often refresh
-  QTimer::singleShot( 30*1000, this, SLOT(draw()) );
+  QTimer::singleShot( 10*1000, this, SLOT(draw() ) );
 }
@@ -198,4 +197,4 @@ void Today::startConfig() {
   cfg.write(); 
-  autoStart();
   draw();
+  autoStart();
 }
@@ -210,3 +209,2 @@ void Today::getDates() {
   QVBoxLayout* layoutDates = new QVBoxLayout(AllDateBookEvents);
-  //QTime time = QTime::currentTime();
   
@@ -221,3 +219,2 @@ void Today::getDates() {
   if ( list.count() > 0 ) {
-    QString msg;
     
@@ -230,3 +227,5 @@ void Today::getDates() {
         
+        QTime time = QTime::currentTime();
         
+        if (!ONLY_LATER) {
         DateBookEvent *l=new DateBookEvent(*it, AllDateBookEvents);
@@ -235,5 +234,21 @@ void Today::getDates() {
                  this, SIGNAL(editEvent(const Event &)));
+        } else if ((time.toString() <= TimeString::dateString((*it).event().end())) ) {
+          // show only later appointments
+          DateBookEventLater *l=new DateBookEventLater(*it, AllDateBookEvents);
+          layoutDates->addWidget(l);
+          connect (l, SIGNAL(editEvent(const Event &)),
+                   this, SIGNAL(editEvent(const Event &)));
+        } else {
+          QLabel* noMoreEvents = new QLabel(AllDateBookEvents);
+          noMoreEvents->setText("No more appointments today");
+          layoutDates->addWidget(noMoreEvents);
       }
- 
            }
+            } 
+  } else {
+    QLabel* noEvents = new QLabel(AllDateBookEvents);
+    noEvents->setText("No appointments today");
+    layoutDates->addWidget(noEvents);
+  }
+  
     layoutDates->addItem(new QSpacerItem(1,1, QSizePolicy::Minimum, QSizePolicy::Expanding));
@@ -241,7 +256,3 @@ void Today::getDates() {
     
-    //if (msg.isEmpty()) {
-    //    msg = tr("No more appointments today");
-    //}
-    //DatesField->setText(msg);
-  }
+  
 }
@@ -441,3 +452,20 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev,
     }
-  } else if ((time.toString() <= TimeString::dateString((ev).event().end())) ) {
+  }
+  setText(msg);
+  connect(this, SIGNAL(clicked()), this, SLOT(editMe()));
+  setAlignment( int( QLabel::WordBreak | QLabel::AlignLeft ) );
+}
+
+
+DateBookEventLater::DateBookEventLater(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 ((time.toString() <= TimeString::dateString((ev).event().end())) ) {
+    // show only later appointments
     msg += "<B>" + (ev).description() + "</B>";
@@ -466,2 +494,5 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev,
 
+  // if (msg.isEmpty()) {
+  //  msg = tr("No more appointments today");
+  // }
   setText(msg);
@@ -475,2 +506,5 @@ void DateBookEvent::editMe() {
 
+void DateBookEventLater::editMe() {
+  emit editEvent(event.event());
+}
 
diff --git a/core/pim/today/today.h b/core/pim/today/today.h
index 0a0837c..b3f0654 100644
--- a/core/pim/today/today.h
+++ b/core/pim/today/today.h
@@ -82,2 +82,16 @@ private:
 
+class DateBookEventLater: public ClickableLabel {
+  Q_OBJECT
+public:
+    DateBookEventLater(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