From 2c53331f0be79ee00b256e309c0a39a52a8fe363 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Thu, 3 May 2007 16:11:29 +0000 Subject: [PATCH] Monotone-Parent: b8a1f679b2d8b5862c0fc73e8bedec0e7b8fdc84 Monotone-Revision: 78d012bb528bcbf5295b1d5241415fcb6465a307 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2007-05-03T16:11:29 Monotone-Branch: ca.inverse.sogo --- UI/Scheduler/UIxAppointmentEditor.m | 39 ------------------- UI/Scheduler/UIxTaskEditor.m | 39 ------------------- .../SchedulerUI/UIxAppointmentEditor.wox | 1 - UI/Templates/SchedulerUI/UIxTaskEditor.wox | 1 - 4 files changed, 80 deletions(-) diff --git a/UI/Scheduler/UIxAppointmentEditor.m b/UI/Scheduler/UIxAppointmentEditor.m index 3f1fa9b07..1ae856576 100644 --- a/UI/Scheduler/UIxAppointmentEditor.m +++ b/UI/Scheduler/UIxAppointmentEditor.m @@ -64,45 +64,6 @@ [[self clientObject] baseURL]]; } -- (NSString *) _toolbarForCalObject -{ - SOGoUser *currentUser; - SOGoAppointmentObject *clientObject; - NSString *filename, *email; - iCalPerson *person; - iCalPersonPartStat participationStatus; - - clientObject = [self clientObject]; - currentUser = [[self context] activeUser]; - email = [currentUser email]; - if ([clientObject isOrganizer: email - orOwner: [currentUser login]]) - filename = @"SOGoAppointmentObject.toolbar"; - else - { - if ([clientObject isParticipant: email]) - { - person = [[clientObject component: NO] findParticipantWithEmail: email]; - participationStatus = [person participationStatus]; - if (participationStatus == iCalPersonPartStatAccepted) - filename = @"SOGoAppointmentObjectDecline.toolbar"; - else if (participationStatus == iCalPersonPartStatDeclined) - filename = @"SOGoAppointmentObjectAccept.toolbar"; - else - filename = @"SOGoAppointmentObjectAcceptOrDecline.toolbar"; - } - else - filename = @"SOGoComponentClose.toolbar"; - } - - return filename; -} - -- (NSString *) toolbar -{ - return ([self _toolbarForCalObject]); -} - /* icalendar values */ - (BOOL) isAllDay { diff --git a/UI/Scheduler/UIxTaskEditor.m b/UI/Scheduler/UIxTaskEditor.m index 360cdf019..cc2627085 100644 --- a/UI/Scheduler/UIxTaskEditor.m +++ b/UI/Scheduler/UIxTaskEditor.m @@ -79,45 +79,6 @@ [[self clientObject] baseURL]]; } -- (NSString *) _toolbarForCalObject -{ - SOGoUser *currentUser; - SOGoTaskObject *clientObject; - NSString *filename, *email; - iCalPerson *person; - iCalPersonPartStat participationStatus; - - clientObject = [self clientObject]; - currentUser = [[self context] activeUser]; - email = [currentUser email]; - if ([clientObject isOrganizer: email - orOwner: [currentUser login]]) - filename = @"SOGoTaskObject.toolbar"; - else - { - if ([clientObject isParticipant: email]) - { - person = [[clientObject component: NO] findParticipantWithEmail: email]; - participationStatus = [person participationStatus]; - if (participationStatus == iCalPersonPartStatAccepted) - filename = @"SOGoTaskObjectDecline.toolbar"; - else if (participationStatus == iCalPersonPartStatDeclined) - filename = @"SOGoTaskObjectAccept.toolbar"; - else - filename = @"SOGoTaskObjectAcceptOrDecline.toolbar"; - } - else - filename = @"SOGoComponentClose.toolbar"; - } - - return filename; -} - -- (NSString *) toolbar -{ - return ([self _toolbarForCalObject]); -} - /* icalendar values */ - (void) setTaskStartDate: (NSCalendarDate *) newTaskStartDate { diff --git a/UI/Templates/SchedulerUI/UIxAppointmentEditor.wox b/UI/Templates/SchedulerUI/UIxAppointmentEditor.wox index 82a06b307..d918e7bd6 100644 --- a/UI/Templates/SchedulerUI/UIxAppointmentEditor.wox +++ b/UI/Templates/SchedulerUI/UIxAppointmentEditor.wox @@ -9,7 +9,6 @@ xmlns:label="OGo:label" className="UIxComponentEditor" var:component="event" - var:toolbar="toolbar" var:saveURL="saveURL">