diff --git a/UI/Scheduler/English.lproj/Localizable.strings b/UI/Scheduler/English.lproj/Localizable.strings index 2a97ad70b..aa881ef13 100644 --- a/UI/Scheduler/English.lproj/Localizable.strings +++ b/UI/Scheduler/English.lproj/Localizable.strings @@ -91,6 +91,7 @@ "delete" = "Delete"; "proposal" = "Proposal"; "Save and Close" = "Save and Close"; +"Close" = "Close"; "Invite Attendees" = "Invite Attendees"; "Documents" = "Documents"; "Cancel" = "Cancel"; diff --git a/UI/Scheduler/French.lproj/Localizable.strings b/UI/Scheduler/French.lproj/Localizable.strings index 187fef43d..adb78b5d2 100644 --- a/UI/Scheduler/French.lproj/Localizable.strings +++ b/UI/Scheduler/French.lproj/Localizable.strings @@ -91,6 +91,7 @@ "delete" = "Supprimer"; "proposal" = "Recherche de plages horaires"; "Save and Close" = "Enregistrer et fermer"; +"Close" = "Fermer"; "Invite Attendees" = "Participants"; "Documents" = "Documents"; "Cancel" = "Annuler"; diff --git a/UI/Scheduler/Toolbars/SOGoComponentClose.toolbar b/UI/Scheduler/Toolbars/SOGoComponentClose.toolbar index 8171adf3c..571e1f6a0 100644 --- a/UI/Scheduler/Toolbars/SOGoComponentClose.toolbar +++ b/UI/Scheduler/Toolbars/SOGoComponentClose.toolbar @@ -1,7 +1,7 @@ ( /* the toolbar groups -*-cperl-*- */ ( { link = "#"; isSafe = NO; - label = "Cancel"; + label = "Close"; onclick = "window.close(); return false;"; - image = "tb-ab-delete-flat-24x24.png"; } ) + image = "tb-mail-stop-flat-24x24.png"; } ) ) diff --git a/UI/Scheduler/UIxAppointmentEditor.m b/UI/Scheduler/UIxAppointmentEditor.m index cbf5af293..17c12eaaa 100644 --- a/UI/Scheduler/UIxAppointmentEditor.m +++ b/UI/Scheduler/UIxAppointmentEditor.m @@ -363,16 +363,6 @@ [event setTransparency: @"OPAQUE"]; } -- (id) acceptAction -{ - return [self acceptOrDeclineAction:YES]; -} - -- (id) declineAction -{ - return [self acceptOrDeclineAction:NO]; -} - // TODO: add tentatively - (id) acceptOrDeclineAction: (BOOL) _accept @@ -384,4 +374,14 @@ return self; } +- (id) acceptAction +{ + return [self acceptOrDeclineAction:YES]; +} + +- (id) declineAction +{ + return [self acceptOrDeclineAction:NO]; +} + @end