From cc29364f06178f8f6b457384f2ec37a042bd9d43 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 1 Sep 2010 00:37:02 +0000 Subject: * Massive set of changes to bring in all fixes and enhancements from the Enterprise PIM branch * Ensured that the Trinity changes were applied on top of those enhancements, and any redundancy removed * Added journal read support to the CalDAV resource * Fixed CalDAV resource to use events URL for tasks and journals when separate URL checkbox unchecked git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1170461 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- korganizer/timelineitem.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'korganizer/timelineitem.cpp') diff --git a/korganizer/timelineitem.cpp b/korganizer/timelineitem.cpp index 7240e06d0..6ebff843f 100644 --- a/korganizer/timelineitem.cpp +++ b/korganizer/timelineitem.cpp @@ -31,8 +31,8 @@ using namespace KOrg; using namespace KCal; -TimelineItem::TimelineItem( const TQString &label, KDGanttView * parent) : - KDGanttViewTaskItem( parent ) +TimelineItem::TimelineItem( const TQString &label, KCal::Calendar *calendar, KDGanttView * parent) : + KDGanttViewTaskItem( parent ), mCalendar( calendar ) { setListViewText( 0, label ); setDisplaySubitemsAsGroup( true ); @@ -56,7 +56,7 @@ void TimelineItem::insertIncidence(KCal::Incidence * incidence, const TQDateTime if ( (*it)->startTime() == start && (*it)->endTime() == end ) return; - TimelineSubItem * item = new TimelineSubItem( incidence, this ); + TimelineSubItem * item = new TimelineSubItem( mCalendar, incidence, this ); TQColor c1, c2, c3; colors( c1, c2, c3 ); item->setColors( c1, c2, c3 ); @@ -91,14 +91,16 @@ void TimelineItem::moveItems(KCal::Incidence * incidence, int delta, int duratio } -TimelineSubItem::TimelineSubItem(KCal::Incidence * incidence, TimelineItem * parent) : +TimelineSubItem::TimelineSubItem( KCal::Calendar *calendar, + KCal::Incidence *incidence, TimelineItem *parent) : KDGanttViewTaskItem( parent ), mIncidence( incidence ), mLeft( 0 ), mRight( 0 ), mMarkerWidth( 0 ) { - setTooltipText( IncidenceFormatter::toolTipString( incidence ) ); + setTooltipText( IncidenceFormatter::toolTipStr( calendar, incidence, + originalStart().date(), true ) ); if ( !incidence->isReadOnly() ) { setMoveable( true ); setResizeable( true ); -- cgit v1.2.1