diff --git a/ChangeLog b/ChangeLog index 6b065820b..42a4cbb8d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2009-12-22 Ludovic Marcotte + + * Removed all the Kolab-related stuff (more specifically, + associated mail part viewers) + + * Removed all references to "anais" stuff. + + * SoObjects/Mailer/SOGoMailFoder.m (-deleteUIDs:inContext:): + we check if we aren't in the Trash folder already before try to + copy over deleted messages. + + * We now offer a way to delete events from the context menu + in all calendar views. + 2009-12-22 Francis Lachapelle * UI/Scheduler/UIxAppointmentEditor.m (-viewAction): added diff --git a/SoObjects/Mailer/SOGoMailFolder.m b/SoObjects/Mailer/SOGoMailFolder.m index e5b6dbe93..e5875d1f5 100644 --- a/SoObjects/Mailer/SOGoMailFolder.m +++ b/SoObjects/Mailer/SOGoMailFolder.m @@ -245,10 +245,12 @@ static NSString *defaultUserID = @"anyone"; inContext: (id) localContext { SOGoMailFolder *trashFolder; - id result; - NSException *error; - NSString *folderName; NGImap4Client *client; + NSString *folderName; + NSException *error; + id result; + BOOL b; + trashFolder = [[self mailAccountFolder] trashFolderInContext: localContext]; if ([trashFolder isNotNull]) @@ -260,19 +262,27 @@ static NSString *defaultUserID = @"anyone"; client = [[self imap4Connection] client]; [imap4 selectFolder: [self imap4URL]]; folderName = [imap4 imap4FolderNameForURL: [trashFolder imap4URL]]; + b = YES; - // If our Trash folder doesn't exist when we try to copy messages - // to it, we create it. - result = [[client status: folderName flags: [NSArray arrayWithObject: @"UIDVALIDITY"]] - objectForKey: @"result"]; + // If we are deleting messages within the Trash folder itself, we + // do not, of course, try to move messages to the Trash folder. + if (![folderName isEqualToString: [self relativeImap4Name]]) + { + // If our Trash folder doesn't exist when we try to copy messages + // to it, we create it. + result = [[client status: folderName flags: [NSArray arrayWithObject: @"UIDVALIDITY"]] + objectForKey: @"result"]; + + if (![result boolValue]) + result = [[self imap4Connection] createMailbox: folderName atURL: [[self mailAccountFolder] imap4URL]]; + + if (!result || [result boolValue]) + result = [client copyUids: uids toFolder: folderName]; + + b = [[result valueForKey: @"result"] boolValue]; + } - if (![result boolValue]) - result = [[self imap4Connection] createMailbox: folderName atURL: [[self mailAccountFolder] imap4URL]]; - - if (!result || [result boolValue]) - result = [client copyUids: uids toFolder: folderName]; - - if ([[result valueForKey: @"result"] boolValue]) + if (b) { result = [client storeFlags: [NSArray arrayWithObject: @"Deleted"] forUIDs: uids addOrRemove: YES]; @@ -433,15 +443,16 @@ static NSString *defaultUserID = @"anyone"; result = [self copyUIDs: uids toFolder: destinationFolder inContext: localContext]; - if ( ![result isNotNull] ) { - result = [client storeFlags: [NSArray arrayWithObject: @"Deleted"] - forUIDs: uids addOrRemove: YES]; - if ([[result valueForKey: @"result"] boolValue]) - { - [self markForExpunge]; - result = nil; + if ( ![result isNotNull] ) + { + result = [client storeFlags: [NSArray arrayWithObject: @"Deleted"] + forUIDs: uids addOrRemove: YES]; + if ([[result valueForKey: @"result"] boolValue]) + { + [self markForExpunge]; + result = nil; + } } - } return result; } diff --git a/SoObjects/Mailer/SOGoMailObject.m b/SoObjects/Mailer/SOGoMailObject.m index 9b8e5fd80..2c0bf2ac5 100644 --- a/SoObjects/Mailer/SOGoMailObject.m +++ b/SoObjects/Mailer/SOGoMailObject.m @@ -1068,18 +1068,6 @@ static BOOL debugSoParts = NO; /* some mail classification */ -- (BOOL) isKolabObject -{ - NSDictionary *h; - - if ((h = [self mailHeaders]) != nil) - return [[h objectForKey: @"x-kolab-type"] isNotEmpty]; - - // TODO: we could check the body structure? - - return NO; -} - - (BOOL) isMailingListMail { NSDictionary *h; @@ -1192,21 +1180,6 @@ static BOOL debugSoParts = NO; - (NSString *) outlookMessageClass { - NSString *type; - - if ((type = [[self mailHeaders] objectForKey: @"x-kolab-type"]) != nil) { - if ([type isEqualToString: @"application/x-vnd.kolab.contact"]) - return @"IPM.Contact"; - if ([type isEqualToString: @"application/x-vnd.kolab.task"]) - return @"IPM.Task"; - if ([type isEqualToString: @"application/x-vnd.kolab.event"]) - return @"IPM.Appointment"; - if ([type isEqualToString: @"application/x-vnd.kolab.note"]) - return @"IPM.Note"; - if ([type isEqualToString: @"application/x-vnd.kolab.journal"]) - return @"IPM.Journal"; - } - return @"IPM.Message"; /* email, default class */ } diff --git a/SoObjects/SOGo/SOGoObject.m b/SoObjects/SOGo/SOGoObject.m index fee5dcea0..5f19fdbce 100644 --- a/SoObjects/SOGo/SOGoObject.m +++ b/SoObjects/SOGo/SOGoObject.m @@ -1,4 +1,4 @@ -/* SOGoGCSFolder.m - this file is part of SOGo +/* SOGoObject.m - this file is part of SOGo * * Copyright (C) 2004-2005 SKYRIX Software AG * Copyright (C) 2006-2009 Inverse inc. diff --git a/UI/MailPartViewers/GNUmakefile b/UI/MailPartViewers/GNUmakefile index d7717cb2a..0978aed65 100644 --- a/UI/MailPartViewers/GNUmakefile +++ b/UI/MailPartViewers/GNUmakefile @@ -26,11 +26,6 @@ MailPartViewers_OBJC_FILES += \ UIxMailPartICalViewer.m \ \ UIxMailPartICalActions.m \ - \ - UIxKolabPartViewer.m \ - UIxKolabPartContactViewer.m \ - UIxKolabPartEventViewer.m \ - UIxKolabPartTaskViewer.m \ MailPartViewers_RESOURCE_FILES += \ Version \ diff --git a/UI/MailPartViewers/UIxKolabPartContactViewer.m b/UI/MailPartViewers/UIxKolabPartContactViewer.m deleted file mode 100644 index 4a68368d7..000000000 --- a/UI/MailPartViewers/UIxKolabPartContactViewer.m +++ /dev/null @@ -1,60 +0,0 @@ -/* - Copyright (C) 2005 SKYRIX Software AG - - This file is part of OpenGroupware.org. - - OGo is free software; you can redistribute it and/or modify it under - the terms of the GNU Lesser General Public License as published by the - Free Software Foundation; either version 2, or (at your option) any - later version. - - OGo is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public - License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with OGo; see the file COPYING. If not, write to the - Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. -*/ - -@class NSString; -#import - -#import - -#import "UIxKolabPartViewer.h" - -/* - UIxKolabPartContactViewer - - Show application/x-vnd.kolab.contact types. (Kolab XML content) -*/ - -@interface UIxKolabPartContactViewer : UIxKolabPartViewer -@end - -@implementation UIxKolabPartContactViewer - -- (id)addressElements { - return [[[self domDocument] documentElement] - getElementsByTagName:@"address"]; -} - -- (id)phoneElements { - return [[[self domDocument] documentElement] - getElementsByTagName:@"phone"]; -} - -- (id)emailElements { - return [[[self domDocument] documentElement] - getElementsByTagName:@"email"]; -} - -- (id)customElements { - return [[[self domDocument] documentElement] - getElementsByTagName:@"x-custom"]; -} - -@end /* UIxKolabPartContactViewer */ diff --git a/UI/MailPartViewers/UIxKolabPartEventViewer.m b/UI/MailPartViewers/UIxKolabPartEventViewer.m deleted file mode 100644 index 30381b007..000000000 --- a/UI/MailPartViewers/UIxKolabPartEventViewer.m +++ /dev/null @@ -1,34 +0,0 @@ -/* - Copyright (C) 2005 SKYRIX Software AG - - This file is part of OpenGroupware.org. - - OGo is free software; you can redistribute it and/or modify it under - the terms of the GNU Lesser General Public License as published by the - Free Software Foundation; either version 2, or (at your option) any - later version. - - OGo is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public - License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with OGo; see the file COPYING. If not, write to the - Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. -*/ - -#import "UIxKolabPartViewer.h" - -/* - UIxKolabPartEventViewer - - Show application/x-vnd.kolab.event types. (Kolab XML content) -*/ - -@interface UIxKolabPartEventViewer : UIxKolabPartViewer -@end - -@implementation UIxKolabPartEventViewer -@end /* UIxKolabPartEventViewer */ diff --git a/UI/MailPartViewers/UIxKolabPartTaskViewer.m b/UI/MailPartViewers/UIxKolabPartTaskViewer.m deleted file mode 100644 index be330f9c2..000000000 --- a/UI/MailPartViewers/UIxKolabPartTaskViewer.m +++ /dev/null @@ -1,34 +0,0 @@ -/* - Copyright (C) 2005 SKYRIX Software AG - - This file is part of OpenGroupware.org. - - OGo is free software; you can redistribute it and/or modify it under - the terms of the GNU Lesser General Public License as published by the - Free Software Foundation; either version 2, or (at your option) any - later version. - - OGo is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public - License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with OGo; see the file COPYING. If not, write to the - Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. -*/ - -#import "UIxKolabPartViewer.h" - -/* - UIxKolabPartTaskViewer - - Show application/x-vnd.kolab.task types. (Kolab XML content) -*/ - -@interface UIxKolabPartTaskViewer : UIxKolabPartViewer -@end - -@implementation UIxKolabPartTaskViewer -@end /* UIxKolabPartTaskViewer */ diff --git a/UI/MailPartViewers/UIxKolabPartViewer.h b/UI/MailPartViewers/UIxKolabPartViewer.h deleted file mode 100644 index cb9a86489..000000000 --- a/UI/MailPartViewers/UIxKolabPartViewer.h +++ /dev/null @@ -1,48 +0,0 @@ -/* - Copyright (C) 2005 SKYRIX Software AG - - This file is part of OpenGroupware.org. - - OGo is free software; you can redistribute it and/or modify it under - the terms of the GNU Lesser General Public License as published by the - Free Software Foundation; either version 2, or (at your option) any - later version. - - OGo is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public - License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with OGo; see the file COPYING. If not, write to the - Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. -*/ - -#ifndef __Mailer_UIxKolabPartViewer_H__ -#define __Mailer_UIxKolabPartViewer_H__ - -#import "UIxMailPartViewer.h" - -/* - UIxKolabPartContactViewer - - Superclass for viewers which show the application/x-vnd.* XML documents. -*/ - -@protocol NSObject; -@protocol DOMDocument; - -@interface UIxKolabPartViewer : UIxMailPartViewer -{ - id domDocument; - id item; -} - -/* getting a DOM representation */ - -- (id ) domDocument; - -@end - -#endif /* __Mailer_UIxKolabPartViewer_H__ */ diff --git a/UI/MailPartViewers/UIxKolabPartViewer.m b/UI/MailPartViewers/UIxKolabPartViewer.m deleted file mode 100644 index 4afa120ef..000000000 --- a/UI/MailPartViewers/UIxKolabPartViewer.m +++ /dev/null @@ -1,81 +0,0 @@ -/* - Copyright (C) 2005 SKYRIX Software AG - - This file is part of OpenGroupware.org. - - OGo is free software; you can redistribute it and/or modify it under - the terms of the GNU Lesser General Public License as published by the - Free Software Foundation; either version 2, or (at your option) any - later version. - - OGo is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public - License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with OGo; see the file COPYING. If not, write to the - Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. -*/ - -#import -#import -#import - -#import "UIxKolabPartViewer.h" - -@implementation UIxKolabPartViewer - -static id domBuilder = nil; - -+ (void)initialize { - DOMBuilderFactory *factory - = [DOMBuilderFactory standardDOMBuilderFactory]; - - domBuilder = [[factory createDOMBuilderForMimeType:@"text/xml"] retain]; - NSLog(@"Note(%@): using DOM builder: %@", - NSStringFromClass(self), domBuilder); -} - -- (void)dealloc { - [(id)self->domDocument release]; - [self->item release]; - [super dealloc]; -} - -/* maintain caches */ - -- (void)resetPathCaches { - [super resetPathCaches]; - [(id)self->domDocument release]; self->domDocument = nil; - [self->item release]; self->item = nil; -} - -/* getting a DOM representation */ - -- (id)domDocument { - /* - Note: this ignores the charset MIME header and will rely on proper - encoding header in the XML. - */ - - if (self->domDocument != nil) - return [(id)self->domDocument isNotNull] ? self->domDocument : nil; - - self->domDocument = - [[domBuilder buildFromSource:[self decodedFlatContent] - systemId:@"Kolab Mail Object"] retain]; - return self->domDocument; -} - -/* accessors */ - -- (void)setItem:(id)_item { - ASSIGN(self->item, _item); -} -- (id)item { - return self->item; -} - -@end /* UIxKolabPartViewer */ diff --git a/UI/MailPartViewers/UIxMailRenderingContext.m b/UI/MailPartViewers/UIxMailRenderingContext.m index 95ffecf93..82113cac3 100644 --- a/UI/MailPartViewers/UIxMailRenderingContext.m +++ b/UI/MailPartViewers/UIxMailRenderingContext.m @@ -170,38 +170,6 @@ static BOOL showNamedTextAttachmentsInline = NO; return [viewer pageWithName: @"UIxMailPartICalViewer"]; } -/* Kolab viewers */ - -- (WOComponent *) kolabContactViewer -{ - return [viewer pageWithName: @"UIxKolabPartContactViewer"]; -} - -- (WOComponent *) kolabEventViewer -{ - return [viewer pageWithName: @"UIxKolabPartEventViewer"]; -} - -- (WOComponent *) kolabTodoViewer -{ - return [viewer pageWithName: @"UIxKolabPartTodoViewer"]; -} - -- (WOComponent *) kolabNoteViewer -{ - return [self textViewer]; // TODO -} - -- (WOComponent *) kolabJournalViewer -{ - return [self textViewer]; // TODO -} - -- (WOComponent *) kolabDistributionListViewer -{ - return [self textViewer]; // TODO -} - /* main viewer selection */ - (WOComponent *) viewerForBodyInfo: (id) _info @@ -275,26 +243,7 @@ static BOOL showNamedTextAttachmentsInline = NO; if ([mt isEqualToString:@"application"]) { // octet-stream (generate download link?, autodetect type?) - - if ([st hasPrefix:@"x-vnd.kolab."]) - { - if ([st isEqualToString:@"x-vnd.kolab.contact"]) - return [self kolabContactViewer]; - if ([st isEqualToString:@"x-vnd.kolab.event"]) - return [self kolabEventViewer]; - if ([st isEqualToString:@"x-vnd.kolab.task"]) - return [self kolabTodoViewer]; - if ([st isEqualToString:@"x-vnd.kolab.note"]) - return [self kolabNoteViewer]; - if ([st isEqualToString:@"x-vnd.kolab.journal"]) - return [self kolabJournalViewer]; - if ([st isEqualToString:@"x-vnd.kolab.contact.distlist"]) - return [self kolabDistributionListViewer]; - - [self errorWithFormat:@"found no viewer for Kolab type: %@/%@", mt, st]; - return [self linkViewer]; - } - else if ([st isEqualToString:@"ics"]) /* Cooqle K4lendahr - Google Calendar */ + if ([st isEqualToString:@"ics"]) /* Cooqle K4lendahr - Google Calendar */ return [self iCalViewer]; #if 0 /* the link viewer looks better than plain text ;-) */ diff --git a/UI/MailerUI/UIxMailFolderActions.m b/UI/MailerUI/UIxMailFolderActions.m index c764df15a..6c9f4d9fa 100644 --- a/UI/MailerUI/UIxMailFolderActions.m +++ b/UI/MailerUI/UIxMailFolderActions.m @@ -1,6 +1,6 @@ /* UIxMailFolderActions.m - this file is part of SOGo * - * Copyright (C) 2007-2008 Inverse inc. + * Copyright (C) 2007-2009 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/UI/Scheduler/BrazilianPortuguese.lproj/Localizable.strings b/UI/Scheduler/BrazilianPortuguese.lproj/Localizable.strings index 5352102a8..6c44772b9 100644 --- a/UI/Scheduler/BrazilianPortuguese.lproj/Localizable.strings +++ b/UI/Scheduler/BrazilianPortuguese.lproj/Localizable.strings @@ -274,7 +274,6 @@ "Search attendees" = "Pesquisar participantes"; "Search resources" = "Pesquisar recursos"; "Search appointments" = "Pesquisar apontamentos"; -"Search in Anais" = "Pesquisar nos Anais"; "All day Event" = "Evento diário"; "check for conflicts" = "Checar conflitos"; @@ -534,6 +533,7 @@ vtodo_class2 = "(Tarefa Confidencial)"; "Open Task..." = "Open Task..."; "Mark Completed" = "Mark Completed"; "Delete Task" = "Delete Task"; +"Delete Event" = "Delete Event"; "Subscribe to a web calendar..." = "Subscribe to a web calendar..."; "URL of the Calendar" = "URL of the Calendar"; diff --git a/UI/Scheduler/Czech.lproj/Localizable.strings b/UI/Scheduler/Czech.lproj/Localizable.strings index 886d3fcb9..2289512ab 100644 --- a/UI/Scheduler/Czech.lproj/Localizable.strings +++ b/UI/Scheduler/Czech.lproj/Localizable.strings @@ -274,7 +274,6 @@ "Search attendees" = "Vyhledat účastníky"; "Search resources" = "Vyhledat zdroje"; "Search appointments" = "Vyhledat schůzky"; -"Search in Anais" = "Vyhledat v Anais"; "All day Event" = "Celodenní událost"; "check for conflicts" = "Zkontrolovat překrývání"; @@ -534,6 +533,7 @@ vtodo_class2 = "(Důvěrný úkol)"; "Open Task..." = "Open Task..."; "Mark Completed" = "Mark Completed"; "Delete Task" = "Delete Task"; +"Delete Event" = "Delete Event"; "Subscribe to a web calendar..." = "Subscribe to a web calendar..."; "URL of the Calendar" = "Adresa vzdáleného kalendáře na webu"; diff --git a/UI/Scheduler/Dutch.lproj/Localizable.strings b/UI/Scheduler/Dutch.lproj/Localizable.strings index 015465d43..4f649a120 100644 --- a/UI/Scheduler/Dutch.lproj/Localizable.strings +++ b/UI/Scheduler/Dutch.lproj/Localizable.strings @@ -274,7 +274,6 @@ "Search attendees" = "Deelnemers zoeken"; "Search resources" = "Resources zoeken"; "Search appointments" = "Afspraken zoeken"; -"Search in Anais" = "Zoeken in Anais???"; "All day Event" = "Afspraak duurt de hele dag"; "check for conflicts" = "Op conflicten controleren"; @@ -534,6 +533,7 @@ vtodo_class2 = "(Vertrouwelijke taak)"; "Open Task..." = "Open Task..."; "Mark Completed" = "Mark Completed"; "Delete Task" = "Delete Task"; +"Delete Event" = "Delete Event"; "Subscribe to a web calendar..." = "Subscribe to a web calendar..."; "URL of the Calendar" = "URL of the Calendar"; diff --git a/UI/Scheduler/English.lproj/Localizable.strings b/UI/Scheduler/English.lproj/Localizable.strings index c4918c9b9..888eaca9d 100644 --- a/UI/Scheduler/English.lproj/Localizable.strings +++ b/UI/Scheduler/English.lproj/Localizable.strings @@ -274,7 +274,6 @@ "Search attendees" = "Search attendees"; "Search resources" = "Search resources"; "Search appointments" = "Search appointments"; -"Search in Anais" = "Search in Anais"; "All day Event" = "All day Event"; "check for conflicts" = "Check for conflicts"; @@ -534,6 +533,7 @@ vtodo_class2 = "(Confidential task)"; "Open Task..." = "Open Task..."; "Mark Completed" = "Mark Completed"; "Delete Task" = "Delete Task"; +"Delete Event" = "Delete Event"; "Subscribe to a web calendar..." = "Subscribe to a web calendar..."; "URL of the Calendar" = "URL of the Calendar"; diff --git a/UI/Scheduler/French.lproj/Localizable.strings b/UI/Scheduler/French.lproj/Localizable.strings index 98db7b55a..0a0972554 100644 --- a/UI/Scheduler/French.lproj/Localizable.strings +++ b/UI/Scheduler/French.lproj/Localizable.strings @@ -274,7 +274,6 @@ "Search attendees" = "Recherche de participants"; "Search resources" = "Recherche de ressources"; "Search appointments" = "Recherche de rendez-vous"; -"Search in Anais" = "Recherche par Anaïs"; "All day Event" = "Événement sur la journée"; "check for conflicts" = "Vérifier les conflits"; @@ -534,6 +533,7 @@ vtodo_class2 = "(Tâche confidentielle)"; "Open Task..." = "Ouvrir la tâche..."; "Mark Completed" = "Marquer comme accomplie"; "Delete Task" = "Supprimer la tâche"; +"Delete Event" = "Supprimer l'événement"; "Subscribe to a web calendar..." = "S'inscrire à un agenda en ligne..."; "URL of the Calendar" = "URL de l'agenda"; diff --git a/UI/Scheduler/GNUmakefile b/UI/Scheduler/GNUmakefile index 8ea71685f..f79e4bd83 100644 --- a/UI/Scheduler/GNUmakefile +++ b/UI/Scheduler/GNUmakefile @@ -63,7 +63,7 @@ SchedulerUI_RESOURCE_FILES += \ Toolbars/SOGoEmpty.toolbar SchedulerUI_LOCALIZED_RESOURCE_FILES += \ - Localizable.strings \ + Localizable.strings # if SoProduct is fixed to enable localized resources, add this to # SchedulerUI_LOCALIZED_RESOURCE_FILES instead diff --git a/UI/Scheduler/German.lproj/Localizable.strings b/UI/Scheduler/German.lproj/Localizable.strings index 4c274a0a8..44fcb7ba0 100644 --- a/UI/Scheduler/German.lproj/Localizable.strings +++ b/UI/Scheduler/German.lproj/Localizable.strings @@ -274,7 +274,6 @@ "Search attendees" = "Teilnehmer suchen"; "Search resources" = "Ressourcen suchen"; "Search appointments" = "Termine suchen"; -"Search in Anais" = "Suche über Anaïs"; "All day Event" = "Ganztägig"; "check for conflicts" = "Auf Konflikte überprüfen"; @@ -534,6 +533,7 @@ vtodo_class2 = "(Vertrauliche Aufgabe)"; "Open Task..." = "Open Task..."; "Mark Completed" = "Mark Completed"; "Delete Task" = "Delete Task"; +"Delete Event" = "Delete Event"; "Subscribe to a web calendar..." = "Subscribe to a web calendar..."; "URL of the Calendar" = "URL of the Calendar"; diff --git a/UI/Scheduler/Hungarian.lproj/Localizable.strings b/UI/Scheduler/Hungarian.lproj/Localizable.strings index 6eff581d8..18ea56ba7 100644 --- a/UI/Scheduler/Hungarian.lproj/Localizable.strings +++ b/UI/Scheduler/Hungarian.lproj/Localizable.strings @@ -274,7 +274,6 @@ "Search attendees" = "Résztvevők keresése"; "Search resources" = "Erőforrások keresése"; "Search appointments" = "Találkozók keresése"; -"Search in Anais" = "Anais keresése"; "All day Event" = "Egésznapos esemény"; "check for conflicts" = "Ütközés ellenőrzése"; @@ -534,6 +533,7 @@ vtodo_class2 = "(Bizalmas feladat)"; "Open Task..." = "Open Task..."; "Mark Completed" = "Mark Completed"; "Delete Task" = "Delete Task"; +"Delete Event" = "Delete Event"; "Subscribe to a web calendar..." = "Subscribe to a web calendar..."; "URL of the Calendar" = "URL of the Calendar"; diff --git a/UI/Scheduler/Italian.lproj/Localizable.strings b/UI/Scheduler/Italian.lproj/Localizable.strings index 085c308c0..39b7de04f 100644 --- a/UI/Scheduler/Italian.lproj/Localizable.strings +++ b/UI/Scheduler/Italian.lproj/Localizable.strings @@ -274,7 +274,6 @@ "Search attendees" = "Cerca invitati"; "Search resources" = "Cerca risorse"; "Search appointments" = "Cerca appuntamenti"; -"Search in Anais" = "Cerca in Anais"; "All day Event" = "Tutta la giornata"; "check for conflicts" = "Controlla conflitti"; @@ -534,6 +533,7 @@ vtodo_class2 = "(Attività confidenziale)"; "Open Task..." = "Open Task..."; "Mark Completed" = "Mark Completed"; "Delete Task" = "Delete Task"; +"Delete Event" = "Delete Event"; "Subscribe to a web calendar..." = "Subscribe to a web calendar..."; "URL of the Calendar" = "URL of the Calendar"; diff --git a/UI/Scheduler/Russian.lproj/Localizable.strings b/UI/Scheduler/Russian.lproj/Localizable.strings index 136af33c3..099b74190 100644 --- a/UI/Scheduler/Russian.lproj/Localizable.strings +++ b/UI/Scheduler/Russian.lproj/Localizable.strings @@ -274,7 +274,6 @@ "Search attendees" = "Search attendees"; "Search resources" = "Search resources"; "Search appointments" = "Search appointments"; -"Search in Anais" = "Search in Anais"; "All day Event" = "All day Event"; "check for conflicts" = "Check for conflicts"; @@ -534,6 +533,7 @@ vtodo_class2 = "(Confidential task)"; "Open Task..." = "Open Task..."; "Mark Completed" = "Mark Completed"; "Delete Task" = "Delete Task"; +"Delete Event" = "Delete Event"; "Subscribe to a web calendar..." = "Subscribe to a web calendar..."; "URL of the Calendar" = "URL of the Calendar"; diff --git a/UI/Scheduler/Spanish.lproj/Localizable.strings b/UI/Scheduler/Spanish.lproj/Localizable.strings index e2a9cb9ba..8cf76c1d1 100644 --- a/UI/Scheduler/Spanish.lproj/Localizable.strings +++ b/UI/Scheduler/Spanish.lproj/Localizable.strings @@ -274,7 +274,6 @@ "Search attendees" = "Buscar asistentes"; "Search resources" = "Search recursos"; "Search appointments" = "Buscar eventos"; -"Search in Anais" = "Buscar en Anais"; "All day Event" = "Todo el día"; "check for conflicts" = "Buscar conflictos"; @@ -534,6 +533,7 @@ vtodo_class2 = "(Tarea confidencial)"; "Open Task..." = "Open Task..."; "Mark Completed" = "Mark Completed"; "Delete Task" = "Delete Task"; +"Delete Event" = "Delete Event"; "Subscribe to a web calendar..." = "Subscribe to a web calendar..."; "URL of the Calendar" = "URL of the Calendar"; diff --git a/UI/Scheduler/Swedish.lproj/Localizable.strings b/UI/Scheduler/Swedish.lproj/Localizable.strings index 117b7f092..693f363e5 100644 --- a/UI/Scheduler/Swedish.lproj/Localizable.strings +++ b/UI/Scheduler/Swedish.lproj/Localizable.strings @@ -274,7 +274,6 @@ "Search attendees" = "Sök deltagare"; "Search resources" = "Sök resurser"; "Search appointments" = "Sök möten"; -"Search in Anais" = "Sök i Anais"; "All day Event" = "Heldagshändelse"; "check for conflicts" = "Kontrollera konflikter"; @@ -534,6 +533,7 @@ vtodo_class2 = "(Konfidentiell uppgift)"; "Open Task..." = "Öppna uppgift..."; "Mark Completed" = "Märk utförd"; "Delete Task" = "Ta bort uppgift"; +"Delete Event" = "Delete Event"; "Subscribe to a web calendar..." = "Prenumrera på en webbkalender..."; "URL of the Calendar" = "URL till kalendern"; diff --git a/UI/Scheduler/UIxCalView.h b/UI/Scheduler/UIxCalView.h index 0c17ba8e4..3ddbb8288 100644 --- a/UI/Scheduler/UIxCalView.h +++ b/UI/Scheduler/UIxCalView.h @@ -1,4 +1,24 @@ -// $Id: UIxCalView.h 1080 2007-06-12 22:15:47Z wolfgang $ +/* UIxCalView.h - this file is part of SOGo + * + * Copyright (C) 2006-2009 Inverse inc. + * + * Author: Wolfgang Sourdeau + * + * This file is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This file is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ #ifndef __SOGo_UIxCalView_H__ #define __SOGo_UIxCalView_H__ diff --git a/UI/Scheduler/UIxCalView.m b/UI/Scheduler/UIxCalView.m index fed974e4c..6d38a3e8f 100644 --- a/UI/Scheduler/UIxCalView.m +++ b/UI/Scheduler/UIxCalView.m @@ -1,4 +1,4 @@ -/* UIxCalMainView.m - this file is part of SOGo +/* UIxCalView.m - this file is part of SOGo * * Copyright (C) 2006-2009 Inverse inc. * diff --git a/UI/Scheduler/Welsh.lproj/Localizable.strings b/UI/Scheduler/Welsh.lproj/Localizable.strings index 73eb7ddc3..55f0d03fc 100644 --- a/UI/Scheduler/Welsh.lproj/Localizable.strings +++ b/UI/Scheduler/Welsh.lproj/Localizable.strings @@ -274,7 +274,6 @@ "Search attendees" = "Chwilio mynychwyr"; "Search resources" = "Chwilio adnoddau"; "Search appointments" = "Chwilio apwyntiadau"; -"Search in Anais" = "Search in Anais"; "All day Event" = "Digwyddiad trwy'r dydd"; "check for conflicts" = "Gwirio gwrthdaro"; @@ -534,6 +533,7 @@ vtodo_class2 = "(Tasg gyhoeddus)"; "Open Task..." = "Open Task..."; "Mark Completed" = "Mark Completed"; "Delete Task" = "Delete Task"; +"Delete Event" = "Delete Event"; "Subscribe to a web calendar..." = "Subscribe to a web calendar..."; "URL of the Calendar" = "URL of the Calendar"; diff --git a/UI/Templates/MailPartViewers/UIxKolabPartContactViewer.wox b/UI/Templates/MailPartViewers/UIxKolabPartContactViewer.wox deleted file mode 100644 index be0a05049..000000000 --- a/UI/Templates/MailPartViewers/UIxKolabPartContactViewer.wox +++ /dev/null @@ -1,181 +0,0 @@ - -
-
- - : - - (ID: ) - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
:
:
:
:
:
:
:
:
:
:
:
:
:
:
:
:
:
: - - - - / - - -
: - - - () -
- -
: - - - <> -
- -
- -
- -
- - -
- - : -
- - -
-
-
-
-
- -
-
- - -
- - - - -
- - - - - - - -
:
-
-
- - - -
-
-
diff --git a/UI/Templates/MailPartViewers/UIxKolabPartEventViewer.wox b/UI/Templates/MailPartViewers/UIxKolabPartEventViewer.wox deleted file mode 100644 index 02ff68a6a..000000000 --- a/UI/Templates/MailPartViewers/UIxKolabPartEventViewer.wox +++ /dev/null @@ -1,16 +0,0 @@ - -
-
- - Kolab Event - - -
-
-
diff --git a/UI/Templates/MailPartViewers/UIxKolabPartTaskViewer.wox b/UI/Templates/MailPartViewers/UIxKolabPartTaskViewer.wox deleted file mode 100644 index 700d11e0f..000000000 --- a/UI/Templates/MailPartViewers/UIxKolabPartTaskViewer.wox +++ /dev/null @@ -1,16 +0,0 @@ - -
-
- - Kolab Task - - -
-
-
diff --git a/UI/Templates/SchedulerUI/UIxAppointmentProposal.wox b/UI/Templates/SchedulerUI/UIxAppointmentProposal.wox index ddbe269c6..6b1df183c 100644 --- a/UI/Templates/SchedulerUI/UIxAppointmentProposal.wox +++ b/UI/Templates/SchedulerUI/UIxAppointmentProposal.wox @@ -114,20 +114,6 @@ - @@ -139,11 +125,6 @@ - @@ -151,20 +132,6 @@ - diff --git a/UI/Templates/SchedulerUI/UIxCalDayView.wox b/UI/Templates/SchedulerUI/UIxCalDayView.wox index 296563192..42c405dbd 100644 --- a/UI/Templates/SchedulerUI/UIxCalDayView.wox +++ b/UI/Templates/SchedulerUI/UIxCalDayView.wox @@ -14,6 +14,8 @@
    • +
    • +
    • +
    • +
    • +
    • +
    • - @@ -139,11 +125,6 @@ - @@ -151,20 +132,6 @@ - diff --git a/UI/WebServerResources/MailerUI.css b/UI/WebServerResources/MailerUI.css index 819f903c1..e590bbc4e 100644 --- a/UI/WebServerResources/MailerUI.css +++ b/UI/WebServerResources/MailerUI.css @@ -127,16 +127,6 @@ DIV#folderTreeContent font-style: italic; } -.anais_me -{ - color: #0000FF; -} - -.anais_uids -{ -} - - /* new stuff for Thunderbird like mailer */ .vertframerow @@ -863,4 +853,4 @@ A#iCalendarDeleteFromCalendar A#iCalendarAddToCalendar { border-left: 2px solid #E6E7E6; - margin-left: 5px;} \ No newline at end of file + margin-left: 5px;} diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js index 40ec4de4b..239eeb0dc 100644 --- a/UI/WebServerResources/SchedulerUI.js +++ b/UI/WebServerResources/SchedulerUI.js @@ -1213,7 +1213,9 @@ function calendarDisplayCallback(http) { onMenuNewTaskClick, "-", loadPreviousView, - loadNextView); + loadNextView, + "-", + deleteEvent); observer = $("daysView"); } else if (currentView == 'weekview') { @@ -1221,7 +1223,9 @@ function calendarDisplayCallback(http) { onMenuNewTaskClick, "-", loadPreviousView, - loadNextView); + loadNextView, + "-", + deleteEvent); observer = $("daysView"); } else { @@ -1229,7 +1233,9 @@ function calendarDisplayCallback(http) { onMenuNewTaskClick, "-", loadPreviousView, - loadNextView); + loadNextView, + "-", + deleteEvent); observer = $("monthDaysView"); } initMenu($("currentViewMenu"), menu);