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

korganizer/incidencechanger.cpp

@@ -328,6 +328,14 @@ bool IncidenceChanger::myAttendeeStatusChanged( Incidence *oldInc, Incidence *ne
 bool IncidenceChanger::changeIncidence( Incidence *oldinc, Incidence *newinc,
                                         KOGlobals::WhatChanged action,
                                         TQWidget *parent )
+{
+  return changeIncidence( oldinc, newinc, action, parent, 0 );
+}
+
+bool IncidenceChanger::changeIncidence( Incidence *oldinc, Incidence *newinc,
+                                        KOGlobals::WhatChanged action,
+                                        TQWidget *parent,
+                                        int dontAskForGroupware )
 {
 kdDebug(5850)<<"IncidenceChanger::changeIncidence for incidence \""<<newinc->summary()<<"\" ( old one was \""<<oldinc->summary()<<"\")"<<endl;
   if ( incidencesEqual( newinc, oldinc ) ) {
@@ -347,7 +355,7 @@ kdDebug(5850)<<"IncidenceChanger::changeIncidence for incidence \""<<newinc->sum
       success = KOGroupware::instance()->sendICalMessage(
         parent,
         KCal::Scheduler::Request,
-        newinc, KOGlobals::INCIDENCEEDITED, attendeeStatusChanged );
+        newinc, KOGlobals::INCIDENCEEDITED, attendeeStatusChanged, dontAskForGroupware );
     }
 
     if ( success ) {
@@ -365,6 +373,13 @@ kdDebug(5850)<<"IncidenceChanger::changeIncidence for incidence \""<<newinc->sum
 bool IncidenceChanger::addIncidence( Incidence *incidence,
                                      ResourceCalendar *res, const TQString &subRes,
                                      TQWidget *parent )
+{
+  return addIncidence( incidence, res, subRes, parent, 0 );
+}
+
+bool IncidenceChanger::addIncidence( Incidence *incidence,
+                                     ResourceCalendar *res, const TQString &subRes,
+                                     TQWidget *parent, int dontAskForGroupware )
 {
   CalendarResources *stdcal = dynamic_cast<CalendarResources *>( mCalendar );
   if( stdcal && !stdcal->hasCalendarResources() ) {
@@ -440,7 +455,7 @@ bool IncidenceChanger::addIncidence( Incidence *incidence,
     if ( !KOGroupware::instance()->sendICalMessage(
            parent,
            KCal::Scheduler::Request,
-           incidence, KOGlobals::INCIDENCEADDED, false ) ) {
+           incidence, KOGlobals::INCIDENCEADDED, false, dontAskForGroupware ) ) {
       KMessageBox::sorry(
         parent,
         i18n( "Attempt to send the scheduling message failed. "

korganizer/incidencechanger.h

@@ -52,9 +52,14 @@ class IncidenceChanger : public KOrg::IncidenceChangerBase
     bool addIncidence( Incidence *incidence,
                        ResourceCalendar *res, const TQString &subRes,
                        TQWidget *parent );
+    bool addIncidence( Incidence *incidence,
+                       ResourceCalendar *res, const TQString &subRes,
+                       TQWidget *parent, int dontAskForGroupware );
 
     bool changeIncidence( Incidence *oldinc, Incidence *newinc,
                           KOGlobals::WhatChanged, TQWidget *parent );
+    bool changeIncidence( Incidence *oldinc, Incidence *newinc,
+                          KOGlobals::WhatChanged, TQWidget *parent, int dontAskForGroupware );
 
     bool deleteIncidence( Incidence *incidence, TQWidget *parent );
 

korganizer/interfaces/korganizer/incidencechangerbase.h

@@ -57,9 +57,15 @@ public:
   virtual bool addIncidence( Incidence *incidence,
                              ResourceCalendar *res, const TQString &subRes,
                              TQWidget *parent ) = 0;
+  virtual bool addIncidence( Incidence *incidence,
+                             ResourceCalendar *res, const TQString &subRes,
+                             TQWidget *parent, int dontAskForGroupware) = 0;
 
   virtual bool changeIncidence( Incidence *oldinc, Incidence *newinc,
                                 KOGlobals::WhatChanged, TQWidget *parent ) = 0;
+  virtual bool changeIncidence( Incidence *oldinc, Incidence *newinc,
+                                KOGlobals::WhatChanged, TQWidget *parent, int dontAskForGroupware ) = 0;
+
   virtual bool deleteIncidence( Incidence *incidence, TQWidget *parent ) = 0;
 
   virtual bool cutIncidences( const Incidence::List &incidences, TQWidget *parent ) = 0;

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

korganizer/kogroupware.cpp

@@ -242,7 +242,8 @@ bool KOGroupware::sendICalMessage( TQWidget* parent,
                                    KCal::Scheduler::Method method,
                                    Incidence* incidence,
                                    KOGlobals::HowChanged action,
-                                   bool attendeeStatusChanged )
+                                   bool attendeeStatusChanged,
+                                   int dontAskForGroupware )
 {
   // If there are no attendees, don't bother
   if( incidence->attendees().isEmpty() )
@@ -264,6 +265,13 @@ bool KOGroupware::sendICalMessage( TQWidget* parent,
    *   insists on applying them.
    */
 
+  if ( dontAskForGroupware == 1 ) {
+    rc = KMessageBox::Yes;
+  }
+  else if ( dontAskForGroupware == 2 ) {
+    rc = KMessageBox::No;
+  }
+  else {
     if ( isOrganizer ) {
       /* We are the organizer. If there is more than one attendee, or if there is
        * only one, and it's not the same as the organizer, ask the user to send
@@ -367,6 +375,7 @@ bool KOGroupware::sendICalMessage( TQWidget* parent,
       kdWarning(5850) << "Groupware messages for Journals are not implemented yet!" << endl;
       return true;
     }
+  }
 
   if ( rc == KMessageBox::Yes ) {
     // We will be sending out a message here. Now make sure there is

korganizer/kogroupware.h

@@ -78,7 +78,8 @@ class KOGroupware : public QObject
     bool sendICalMessage( TQWidget *parent, KCal::Scheduler::Method method,
                           Incidence* incidence,
                           KOGlobals::HowChanged action,
-                          bool attendeeStatusChanged );
+                          bool attendeeStatusChanged,
+                          int dontAskForGroupware = 0 );
 
     /**
       Send counter proposal message.