1 files changed, 22 insertions, 20 deletions

diff --git a/core/pim/datebook/datebookweeklst.cpp b/core/pim/datebook/datebookweeklst.cpp
index 9089fe9..e8e12ba 100644
--- a/core/pim/datebook/datebookweeklst.cpp
+++ b/core/pim/datebook/datebookweeklst.cpp
@@ -118,130 +118,132 @@ DateBookWeekLstDayHdr::DateBookWeekLstDayHdr(const QDate &d, bool /*onM*/,
 	  label->setPalette(QPalette(QColor(0,0,255),label->backgroundColor()));
 	*/
     } else if (d.dayOfWeek() == 7) { // FIXME: Match any holiday
 	QPalette pal=label->palette();
 	pal.setColor(QColorGroup::Foreground, QColor(255,0,0));
 	label->setPalette(pal);
     }
 
 
     connect (label, SIGNAL(clicked()), this, SLOT(showDay()));
     connect (add, SIGNAL(clicked()), this, SLOT(newEvent()));
 }
 
 void DateBookWeekLstDayHdr::showDay() {
     emit showDate(date.year(), date.month(), date.day());
 }
 void DateBookWeekLstDayHdr::newEvent() {
     QDateTime start, stop;
     start=stop=date;
     start.setTime(QTime(10,0));
     stop.setTime(QTime(12,0));
 
     emit addEvent(start,stop,"");
 }
 DateBookWeekLstEvent::DateBookWeekLstEvent(const EffectiveEvent &ev,
 					   QWidget* parent,
 					   const char* name,
 					   WFlags fl) :
     OClickableLabel(parent,name,fl),
     event(ev)
 {
     char s[10];
-    if ( ev.startDate() != ev.date() ) { // multiday event (not first day)
-      if ( ev.endDate() == ev.date() ) { // last day
-	strcpy(s, "__|__");
-      } else {
-	strcpy(s, "    |---");
-      }
-    } else {
-      if(ev.event().type() == Event::Normal )
-        sprintf(s,"%.2d:%.2d",ev.start().hour(),ev.start().minute());
-      else
-        sprintf(s,"     ");
-    }
-    setText(QString(s) + " " + ev.description());
-    connect(this, SIGNAL(clicked()), this, SLOT(editMe()));
-    setAlignment( int( QLabel::WordBreak | QLabel::AlignLeft ) );
+	if ( ev.startDate() != ev.date() ) { // multiday event (not first day)
+		if ( ev.endDate() == ev.date() ) { // last day
+			strcpy(s, "__|__");
+		} else {
+			strcpy(s, "    |---");
+		}
+	} else {
+		if(ev.event().type() == Event::Normal )
+			sprintf(s,"%.2d:%.2d",ev.start().hour(),ev.start().minute());
+		else
+			sprintf(s,"     ");
+	}
+	setText(QString(s) + " " + ev.description());
+	connect(this, SIGNAL(clicked()), this, SLOT(editMe()));
+	setAlignment( int( QLabel::WordBreak | QLabel::AlignLeft ) );
 }
 void DateBookWeekLstEvent::editMe() {
     emit editEvent(event.event());
 }
 
 
 DateBookWeekLstView::DateBookWeekLstView(QValueList<EffectiveEvent> &ev,
 					 const QDate &d, bool onM,
 					 QWidget* parent,
 					 const char* name, WFlags fl)
     : QWidget( parent, name, fl )
 {
     onMonday=onM;
     setPalette(white);
     setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding));
 
     QVBoxLayout *layout = new QVBoxLayout( this );
 
     qBubbleSort(ev);
     QValueListIterator<EffectiveEvent> it;
     it=ev.begin();
 
     int dayOrder[7];
     if (onMonday)
 	for (int d=0; d<7; d++) dayOrder[d]=d+1;
     else {
 	for (int d=0; d<7; d++) dayOrder[d]=d;
 	dayOrder[0]=7;
     }
 
     for (int i=0; i<7; i++) {
 	// Header
 	DateBookWeekLstDayHdr *hdr=new DateBookWeekLstDayHdr(d.addDays(i),
 							     onMonday,this);
 	connect(hdr, SIGNAL(showDate(int,int,int)),
 		this, SIGNAL(showDate(int,int,int)));
 	connect(hdr, SIGNAL(addEvent(const QDateTime &,
 				     const QDateTime &,
 				     const QString &)),
 		this, SIGNAL(addEvent(const QDateTime &,
 				      const QDateTime &,
 				      const QString &)));
 	layout->addWidget(hdr);
 
 	// Events
 	while ( (*it).date().dayOfWeek() == dayOrder[i] && it!=ev.end() ) {
-	    DateBookWeekLstEvent *l=new DateBookWeekLstEvent(*it,this);
-	    layout->addWidget(l);
-	    connect (l, SIGNAL(editEvent(const Event &)),
-		     this, SIGNAL(editEvent(const Event &)));
-	    it++;
+		if(!((*it).end().hour()==(*it).start().hour() && (*it).end().minute()==(*it).start().minute())) {	// Skip effective events with no duration. (i.e ending at 00:00)
+			DateBookWeekLstEvent *l=new DateBookWeekLstEvent(*it,this);
+			layout->addWidget(l);
+			connect (l, SIGNAL(editEvent(const Event &)),
+							this, SIGNAL(editEvent(const Event &)));
+		}
+		it++;
 	}
 
 	layout->addItem(new QSpacerItem(1,1, QSizePolicy::Minimum, QSizePolicy::Expanding));
     }
 }
 DateBookWeekLstView::~DateBookWeekLstView(){}
 void DateBookWeekLstView::keyPressEvent(QKeyEvent *e) {e->ignore();}
 
 DateBookWeekLstDblView::DateBookWeekLstDblView(QValueList<EffectiveEvent> &ev1,
 					       QValueList<EffectiveEvent> &ev2,
 					       QDate &d, bool onM,
 					       QWidget* parent,
 					       const char* name, WFlags fl)
     : QWidget( parent, name, fl )
 {
     QHBoxLayout *layout = new QHBoxLayout( this );
 
     DateBookWeekLstView *w=new DateBookWeekLstView(ev1,d,onM,this);
     layout->addWidget(w);
     connect (w, SIGNAL(editEvent(const Event &)),
 	     this, SIGNAL(editEvent(const Event &)));
     connect (w, SIGNAL(showDate(int,int,int)),
 	     this, SIGNAL(showDate(int,int,int)));
     connect (w, SIGNAL(addEvent(const QDateTime &, const QDateTime &,
 				const QString &)),
 	     this, SIGNAL(addEvent(const QDateTime &, const QDateTime &,
 				   const QString &)));
 
 
     w=new DateBookWeekLstView(ev2,d.addDays(7),onM,this);
     layout->addWidget(w);
     connect (w, SIGNAL(editEvent(const Event &)),