diff --git a/ChangeLog b/ChangeLog index 9d229a5ce..60282fbd7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-07-15 Wolfgang Sourdeau + + * UI/Scheduler/UIxComponentEditor.m (-categoryList): insert the + category of the current component in the list, don't convert it + to upper case and sort the resulting list alphabetically. + 2009-07-14 Francis Lachapelle * UI/SOGoUI/UIxComponent.m ([UIxComponent -buildDate]): moved diff --git a/NEWS b/NEWS index 541f862ce..6cfbc7602 100644 --- a/NEWS +++ b/NEWS @@ -1,7 +1,15 @@ +<<<<<<< variant A 1.0-2009mmdd (1.0.4) -------------------- - added contextual menu in web calendar views +>>>>>>> variant B +1.0-2009XXXX (1.0.4) +-------------------- +- added "Reload" button to refresh the current view in the calendar + +####### Ancestor +======= end 1.0-20090714 (1.0.3) -------------------- - improved search behavior of users folders (UIxContactsUserFolders) diff --git a/UI/Scheduler/BrazilianPortuguese.lproj/Localizable.strings b/UI/Scheduler/BrazilianPortuguese.lproj/Localizable.strings index 64680daf4..3c88913fb 100755 --- a/UI/Scheduler/BrazilianPortuguese.lproj/Localizable.strings +++ b/UI/Scheduler/BrazilianPortuguese.lproj/Localizable.strings @@ -10,6 +10,7 @@ "Switch to day view" = "Visualizar Dia"; "Switch to week view" = "Visualizar Semana"; "Switch to month view" = "Visualizar Mês"; +"Reload all calendars" = "Reload all calendars"; /* Tabs */ "Date" = "Data"; @@ -443,6 +444,7 @@ validate_endbeforestart = "A data que você informou ocorre antes da data ini "Day View" = "Visualizar Dia"; "Week View" = "Visualizar Mês"; "Month View" = "Visualizar Mês"; +"Reload" = "Reload"; "eventPartStatModificationError" = "Seu status de participação não pode ser modificado."; diff --git a/UI/Scheduler/Czech.lproj/Localizable.strings b/UI/Scheduler/Czech.lproj/Localizable.strings index 15f2deac3..bdd2f7839 100755 --- a/UI/Scheduler/Czech.lproj/Localizable.strings +++ b/UI/Scheduler/Czech.lproj/Localizable.strings @@ -10,6 +10,7 @@ "Switch to day view" = "Přepnout na denní zobrazení"; "Switch to week view" = "Přepnout na týdenní zobrazení"; "Switch to month view" = "Přepnout na měsíční zobrazení"; +"Reload all calendars" = "Reload all calendars"; /* Tabs */ "Date" = "Datum"; @@ -443,6 +444,7 @@ validate_endbeforestart = "Zadané datum konce je před začátkem události. "Day View" = "Denní zobrazení"; "Week View" = "Týdenní zobrazení"; "Month View" = "Měsíční zobrazení"; +"Reload" = "Reload"; "eventPartStatModificationError" = "Status Vaší účasti nemohl být změněn."; diff --git a/UI/Scheduler/Dutch.lproj/Localizable.strings b/UI/Scheduler/Dutch.lproj/Localizable.strings index 70d80bece..a1eca9448 100644 --- a/UI/Scheduler/Dutch.lproj/Localizable.strings +++ b/UI/Scheduler/Dutch.lproj/Localizable.strings @@ -426,6 +426,7 @@ validate_endbeforestart = "Het begin vindt plaats vóór het einde."; "Day View" = "Dagoverzicht"; "Week View" = "Weekoverzicht"; "Month View" = "Maandoverzicht"; +"Reload" = "Reload"; "eventPartStatModificationError" = "Uw participatiestatus kon niet worden gewijzigd."; @@ -437,6 +438,7 @@ validate_endbeforestart = "Het begin vindt plaats vóór het einde."; "Select All" = "Alles selecteren"; "Workweek days only" = "Alleen werkdagen weergeven"; "Tasks in View" = "Taken in binnen het zicht"; +"Reload all calendars" = "Reload all calendars"; "eventDeleteConfirmation" = "Weet u zeker dat u deze afspraak wilt verwijderen?"; "taskDeleteConfirmation" = "Weet u zeker dat u deze taak wilt verwijderen?"; diff --git a/UI/Scheduler/English.lproj/Localizable.strings b/UI/Scheduler/English.lproj/Localizable.strings index 1489aa6af..7b308b498 100644 --- a/UI/Scheduler/English.lproj/Localizable.strings +++ b/UI/Scheduler/English.lproj/Localizable.strings @@ -10,6 +10,7 @@ "Switch to day view" = "Switch to day view"; "Switch to week view" = "Switch to week view"; "Switch to month view" = "Switch to month view"; +"Reload all calendars" = "Reload all calendars"; /* Tabs */ "Date" = "Date"; @@ -443,6 +444,7 @@ validate_endbeforestart = "The end date that you entered occurs before the st "Day View" = "Day View"; "Week View" = "Week View"; "Month View" = "Month View"; +"Reload" = "Reload"; "eventPartStatModificationError" = "Your participation status could not be modified."; diff --git a/UI/Scheduler/French.lproj/Localizable.strings b/UI/Scheduler/French.lproj/Localizable.strings index c6e18b932..6ac9305ef 100644 --- a/UI/Scheduler/French.lproj/Localizable.strings +++ b/UI/Scheduler/French.lproj/Localizable.strings @@ -10,6 +10,7 @@ "Switch to day view" = "Passer à la vue par jour"; "Switch to week view" = "Passer à la vue par semaine"; "Switch to month view" = "Passer à la vue par mois"; +"Reload all calendars" = "Actualiser tous les agendas"; /* Tabs */ "Date" = "Date"; @@ -441,6 +442,7 @@ validate_endbeforestart = "La date de fin est avant la date de début."; "Day View" = "Par jour"; "Week View" = "Par semaine"; "Month View" = "Par mois"; +"Reload" = "Actualiser"; "eventPartStatModificationError" = "Votre état de participation à l'événement n'a pas pu être modifié."; diff --git a/UI/Scheduler/German.lproj/Localizable.strings b/UI/Scheduler/German.lproj/Localizable.strings index f7d6c1bb0..73a897d60 100644 --- a/UI/Scheduler/German.lproj/Localizable.strings +++ b/UI/Scheduler/German.lproj/Localizable.strings @@ -10,6 +10,7 @@ "Switch to day view" = "Zur Tagesansicht wechseln"; "Switch to week view" = "Zur Wochenansicht wechseln"; "Switch to month view" = "Zur wehrwöchigen Ansicht wechseln"; +"Reload all calendars" = "Reload all calendars"; /* Tabs */ "Date" = "Datum"; @@ -441,6 +442,7 @@ validate_endbeforestart = "Ihr Beginn ist nach dem Ende"; "Day View" = "Tagesansicht"; "Week View" = "Wochenansicht"; "Month View" = "Monatsansicht"; +"Reload" = "Reload"; "eventPartStatModificationError" = "Ihre Teilnahme an dem Termin kann nicht geändert werden."; diff --git a/UI/Scheduler/Italian.lproj/Localizable.strings b/UI/Scheduler/Italian.lproj/Localizable.strings index b21600bbc..8754ebffb 100644 --- a/UI/Scheduler/Italian.lproj/Localizable.strings +++ b/UI/Scheduler/Italian.lproj/Localizable.strings @@ -10,6 +10,7 @@ "Switch to day view" = "Giorno"; "Switch to week view" = "Settimana"; "Switch to month view" = "Mese"; +"Reload all calendars" = "Reload all calendars"; /* Tabs */ "Date" = "Data"; @@ -443,6 +444,7 @@ validate_endbeforestart = "La data finale specificata è precedente alla data "Day View" = "Giorno"; "Week View" = "Settimana"; "Month View" = "Mese"; +"Reload" = "Reload"; "eventPartStatModificationError" = "Lo stato della tua partecipazione non può essere modificato."; diff --git a/UI/Scheduler/Russian.lproj/Localizable.strings b/UI/Scheduler/Russian.lproj/Localizable.strings index a43c6be2a..ef1e6f5fb 100644 --- a/UI/Scheduler/Russian.lproj/Localizable.strings +++ b/UI/Scheduler/Russian.lproj/Localizable.strings @@ -10,6 +10,7 @@ "Switch to day view" = "Перейти к обзору дня"; "Switch to week view" = "Перейти к обзору недели"; "Switch to month view" = "Перейти к обзору месяца"; +"Reload all calendars" = "Reload all calendars"; /* Tabs */ "Date" = "Дата"; @@ -442,6 +443,7 @@ validate_endbeforestart = "The end date that you entered occurs before the st "Day View" = "День"; "Week View" = "По неделям"; "Month View" = "Месяц"; +"Reload" = "Reload"; "eventPartStatModificationError" = "Невозможно изменить статус Вашего участия."; diff --git a/UI/Scheduler/Spanish.lproj/Localizable.strings b/UI/Scheduler/Spanish.lproj/Localizable.strings index 41263f199..6e3155ac5 100644 --- a/UI/Scheduler/Spanish.lproj/Localizable.strings +++ b/UI/Scheduler/Spanish.lproj/Localizable.strings @@ -13,6 +13,7 @@ "Switch to day view" = "Cambiar a vista diaria"; "Switch to week view" = "Cambiar a vista semanal"; "Switch to month view" = "Cambiar a vista mensual"; +"Reload all calendars" = "Reload all calendars"; /* Tabs */ "Date" = "Fecha"; @@ -447,6 +448,7 @@ validate_endbeforestart = "Su fecha/hora de comienzo es posterio a la de fina "Day View" = "Vista diaria"; "Week View" = "Vista semanal"; "Month View" = "Vista mensual"; +"Reload" = "Reload"; "eventPartStatModificationError" = "Su estado de participación no puede ser actualizado."; diff --git a/UI/Scheduler/Toolbars/SOGoAppointmentFolders.toolbar b/UI/Scheduler/Toolbars/SOGoAppointmentFolders.toolbar index d23428f1d..8aabe8a32 100644 --- a/UI/Scheduler/Toolbars/SOGoAppointmentFolders.toolbar +++ b/UI/Scheduler/Toolbars/SOGoAppointmentFolders.toolbar @@ -46,5 +46,10 @@ label="Month View"; onclick = "return onMonthOverview();"; image = "month-view.png"; - tooltip = "Switch to month view"; } ) + tooltip = "Switch to month view"; } ), + ( { link = "#"; + label = "Reload"; + onclick = "return onCalendarReload();"; + image = "calendar-reload.png"; + tooltip = "Reload all calendars"; } ) ) diff --git a/UI/Scheduler/UIxComponentEditor.h b/UI/Scheduler/UIxComponentEditor.h index 910d4a466..2fdb1b28d 100644 --- a/UI/Scheduler/UIxComponentEditor.h +++ b/UI/Scheduler/UIxComponentEditor.h @@ -110,7 +110,6 @@ - (NSArray *) categoryList; - (void) setCategories: (NSArray *) _categories; - (NSArray *) categories; -- (NSString *) itemCategoryText; - (NSArray *) priorities; - (void) setPriority: (NSString *) _priority; diff --git a/UI/Scheduler/UIxComponentEditor.m b/UI/Scheduler/UIxComponentEditor.m index 089a67ebc..4353e5c35 100644 --- a/UI/Scheduler/UIxComponentEditor.m +++ b/UI/Scheduler/UIxComponentEditor.m @@ -53,6 +53,7 @@ #import #import #import +#import #import #import #import @@ -285,7 +286,7 @@ iRANGE(2); { simpleCategory = [[compCategories componentsSeparatedByString: @","] objectAtIndex: 0]; - ASSIGN (category, [simpleCategory uppercaseString]); + ASSIGN (category, simpleCategory); } } @@ -538,8 +539,8 @@ iRANGE(2); ASSIGN (privacy, [component accessClass]); ASSIGN (priority, [component priority]); ASSIGN (status, [component status]); - ASSIGN (categories, - [[component categories] componentsWithSafeSeparator: ',']); + ASSIGN (categories, + [[component categories] componentsWithSafeSeparator: ',']); ASSIGN (organizer, [component organizer]); [self _loadCategories]; [self _loadAttendees]; @@ -791,6 +792,9 @@ iRANGE(2); - (NSArray *) categoryList { static NSArray *categoryItems = nil; + NSMutableArray *categoryList; + unsigned int count, max; + NSString *categoryItem, *newCategoryItem; if (!categoryItems) { @@ -819,7 +823,22 @@ iRANGE(2); [categoryItems retain]; } - return categoryItems; + max = [categoryItems count]; + categoryList = [NSMutableArray arrayWithCapacity: max + 1]; + + for (count = 0; count < max; count++) + { + categoryItem = [categoryItems objectAtIndex: count]; + newCategoryItem + = [self labelForKey: [NSString stringWithFormat: @"category_%@", + categoryItem]]; + [categoryList addObject: newCategoryItem]; + } + if ([categories count]) + [categoryList addObjectsFromArray: categories]; + + return [[categoryList uniqueObjects] + sortedArrayUsingSelector: @selector (localizedCaseInsensitiveCompare:)]; } - (void) setCategories: (NSArray *) _categories @@ -832,7 +851,7 @@ iRANGE(2); return categories; } -- (void) setCategory: (NSArray *) newCategory +- (void) setCategory: (NSString *) newCategory { ASSIGN (category, newCategory); } @@ -842,12 +861,6 @@ iRANGE(2); return category; } -- (NSString *) itemCategoryText -{ - return [self labelForKey: - [NSString stringWithFormat: @"category_%@", item]]; -} - - (NSArray *) repeatList { static NSArray *repeatItems = nil; @@ -1713,7 +1726,7 @@ RANGE(2); [component setComment: comment]; [component setAttach: attachUrl]; [component setAccessClass: privacy]; - [component setCategories: [category capitalizedString]]; + [component setCategories: category]; [self _handleAttendeesEdition]; [self _handleOrganizer]; clientObject = [self clientObject]; diff --git a/UI/Scheduler/Welsh.lproj/Localizable.strings b/UI/Scheduler/Welsh.lproj/Localizable.strings index 0466da88d..0daceba1b 100644 --- a/UI/Scheduler/Welsh.lproj/Localizable.strings +++ b/UI/Scheduler/Welsh.lproj/Localizable.strings @@ -10,6 +10,7 @@ "Switch to day view" = "Newid i olygfa diwrnod"; "Switch to week view" = "Newid i olygfa wythnos"; "Switch to month view" = "Newid i olygfa mis"; +"Reload all calendars" = "Reload all calendars"; /* Tabs */ "Date" = "Dyddiad"; @@ -434,6 +435,7 @@ validate_endbeforestart = "Mae'r dyddiad gorffen sydd wedi'i roi yn digwydd c "Day View" = "Golygfa diwrnod"; "Week View" = "Golygfa wythnos"; "Month View" = "Golygfa mis"; +"Reload" = "Reload"; "eventPartStatModificationError" = "Ni fedrwyd newid statws eich cyfranogiad."; diff --git a/UI/Templates/SchedulerUI/UIxComponentEditor.wox b/UI/Templates/SchedulerUI/UIxComponentEditor.wox index 590bcade3..39df92a9b 100644 --- a/UI/Templates/SchedulerUI/UIxComponentEditor.wox +++ b/UI/Templates/SchedulerUI/UIxComponentEditor.wox @@ -43,7 +43,7 @@