Monotone-Parent: 55c226ffd5db8ed7f07eb8591aded800a89418b2 Monotone-Revision: c3c980772004fa550702d469d6fbe729fd954f5d Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2012-02-20T22:25:49 Monotone-Branch: ca.inverse.sogomaint-2.0.2
parent
5e1a8b3b58
commit
c8fbb0718c
|
@ -1,5 +1,12 @@
|
|||
2012-02-20 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||
|
||||
* SoObjects/SOGo/SOGoUserDefaults.m
|
||||
(-setCalendarEventsDefaultClassification:)
|
||||
(-calendarEventsDefaultClassification)
|
||||
(-setCalendarTasksDefaultClassification:)
|
||||
(-calendarTasksDefaultClassification): new accessors related to
|
||||
the user-configured default classification of calendar components.
|
||||
|
||||
* UI/Scheduler/UIxComponentEditor.m: s/privacy/classification/g,
|
||||
which is a better description for the "CLASS" attribute.
|
||||
|
||||
|
|
|
@ -63,6 +63,9 @@
|
|||
|
||||
SOGoCalendarDefaultCategoryColor = "#aaa";
|
||||
SOGoCalendarShouldDisplayWeekend = YES;
|
||||
SOGoCalendarEventsDefaultClassification = "PUBLIC";
|
||||
SOGoCalendarTasksDefaultClassification = "PUBLIC";
|
||||
|
||||
SOGoFreeBusyDefaultInterval = ( 7, 7 );
|
||||
|
||||
SOGoReminderEnabled = YES;
|
||||
|
|
|
@ -164,6 +164,12 @@ extern NSString *SOGoWeekStartFirstFullWeek;
|
|||
- (void) setCalendarShouldDisplayWeekend: (BOOL) newValue;
|
||||
- (BOOL) calendarShouldDisplayWeekend;
|
||||
|
||||
- (void) setCalendarEventsDefaultClassification: (NSString *) newValue;
|
||||
- (NSString *) calendarEventsDefaultClassification;
|
||||
|
||||
- (void) setCalendarTasksDefaultClassification: (NSString *) newValue;
|
||||
- (NSString *) calendarTasksDefaultClassification;
|
||||
|
||||
- (void) setReminderEnabled: (BOOL) newValue;
|
||||
- (BOOL) reminderEnabled;
|
||||
|
||||
|
|
|
@ -621,6 +621,26 @@ NSString *SOGoWeekStartFirstFullWeek = @"FirstFullWeek";
|
|||
return [self boolForKey: @"SOGoCalendarShouldDisplayWeekend"];
|
||||
}
|
||||
|
||||
- (void) setCalendarEventsDefaultClassification: (NSString *) newValue
|
||||
{
|
||||
[self setObject: newValue forKey: @"SOGoCalendarEventsDefaultClassification"];
|
||||
}
|
||||
|
||||
- (NSString *) calendarEventsDefaultClassification
|
||||
{
|
||||
return [self stringForKey: @"SOGoCalendarEventsDefaultClassification"];
|
||||
}
|
||||
|
||||
- (void) setCalendarTasksDefaultClassification: (NSString *) newValue
|
||||
{
|
||||
[self setObject: newValue forKey: @"SOGoCalendarTasksDefaultClassification"];
|
||||
}
|
||||
|
||||
- (NSString *) calendarTasksDefaultClassification
|
||||
{
|
||||
return [self stringForKey: @"SOGoCalendarTasksDefaultClassification"];
|
||||
}
|
||||
|
||||
- (void) setReminderEnabled: (BOOL) newValue
|
||||
{
|
||||
[self setBool: newValue forKey: @"SOGoReminderEnabled"];
|
||||
|
|
|
@ -172,6 +172,13 @@
|
|||
"Confirmation:" = "Confirmação:";
|
||||
"Change" = "Alterar";
|
||||
|
||||
/* Event+task classifications */
|
||||
"Default events classification :" = "Default events classification :";
|
||||
"Default tasks classification :" = "Default tasks classification :";
|
||||
"PUBLIC_item" = "Public";
|
||||
"CONFIDENTIAL_item" = "Confidential";
|
||||
"PRIVATE_item" = "Private";
|
||||
|
||||
/* Event+task categories */
|
||||
"category_none" = "Nenhum";
|
||||
"calendar_category_labels" = "Aniversário,Negócios,Ligações,Concorrência,Cliente,Favoritos,Acompanhamento,Presentes,Feriados,Idéias,Meeting,Problemas,Miscelânea,Pessoal,Projetos,Feriado público,Posição,Fornecedores,Viagem,Férias";
|
||||
|
|
|
@ -167,6 +167,13 @@
|
|||
"Confirmation:" = "Confirmar contrasenya nova:";
|
||||
"Change" = "Canviar";
|
||||
|
||||
/* Event+task classifications */
|
||||
"Default events classification :" = "Default events classification :";
|
||||
"Default tasks classification :" = "Default tasks classification :";
|
||||
"PUBLIC_item" = "Public";
|
||||
"CONFIDENTIAL_item" = "Confidential";
|
||||
"PRIVATE_item" = "Private";
|
||||
|
||||
/* Event+task categories */
|
||||
"category_none" = "Cap";
|
||||
"calendar_category_labels" = "Aniversari,Natalici,Negocis,Telefonades,Clients,Competició,Feina,Favorits,Seguiment,Regals,Festes,Idees,Reunió,Assumptes,Altres,Personal,Projectes,Vacances públiques,Estat,Proveïdors,Viatges,Vacances";
|
||||
|
|
|
@ -156,6 +156,13 @@
|
|||
"Confirmation:" = "Potvrzení:";
|
||||
"Change" = "Změnit";
|
||||
|
||||
/* Event+task classifications */
|
||||
"Default events classification :" = "Default events classification :";
|
||||
"Default tasks classification :" = "Default tasks classification :";
|
||||
"PUBLIC_item" = "Public";
|
||||
"CONFIDENTIAL_item" = "Confidential";
|
||||
"PRIVATE_item" = "Private";
|
||||
|
||||
/* Event+task categories */
|
||||
"category_none" = "Žádný";
|
||||
"calendar_category_labels" = "Výročí,Narozeniny,Obchod,Hovory,Klienti,Soutěže,Zákazník,Oblíbené,Sledování,Dárky,Volno,Nápady,Meeting,Problémy,Různé,Osobní,Projekty,Veřejné prázdniny,Stav,Dodavatelé,Cesta,Dovolená";
|
||||
|
|
|
@ -165,6 +165,13 @@
|
|||
"Confirmation:" = "Bekræftelse:";
|
||||
"Change" = "Skift";
|
||||
|
||||
/* Event+task classifications */
|
||||
"Default events classification :" = "Default events classification :";
|
||||
"Default tasks classification :" = "Default tasks classification :";
|
||||
"PUBLIC_item" = "Public";
|
||||
"CONFIDENTIAL_item" = "Confidential";
|
||||
"PRIVATE_item" = "Private";
|
||||
|
||||
/* Event+task categories */
|
||||
"category_none" = "Ingen";
|
||||
"calendar_category_labels" = "Jubilæum, fødselsdag, forretning,kald, kunder, konkurrence, foretrukne, opfølgning, gaver, helligdage, idéer, møde, problemer, diverse, personlig, projekter, offentlige helligdage, status, leverandører, rejser, ferie";
|
||||
|
|
|
@ -154,6 +154,13 @@
|
|||
"Confirmation:" = "Bevestig wachtwoord:";
|
||||
"Change" = "Veranderen";
|
||||
|
||||
/* Event+task classifications */
|
||||
"Default events classification :" = "Default events classification :";
|
||||
"Default tasks classification :" = "Default tasks classification :";
|
||||
"PUBLIC_item" = "Public";
|
||||
"CONFIDENTIAL_item" = "Confidential";
|
||||
"PRIVATE_item" = "Private";
|
||||
|
||||
/* Event+task categories */
|
||||
"category_none" = "Geen categorie";
|
||||
"calendar_category_labels" = "Cliënten,Concurrentie,Diversen,Favorieten,Giften,Ideeën,Klant,Kwesties,Leveranciers,Nationale feestdag,Persoonlijk,Projecten,Meeting,Reizen,Status,Telefoongesprekken,Trouwdag,Vakantie,Verjaardag,Vervolggesprek,Vrije dagen,Zaken";
|
||||
|
|
|
@ -173,6 +173,13 @@
|
|||
"Confirmation:" = "Confirmation:";
|
||||
"Change" = "Change";
|
||||
|
||||
/* Event+task classifications */
|
||||
"Default events classification :" = "Default events classification :";
|
||||
"Default tasks classification :" = "Default tasks classification :";
|
||||
"PUBLIC_item" = "Public";
|
||||
"CONFIDENTIAL_item" = "Confidential";
|
||||
"PRIVATE_item" = "Private";
|
||||
|
||||
/* Event+task categories */
|
||||
"category_none" = "None";
|
||||
"calendar_category_labels" = "Anniversary,Birthday,Business,Calls,Clients,Competition,Customer,Favorites,Follow up,Gifts,Holidays,Ideas,Meeting,Issues,Miscellaneous,Personal,Projects,Public Holiday,Status,Suppliers,Travel,Vacation";
|
||||
|
|
|
@ -173,6 +173,13 @@
|
|||
"Confirmation:" = "Confirmation:";
|
||||
"Change" = "Changer";
|
||||
|
||||
/* Event+task classifications */
|
||||
"Default events classification :" = "Classification par défaut des événements :";
|
||||
"Default tasks classification :" = "Classification par défaut des tâches :";
|
||||
"PUBLIC_item" = "Public";
|
||||
"CONFIDENTIAL_item" = "Confidentiel";
|
||||
"PRIVATE_item" = "Privé";
|
||||
|
||||
/* Event+task categories */
|
||||
"category_none" = "Aucune";
|
||||
"calendar_category_labels" = "Anniversaire,Affaire,Appels,Clients,Compétitions,Congrès,Consommation,Préférés,Suivis,Cadeaux,Congés,Idées,Problèmes,Réunion,Divers,Personnel,Projets,Jour férié,Statut,Fournisseurs,Voyages,Professionnel";
|
||||
|
|
|
@ -164,6 +164,13 @@
|
|||
"Confirmation:" = "Bestätigung:";
|
||||
"Change" = "Ändern";
|
||||
|
||||
/* Event+task classifications */
|
||||
"Default events classification :" = "Default events classification :";
|
||||
"Default tasks classification :" = "Default tasks classification :";
|
||||
"PUBLIC_item" = "Public";
|
||||
"CONFIDENTIAL_item" = "Confidential";
|
||||
"PRIVATE_item" = "Private";
|
||||
|
||||
/* Event+task categories */
|
||||
"category_none" = "Keine";
|
||||
"calendar_category_labels" = "Jubiläum,Geburtstag,Geschäft,Anrufe,Klienten,Konkurrenz,Kunde,Favoriten,Fortsetzung,Geschenke,Ferien,Ideen,Meeting,Fragen,Verschiedenes,Persönlich,Projekte,Feiertag,Status,Lieferanten,Reise,Urlaub";
|
||||
|
|
|
@ -161,6 +161,13 @@
|
|||
"Confirmation:" = "Megerősítés:";
|
||||
"Change" = "Megváltoztat";
|
||||
|
||||
/* Event+task classifications */
|
||||
"Default events classification :" = "Default events classification :";
|
||||
"Default tasks classification :" = "Default tasks classification :";
|
||||
"PUBLIC_item" = "Public";
|
||||
"CONFIDENTIAL_item" = "Confidential";
|
||||
"PRIVATE_item" = "Private";
|
||||
|
||||
/* Event+task categories */
|
||||
"category_none" = "Nincs";
|
||||
"calendar_category_labels" = "Évforduló,Születésnap,Üzleti,Meghívás,Ügyfelek,Versenytársak,Vevő,Kedvencek,Nyomonkövetés,Ajándékozás,Szabadság,Ötletek,Meeting,Ügyek,Egyéb,Személyes,Projektek,Állami ünnep,Állapot,Szállítók,Utazás,Szünidő";
|
||||
|
|
|
@ -154,6 +154,13 @@
|
|||
"Confirmation:" = "Staðfesting:";
|
||||
"Change" = "Breyta";
|
||||
|
||||
/* Event+task classifications */
|
||||
"Default events classification :" = "Default events classification :";
|
||||
"Default tasks classification :" = "Default tasks classification :";
|
||||
"PUBLIC_item" = "Public";
|
||||
"CONFIDENTIAL_item" = "Confidential";
|
||||
"PRIVATE_item" = "Private";
|
||||
|
||||
/* Event+task categories */
|
||||
"category_none" = "Engin";
|
||||
"calendar_category_labels" = "Árdagur,Afmælisdagur,Viðskipti,Símtöl,Skjólstæðingar,Samkeppni,Viðskiptavinur,Uppáhald,Eftirfylgni,Gjafir,Helgidagar,Hugmyndir,Fundur,Úrlausnarefni,Ýmislegt,Persónulegt,Verkefni,Almenn Frí,Staða,Birgjar,Ferðalög,Frí";
|
||||
|
|
|
@ -172,6 +172,13 @@
|
|||
"Confirmation:" = "Ripeti nuova password:";
|
||||
"Change" = "Cambia Password";
|
||||
|
||||
/* Event+task classifications */
|
||||
"Default events classification :" = "Default events classification :";
|
||||
"Default tasks classification :" = "Default tasks classification :";
|
||||
"PUBLIC_item" = "Public";
|
||||
"CONFIDENTIAL_item" = "Confidential";
|
||||
"PRIVATE_item" = "Private";
|
||||
|
||||
/* Event+task categories */
|
||||
"category_none" = "Nessuna";
|
||||
"calendar_category_labels" = "Anniversari,Compleanni,Lavoro,Chiamate,Clienti,Competizioni,Compratori,Preferiti,Incontri,Regali,Vacanze,Idee,Meeting,Problemi,Varie,Personale,Progetti,Giorno festivo,Stato,Fornitori,Viaggio,Chiusura";
|
||||
|
|
|
@ -173,6 +173,13 @@
|
|||
"Confirmation:" = "Bekreft:";
|
||||
"Change" = "Endre";
|
||||
|
||||
/* Event+task classifications */
|
||||
"Default events classification :" = "Default events classification :";
|
||||
"Default tasks classification :" = "Default tasks classification :";
|
||||
"PUBLIC_item" = "Public";
|
||||
"CONFIDENTIAL_item" = "Confidential";
|
||||
"PRIVATE_item" = "Private";
|
||||
|
||||
/* Event+task categories */
|
||||
"category_none" = "Ingen";
|
||||
"calendar_category_labels" = "Diverse,Favoritter,Fødselsdager,Heligdager,Idéer,Jobb,Konkurranser,Kunder,Ledighet,Leverandører,Møter,Oppfølging,Personlig,Presentasjoner,Reiser,Prosjekt,Status,Telefonsamtaler,Ærend";
|
||||
|
|
|
@ -161,6 +161,13 @@
|
|||
"Confirmation:" = "Bekreft:";
|
||||
"Change" = "Endre";
|
||||
|
||||
/* Event+task classifications */
|
||||
"Default events classification :" = "Default events classification :";
|
||||
"Default tasks classification :" = "Default tasks classification :";
|
||||
"PUBLIC_item" = "Public";
|
||||
"CONFIDENTIAL_item" = "Confidential";
|
||||
"PRIVATE_item" = "Private";
|
||||
|
||||
/* Event+task categories */
|
||||
"category_none" = "Ingen";
|
||||
"calendar_category_labels" = "Diverse,Favoritter,Fødselsdager,Heligdager,Idéer,Jobb,Konkurranser,Kunder,Ledighet,Leverandører,Møter,Oppfølging,Personlig,Presentasjoner,Reiser,Prosjekt,Status,Telefonsamtaler,Ærend";
|
||||
|
|
|
@ -144,6 +144,13 @@
|
|||
"Confirmation:" = "Potwierdzenie:";
|
||||
"Change" = "Zmiana";
|
||||
|
||||
/* Event+task classifications */
|
||||
"Default events classification :" = "Default events classification :";
|
||||
"Default tasks classification :" = "Default tasks classification :";
|
||||
"PUBLIC_item" = "Public";
|
||||
"CONFIDENTIAL_item" = "Confidential";
|
||||
"PRIVATE_item" = "Private";
|
||||
|
||||
/* Event+task categories */
|
||||
"category_none" = "Brak";
|
||||
"calendar_category_labels" = "Rocznica,Urodziny,Biznes,Telefony,Klienci,Konkurencja,Klient,Ulubione,Nawiązanie,Podarunki,Święta,Idee,Spotkania,Problemy,Różne,Osobiste,Projekty,Święta,Status,Dostawcy,Podróż,Wakacje";
|
||||
|
|
|
@ -170,6 +170,13 @@
|
|||
"Confirmation:" = "Повтор нового пароля:";
|
||||
"Change" = "Изменить";
|
||||
|
||||
/* Event+task classifications */
|
||||
"Default events classification :" = "Default events classification :";
|
||||
"Default tasks classification :" = "Default tasks classification :";
|
||||
"PUBLIC_item" = "Public";
|
||||
"CONFIDENTIAL_item" = "Confidential";
|
||||
"PRIVATE_item" = "Private";
|
||||
|
||||
/* Event+task categories */
|
||||
"category_none" = "None";
|
||||
"calendar_category_labels" = "Годовщина,День рождения,Деловые,Звонки,Клиенты,Конкуренты,Потребители,Избранное,Вслед за,Подарки,Праздники,Идеи,Встречи,Проблемы,Разное,Персональное,Проекты,Государственный праздник,Статус,Поставщики,Путешествия,Отпуск";
|
||||
|
|
|
@ -167,6 +167,13 @@
|
|||
"Confirmation:" = "Confirmar nueva contraseña:";
|
||||
"Change" = "Cambiar";
|
||||
|
||||
/* Event+task classifications */
|
||||
"Default events classification :" = "Default events classification :";
|
||||
"Default tasks classification :" = "Default tasks classification :";
|
||||
"PUBLIC_item" = "Public";
|
||||
"CONFIDENTIAL_item" = "Confidential";
|
||||
"PRIVATE_item" = "Private";
|
||||
|
||||
/* Event+task categories */
|
||||
"category_none" = "Ninguna";
|
||||
"calendar_category_labels" = "Aniversario,Cumpleaños,Negocios,Llamadas,Clientes,Competencia,Trabajo,Favoritos,Seguimiento,Regalos,Fiestas,Ideas,Reunión,Asuntos,Varios,Personal,Proyectos,Vacaciones públicas,Estado,Proveedores,Viajes,Vacaciones";
|
||||
|
|
|
@ -167,6 +167,13 @@
|
|||
"Confirmation:" = "Confirmar nueva contraseña:";
|
||||
"Change" = "Cambiar";
|
||||
|
||||
/* Event+task classifications */
|
||||
"Default events classification :" = "Default events classification :";
|
||||
"Default tasks classification :" = "Default tasks classification :";
|
||||
"PUBLIC_item" = "Public";
|
||||
"CONFIDENTIAL_item" = "Confidential";
|
||||
"PRIVATE_item" = "Private";
|
||||
|
||||
/* Event+task categories */
|
||||
"category_none" = "Ninguna";
|
||||
"calendar_category_labels" = "Aniversario,Cumpleaños,Negocios,Llamadas,Clientes,Competición,Trabajo,Favoritos,Seguimiento,Regalos,Fiestas,Ideas,Reunión,Asuntos,Varios,Personal,Proyectos,Vacaciones públicas,Estado,Proveedores,Viajes,Vacaciones";
|
||||
|
|
|
@ -163,6 +163,13 @@ Servernamn:";
|
|||
"Confirmation:" = "Bekräfta:";
|
||||
"Change" = "Ändra";
|
||||
|
||||
/* Event+task classifications */
|
||||
"Default events classification :" = "Default events classification :";
|
||||
"Default tasks classification :" = "Default tasks classification :";
|
||||
"PUBLIC_item" = "Public";
|
||||
"CONFIDENTIAL_item" = "Confidential";
|
||||
"PRIVATE_item" = "Private";
|
||||
|
||||
/* Event+task categories */
|
||||
"category_none" = "Ingen";
|
||||
"calendar_category_labels" = "Arbete,Diverse,Favoriter,Födelsedagar,Helgdagar,Idéer,Kunder,Ledighet,Leverantörer,Personligt,Presenter,Projekt,Möte,Resor,Status,Telefonsamtal,Tävlingar,Uppföljning,Ärenden";
|
||||
|
|
|
@ -445,6 +445,46 @@
|
|||
[userDefaults setDefaultCalendar: newValue];
|
||||
}
|
||||
|
||||
- (NSArray *) calendarClassificationsList
|
||||
{
|
||||
static NSArray *classifications = nil;
|
||||
|
||||
if (!classifications)
|
||||
classifications = [[NSArray alloc] initWithObjects:
|
||||
@"PUBLIC",
|
||||
@"CONFIDENTIAL",
|
||||
@"PRIVATE",
|
||||
nil];
|
||||
|
||||
return classifications;
|
||||
}
|
||||
|
||||
- (NSString *) itemClassificationText
|
||||
{
|
||||
return [self labelForKey: [NSString stringWithFormat: @"%@_item",
|
||||
item]];
|
||||
}
|
||||
|
||||
- (void) setEventsDefaultClassification: (NSString *) newValue
|
||||
{
|
||||
[userDefaults setCalendarEventsDefaultClassification: newValue];
|
||||
}
|
||||
|
||||
- (NSString *) eventsDefaultClassification
|
||||
{
|
||||
return [userDefaults calendarEventsDefaultClassification];
|
||||
}
|
||||
|
||||
- (void) setTasksDefaultClassification: (NSString *) newValue
|
||||
{
|
||||
[userDefaults setCalendarTasksDefaultClassification: newValue];
|
||||
}
|
||||
|
||||
- (NSString *) tasksDefaultClassification
|
||||
{
|
||||
return [userDefaults calendarTasksDefaultClassification];
|
||||
}
|
||||
|
||||
- (NSArray *) hoursList
|
||||
{
|
||||
static NSMutableArray *hours = nil;
|
||||
|
|
|
@ -165,6 +165,13 @@
|
|||
"Confirmation:" = "Повтор нового пароля:";
|
||||
"Change" = "Змінити";
|
||||
|
||||
/* Event+task classifications */
|
||||
"Default events classification :" = "Default events classification :";
|
||||
"Default tasks classification :" = "Default tasks classification :";
|
||||
"PUBLIC_item" = "Public";
|
||||
"CONFIDENTIAL_item" = "Confidential";
|
||||
"PRIVATE_item" = "Private";
|
||||
|
||||
/* Event+task categories */
|
||||
"category_none" = "Без категорії";
|
||||
"calendar_category_labels" = "Важливий день,День народження,Справи,Дзвінки,Клієнти,Поточне,Користувачі,Обране,Продовження,Подарунки,Свято,Думки,Зустріч,Питання,Різне,Особисте,Проекти,Публічне свято,Поточне,Постачальники,Поїздка,Відпустка";
|
||||
|
|
|
@ -161,6 +161,13 @@
|
|||
"Confirmation:" = "Confirmation:";
|
||||
"Change" = "Change";
|
||||
|
||||
/* Event+task classifications */
|
||||
"Default events classification :" = "Default events classification :";
|
||||
"Default tasks classification :" = "Default tasks classification :";
|
||||
"PUBLIC_item" = "Public";
|
||||
"CONFIDENTIAL_item" = "Confidential";
|
||||
"PRIVATE_item" = "Private";
|
||||
|
||||
/* Event+task categories */
|
||||
"category_none" = "Dim";
|
||||
"calendar_category_labels" = "Amrywiol,Anrhegion,Busnes,Canlyniadau,Clientau,Cwsmer,Cyflenwyr,Cystadleuaeth,Dilyn lan,Ffefrynnau,Galwadau,Gwyliau,Meeting,Gwyliau Cyhoeddus,Penblwydd,Personol,Projectau,Statws,Syniadau,Teithio";
|
||||
|
|
|
@ -167,7 +167,7 @@ iRANGE(2);
|
|||
|
||||
component = nil;
|
||||
componentCalendar = nil;
|
||||
[self setClassification: @"PUBLIC"];
|
||||
classification = nil;
|
||||
[self setIsCycleEndNever];
|
||||
componentOwner = @"";
|
||||
organizer = nil;
|
||||
|
@ -213,6 +213,7 @@ iRANGE(2);
|
|||
[ownerAsAttendee release];
|
||||
[comment release];
|
||||
[priority release];
|
||||
[classification release];
|
||||
[categories release];
|
||||
[cycle release];
|
||||
[cycleEnd release];
|
||||
|
@ -612,10 +613,12 @@ iRANGE(2);
|
|||
doing this... for example, when the clientObject is set */
|
||||
- (void) setComponent: (iCalRepeatableEntityObject *) newComponent
|
||||
{
|
||||
SOGoObject *co;
|
||||
SOGoCalendarComponent *co;
|
||||
SOGoUserManager *um;
|
||||
NSString *owner, *ownerEmail;
|
||||
iCalRepeatableEntityObject *masterComponent;
|
||||
SOGoUserDefaults *defaults;
|
||||
NSString *tag;
|
||||
|
||||
if (!component)
|
||||
{
|
||||
|
@ -630,6 +633,21 @@ iRANGE(2);
|
|||
ASSIGN (comment, [component comment]);
|
||||
ASSIGN (attachUrl, [[component attach] absoluteString]);
|
||||
ASSIGN (classification, [component accessClass]);
|
||||
if ([co isNew] && [classification length] == 0)
|
||||
{
|
||||
defaults = [[context activeUser] userDefaults];
|
||||
tag = [co componentTag];
|
||||
[classification release];
|
||||
if ([tag isEqualToString: @"vevent"])
|
||||
classification = [defaults calendarEventsDefaultClassification];
|
||||
else
|
||||
classification = [defaults calendarTasksDefaultClassification];
|
||||
|
||||
if ([classification length] == 0)
|
||||
classification = @"PUBLIC";
|
||||
[classification retain];
|
||||
}
|
||||
|
||||
ASSIGN (priority, [component priority]);
|
||||
ASSIGN (status, [component status]);
|
||||
ASSIGN (categories, [component categories]);
|
||||
|
|
|
@ -123,6 +123,20 @@
|
|||
const:name="defaultCalendar"
|
||||
string="itemCalendarText" selection="userDefaultCalendar"
|
||||
/></label><br/>
|
||||
|
||||
<label><var:string label:value="Default events classification :"/>
|
||||
<var:popup list="calendarClassificationsList" item="item"
|
||||
const:id="eventsClassification"
|
||||
const:name="eventsClassification"
|
||||
string="itemClassificationText" selection="eventsDefaultClassification"
|
||||
/></label><br/>
|
||||
<label><var:string label:value="Default tasks classification :"/>
|
||||
<var:popup list="calendarClassificationsList" item="item"
|
||||
const:id="tasksClassification"
|
||||
const:name="tasksClassification"
|
||||
string="itemClassificationText" selection="tasksDefaultClassification"
|
||||
/></label><br/>
|
||||
|
||||
<label><var:string label:value="Categories"/></label>
|
||||
<div id="calendarCategoriesListWrapper" class="listWrapper"
|
||||
><table class="categoriesList" cellspacing="0">
|
||||
|
|
|
@ -49,9 +49,9 @@ DIV.listWrapper
|
|||
background: #ccddec;}
|
||||
|
||||
#calendarCategoriesListWrapper
|
||||
{ bottom: 30px;
|
||||
{ top: 170px;
|
||||
bottom: 30px;
|
||||
right: 2em;
|
||||
top: 128px;
|
||||
left: 2em; }
|
||||
|
||||
#contactsCategoriesListWrapper
|
||||
|
|
Loading…
Reference in New Issue