[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/3.5/kdepim/korganizer
From:       Allen Winter <winter () kde ! org>
Date:       2008-04-24 14:49:59
Message-ID: 1209048599.229949.29791.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 800627 by winterz:

port r800615 by ervin

In the case of a counter proposal we're actually changing the incidence,
not simply adding it. Now it correctly triggers a notification mail for
the organizer.



 M  +20 -3     koeventeditor.cpp  
 M  +2 -0      koeventeditor.h  


--- branches/KDE/3.5/kdepim/korganizer/koeventeditor.cpp #800626:800627
@@ -59,7 +59,8 @@
 
 KOEventEditor::~KOEventEditor()
 {
-  emit dialogClose( mEvent );
+  if ( !mIsCounter )
+    emit dialogClose( mEvent );
 }
 
 void KOEventEditor::init()
@@ -284,7 +285,14 @@
       kdDebug(5850) << "Event changed\n";
       //IncidenceChanger::assignIncidence( mEvent, event );
       writeEvent( mEvent );
-      mChanger->changeIncidence( oldEvent, mEvent, -1, mIsCounter );
+      if ( mIsCounter ) {
+        Event *event = mEvent->clone();
+        event->clearAttendees();
+        event->setSummary( i18n("My counter proposal for: %1").arg( mEvent->summary() ) );
+        mChanger->changeIncidence( oldEvent, event, -1, mIsCounter );
+      } else {
+        mChanger->changeIncidence( oldEvent, mEvent, -1, mIsCounter );
+      }
     }
     delete event;
     delete oldEvent;
@@ -312,7 +320,6 @@
   kdDebug(5850) << "KOEventEditor::processCancel()" << endl;
 
   if ( mFreeBusy ) mFreeBusy->cancelReload();
-  if ( mIsCounter ) deleteEvent();
 }
 
 void KOEventEditor::deleteEvent()
@@ -337,6 +344,9 @@
 
   createEmbeddedURLPages( event );
   readDesignerFields( event );
+
+  if ( mIsCounter )
+    mGeneral->invitationBar()->hide();
 }
 
 void KOEventEditor::writeEvent( Event *event )
@@ -406,4 +416,11 @@
   delete ev;
 }
 
+void KOEventEditor::selectInvitationCounterProposal(bool enable)
+{
+  KOIncidenceEditor::selectInvitationCounterProposal( enable );
+  if ( enable )
+    mGeneral->invitationBar()->hide();
+}
+
 #include "koeventeditor.moc"
--- branches/KDE/3.5/kdepim/korganizer/koeventeditor.h #800626:800627
@@ -93,6 +93,8 @@
 
     QObject *typeAheadReceiver() const;
 
+    void selectInvitationCounterProposal( bool enable );
+
   signals:
     void focusReceivedSignal();
 
[prev in list] [next in list] [prev in thread] [next in thread]