merge of '6ea189a179012ff48f750e835f069abfdbe32c7c'

and 'e0d6a2d51589348dbe6602973f8a6ae6718f0991'

Monotone-Parent: 6ea189a179012ff48f750e835f069abfdbe32c7c
Monotone-Parent: e0d6a2d51589348dbe6602973f8a6ae6718f0991
Monotone-Revision: 3765f757435c9d9934d42b1af5d1fd32fe72631a

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2009-07-16T02:17:32
Monotone-Branch: ca.inverse.sogo

ChangeLog

@@ -1,3 +1,9 @@
+2009-07-15  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* 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  <flachapelle@inverse.ca>
 
 	* UI/SOGoUI/UIxComponent.m ([UIxComponent -buildDate]): moved

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)

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.";
 

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.";
 

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?";

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.";
 

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é.";
 

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.";
 

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.";
 

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" = "Невозможно изменить статус Вашего участия.";
 

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.";
 

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"; } )
 )

UI/Scheduler/UIxComponentEditor.h

@@ -110,7 +110,6 @@
 - (NSArray *) categoryList;
 - (void) setCategories: (NSArray *) _categories;
 - (NSArray *) categories;
-- (NSString *) itemCategoryText;
 
 - (NSArray *) priorities;
 - (void) setPriority: (NSString *) _priority;

UI/Scheduler/UIxComponentEditor.m

@@ -53,6 +53,7 @@
 #import <SoObjects/Appointments/SOGoTaskObject.h>
 #import <SoObjects/SOGo/iCalEntityObject+Utilities.h>
 #import <SoObjects/SOGo/LDAPUserManager.h>
+#import <SoObjects/SOGo/NSArray+Utilities.h>
 #import <SoObjects/SOGo/NSDictionary+Utilities.h>
 #import <SoObjects/SOGo/NSString+Utilities.h>
 #import <SoObjects/SOGo/SOGoUser.h>
@@ -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];

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.";
 

UI/Templates/SchedulerUI/UIxComponentEditor.wox

@@ -43,7 +43,7 @@
       <span class="checkBoxList"><var:string label:value="Category:" />
         <span class="content"><var:popup name="category" list="categoryList" item="item"
             label:noSelectionString="category_NONE"
-            string="itemCategoryText" selection="category"
+            string="item" selection="category"
             /> <var:string label:value="Calendar:" />
           <var:popup const:id="calendarList"
 	    var:disabled="isChildOccurence"

UI/WebServerResources/SchedulerUI.js

@@ -856,6 +856,12 @@ function onMonthOverview() {
   return _ensureView("monthview");
 }
 
+function onCalendarReload() {
+	changeCalendarDisplay(null, currentView);
+
+	return false;
+}
+
 function scrollDayView(scrollEvent) {
   if (scrollEvent) {
     var contentView;