Can turn alarm on and off

OtaClock/Base.lproj/MainMenu.xib

@@ -84,6 +84,8 @@
             </view>
             <connections>
                 <outlet property="alarmDatePicker" destination="A2I-e6-ur5" id="wh1-Z1-r9q"/>
+                <outlet property="alarmModeItem" destination="S8W-ak-RY9" id="cdh-MO-cra"/>
+                <outlet property="alarmTextItem" destination="Sk9-Xp-wdP" id="s0c-OH-mqZ"/>
                 <outlet property="changeSize1" destination="Acr-Ff-Lm2" id="qUp-XP-Ffo"/>
                 <outlet property="changeSize10" destination="eMz-8d-XLg" id="Ppm-Gu-5xS"/>
                 <outlet property="changeSize2" destination="sRn-WM-cKW" id="luN-Dk-xw4"/>
@@ -113,6 +115,9 @@
                             </menuItem>
                             <menuItem title="Alarm Mode" id="S8W-ak-RY9">
                                 <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="toggleAlarm:" target="QvC-M9-y7g" id="nMc-tu-sCH"/>
+                                </connections>
                             </menuItem>
                             <menuItem title="Show Date" id="0Cy-4I-9bF">
                                 <modifierMask key="keyEquivalentModifierMask"/>
@@ -253,6 +258,9 @@
                             <menuItem title="Item" id="IRB-i7-bez">
                                 <modifierMask key="keyEquivalentModifierMask"/>
                             </menuItem>
+                            <menuItem title="Item" enabled="NO" id="Sk9-Xp-wdP">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                            </menuItem>
                         </items>
                     </menu>
                 </menuItem>
@@ -273,9 +281,9 @@
             <point key="canvasLocation" x="292.5" y="80.5"/>
         </menu>
         <datePicker verticalHuggingPriority="750" id="A2I-e6-ur5">
-            <rect key="frame" x="0.0" y="0.0" width="200" height="31"/>
+            <rect key="frame" x="0.0" y="0.0" width="125" height="127"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-            <datePickerCell key="cell" borderStyle="bezel" alignment="left" id="aSU-YP-y5q">
+            <datePickerCell key="cell" borderStyle="bezel" alignment="left" datePickerStyle="clockAndCalendar" id="aSU-YP-y5q">
                 <font key="font" metaFont="system"/>
                 <calendarDate key="date" timeIntervalSinceReferenceDate="-595929600" calendarFormat="%Y-%m-%d %H:%M:%S %z">
                     <!--1982-02-12 16:00:00 +0000-->
@@ -283,12 +291,12 @@
                 </calendarDate>
                 <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                <datePickerElements key="datePickerElements" year="YES" month="YES" day="YES" hour="YES" minute="YES" second="YES"/>
+                <datePickerElements key="datePickerElements" hour="YES" minute="YES"/>
             </datePickerCell>
             <connections>
                 <action selector="alarmDateSelected:" target="QvC-M9-y7g" id="ghc-DM-FuW"/>
             </connections>
-            <point key="canvasLocation" x="121.5" y="377"/>
+            <point key="canvasLocation" x="284" y="354.5"/>
         </datePicker>
     </objects>
 </document>

OtaClock/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>371</string>
+	<string>389</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

OtaClock/MainWindow.m

@@ -19,6 +19,7 @@
 #define CONFIG_MILITARY_TIME @"military_time"
 #define CONFIG_SHOW_DATE @"show_date"
 #define CONFIG_ALARM_TIME @"alarm_time"
+#define CONFIG_ALARM_MODE @"alarm_mode"
 
 #define MOUSE_CENTER_X 67
 #define MOUSE_CENTER_Y 47
@@ -52,6 +53,8 @@
 @property (weak) IBOutlet NSMenuItem *keepOnTopItem;
 @property (weak) IBOutlet NSMenuItem *setAlarmItem;
 @property (weak) IBOutlet NSMenuItem *showDateItem;
+@property (weak) IBOutlet NSMenuItem *alarmModeItem;
+@property (weak) IBOutlet NSMenuItem *alarmTextItem;
 
 @property (weak) IBOutlet NSMenuItem *changeSize1;
 @property (weak) IBOutlet NSMenuItem *changeSize2;
@@ -154,6 +157,8 @@
         self.alarmDatePicker.dateValue = [defaults objectForKey:CONFIG_ALARM_TIME];
     }
     self.setAlarmItem.view = self.alarmDatePicker;
+    NSDateComponents *components = [[NSCalendar currentCalendar] components:(NSHourCalendarUnit | NSMinuteCalendarUnit) fromDate:self.alarmDatePicker.dateValue];
+    [self.alarmTextItem setTitle:[NSString stringWithFormat:@"%02ld:%02ld", (long)[components hour], (long)[components minute]]];
     
     // load show date state
     if ([defaults objectForKey:CONFIG_SHOW_DATE] == nil) {
@@ -167,11 +172,37 @@
         self.showDateItem.state = NSOffState;
     }
     
+    if ([defaults objectForKey:CONFIG_ALARM_MODE] != nil) {
+        if ([defaults boolForKey:CONFIG_ALARM_MODE] == YES) {
+            [self.alarmModeItem setState:NSOnState];
+            [[self.mainView render] drawAlarmDate:self.alarmDatePicker.dateValue];
+        }
+    }
+    
     [[self.mainView render] drawDate:showDate];
     
     [self setFrame:frame display:YES];
 }
 
+- (IBAction)toggleAlarm:(id)sender {
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+    
+    if (self.alarmModeItem.state == NSOnState) {
+        // Turn off alarm
+        [self.alarmModeItem setState:NSOffState];
+        [[self.mainView render] drawAlarmDate:nil];
+        [defaults setBool:NO forKey:CONFIG_ALARM_MODE];
+    } else {
+        // Turn on alarm
+        [self.alarmModeItem setState:NSOnState];
+        [[self.mainView render] drawAlarmDate:self.alarmDatePicker.dateValue];
+        [defaults setBool:YES forKey:CONFIG_ALARM_MODE];
+    }
+    
+    [defaults synchronize];
+    self.mainView.needsDisplay = YES;
+}
+
 - (void)drawAnimation:(NSNumber *)anim {
     if ([anim integerValue] > (3 * ANIMATION_SHADOW_HACK)) {
         [[self.mainView render] drawAnimation:0]; // reset
@@ -194,7 +225,7 @@
     
     // Check if a second went by
     NSDate *now = [NSDate date];
-    NSDateComponents *components = [[NSCalendar currentCalendar] components:NSSecondCalendarUnit fromDate:now];
+    NSDateComponents *components = [[NSCalendar currentCalendar] components:(NSHourCalendarUnit | NSMinuteCalendarUnit | NSSecondCalendarUnit) fromDate:now];
     static NSInteger lastSec = -1;
     if (lastSec == [components second]) {
         return;
@@ -204,11 +235,13 @@
     [[self.mainView render] drawWithDate:now];
     [[self.mainView render] blinkDots];
     
-    NSTimeInterval in = [now timeIntervalSinceDate:self.alarmDatePicker.dateValue];
-    if ((in >= -0.5) && (in <= 0.5)) {
-        // We have reached the alarm time
-        NSLog(@"Alarm time reached!");
-        [self drawAnimation:[NSNumber numberWithInteger:1]];
+    if (self.alarmModeItem.state == NSOnState) {
+        NSDateComponents *alarmComponents = [[NSCalendar currentCalendar] components:(NSHourCalendarUnit | NSMinuteCalendarUnit) fromDate:self.alarmDatePicker.dateValue];
+        if (([components minute] == [alarmComponents minute]) && ([components hour] == [alarmComponents hour]) && ([components second] == 0)) {
+            // We have reached the alarm time
+            NSLog(@"Alarm time reached!");
+            [self drawAnimation:[NSNumber numberWithInteger:1]];
+        }
     }
     
     self.mainView.needsDisplay = YES;
@@ -235,8 +268,14 @@
 }
 
 - (IBAction)alarmDateSelected:(id)sender {
-    [[self.mainView render] drawAlarmDate:self.alarmDatePicker.dateValue];
-    self.mainView.needsDisplay = YES;
+    // Update text representation
+    NSDateComponents *components = [[NSCalendar currentCalendar] components:(NSHourCalendarUnit | NSMinuteCalendarUnit) fromDate:self.alarmDatePicker.dateValue];
+    [self.alarmTextItem setTitle:[NSString stringWithFormat:@"%02ld:%02ld", (long)[components hour], (long)[components minute]]];
+    
+    if (self.alarmModeItem.state == NSOnState) {
+        [[self.mainView render] drawAlarmDate:self.alarmDatePicker.dateValue];
+        self.mainView.needsDisplay = YES;
+    }
     
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
     [defaults setObject:self.alarmDatePicker.dateValue forKey:CONFIG_ALARM_TIME];