Merge branch 'master' into fix-some-warnings

Conflicts: SoObjects/Appointments/SOGoAppointmentObject.m
2026-04-18 11:38:53 +00:00 · 2016-02-15 11:23:27 -05:00
parent 9e83ff9f04 f2ffb52318
commit a5cc2bb5d5
66 changed files with 676 additions and 343 deletions
--- a/UI/PreferencesUI/UIxPreferences.m
+++ b/UI/PreferencesUI/UIxPreferences.m
@@ -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
 //