diff --git a/Clocker/Appearance Tab/CLAppearanceViewController.m b/Clocker/Appearance Tab/CLAppearanceViewController.m
index 993eca3..5c287f7 100644
--- a/Clocker/Appearance Tab/CLAppearanceViewController.m
+++ b/Clocker/Appearance Tab/CLAppearanceViewController.m
@@ -35,8 +35,43 @@
self.informationLabel.textColor = [NSColor secondaryLabelColor];
self.enableOptions = [[NSUserDefaults standardUserDefaults] objectForKey:@"favouriteTimezone"] == nil ? NO : YES;
+
+ [self setAppropriateFont];
+
+}
+
+
+- (void)setAppropriateFont
+{
+ NSOperatingSystemVersion operatingSystemVersion = [[NSProcessInfo processInfo] operatingSystemVersion];
+
+ if (operatingSystemVersion.minorVersion <= 10)
+ {
+ //Set up Helvetica Neue font
+ [self setFontFamily:@"HelveticaNeue-Light" forView:self.view andSubViews:YES];
+ }
+
+}
+
+-(void)setFontFamily:(NSString*)fontFamily forView:(NSView*)view andSubViews:(BOOL)isSubViews
+{
+ if ([view isKindOfClass:[NSTextField class]])
+ {
+ NSTextField *lbl = (NSTextField *)view;
+
+ [lbl setFont:[NSFont fontWithName:fontFamily size:[[lbl font] pointSize]]];
+ }
+
+ if (isSubViews)
+ {
+ for (NSView *sview in view.subviews)
+ {
+ [self setFontFamily:fontFamily forView:sview andSubViews:YES];
+ }
+ }
}
+
- (IBAction)timeFormatSelectionChanged:(id)sender
{
NSSegmentedControl *timeFormat = (NSSegmentedControl *)sender;
diff --git a/Clocker/Appearance Tab/en.lproj/CLAppearanceView.xib b/Clocker/Appearance Tab/en.lproj/CLAppearanceView.xib
index 9613033..f2250af 100644
--- a/Clocker/Appearance Tab/en.lproj/CLAppearanceView.xib
+++ b/Clocker/Appearance Tab/en.lproj/CLAppearanceView.xib
@@ -60,9 +60,9 @@
-
+
-
+
@@ -89,7 +89,7 @@
-
+
@@ -101,7 +101,7 @@
-
+
@@ -115,7 +115,7 @@
-
+
@@ -133,7 +133,7 @@
-
+
@@ -148,7 +148,7 @@
-
+
@@ -166,7 +166,7 @@
-
+
@@ -183,7 +183,7 @@
-
+
@@ -199,7 +199,7 @@
-
+
@@ -210,7 +210,7 @@
-
+
@@ -221,13 +221,13 @@
-
+
-
+
@@ -242,7 +242,7 @@
-
+
@@ -272,7 +272,7 @@
-
+
@@ -289,10 +289,10 @@
-
+
-
+
@@ -319,7 +319,7 @@
-
+
@@ -336,7 +336,7 @@
-
+
diff --git a/Clocker/Custom Table Cell Views/CLTimezoneCellView.h b/Clocker/Custom Table Cell Views/CLTimezoneCellView.h
index 2704971..3ee4fec 100644
--- a/Clocker/Custom Table Cell Views/CLTimezoneCellView.h
+++ b/Clocker/Custom Table Cell Views/CLTimezoneCellView.h
@@ -20,6 +20,7 @@
- (void)updateTextColorWithColor:(NSColor *)color andCell:(CLTimezoneCellView*)cell;
- (void)setUpAutoLayoutWithCell:(CLTimezoneCellView *)cell;
+- (void)setAppropriateFont;
@end
diff --git a/Clocker/Custom Table Cell Views/CLTimezoneCellView.m b/Clocker/Custom Table Cell Views/CLTimezoneCellView.m
index 04ac021..788212a 100644
--- a/Clocker/Custom Table Cell Views/CLTimezoneCellView.m
+++ b/Clocker/Custom Table Cell Views/CLTimezoneCellView.m
@@ -138,6 +138,24 @@
cell.sunriseSetTime.textColor = color;
}
+- (void)setAppropriateFont
+{
+ NSOperatingSystemVersion version = [[NSProcessInfo processInfo] operatingSystemVersion];
+
+ NSArray *availableFonts = [[NSFontManager sharedFontManager] availableFontFamilies];
+
+ if(version.minorVersion <= 10)
+ {
+ if ([availableFonts containsObject:@"Helvetica Neue"])
+ {
+ self.relativeDate.font = [NSFont fontWithName:@"HelveticaNeue-Bold" size:0];
+ self.customName.font = [NSFont fontWithName:@"HelveticaNeue-Thin" size:15];
+ self.time.font = [NSFont fontWithName:@"HelveticaNeue-Thin" size:22];
+ self.sunriseSetTime.font = [NSFont fontWithName:@"HelveticaNeue-UltraLight" size:11];
+ }
+ }
+}
+
- (void)setUpAutoLayoutWithCell:(CLTimezoneCellView *)cell
{
CGFloat width = [cell.relativeDate.stringValue