summaryrefslogtreecommitdiffstats
path: root/korganizer/koincidenceeditor.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-01 00:37:02 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-01 00:37:02 +0000
commitcc29364f06178f8f6b457384f2ec37a042bd9d43 (patch)
tree7c77a3184c698bbf9d98cef09fb1ba8124daceba /korganizer/koincidenceeditor.cpp
parent4f6c584bacc8c3c694228f36ada3de77a76614a6 (diff)
downloadtdepim-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/koincidenceeditor.cpp')
-rw-r--r--korganizer/koincidenceeditor.cpp45
1 files changed, 40 insertions, 5 deletions
diff --git a/korganizer/koincidenceeditor.cpp b/korganizer/koincidenceeditor.cpp
index 3eb4920f8..240497e19 100644
--- a/korganizer/koincidenceeditor.cpp
+++ b/korganizer/koincidenceeditor.cpp
@@ -45,6 +45,7 @@
#include <libkcal/calendarlocal.h>
#include <libkcal/incidence.h>
#include <libkcal/icalformat.h>
+#include <libkcal/resourcecalendar.h>
#include "koprefs.h"
#include "koglobals.h"
@@ -58,7 +59,8 @@ KOIncidenceEditor::KOIncidenceEditor( const TQString &caption,
Calendar *calendar, TQWidget *parent )
: KDialogBase( Tabbed, caption, Ok | Apply | Cancel | Default, Ok,
parent, 0, false, false ),
- mAttendeeEditor( 0 ), mIsCounter( false )
+ mAttendeeEditor( 0 ), mResource( 0 ), mIsCounter( false ), mIsCreateTask( false ),
+ mRecurIncidence( 0 ), mRecurIncidenceAfterDissoc( 0 )
{
// Set this to be the group leader for all subdialogs - this means
// modal subdialogs will only affect this dialog, not the other windows
@@ -349,14 +351,14 @@ void KOIncidenceEditor::createEmbeddedURLPages( Incidence *i )
void KOIncidenceEditor::openURL( const KURL &url )
{
TQString uri = url.url();
- UriHandler::process( uri );
+ UriHandler::process( this, uri );
}
void KOIncidenceEditor::addAttachments( const TQStringList &attachments,
const TQStringList &mimeTypes,
bool inlineAttachments )
{
- emit signalAddAttachments( attachments, mimeTypes, inlineAttachments );
+ emit signalAddAttachments( attachments, mimeTypes, inlineAttachments );
}
void KOIncidenceEditor::addAttendees( const TQStringList &attendees )
@@ -365,7 +367,33 @@ void KOIncidenceEditor::addAttendees( const TQStringList &attendees )
for ( it = attendees.begin(); it != attendees.end(); ++it ) {
TQString name, email;
KABC::Addressee::parseEmailAddress( *it, name, email );
- mAttendeeEditor->insertAttendee( new Attendee( name, email ) );
+ mAttendeeEditor->insertAttendee( new Attendee( name, email, true, Attendee::NeedsAction ) );
+ }
+}
+
+void KOIncidenceEditor::setResource( ResourceCalendar *res, const TQString &subRes )
+{
+ TQString label;
+ if ( res ) {
+ if ( !res->subresources().isEmpty() && !subRes.isEmpty() ) {
+ label = res->labelForSubresource( subRes );
+ } else {
+ label = res->resourceName();
+ }
+ }
+
+ mResource = res;
+ mSubResource = subRes;
+}
+
+
+void KOIncidenceEditor::selectCreateTask( bool enable )
+{
+ mIsCreateTask = enable;
+ if ( mIsCreateTask ) {
+ setCaption( i18n( "Create to-do" ) );
+ setButtonOK( i18n( "Create to-do" ) );
+ showButtonApply( false );
}
}
@@ -375,9 +403,16 @@ void KOIncidenceEditor::selectInvitationCounterProposal(bool enable)
if ( mIsCounter ) {
setCaption( i18n( "Counter proposal" ) );
setButtonOK( i18n( "Counter proposal" ) );
- enableButtonApply( false );
+ showButtonApply( false );
}
}
+void KOIncidenceEditor::setRecurringIncidence ( Incidence *originalIncidence,
+ Incidence *incAfterDissociation )
+{
+ mRecurIncidence = originalIncidence;
+ mRecurIncidenceAfterDissoc = incAfterDissociation;
+}
+
#include "koincidenceeditor.moc"