All day events are not from 00:00 to 23:59 they're all day now.

5 files changed, 107 insertions, 49 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
@@ -565,9 +565,9 @@ void DateBookDay::keyPressEvent(QKeyEvent *e)
 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();
@@ -596,29 +596,16 @@ DateBookDayWidget::DateBookDayWidget( const EffectiveEvent &e,
 	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();
@@ -634,8 +621,32 @@ DateBookDayWidget::DateBookDayWidget( const EffectiveEvent &e,
     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()
 {
 }
@@ -688,8 +699,9 @@ void DateBookDayWidget::paintEvent( QPaintEvent *e )
 
     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 );
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
@@ -39,9 +39,9 @@ class DateBookDayView : public QTable
     Q_OBJECT
 public:
     DateBookDayView( bool hourClock, QWidget *parent, const char *name );
     bool whichClock() const;
-    
+
     void setRowStyle( int style );
 
 public slots:
     void moveUp();
@@ -54,9 +54,9 @@ protected slots:
     void slotChangeClock( bool );
 protected:
     virtual void paintCell( QPainter *p, int row, int col, const QRect &cr, bool selected );
     virtual void paintFocus( QPainter *p, const QRect &cr );
-      
+
     virtual void resizeEvent( QResizeEvent *e );
     void keyPressEvent( QKeyEvent *e );
     void initHeader();
 private:
@@ -75,9 +75,9 @@ public:
     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 );
@@ -86,8 +86,19 @@ 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;
@@ -105,9 +116,9 @@ public:
     const QRect &geometry() { return geom; }
     void setGeometry( const QRect &r );
     void setTime( const QTime &t );
 
-signals: 
+signals:
 
 protected:
     void paintEvent( QPaintEvent *e );
 
@@ -118,23 +129,23 @@ private:
 };
 
 //reimplemented the compareItems function so that it sorts DayWidgets by geometry heights
 class WidgetListClass : public QList<DateBookDayWidget>
-{	
+{
 	private:
-		
-	int compareItems( QCollection::Item s1, QCollection::Item s2 ) 
-	{ 
+
+	int compareItems( QCollection::Item s1, QCollection::Item s2 )
+	{
 		//hmm, don't punish me for that ;)
 		if (reinterpret_cast<DateBookDayWidget*>(s1)->geometry().height() > reinterpret_cast<DateBookDayWidget*>(s2)->geometry().height())
-		{ 
+		{
 			return -1;
 		} else
 		{
 			return 1;
 		}
 	}
-	
+
 
 };
 
 class DateBookDay : public QVBox
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
@@ -460,8 +460,35 @@ void DateBookWeek::getEvents()
     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();
@@ -494,28 +521,17 @@ void DateBookWeek::slotShowEvent( const EffectiveEvent &ev )
 	where = strNote.find( "<", where );
     }
 
     QString str = "<b>" + strDesc + "</b><br>" + "<i>"
-            + strCat + "</i>"
-	    + "<br>" + TimeString::longDateString( ev.date() )
-	    + "<br><b>" + QObject::tr("Start") + "</b>: ";
+                  + strCat + "</i>"
+                  + "<br>" + TimeString::longDateString( ev.date() )
+	          + "<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() );
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
@@ -132,8 +132,24 @@ private slots:
     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;
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
@@ -153,9 +153,12 @@ DateBookWeekLstEvent::DateBookWeekLstEvent(const EffectiveEvent &ev,
       } else {
 	strcpy(s, "    |---");
       }
     } else {
-      sprintf(s,"%.2d:%.2d",ev.start().hour(),ev.start().minute());
+      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 ) );