amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-05-14 07:55:28 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into fix-some-warnings

Browse Source 
Conflicts:
	SoObjects/Appointments/SOGoAppointmentObject.m
This commit is contained in:
Patrice Levesque
2016-02-15 11:23:27 -05:00
parent 9e83ff9f04 f2ffb52318
commit a5cc2bb5d5
66 changed files with 676 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/PreferencesUI/English.lproj/Localizable.strings
+4
View File
@@ -142,6 +142,10 @@
"Compose messages in" = "Compose messages in";
"composemessagestype_html" = "HTML";
"composemessagestype_text" = "Plain text";
/* Base font size for messages composed in HTML */
"Default font size" = "Default font size";
"Display remote inline images" = "Display remote inline images";
"displayremoteinlineimages_never" = "Never";
"displayremoteinlineimages_always" = "Always";
UI/PreferencesUI/UIxJSONPreferences.m
+3
View File
@@ -171,6 +171,9 @@ static SoProduct *preferencesProduct = nil;
if (![[defaults source] objectForKey: @"SOGoMailComposeMessageType"])
[[defaults source] setObject: [defaults mailComposeMessageType] forKey: @"SOGoMailComposeMessageType"];
if (![[defaults source] objectForKey: @"SOGoMailComposeFontSize"])
[[defaults source] setObject: [defaults mailComposeFontSize] forKey: @"SOGoMailComposeFontSize"];
if (![[defaults source] objectForKey: @"SOGoMailDisplayRemoteInlineImages"])
[[defaults source] setObject: [defaults mailDisplayRemoteInlineImages] forKey: @"SOGoMailDisplayRemoteInlineImages"];
UI/PreferencesUI/UIxPreferences.m
+21
View File
@@ -1163,6 +1163,27 @@ static NSArray *reminderValues = nil;
: [self _defaultEmailAddresses]);
}
//
// Used by templates
//
- (NSArray *) fontSizesList
{
static NSArray *fontSizes = nil;
if (!fontSizes)
{
fontSizes = [NSArray arrayWithObjects: @"8", @"9", @"10", @"11", @"12", @"13", @"14", @"16", @"18",
@"20", @"22", @"24", @"26", @"28",
@"36",
@"48",
@"72",
nil];
[fontSizes retain];
}
return fontSizes;
}
//
// Used by templates
//