First round of counter proposal fixes with minor changes to comply with the string freeze. All added strings should already be present elsewhere in the same module.

Merged revisions 791184-791440,791443-792201,792203-792957 via svnmerge from 
https://vkrause@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim

........
  r791184 | vkrause | 2008-03-28 17:52:23 +0100 (Fri, 28 Mar 2008) | 4 lines
  
  Add the proposed new event into the calendar.
  
  Kolab issue 2148
........
  r791200 | vkrause | 2008-03-28 19:02:57 +0100 (Fri, 28 Mar 2008) | 2 lines
  
  Improve display of iTIP counter proposals.
........
  r791414 | vkrause | 2008-03-29 15:00:41 +0100 (Sat, 29 Mar 2008) | 2 lines
  
  Implement declining of counter proposals.
........
  r791430 | vkrause | 2008-03-29 15:43:58 +0100 (Sat, 29 Mar 2008) | 6 lines
  
  - allow to accept counter proposals
  - send real iTIP counter proposals by default but keep the Outlook
    compat ones as an option
  
  Kolab issue 2147, 2149
........
  r792230 | vkrause | 2008-03-31 19:35:35 +0200 (Mon, 31 Mar 2008) | 4 lines
  
  Send declined counter proposals back to the sender instead of to myself.
  
  Kolab issue 2581
........
  r792231 | vkrause | 2008-03-31 19:39:22 +0200 (Mon, 31 Mar 2008) | 5 lines
  
  Don't delete invitations after a counter proposal in any case, eg. after a
  rejection it might be needed again.
  
  Kolab issue 2580
........
  r792950 | vkrause | 2008-04-02 18:39:22 +0200 (Wed, 02 Apr 2008) | 7 lines
  
  - don't add the original event to the calendar when creating a counter
    proposal
  - hide the invitation bar when editing a counter proposal to avoid
    confusion
  
  Kolab issue 2582
........
  r792957 | vkrause | 2008-04-02 19:06:52 +0200 (Wed, 02 Apr 2008) | 7 lines
  
   don't send cancel notifications to the organizer on event deletion if
    I happen to be the organizer myself
  - create standard conform cancel notifications on event deletion
    (they must contain exactly one attendee entry)
  
  Kolab issue 2578
........

svn path=/branches/KDE/3.5/kdepim/; revision=848887
wilder-work
Volker Krause 18 years ago
parent 91945c90e3
commit 698163323e
  1. 5
      callback.cpp
  2. 3
      callback.h

@ -211,3 +211,8 @@ bool Callback::deleteInvitationAfterReply() const
{
return GlobalSettings::self()->deleteInvitationEmailsAfterSendingReply();
}
QString Callback::sender() const
{
return mMsg->from();
}

@ -69,6 +69,9 @@ public:
/** Get the receiver of the mail */
QString receiver() const;
/** Returns the sender of the mail. */
QString sender() const;
/** Close the main window showing this message, if it's a secondary window. */
void closeIfSecondaryWindow() const;

Loading…
Cancel
Save