From cc29364f06178f8f6b457384f2ec37a042bd9d43 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
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/koincidencetooltip.cpp | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
(limited to 'korganizer/koincidencetooltip.cpp')
diff --git a/korganizer/koincidencetooltip.cpp b/korganizer/koincidencetooltip.cpp
index 8b3f11756..2b2a80f29 100644
--- a/korganizer/koincidencetooltip.cpp
+++ b/korganizer/koincidencetooltip.cpp
@@ -33,19 +33,24 @@
some improvements by Mikolaj Machowski
*/
-void KOIncidenceToolTip::add ( TQWidget * widget, Incidence *incidence,
- TQToolTipGroup * group, const TQString & longText )
+void KOIncidenceToolTip::add ( TQWidget *widget, Calendar *calendar,
+ Incidence *incidence, const TQDate &date,
+ TQToolTipGroup *group, const TQString &longText )
{
- if ( !widget || !incidence ) return;
- TQToolTip::add(widget, IncidenceFormatter::toolTipString( incidence ), group, longText);
+ if ( !widget || !incidence ) {
+ return;
+ }
+ TQToolTip::add( widget, IncidenceFormatter::toolTipStr( calendar, incidence, date ), group, longText );
}
-void KOIncidenceToolTip::add(KOAgendaItem * item, Incidence * incidence, TQToolTipGroup * group)
+void KOIncidenceToolTip::add( KOAgendaItem *item, Calendar *calendar,
+ Incidence *incidence, const TQDate &date,
+ TQToolTipGroup *group )
{
Q_UNUSED( incidence );
Q_UNUSED( group );
TQToolTip::remove( item );
- new KOIncidenceToolTip( item );
+ new KOIncidenceToolTip( item, calendar, date );
}
void KOIncidenceToolTip::maybeTip(const TQPoint & pos)
@@ -55,6 +60,6 @@ void KOIncidenceToolTip::maybeTip(const TQPoint & pos)
if ( !item )
return;
if ( !mText )
- mText = IncidenceFormatter::toolTipString( item->incidence() );
+ mText = IncidenceFormatter::toolTipStr( mCalendar, item->incidence(), mDate );
tip( TQRect( TQPoint( 0, 0 ), item->size() ), mText );
}
--
cgit v1.2.1