Monotone-Parent: 55c226ffd5db8ed7f07eb8591aded800a89418b2
Monotone-Revision: c3c980772004fa550702d469d6fbe729fd954f5d

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-02-20T22:25:49
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2012-02-20 22:25:49 +00:00
parent 5e1a8b3b58
commit c8fbb0718c
28 changed files with 252 additions and 4 deletions

View File

@ -1,5 +1,12 @@
2012-02-20 Wolfgang Sourdeau <wsourdeau@inverse.ca> 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, * UI/Scheduler/UIxComponentEditor.m: s/privacy/classification/g,
which is a better description for the "CLASS" attribute. which is a better description for the "CLASS" attribute.

View File

@ -63,6 +63,9 @@
SOGoCalendarDefaultCategoryColor = "#aaa"; SOGoCalendarDefaultCategoryColor = "#aaa";
SOGoCalendarShouldDisplayWeekend = YES; SOGoCalendarShouldDisplayWeekend = YES;
SOGoCalendarEventsDefaultClassification = "PUBLIC";
SOGoCalendarTasksDefaultClassification = "PUBLIC";
SOGoFreeBusyDefaultInterval = ( 7, 7 ); SOGoFreeBusyDefaultInterval = ( 7, 7 );
SOGoReminderEnabled = YES; SOGoReminderEnabled = YES;

View File

@ -164,6 +164,12 @@ extern NSString *SOGoWeekStartFirstFullWeek;
- (void) setCalendarShouldDisplayWeekend: (BOOL) newValue; - (void) setCalendarShouldDisplayWeekend: (BOOL) newValue;
- (BOOL) calendarShouldDisplayWeekend; - (BOOL) calendarShouldDisplayWeekend;
- (void) setCalendarEventsDefaultClassification: (NSString *) newValue;
- (NSString *) calendarEventsDefaultClassification;
- (void) setCalendarTasksDefaultClassification: (NSString *) newValue;
- (NSString *) calendarTasksDefaultClassification;
- (void) setReminderEnabled: (BOOL) newValue; - (void) setReminderEnabled: (BOOL) newValue;
- (BOOL) reminderEnabled; - (BOOL) reminderEnabled;

View File

@ -621,6 +621,26 @@ NSString *SOGoWeekStartFirstFullWeek = @"FirstFullWeek";
return [self boolForKey: @"SOGoCalendarShouldDisplayWeekend"]; 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 - (void) setReminderEnabled: (BOOL) newValue
{ {
[self setBool: newValue forKey: @"SOGoReminderEnabled"]; [self setBool: newValue forKey: @"SOGoReminderEnabled"];

View File

@ -172,6 +172,13 @@
"Confirmation:" = "Confirmação:"; "Confirmation:" = "Confirmação:";
"Change" = "Alterar"; "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 */ /* Event+task categories */
"category_none" = "Nenhum"; "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"; "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";

View File

@ -167,6 +167,13 @@
"Confirmation:" = "Confirmar contrasenya nova:"; "Confirmation:" = "Confirmar contrasenya nova:";
"Change" = "Canviar"; "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 */ /* Event+task categories */
"category_none" = "Cap"; "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"; "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";

View File

@ -156,6 +156,13 @@
"Confirmation:" = "Potvrzení:"; "Confirmation:" = "Potvrzení:";
"Change" = "Změnit"; "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 */ /* Event+task categories */
"category_none" = "Žádný"; "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á"; "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á";

View File

@ -165,6 +165,13 @@
"Confirmation:" = "Bekræftelse:"; "Confirmation:" = "Bekræftelse:";
"Change" = "Skift"; "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 */ /* Event+task categories */
"category_none" = "Ingen"; "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"; "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";

View File

@ -154,6 +154,13 @@
"Confirmation:" = "Bevestig wachtwoord:"; "Confirmation:" = "Bevestig wachtwoord:";
"Change" = "Veranderen"; "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 */ /* Event+task categories */
"category_none" = "Geen categorie"; "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"; "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";

View File

@ -173,6 +173,13 @@
"Confirmation:" = "Confirmation:"; "Confirmation:" = "Confirmation:";
"Change" = "Change"; "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 */ /* Event+task categories */
"category_none" = "None"; "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"; "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";

View File

@ -173,6 +173,13 @@
"Confirmation:" = "Confirmation:"; "Confirmation:" = "Confirmation:";
"Change" = "Changer"; "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 */ /* Event+task categories */
"category_none" = "Aucune"; "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"; "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";

View File

@ -164,6 +164,13 @@
"Confirmation:" = "Bestätigung:"; "Confirmation:" = "Bestätigung:";
"Change" = "Ändern"; "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 */ /* Event+task categories */
"category_none" = "Keine"; "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"; "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";

View File

@ -161,6 +161,13 @@
"Confirmation:" = "Megerősítés:"; "Confirmation:" = "Megerősítés:";
"Change" = "Megváltoztat"; "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 */ /* Event+task categories */
"category_none" = "Nincs"; "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ő"; "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ő";

View File

@ -154,6 +154,13 @@
"Confirmation:" = "Staðfesting:"; "Confirmation:" = "Staðfesting:";
"Change" = "Breyta"; "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 */ /* Event+task categories */
"category_none" = "Engin"; "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í"; "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í";

View File

@ -172,6 +172,13 @@
"Confirmation:" = "Ripeti nuova password:"; "Confirmation:" = "Ripeti nuova password:";
"Change" = "Cambia 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 */ /* Event+task categories */
"category_none" = "Nessuna"; "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"; "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";

View File

@ -173,6 +173,13 @@
"Confirmation:" = "Bekreft:"; "Confirmation:" = "Bekreft:";
"Change" = "Endre"; "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 */ /* Event+task categories */
"category_none" = "Ingen"; "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"; "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";

View File

@ -161,6 +161,13 @@
"Confirmation:" = "Bekreft:"; "Confirmation:" = "Bekreft:";
"Change" = "Endre"; "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 */ /* Event+task categories */
"category_none" = "Ingen"; "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"; "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";

View File

@ -144,6 +144,13 @@
"Confirmation:" = "Potwierdzenie:"; "Confirmation:" = "Potwierdzenie:";
"Change" = "Zmiana"; "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 */ /* Event+task categories */
"category_none" = "Brak"; "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"; "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";

View File

@ -170,6 +170,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 */ /* Event+task categories */
"category_none" = "None"; "category_none" = "None";
"calendar_category_labels" = "Годовщина,День рождения,Деловые,Звонки,Клиенты,Конкуренты,Потребители,Избранное,Вслед за,Подарки,Праздники,Идеи,Встречи,Проблемы,Разное,Персональное,Проекты,Государственный праздник,Статус,Поставщики,Путешествия,Отпуск"; "calendar_category_labels" = "Годовщина,День рождения,Деловые,Звонки,Клиенты,Конкуренты,Потребители,Избранное,Вслед за,Подарки,Праздники,Идеи,Встречи,Проблемы,Разное,Персональное,Проекты,Государственный праздник,Статус,Поставщики,Путешествия,Отпуск";

View File

@ -167,6 +167,13 @@
"Confirmation:" = "Confirmar nueva contraseña:"; "Confirmation:" = "Confirmar nueva contraseña:";
"Change" = "Cambiar"; "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 */ /* Event+task categories */
"category_none" = "Ninguna"; "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"; "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";

View File

@ -167,6 +167,13 @@
"Confirmation:" = "Confirmar nueva contraseña:"; "Confirmation:" = "Confirmar nueva contraseña:";
"Change" = "Cambiar"; "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 */ /* Event+task categories */
"category_none" = "Ninguna"; "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"; "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";

View File

@ -163,6 +163,13 @@ Servernamn:";
"Confirmation:" = "Bekräfta:"; "Confirmation:" = "Bekräfta:";
"Change" = "Ändra"; "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 */ /* Event+task categories */
"category_none" = "Ingen"; "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"; "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";

View File

@ -445,6 +445,46 @@
[userDefaults setDefaultCalendar: newValue]; [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 - (NSArray *) hoursList
{ {
static NSMutableArray *hours = nil; static NSMutableArray *hours = nil;

View File

@ -165,6 +165,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 */ /* Event+task categories */
"category_none" = "Без категорії"; "category_none" = "Без категорії";
"calendar_category_labels" = "Важливий день,День народження,Справи,Дзвінки,Клієнти,Поточне,Користувачі,Обране,Продовження,Подарунки,Свято,Думки,Зустріч,Питання,Різне,Особисте,Проекти,Публічне свято,Поточне,Постачальники,Поїздка,Відпустка"; "calendar_category_labels" = "Важливий день,День народження,Справи,Дзвінки,Клієнти,Поточне,Користувачі,Обране,Продовження,Подарунки,Свято,Думки,Зустріч,Питання,Різне,Особисте,Проекти,Публічне свято,Поточне,Постачальники,Поїздка,Відпустка";

View File

@ -161,6 +161,13 @@
"Confirmation:" = "Confirmation:"; "Confirmation:" = "Confirmation:";
"Change" = "Change"; "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 */ /* Event+task categories */
"category_none" = "Dim"; "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"; "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";

View File

@ -167,7 +167,7 @@ iRANGE(2);
component = nil; component = nil;
componentCalendar = nil; componentCalendar = nil;
[self setClassification: @"PUBLIC"]; classification = nil;
[self setIsCycleEndNever]; [self setIsCycleEndNever];
componentOwner = @""; componentOwner = @"";
organizer = nil; organizer = nil;
@ -213,6 +213,7 @@ iRANGE(2);
[ownerAsAttendee release]; [ownerAsAttendee release];
[comment release]; [comment release];
[priority release]; [priority release];
[classification release];
[categories release]; [categories release];
[cycle release]; [cycle release];
[cycleEnd release]; [cycleEnd release];
@ -612,10 +613,12 @@ iRANGE(2);
doing this... for example, when the clientObject is set */ doing this... for example, when the clientObject is set */
- (void) setComponent: (iCalRepeatableEntityObject *) newComponent - (void) setComponent: (iCalRepeatableEntityObject *) newComponent
{ {
SOGoObject *co; SOGoCalendarComponent *co;
SOGoUserManager *um; SOGoUserManager *um;
NSString *owner, *ownerEmail; NSString *owner, *ownerEmail;
iCalRepeatableEntityObject *masterComponent; iCalRepeatableEntityObject *masterComponent;
SOGoUserDefaults *defaults;
NSString *tag;
if (!component) if (!component)
{ {
@ -630,6 +633,21 @@ iRANGE(2);
ASSIGN (comment, [component comment]); ASSIGN (comment, [component comment]);
ASSIGN (attachUrl, [[component attach] absoluteString]); ASSIGN (attachUrl, [[component attach] absoluteString]);
ASSIGN (classification, [component accessClass]); 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 (priority, [component priority]);
ASSIGN (status, [component status]); ASSIGN (status, [component status]);
ASSIGN (categories, [component categories]); ASSIGN (categories, [component categories]);

View File

@ -123,6 +123,20 @@
const:name="defaultCalendar" const:name="defaultCalendar"
string="itemCalendarText" selection="userDefaultCalendar" string="itemCalendarText" selection="userDefaultCalendar"
/></label><br/> /></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> <label><var:string label:value="Categories"/></label>
<div id="calendarCategoriesListWrapper" class="listWrapper" <div id="calendarCategoriesListWrapper" class="listWrapper"
><table class="categoriesList" cellspacing="0"> ><table class="categoriesList" cellspacing="0">

View File

@ -49,9 +49,9 @@ DIV.listWrapper
background: #ccddec;} background: #ccddec;}
#calendarCategoriesListWrapper #calendarCategoriesListWrapper
{ bottom: 30px; { top: 170px;
bottom: 30px;
right: 2em; right: 2em;
top: 128px;
left: 2em; } left: 2em; }
#contactsCategoriesListWrapper #contactsCategoriesListWrapper