5 files changed, 94 insertions, 36 deletions

diff --git a/core/pim/datebook/datebookday.cpp b/core/pim/datebook/datebookday.cpp
index 9cc5fcd..5474cfc 100644
--- a/core/pim/datebook/datebookday.cpp
+++ b/core/pim/datebook/datebookday.cpp
@@ -537,187 +537,199 @@ int DateBookDay::startViewTime() const
 void DateBookDay::slotWeekChanged( bool bStartOnMonday )
 {
     header->setStartOfWeek( bStartOnMonday );
     //    redraw();
 }
 
 void DateBookDay::keyPressEvent(QKeyEvent *e)
 {
     switch(e->key()) {
 	case Key_Up:
 	    view->moveUp();
 	    break;
 	case Key_Down:
 	    view->moveDown();
 	    break;
 	case Key_Left:
 	    setDate(QDate(currDate).addDays(-1));
 	    break;
 	case Key_Right:
 	    setDate(QDate(currDate).addDays(1));
 	    break;
 	default:
 	    e->ignore();
     }
 }
 
 //===========================================================================
 
 DateBookDayWidget::DateBookDayWidget( const EffectiveEvent &e,
 				      DateBookDay *db )
     : QWidget( db->dayView()->viewport() ), ev( e ), dateBook( db )
 {
-    bool whichClock = db->dayView()->whichClock();
+
 
     // why would someone use "<"?  Oh well, fix it up...
     // I wonder what other things may be messed up...
     QString strDesc = ev.description();
     int where = strDesc.find( "<" );
     while ( where != -1 ) {
 	strDesc.remove( where, 1 );
 	strDesc.insert( where, "&#60;" );
 	where = strDesc.find( "<", where );
     }
 
     QString strCat;
     // ### Fix later...
 //     QString strCat = ev.category();
 //     where = strCat.find( "<" );
 //     while ( where != -1 ) {
 // 	strCat.remove( where, 1 );
 // 	strCat.insert( where, "&#60;" );
 // 	where = strCat.find( "<", where );
 //     }
 
     QString strNote = ev.notes();
     where = strNote.find( "<" );
     while ( where != -1 ) {
 	strNote.remove( where, 1 );
 	strNote.insert( where, "&#60;" );
 	where = strNote.find( "<", where );
     }
 
     text = "<b>" + strDesc + "</b><br>" + "<i>"
-        + strCat + "</i>"
-	+ "<br><b>" + tr("Start") + "</b>: ";
-
-
-    if ( e.startDate() != ev.date() ) {
-	// multi-day event.  Show start date
-	text += TimeString::longDateString( e.startDate() );
-    } else {
-	// Show start time.
-	text += TimeString::timeString( ev.start(), whichClock, FALSE );
-    }
+           + strCat + "</i><br>";
+    if (ev.event().type() == Event::Normal )
+        setEventText( text );
+    else
+        setAllDayText( text );
 
-    text += "<br><b>" + tr("End") + "</b>: ";
-    if ( e.endDate() != ev.date() ) {
-	// multi-day event.  Show end date
-	text += TimeString::longDateString( e.endDate() );
-    } else {
-	// Show end time.
-	text += TimeString::timeString( ev.end(), whichClock, FALSE );
-    }
     text += "<br><br>" + strNote;
+
     setBackgroundMode( PaletteBase );
 
     QTime start = ev.start();
     QTime end = ev.end();
     int y = start.hour()*60+start.minute();
     int h = end.hour()*60+end.minute()-y;
     int rh = dateBook->dayView()->rowHeight(0);
     y = y*rh/60;
     h = h*rh/60;
     if ( h < 3 )
         h = 3;
     geom.setY( y );
     geom.setHeight( h );
     geom.setX( 0 );
     geom.setWidth(dateBook->dayView()->columnWidth(0)-1);
 
 }
+void DateBookDayWidget::setAllDayText( QString &text ) {
+    text += "<b>" + tr("This is an all day event.") + "</b><br>";
+}
+void DateBookDayWidget::setEventText( QString& text ) {
+    bool whichClock = dateBook->dayView()->whichClock();
+    text += "<b>" + tr("Start") + "</b>: ";
+    if ( ev.startDate() != ev.date() ) {
+	// multi-day event.  Show start date
+	text += TimeString::longDateString( ev.startDate() );
+    } else {
+	// Show start time.
+	text += TimeString::timeString( ev.start(), whichClock, FALSE );
+    }
+
+    text += "<br><b>" + tr("End") + "</b>: ";
+    if ( ev.endDate() != ev.date() ) {
+	// multi-day event.  Show end date
+	text += TimeString::longDateString( ev.endDate() );
+    } else {
+	// Show end time.
+	text += TimeString::timeString( ev.end(), whichClock, FALSE );
+    }
+
+}
 
 DateBookDayWidget::~DateBookDayWidget()
 {
 }
 
 void DateBookDayWidget::paintEvent( QPaintEvent *e )
 {
     QPainter p( this );
 
     if (dateBook->getSelectedWidget() == this)
     {
        	    p.setBrush( QColor( 155, 240, 230 ) ); // selected item
     } else
     {
     	if (dateBook->date() == QDate::currentDate())
 	{
     	    QTime curTime = QTime::currentTime();
 
 	    if (ev.end() < curTime)
 	    {
 	    	  p.setBrush( QColor( 180, 180, 180 ) ); // grey, inactive
 	    } else
 	    {
 	    	//change color in dependence of the time till the event starts
  	          int duration = curTime.secsTo(ev.start());
 		  if (duration < 0) duration = 0;
 		  int colChange = duration*160/86400; //86400: secs per day, 160: max color shift
 
 	    	  p.setBrush( QColor( 200-colChange, 200-colChange, 255 ) ); //blue
 	    }
 	 } else
 	 {
                   p.setBrush( QColor( 220, 220, 220 ) ); //light grey, inactive (not current date)
 		  //perhaps make a distinction between future/past dates
 	 }
     }
 
     p.setPen( QColor(100, 100, 100) );
     p.drawRect(rect());
 
  //   p.drawRect(0,0, 5, height());
 
     int y = 0;
     int d = 0;
 
     if ( ev.event().hasAlarm() ) {
         p.drawPixmap( width() - 16, 0, Resource::loadPixmap( "bell" ) );
         y = 20;
         d = 20;
     }
 
     if ( ev.event().hasRepeat() ) {
         p.drawPixmap( width() - 16, y, Resource::loadPixmap( "repeat" ) );
         d = 20;
+	y += 20;
     }
 
     QSimpleRichText rt( text, font() );
     rt.setWidth( geom.width() - d - 6 );
     rt.draw( &p, 7, 0, e->region(), colorGroup() );
 }
 
 void DateBookDayWidget::mousePressEvent( QMouseEvent *e )
 {
 	DateBookDayWidget *item;
 
 	item = dateBook->getSelectedWidget();
 	if (item) item->update();
 
 	dateBook->setSelectedWidget(this);
 	update();
 	dateBook->repaint();
 
     QPopupMenu m;
     m.insertItem( tr( "Edit" ), 1 );
     m.insertItem( tr( "Delete" ), 2 );
     m.insertItem( tr( "Beam" ), 3 );
     int r = m.exec( e->globalPos() );
     if ( r == 1 ) {
         emit editMe( ev.event() );
     } else if ( r == 2 ) {
         emit deleteMe( ev.event() );
     } else if ( r == 3 ) {
 	emit beamMe( ev.event() );
     }
 }
 
diff --git a/core/pim/datebook/datebookday.h b/core/pim/datebook/datebookday.h
index be7cc45..db1cd04 100644
--- a/core/pim/datebook/datebookday.h
+++ b/core/pim/datebook/datebookday.h
@@ -58,64 +58,75 @@ protected:
       
     virtual void resizeEvent( QResizeEvent *e );
     void keyPressEvent( QKeyEvent *e );
     void initHeader();
 private:
     bool ampm;
 };
 
 class DateBookDay;
 class DateBookDayWidget : public QWidget
 {
     Q_OBJECT
 
 public:
     DateBookDayWidget( const EffectiveEvent &e, DateBookDay *db );
     ~DateBookDayWidget();
 
     const QRect &geometry() { return geom; }
     void setGeometry( const QRect &r );
 
     const EffectiveEvent &event() const { return ev; }
         
 signals:
     void deleteMe( const Event &e );
     void editMe( const Event &e );
     void beamMe( const Event &e );
 
 protected:
     void paintEvent( QPaintEvent *e );
     void mousePressEvent( QMouseEvent *e );
 
 private:
+    /**
+     * Sets the text for an all day Event
+     * All day events have no time associated
+     */
+    void setAllDayText( QString& text );
+
+    /**
+     * Sets the EventText
+     * it got a start and an end Time
+     */
+    void setEventText( QString& text );
     const EffectiveEvent ev;
     DateBookDay *dateBook;
     QString text;
     QRect geom;
 };
 
 //Marker for current time in the dayview
 class DateBookDayTimeMarker : public QWidget
 {
     Q_OBJECT
 
 public:
     DateBookDayTimeMarker( DateBookDay *db );
     ~DateBookDayTimeMarker();
 
     const QRect &geometry() { return geom; }
     void setGeometry( const QRect &r );
     void setTime( const QTime &t );
 
 signals: 
 
 protected:
     void paintEvent( QPaintEvent *e );
 
 private:
     QRect geom;
     QTime time;
     DateBookDay *dateBook;
 };
 
 //reimplemented the compareItems function so that it sorts DayWidgets by geometry heights
 class WidgetListClass : public QList<DateBookDayWidget>
diff --git a/core/pim/datebook/datebookweek.cpp b/core/pim/datebook/datebookweek.cpp
index 6532ba4..e16f516 100644
--- a/core/pim/datebook/datebookweek.cpp
+++ b/core/pim/datebook/datebookweek.cpp
@@ -432,118 +432,134 @@ void DateBookWeek::dateChanged( int y, int w )
 {
     year = y;
     _week = w;
     getEvents();
 }
 
 QDate DateBookWeek::date() const
 {
     QDate d;
     d = dateFromWeek( _week - 1, year, bStartOnMonday );
     if ( bStartOnMonday )
 	d = d.addDays( 7 + dow - 1 );
     else {
 	if ( dow == 7 )
 	    d = d.addDays( dow );
 	else
 	    d = d.addDays( 7 + dow );
     }
     return d;
 }
 
 void DateBookWeek::getEvents()
 {
     QDate startWeek = weekDate();
 
     QDate endWeek = startWeek.addDays( 6 );
     QValueList<EffectiveEvent> eventList = db->getEffectiveEvents(startWeek,
 								  endWeek);
     view->showEvents( eventList );
     view->moveToHour( startTime );
 }
 
+void DateBookWeek::generateAllDayTooltext( QString& text ) {
+    text += "<b>" + tr("This is an all day event.") + "</b><br>";
+}
+
+void DateBookWeek::generateNormalTooltext( QString& str,
+                                           const EffectiveEvent &ev ) {
+    str += "<b>" + QObject::tr("Start") + "</b>: ";
+
+    if ( ev.startDate() != ev.date() ) {
+	// multi-day event.  Show start date
+	str += TimeString::longDateString( ev.startDate() );
+    } else {
+	// Show start time.
+	str += TimeString::timeString(ev.start(), ampm, FALSE );
+    }
+
+
+    str += "<br><b>" + QObject::tr("End") + "</b>: ";
+    if ( ev.endDate() != ev.date() ) {
+        // multi-day event.  Show end date
+        str += TimeString::longDateString( ev.endDate() );
+    } else {
+        // Show end time.
+        str += TimeString::timeString( ev.end(), ampm, FALSE );
+    }
+}
+
 void DateBookWeek::slotShowEvent( const EffectiveEvent &ev )
 {
     if ( tHide->isActive() )
         tHide->stop();
 
     // why would someone use "<"?  Oh well, fix it up...
     // I wonder what other things may be messed up...
     QString strDesc = ev.description();
     int where = strDesc.find( "<" );
     while ( where != -1 ) {
 	strDesc.remove( where, 1 );
 	strDesc.insert( where, "&#60;" );
 	where = strDesc.find( "<", where );
     }
 
     QString strCat;
     // ### FIX later...
 //     QString strCat = ev.category();
 //     where = strCat.find( "<" );
 //     while ( where != -1 ) {
 // 	strCat.remove( where, 1 );
 // 	strCat.insert( where, "&#60;" );
 // 	where = strCat.find( "<", where );
 //     }
 
     QString strNote = ev.notes();
     where = strNote.find( "<" );
     while ( where != -1 ) {
 	strNote.remove( where, 1 );
 	strNote.insert( where, "&#60;" );
 	where = strNote.find( "<", where );
     }
 
     QString str = "<b>" + strDesc + "</b><br>" + "<i>"
             + strCat + "</i>"
 	    + "<br>" + TimeString::longDateString( ev.date() )
-	    + "<br><b>" + QObject::tr("Start") + "</b>: ";
+	          + "<br>";
 
-    if ( ev.startDate() != ev.date() ) {
-	// multi-day event.  Show start date
-	str += TimeString::longDateString( ev.startDate() );
-    } else {
-	// Show start time.
-	str += TimeString::timeString(ev.start(), ampm, FALSE );
-    }
+    if (ev.event().type() == Event::Normal )
+        generateNormalTooltext( str, ev );
+    else
+        generateAllDayTooltext( str );
 
-    str += "<br><b>" + QObject::tr("End") + "</b>: ";
-    if ( ev.endDate() != ev.date() ) {
-	// multi-day event.  Show end date
-	str += TimeString::longDateString( ev.endDate() );
-    } else {
-	// Show end time.
-	str += TimeString::timeString( ev.end(), ampm, FALSE );
-    }
     str += "<br><br>" + strNote;
 
     lblDesc->setText( str );
     lblDesc->resize( lblDesc->sizeHint() );
     // move the label so it is "centerd" horizontally...
     lblDesc->move( QMAX(0,(width() - lblDesc->width()) / 2), 0 );
     lblDesc->show();
 }
 
 void DateBookWeek::slotHideEvent()
 {
     tHide->start( 2000, true );
 }
 
 void DateBookWeek::setStartViewTime( int startHere )
 {
     startTime = startHere;
     view->moveToHour( startTime );
 }
 
 int DateBookWeek::startViewTime() const
 {
     return startTime;
 }
 
 void DateBookWeek::redraw()
 {
     getEvents();
 }
 
 void DateBookWeek::slotYearChanged( int y )
 {
diff --git a/core/pim/datebook/datebookweek.h b/core/pim/datebook/datebookweek.h
index 6e675f1..acbc2c7 100644
--- a/core/pim/datebook/datebookweek.h
+++ b/core/pim/datebook/datebookweek.h
@@ -104,49 +104,65 @@ public:
 		  QWidget *parent = 0, const char *name = 0 );
     void setDate( int y, int m, int d );
     void setDate( QDate d );
     QDate date() const;
     DateBookWeekView *weekView() const { return view; }
     void setStartViewTime( int startHere );
     int startViewTime() const;
     int week() const { return _week; };
     void setTotalWeeks( int totalWeeks );
     int totalWeeks() const;
     QDate weekDate() const;
 
 public slots:
     void redraw();
     void slotWeekChanged( bool bStartOnMonday );
     void slotClockChanged( bool a );
 
 signals:
     void showDate( int y, int m, int d );
 
 protected slots:
     void keyPressEvent(QKeyEvent *);
 
 private slots:
     void showDay( int day );
     void dateChanged( int y, int w );
     void slotShowEvent( const EffectiveEvent & );
     void slotHideEvent();
     void slotYearChanged( int );
 
 private:
     void getEvents();
+
+    /**
+     * Wow that's a hell lot of code duplication
+     * in datebook. I vote for a common base class
+     * but never the less. This add a note
+     * that the Event is an all day event
+     *
+     */
+    void generateAllDayTooltext( QString& text );
+
+    /**
+     * This will add the times to the text
+     * It will be shown in the Tooltip bubble
+     */
+    void generateNormalTooltext( QString& text,
+                                 const EffectiveEvent &ev);
     int year;
     int _week;
     int dow;
     DateBookWeekHeader *header;
     DateBookWeekView *view;
     DateBookDB *db;
     QLabel *lblDesc;
     QTimer *tHide;
     int startTime;
     bool ampm;
     bool bStartOnMonday;
 };
 
 
 bool calcWeek( const QDate &d, int &week, int &year,
 	       bool startOnMonday = false );
 #endif
diff --git a/core/pim/datebook/datebookweeklst.cpp b/core/pim/datebook/datebookweeklst.cpp
index 29519c1..5eefc27 100644
--- a/core/pim/datebook/datebookweeklst.cpp
+++ b/core/pim/datebook/datebookweeklst.cpp
@@ -125,65 +125,68 @@ DateBookWeekLstDayHdr::DateBookWeekLstDayHdr(const QDate &d, bool /*onM*/,
 
 
     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 ) );
 }
 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;