diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-09-01 00:37:02 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-09-01 00:37:02 +0000 |
commit | cc29364f06178f8f6b457384f2ec37a042bd9d43 (patch) | |
tree | 7c77a3184c698bbf9d98cef09fb1ba8124daceba /korganizer/koeventpopupmenu.cpp | |
parent | 4f6c584bacc8c3c694228f36ada3de77a76614a6 (diff) | |
download | tdepim-cc29364f06178f8f6b457384f2ec37a042bd9d43.tar.gz tdepim-cc29364f06178f8f6b457384f2ec37a042bd9d43.zip |
* 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
Diffstat (limited to 'korganizer/koeventpopupmenu.cpp')
-rw-r--r-- | korganizer/koeventpopupmenu.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/korganizer/koeventpopupmenu.cpp b/korganizer/koeventpopupmenu.cpp index 75c96d205..b0326ee52 100644 --- a/korganizer/koeventpopupmenu.cpp +++ b/korganizer/koeventpopupmenu.cpp @@ -45,6 +45,7 @@ KOEventPopupMenu::KOEventPopupMenu() { + mCalendar = 0; mCurrentIncidence = 0; mCurrentDate = TQDate(); mHasAdditionalItems = false; @@ -89,8 +90,9 @@ KOEventPopupMenu::KOEventPopupMenu() this, TQT_SLOT(forward()) ); } -void KOEventPopupMenu::showIncidencePopup( Incidence *incidence, const TQDate &qd ) +void KOEventPopupMenu::showIncidencePopup( Calendar *cal, Incidence *incidence, const TQDate &qd ) { + mCalendar = cal; mCurrentIncidence = incidence; mCurrentDate = qd; @@ -123,19 +125,23 @@ void KOEventPopupMenu::addAdditionalItem(const TQIconSet &icon,const TQString &t void KOEventPopupMenu::popupShow() { - if (mCurrentIncidence) emit showIncidenceSignal(mCurrentIncidence); + if ( mCurrentIncidence ) { + emit showIncidenceSignal( mCurrentIncidence, mCurrentDate ); + } } void KOEventPopupMenu::popupEdit() { - if (mCurrentIncidence) emit editIncidenceSignal(mCurrentIncidence); + if ( mCurrentIncidence ) { + emit editIncidenceSignal( mCurrentIncidence, mCurrentDate ); + } } void KOEventPopupMenu::print() { #ifndef KORG_NOPRINTER KOCoreHelper helper; - CalPrinter printer( this, 0, &helper ); + CalPrinter printer( this, mCalendar, &helper ); connect( this, TQT_SIGNAL(configChanged()), &printer, TQT_SLOT(updateConfig()) ); Incidence::List selectedIncidences; |