summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/datebook/datebookday.cpp52
-rw-r--r--core/pim/datebook/datebookday.h31
-rw-r--r--core/pim/datebook/datebookweek.cpp52
-rw-r--r--core/pim/datebook/datebookweek.h16
-rw-r--r--core/pim/datebook/datebookweeklst.cpp5
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
@@ -568,3 +568,3 @@ DateBookDayWidget::DateBookDayWidget( const EffectiveEvent &e,
568{ 568{
569 bool whichClock = db->dayView()->whichClock(); 569
570 570
@@ -599,23 +599,10 @@ DateBookDayWidget::DateBookDayWidget( const EffectiveEvent &e,
599 text = "<b>" + strDesc + "</b><br>" + "<i>" 599 text = "<b>" + strDesc + "</b><br>" + "<i>"
600 + strCat + "</i>" 600 + strCat + "</i><br>";
601 + "<br><b>" + tr("Start") + "</b>: "; 601 if (ev.event().type() == Event::Normal )
602 602 setEventText( text );
603 603 else
604 if ( e.startDate() != ev.date() ) { 604 setAllDayText( text );
605 // multi-day event. Show start date
606 text += TimeString::longDateString( e.startDate() );
607 } else {
608 // Show start time.
609 text += TimeString::timeString( ev.start(), whichClock, FALSE );
610 }
611 605
612 text += "<br><b>" + tr("End") + "</b>: ";
613 if ( e.endDate() != ev.date() ) {
614 // multi-day event. Show end date
615 text += TimeString::longDateString( e.endDate() );
616 } else {
617 // Show end time.
618 text += TimeString::timeString( ev.end(), whichClock, FALSE );
619 }
620 text += "<br><br>" + strNote; 606 text += "<br><br>" + strNote;
607
621 setBackgroundMode( PaletteBase ); 608 setBackgroundMode( PaletteBase );
@@ -637,2 +624,26 @@ DateBookDayWidget::DateBookDayWidget( const EffectiveEvent &e,
637} 624}
625void DateBookDayWidget::setAllDayText( QString &text ) {
626 text += "<b>" + tr("This is an all day event.") + "</b><br>";
627}
628void DateBookDayWidget::setEventText( QString& text ) {
629 bool whichClock = dateBook->dayView()->whichClock();
630 text += "<b>" + tr("Start") + "</b>: ";
631 if ( ev.startDate() != ev.date() ) {
632 // multi-day event. Show start date
633 text += TimeString::longDateString( ev.startDate() );
634 } else {
635 // Show start time.
636 text += TimeString::timeString( ev.start(), whichClock, FALSE );
637 }
638
639 text += "<br><b>" + tr("End") + "</b>: ";
640 if ( ev.endDate() != ev.date() ) {
641 // multi-day event. Show end date
642 text += TimeString::longDateString( ev.endDate() );
643 } else {
644 // Show end time.
645 text += TimeString::timeString( ev.end(), whichClock, FALSE );
646 }
647
648}
638 649
@@ -691,2 +702,3 @@ void DateBookDayWidget::paintEvent( QPaintEvent *e )
691 d = 20; 702 d = 20;
703 y += 20;
692 } 704 }
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
@@ -42,3 +42,3 @@ public:
42 bool whichClock() const; 42 bool whichClock() const;
43 43
44 void setRowStyle( int style ); 44 void setRowStyle( int style );
@@ -57,3 +57,3 @@ protected:
57 virtual void paintFocus( QPainter *p, const QRect &cr ); 57 virtual void paintFocus( QPainter *p, const QRect &cr );
58 58
59 virtual void resizeEvent( QResizeEvent *e ); 59 virtual void resizeEvent( QResizeEvent *e );
@@ -78,3 +78,3 @@ public:
78 const EffectiveEvent &event() const { return ev; } 78 const EffectiveEvent &event() const { return ev; }
79 79
80signals: 80signals:
@@ -89,2 +89,13 @@ protected:
89private: 89private:
90 /**
91 * Sets the text for an all day Event
92 * All day events have no time associated
93 */
94 void setAllDayText( QString& text );
95
96 /**
97 * Sets the EventText
98 * it got a start and an end Time
99 */
100 void setEventText( QString& text );
90 const EffectiveEvent ev; 101 const EffectiveEvent ev;
@@ -108,3 +119,3 @@ public:
108 119
109signals: 120signals:
110 121
@@ -121,10 +132,10 @@ private:
121class WidgetListClass : public QList<DateBookDayWidget> 132class WidgetListClass : public QList<DateBookDayWidget>
122 { 133{
123 private: 134 private:
124 135
125 int compareItems( QCollection::Item s1, QCollection::Item s2 ) 136 int compareItems( QCollection::Item s1, QCollection::Item s2 )
126 { 137 {
127 //hmm, don't punish me for that ;) 138 //hmm, don't punish me for that ;)
128 if (reinterpret_cast<DateBookDayWidget*>(s1)->geometry().height() > reinterpret_cast<DateBookDayWidget*>(s2)->geometry().height()) 139 if (reinterpret_cast<DateBookDayWidget*>(s1)->geometry().height() > reinterpret_cast<DateBookDayWidget*>(s2)->geometry().height())
129 { 140 {
130 return -1; 141 return -1;
@@ -135,3 +146,3 @@ class WidgetListClass : public QList<DateBookDayWidget>
135 } 146 }
136 147
137 148
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
@@ -463,2 +463,29 @@ void DateBookWeek::getEvents()
463 463
464void DateBookWeek::generateAllDayTooltext( QString& text ) {
465 text += "<b>" + tr("This is an all day event.") + "</b><br>";
466}
467
468void DateBookWeek::generateNormalTooltext( QString& str,
469 const EffectiveEvent &ev ) {
470 str += "<b>" + QObject::tr("Start") + "</b>: ";
471
472 if ( ev.startDate() != ev.date() ) {
473 // multi-day event. Show start date
474 str += TimeString::longDateString( ev.startDate() );
475 } else {
476 // Show start time.
477 str += TimeString::timeString(ev.start(), ampm, FALSE );
478 }
479
480
481 str += "<br><b>" + QObject::tr("End") + "</b>: ";
482 if ( ev.endDate() != ev.date() ) {
483 // multi-day event. Show end date
484 str += TimeString::longDateString( ev.endDate() );
485 } else {
486 // Show end time.
487 str += TimeString::timeString( ev.end(), ampm, FALSE );
488 }
489}
490
464void DateBookWeek::slotShowEvent( const EffectiveEvent &ev ) 491void DateBookWeek::slotShowEvent( const EffectiveEvent &ev )
@@ -497,22 +524,11 @@ void DateBookWeek::slotShowEvent( const EffectiveEvent &ev )
497 QString str = "<b>" + strDesc + "</b><br>" + "<i>" 524 QString str = "<b>" + strDesc + "</b><br>" + "<i>"
498 + strCat + "</i>" 525 + strCat + "</i>"
499 + "<br>" + TimeString::longDateString( ev.date() ) 526 + "<br>" + TimeString::longDateString( ev.date() )
500 + "<br><b>" + QObject::tr("Start") + "</b>: "; 527 + "<br>";
501 528
502 if ( ev.startDate() != ev.date() ) { 529 if (ev.event().type() == Event::Normal )
503 // multi-day event. Show start date 530 generateNormalTooltext( str, ev );
504 str += TimeString::longDateString( ev.startDate() ); 531 else
505 } else { 532 generateAllDayTooltext( str );
506 // Show start time.
507 str += TimeString::timeString(ev.start(), ampm, FALSE );
508 }
509 533
510 str += "<br><b>" + QObject::tr("End") + "</b>: ";
511 if ( ev.endDate() != ev.date() ) {
512 // multi-day event. Show end date
513 str += TimeString::longDateString( ev.endDate() );
514 } else {
515 // Show end time.
516 str += TimeString::timeString( ev.end(), ampm, FALSE );
517 }
518 str += "<br><br>" + strNote; 534 str += "<br><br>" + strNote;
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
@@ -135,2 +135,18 @@ private:
135 void getEvents(); 135 void getEvents();
136
137 /**
138 * Wow that's a hell lot of code duplication
139 * in datebook. I vote for a common base class
140 * but never the less. This add a note
141 * that the Event is an all day event
142 *
143 */
144 void generateAllDayTooltext( QString& text );
145
146 /**
147 * This will add the times to the text
148 * It will be shown in the Tooltip bubble
149 */
150 void generateNormalTooltext( QString& text,
151 const EffectiveEvent &ev);
136 int year; 152 int year;
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
@@ -156,3 +156,6 @@ DateBookWeekLstEvent::DateBookWeekLstEvent(const EffectiveEvent &ev,
156 } else { 156 } else {
157 sprintf(s,"%.2d:%.2d",ev.start().hour(),ev.start().minute()); 157 if(ev.event().type() == Event::Normal )
158 sprintf(s,"%.2d:%.2d",ev.start().hour(),ev.start().minute());
159 else
160 sprintf(s," ");
158 } 161 }