diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-09-03 02:40:06 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-09-03 02:40:06 +0000 |
| commit | b35cd0e8350babc091667a5070f8ff6e359e5750 (patch) | |
| tree | abc1612f77c9d692fb0d810c42bae10e28b9121c /korganizer/koagenda.cpp | |
| parent | 4da59365263742bd16027434e2aa7d11e17d7909 (diff) | |
| download | tdepim-b35cd0e8350babc091667a5070f8ff6e359e5750.tar.gz tdepim-b35cd0e8350babc091667a5070f8ff6e359e5750.zip | |
Hacked in a temporary fix for three GroupWare popups showing up when a single instance of a recurring meeting is resized in the agenda view
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1171222 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'korganizer/koagenda.cpp')
| -rw-r--r-- | korganizer/koagenda.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp index 8329d161c..bc456a786 100644 --- a/korganizer/koagenda.cpp +++ b/korganizer/koagenda.cpp @@ -1109,6 +1109,10 @@ void KOAgenda::endItemAction() if ( chosenOption == KOGlobals::ONLY_THIS_ONE || chosenOption == KOGlobals::ONLY_FUTURE ) { + // FIXME Prompt for this...it is quite possible that the user does not want to broadcast the change + // That prompting dialog will require the ability to suppress/override the mChanger->endChange GroupWare communication though. + int autoAnswerGroupWare = 1; // Send all possible GroupWare messages without prompting + // Store modification information in case it is needed to recreate the changes with a new actionitem... int mai_xl = mActionItem->cellXLeft(); int mai_xr = mActionItem->cellXRight(); @@ -1116,15 +1120,16 @@ void KOAgenda::endItemAction() int mai_yb = mActionItem->cellYBottom(); multiModify = true; + emit startMultiModify( i18n("Dissociate event from recurrence") ); enableAgendaUpdate( false ); - mChanger->addIncidence( incToChange, mResPair.first, mResPair.second, this ); + mChanger->addIncidence( incToChange, mResPair.first, mResPair.second, this, autoAnswerGroupWare ); enableAgendaUpdate( true ); KOGlobals::WhatChanged wc = chosenOption == KOGlobals::ONLY_THIS_ONE ? KOGlobals::RECURRENCE_MODIFIED_ONE_ONLY : KOGlobals::RECURRENCE_MODIFIED_ALL_FUTURE; - mChanger->changeIncidence( oldIncSaved, inc, wc, this ); + mChanger->changeIncidence( oldIncSaved, inc, wc, this, autoAnswerGroupWare ); // mActionItem does not exist any more, seeing as we just got done deleting it // (by deleting/replacing the original incidence it was created from through |