(fix) improved the handling of default calendar categories/colors (#3200)
parent
76360958a2
commit
a56dbeb6a9
|
@ -1920,10 +1920,11 @@ events. This parameter is an array of arbitrary strings.
|
||||||
|
|
||||||
Defaults to a list that depends on the language.
|
Defaults to a list that depends on the language.
|
||||||
|
|
||||||
|U |SOGoCalendarDefaultCategoryColor
|
|U |SOGoCalendarCategoriesColors
|
||||||
|Parameter used to define the default colour of categories.
|
|Parameter used to define the colour of categories. This parameter
|
||||||
|
is a dictionary of category name/color.
|
||||||
|
|
||||||
Defaults to `#F0F0F0` when unset.
|
Defaults to `#F0F0F0` for all categories when unset.
|
||||||
|
|
||||||
|U |SOGoCalendarEventsDefaultClassification
|
|U |SOGoCalendarEventsDefaultClassification
|
||||||
|Parameter used to defined the default classification for new events.
|
|Parameter used to defined the default classification for new events.
|
||||||
|
@ -2712,6 +2713,11 @@ current version of SOGo from the previous release.
|
||||||
|
|
||||||
[cols="100a"]
|
[cols="100a"]
|
||||||
|=======================================================================
|
|=======================================================================
|
||||||
|
h|2.3.1
|
||||||
|
|The SOGoCalendarDefaultCategoryColor default has been removed. If you
|
||||||
|
want to customize the color of calendar categories, use the
|
||||||
|
SOGoCalendarCategories and SOGoCalendarCategoriesColors defaults.
|
||||||
|
|
||||||
h|2.3.0
|
h|2.3.0
|
||||||
|Run the shell script `sql-update-2.2.17_to_2.3.0.sh` or
|
|Run the shell script `sql-update-2.2.17_to_2.3.0.sh` or
|
||||||
`sql-update-2.2.17_to_2.3.0-mysql.sh` (if you use MySQL).
|
`sql-update-2.2.17_to_2.3.0-mysql.sh` (if you use MySQL).
|
||||||
|
|
1
NEWS
1
NEWS
|
@ -4,6 +4,7 @@
|
||||||
Enhancements
|
Enhancements
|
||||||
- improved EAS speed, especially when fetching big attachments
|
- improved EAS speed, especially when fetching big attachments
|
||||||
- now always enforce the organizer's default identity in appointments
|
- now always enforce the organizer's default identity in appointments
|
||||||
|
- improved the handling of default calendar categories/colors (#3200)
|
||||||
|
|
||||||
Bug fixes
|
Bug fixes
|
||||||
- EAS's GetItemEstimate/ItemOperations now support fetching mails and empty folders
|
- EAS's GetItemEstimate/ItemOperations now support fetching mails and empty folders
|
||||||
|
|
|
@ -70,7 +70,6 @@
|
||||||
|
|
||||||
SOGoMailAutoSave = "5";
|
SOGoMailAutoSave = "5";
|
||||||
|
|
||||||
SOGoCalendarDefaultCategoryColor = "#aaa";
|
|
||||||
SOGoCalendarShouldDisplayWeekend = YES;
|
SOGoCalendarShouldDisplayWeekend = YES;
|
||||||
SOGoCalendarEventsDefaultClassification = "PUBLIC";
|
SOGoCalendarEventsDefaultClassification = "PUBLIC";
|
||||||
SOGoCalendarTasksDefaultClassification = "PUBLIC";
|
SOGoCalendarTasksDefaultClassification = "PUBLIC";
|
||||||
|
@ -87,6 +86,10 @@
|
||||||
$label4 = ("To Do", "#3333FF");
|
$label4 = ("To Do", "#3333FF");
|
||||||
$label5 = ("Later", "#993399");
|
$label5 = ("Later", "#993399");
|
||||||
};
|
};
|
||||||
|
|
||||||
|
SOGoCalendarCategories = ("Customer", "Calls", "Favorites", "Meeting", "Ideas", "Miscellaneous", "Birthday", "Anniversary", "Vacation", "Travel", "Projects", "Suppliers", "Gifts", "Clients", "Issues", "Business", "Holidays", "Personal", "Status", "Competition", "Follow up", "Public Holiday");
|
||||||
|
|
||||||
|
SOGoCalendarCategoriesColors = { "Customer" = "#F0F0F0"; "Calls" = "#F0F0F0"; "Favorites" = "#F0F0F0"; "Meeting" = "#F0F0F0"; "Ideas" = "#F0F0F0"; "Miscellaneous" = "#F0F0F0"; "Birthday" = "#F0F0F0"; "Anniversary" = "#F0F0F0"; "Vacation" = "#F0F0F0"; "Travel" = "#F0F0F0"; "Projects" = "#F0F0F0"; "Suppliers" = "#F0F0F0"; "Gifts" = "#F0F0F0"; "Clients" = "#F0F0F0"; "Issues" = "#F0F0F0"; "Business" = "#F0F0F0"; "Holidays" = "#F0F0F0"; "Personal" = "#F0F0F0"; "Status" = "#F0F0F0"; "Competition" = "#F0F0F0"; "Follow up" = "#F0F0F0"; "Public Holiday" = "#F0F0F0"; };
|
||||||
|
|
||||||
SOGoSubscriptionFolderFormat = "%{FolderName} (%{UserName} <%{Email}>)";
|
SOGoSubscriptionFolderFormat = "%{FolderName} (%{UserName} <%{Email}>)";
|
||||||
}
|
}
|
||||||
|
|
|
@ -68,8 +68,6 @@
|
||||||
- (NSArray *) refreshViewIntervals;
|
- (NSArray *) refreshViewIntervals;
|
||||||
- (NSString *) subscriptionFolderFormat;
|
- (NSString *) subscriptionFolderFormat;
|
||||||
|
|
||||||
- (NSString *) calendarDefaultCategoryColor;
|
|
||||||
|
|
||||||
- (NSArray *) freeBusyDefaultInterval;
|
- (NSArray *) freeBusyDefaultInterval;
|
||||||
- (int) davCalendarStartTimeLimit;
|
- (int) davCalendarStartTimeLimit;
|
||||||
|
|
||||||
|
|
|
@ -294,11 +294,6 @@
|
||||||
return [self stringForKey: @"SOGoLDAPContactInfoAttribute"];
|
return [self stringForKey: @"SOGoLDAPContactInfoAttribute"];
|
||||||
}
|
}
|
||||||
|
|
||||||
- (NSString *) calendarDefaultCategoryColor
|
|
||||||
{
|
|
||||||
return [self stringForKey: @"SOGoCalendarDefaultCategoryColor"];
|
|
||||||
}
|
|
||||||
|
|
||||||
- (NSArray *) freeBusyDefaultInterval
|
- (NSArray *) freeBusyDefaultInterval
|
||||||
{
|
{
|
||||||
return [self arrayForKey: @"SOGoFreeBusyDefaultInterval"];
|
return [self arrayForKey: @"SOGoFreeBusyDefaultInterval"];
|
||||||
|
|
|
@ -702,7 +702,7 @@ NSString *SOGoWeekStartFirstFullWeek = @"FirstFullWeek";
|
||||||
|
|
||||||
- (NSDictionary *) calendarCategoriesColors
|
- (NSDictionary *) calendarCategoriesColors
|
||||||
{
|
{
|
||||||
return [self dictionaryForKey: @"SOGoCalendarCategoriesColors"];
|
return [self objectForKey: @"SOGoCalendarCategoriesColors"];
|
||||||
}
|
}
|
||||||
|
|
||||||
- (void) setCalendarShouldDisplayWeekend: (BOOL) newValue
|
- (void) setCalendarShouldDisplayWeekend: (BOOL) newValue
|
||||||
|
|
|
@ -44,7 +44,6 @@
|
||||||
NSDictionary *calendarCategoriesColors;
|
NSDictionary *calendarCategoriesColors;
|
||||||
|
|
||||||
NSArray *contactsCategories;
|
NSArray *contactsCategories;
|
||||||
NSString *defaultCategoryColor;
|
|
||||||
NSCalendarDate *today;
|
NSCalendarDate *today;
|
||||||
|
|
||||||
// Mail labels/tags
|
// Mail labels/tags
|
||||||
|
|
|
@ -128,7 +128,6 @@ static NSArray *reminderValues = nil;
|
||||||
|
|
||||||
calendarCategories = nil;
|
calendarCategories = nil;
|
||||||
calendarCategoriesColors = nil;
|
calendarCategoriesColors = nil;
|
||||||
defaultCategoryColor = nil;
|
|
||||||
category = nil;
|
category = nil;
|
||||||
|
|
||||||
label = nil;
|
label = nil;
|
||||||
|
@ -175,7 +174,6 @@ static NSArray *reminderValues = nil;
|
||||||
[vacationOptions release];
|
[vacationOptions release];
|
||||||
[calendarCategories release];
|
[calendarCategories release];
|
||||||
[calendarCategoriesColors release];
|
[calendarCategoriesColors release];
|
||||||
[defaultCategoryColor release];
|
|
||||||
[category release];
|
[category release];
|
||||||
[label release];
|
[label release];
|
||||||
[mailLabels release];
|
[mailLabels release];
|
||||||
|
@ -1521,15 +1519,6 @@ static NSArray *reminderValues = nil;
|
||||||
ASSIGN (calendarCategoriesColors, [userDefaults calendarCategoriesColors]);
|
ASSIGN (calendarCategoriesColors, [userDefaults calendarCategoriesColors]);
|
||||||
|
|
||||||
categoryColor = [calendarCategoriesColors objectForKey: category];
|
categoryColor = [calendarCategoriesColors objectForKey: category];
|
||||||
if (!categoryColor)
|
|
||||||
{
|
|
||||||
if (!defaultCategoryColor)
|
|
||||||
{
|
|
||||||
dd = [[context activeUser] domainDefaults];
|
|
||||||
ASSIGN (defaultCategoryColor, [dd calendarDefaultCategoryColor]);
|
|
||||||
}
|
|
||||||
categoryColor = defaultCategoryColor;
|
|
||||||
}
|
|
||||||
|
|
||||||
return categoryColor;
|
return categoryColor;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue