Changeset 329 for trunk/Cocoa/AntiRSI/AntiRSI.m

Timestamp:

08/05/07 00:15:30 (17 years ago)

Author:

Nicholas Riley

Message:

AntiRSI changes for "something" called 1.4, with much of the code but not the same UI as Onne Gorter's released 1.4.

Info.plist, English.lproj/InfoPlist.strings: Updated for 1.4.

AntiRSI.[hm]: Some of Onne Gorter's changes, update checking, "go to Web site" and crediting idle time to work break, and "AntiRSI Help". Most of these are not hooked up in the UI as above. Default to smooth sampling.

AntiRSI.xcodeproj: Build fat (i386/ppc).

English.lproj/MainMenu.nib: Some changes...

File:

• trunk/Cocoa/AntiRSI/AntiRSI.m (modified) (10 diffs)

trunk/Cocoa/AntiRSI/AntiRSI.m

@@ -139 +139 @@
         micro_pause_taking_t = 0;
         work_break_taking_t = 0;
+        work_break_taking_cached_t = 0;
+        work_break_taking_cached_date = 0;
         
         // initialize dock image
@@ -177 +179 @@
         [initial setObject:[NSNumber numberWithFloat:50] forKey:@"work_break_period"];
         [initial setObject:[NSNumber numberWithFloat:8] forKey:@"work_break_duration"];
-        [initial setObject:@"Normal" forKey:@"sample_interval"];
+        [initial setObject:@"Smooth" forKey:@"sample_interval"];
         [initial setObject:[NSNumber numberWithBool:YES] forKey:@"draw_dock_image"];
         [initial setObject:[NSNumber numberWithBool:NO] forKey:@"lock_focus"];
@@ -204 +206 @@
         // start the timer
         [self installTimer:sample_interval];
+        
+        // about dialog
+        [version setStringValue:[NSString stringWithFormat:@"Version %@", sVersion]]; 
 }
 
@@ -228 +233 @@
         }
         
+        // just did a whole micropause beyond normal time
         if (tick_time > micro_pause_duration && s_taking_work_break != state) {
                 // set micro_pause timers to 0
@@ -274 +280 @@
                                 work_break_t += tick_time;
                                 micro_pause_taking_t = 0;
+                                if (work_break_taking_t > 0) {
+                                        work_break_taking_cached_t = work_break_taking_t;
+                                        work_break_taking_cached_date = date;
+                                }
                                 work_break_taking_t = 0;
                         } else if (micro_pause_t > 0) {
@@ -294 +304 @@
                                 micro_pause_t = 0;
                                 work_break_t = 0;
-                                //micro_pause_taking_t stays put
+                                // micro_pause_taking_t stays put
                                 // work_break_taking_t stays put
                         }
@@ -495 +505 @@
 {
         work_break_taking_t = 0;
+        // incase you were already having an implicit work break and clicked the take work break now button
+        // not more then 20 seconds ago we took a natural break longer then 0.2 * normal work break duration 
+        if (date - work_break_taking_cached_date < 20 && work_break_taking_cached_t > work_break_duration * 0.2) {
+                work_break_taking_t = work_break_taking_cached_t;
+        } 
         [status setStringValue:@"Work Break"];
         [progress setMaxValue:work_break_duration / 60];
@@ -527 +542 @@
 }
 
+// goto website
+- (IBAction)gotoWebsite:(id)sender
+{
+        [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:sURL]];
+}
+
+// check for update
+- (IBAction)checkForUpdate:(id)sender
+{
+        NSString *latest_version =
+        [NSString stringWithContentsOfURL: [NSURL URLWithString:sLatestVersionURL]];
+        
+        if (latest_version == Nil) latest_version = @"";
+        latest_version = [latest_version stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
+        
+        if ([latest_version length] == 0) {
+                NSRunInformationalAlertPanel(
+                        @"Unable to Determine",
+                        @"Unable to determine the latest AntiRSI version number.",
+                        @"Ok", nil, nil);
+        } else if ([latest_version compare:sVersion] == NSOrderedDescending) {
+                int r = NSRunInformationalAlertPanel(
+                        @"New Version",
+                        [NSString stringWithFormat:@"A new version (%@) of AntiRSI is available; would you like to go to the website now?", latest_version],
+                        @"Goto Website", @"Cancel", nil);
+                if (r == NSOKButton) {
+                        [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:sURL]];
+                }
+    } else {
+        NSRunInformationalAlertPanel(
+                        @"No Update Available", 
+                        @"This is the latest version of AntiRSI.", 
+                        @"OK", nil, nil);
+    }
+}
+
 // stop work break and postpone by 10 minutes
 - (IBAction)postpone:(id)sender
@@ -534 +585 @@
                 micro_pause_taking_t = 0;
                 work_break_taking_t = 0;
+                work_break_taking_cached_t = 0;
                 work_break_t -= 10*60; // decrease with 10 minutes
                 if (work_break_t < 0) work_break_t = 0;
@@ -553 +605 @@
         
         if ([[anItem title] isEqualToString:@"Postpone Break"] && state == s_taking_work_break) {
+                return YES;
+        }
+        
+        if ([[anItem title] isEqualToString:@"AntiRSI Help"]) {
                 return YES;
         }