fixes must obvious bugs

1 files changed, 58 insertions, 24 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,4 +219,3 @@ void Today::getDates() {
   if ( list.count() > 0 ) {
-    QString msg;
-    
+       
     for ( QValueList<EffectiveEvent>::ConstIterator it=list.begin();
@@ -229,19 +226,33 @@ void Today::getDates() {
       if ( count <= MAX_LINES_MEET ) {
+
+	QTime time = QTime::currentTime();
 	
-	
-	DateBookEvent *l=new DateBookEvent(*it, AllDateBookEvents);
-	layoutDates->addWidget(l);
-	connect (l, SIGNAL(editEvent(const Event &)),
-		 this, SIGNAL(editEvent(const Event &)));
+	if (!ONLY_LATER) {
+	  DateBookEvent *l=new DateBookEvent(*it, AllDateBookEvents);
+	  layoutDates->addWidget(l);
+	  connect (l, SIGNAL(editEvent(const Event &)),
+		   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);
+	}
       }
- 
-   }	
-    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);
+    } 	
+  } else {
+    QLabel* noEvents = new QLabel(AllDateBookEvents);
+    noEvents->setText("No appointments today");
+    layoutDates->addWidget(noEvents);
   }
+  
+  layoutDates->addItem(new QSpacerItem(1,1, QSizePolicy::Minimum, QSizePolicy::Expanding));
+  sv1->addChild(AllDateBookEvents);
+    
+  
 }
@@ -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>";
@@ -464,4 +492,7 @@ 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());
+}