Changeset 332 for trunk

Timestamp:

08/09/07 05:48:07 (17 years ago)

Author:

Nicholas Riley

Message:

version.plist: Not needed.

Info.plist: Updated for 1.4njr2.

AUTHORS: Updated Onne Gorter's email address and added mine.

AntiRSI.[hm]: Added dock badge session timer display and auto-reset options. Updated URLs to point to my Web site; should probably just switch to Sparkle.

CTBadge: Added customized version.

English.lproj/InfoPlist.strings: Updated for 1.4njr2; credit myself and Chad; remove Onne Gorter's URL.

English.lproj/MainMenu.nib: Preference changes; add cmd-R for manual reset.

Location:

trunk/Cocoa/AntiRSI

Files:

• . (modified) (1 prop)
• AUTHORS (modified) (1 diff)
• AntiRSI.h (modified) (5 diffs)
• AntiRSI.m (modified) (8 diffs)
• AntiRSI.xcodeproj/project.pbxproj (modified) (7 diffs)
• CTBadge (added)
• CTBadge/CTBadge.h (added)
• CTBadge/CTBadge.m (added)
• CTBadge/CTGradient.h (added)
• CTBadge/CTGradient.m (added)
• CTBadge/badges (added)
• CTBadge/badges/CTBadge_1.pdf (added)
• CTBadge/badges/CTBadge_3.pdf (added)
• CTBadge/badges/CTBadge_4.pdf (added)
• CTBadge/badges/CTBadge_5.pdf (added)
• English.lproj (modified) (1 prop)
• English.lproj/InfoPlist.strings (modified) ( previous)
• English.lproj/MainMenu.nib/classes.nib (modified) (2 diffs)
• English.lproj/MainMenu.nib/info.nib (modified) (2 diffs)
• English.lproj/MainMenu.nib/keyedobjects.nib (modified) ( previous)
• Info.plist (modified) (1 diff)
• version.plist (deleted)

trunk/Cocoa/AntiRSI/AUTHORS

@@ -1 @@
-Onne Gorter <o.gorter@student.utwente.nl>
+Onne Gorter <o.gorter@gmail.com>
+Nicholas Riley <antirsi@sabi.net>

trunk/Cocoa/AntiRSI/AntiRSI.h

@@ -21 +21 @@
 #import <Cocoa/Cocoa.h>
 #import "AntiRSIView.h"
+#import "CTBadge.h"
 
-#define sLatestVersionURL @"http://tech.inhelsinki.nl/antirsi/antirsi_version.txt"
-#define sURL @"http://tech.inhelsinki.nl/antirsi/"
-#define sVersion @"1.4"
+#define sLatestVersionURL @"http://web.sabi.net/nriley/software/AntiRSI-version.txt"
+#define sURL @"http://web.sabi.net/nriley/software/#antirsi"
+#define sVersion @"1.4njr2"
 
 typedef enum _AntiRSIState {
@@ -43 +44 @@
     IBOutlet NSTextField *status;
         IBOutlet NSTextField *version; // XXX unused?
+    IBOutlet NSDatePicker *reset_session_time;
     
     // dock menu
@@ -51 +53 @@
         NSImage* dock_image;
         NSImage* original_dock_image;
+    CTBadge* dock_badge;
         
         // window to display the views in
@@ -67 +70 @@
     double session_t;
         double date;
+    double reset_session_date;
                 
         // various timing lengths
@@ -79 +83 @@
         bool lock_focus;
         bool draw_dock_image;
+        bool draw_dock_badge;
         bool draw_dock_image_q;
+    bool reset_session_timer_daily;
+    bool reset_session_timer_after;
+    NSDate *reset_session_timer_time;
+    int reset_session_timer_after_hours;
         
         // various colors

trunk/Cocoa/AntiRSI/AntiRSI.m

@@ -102 +102 @@
         [elapsed autorelease];
         elapsed=[c retain];
+    [dock_badge setBadgeColor:elapsed];
         [self drawDockImage];
 }
@@ -152 +153 @@
         original_dock_image = [NSImage imageNamed:@"AntiRSI"];
         draw_dock_image_q = YES;
+    dock_badge = [[CTBadge systemBadge] retain];
+    [dock_badge setBadgeColor:elapsed];
         
         // setup main window that will show either micropause or workbreak
@@ -165 +168 @@
         [main_window center];
         [main_window setContentView:view];
+    NSTimeZone *utcZone = [NSTimeZone timeZoneForSecondsFromGMT:0];
+    [reset_session_time setTimeZone:utcZone];
     [progress setEnabled:NO];
     NSFont *myriad = [NSFont fontWithName: @"Myriad" size: 40];
@@ -181 +186 @@
         
         // create initial values
-        NSMutableDictionary* initial = [NSMutableDictionary dictionaryWithCapacity:10];
-        [initial setObject:[NSNumber numberWithFloat:4] forKey:@"micro_pause_period"];
-        [initial setObject:[NSNumber numberWithFloat:13] forKey:@"micro_pause_duration"];
-        [initial setObject:[NSNumber numberWithFloat:50] forKey:@"work_break_period"];
-        [initial setObject:[NSNumber numberWithFloat:8] forKey:@"work_break_duration"];
-        [initial setObject:@"Smooth" forKey:@"sample_interval"];
-        [initial setObject:[NSNumber numberWithBool:YES] forKey:@"draw_dock_image"];
-        [initial setObject:[NSNumber numberWithBool:NO] forKey:@"lock_focus"];
-        [initial setObject:[NSArchiver archivedDataWithRootObject:elapsed] forKey:@"elapsed"];
-        [initial setObject:[NSArchiver archivedDataWithRootObject:taking] forKey:@"taking"];
-        [initial setObject:[NSArchiver archivedDataWithRootObject:background] forKey:@"background"];
-        [[NSUserDefaultsController sharedUserDefaultsController] setInitialValues:initial];
+        NSUserDefaultsController *dc = [NSUserDefaultsController sharedUserDefaultsController];
+        NSMutableDictionary* initial = [NSMutableDictionary dictionaryWithObjectsAndKeys:
+        [NSNumber numberWithFloat:4], @"micro_pause_period",
+        [NSNumber numberWithFloat:13], @"micro_pause_duration",
+        [NSNumber numberWithFloat:50], @"work_break_period",
+        [NSNumber numberWithFloat:8], @"work_break_duration",
+        @"Smooth", @"sample_interval",
+        [NSNumber numberWithBool:YES], @"draw_dock_image",
+        [NSNumber numberWithBool:YES], @"draw_dock_badge",
+        [NSNumber numberWithBool:NO], @"lock_focus",
+        [NSNumber numberWithBool:NO], @"reset_session_timer_daily",
+        [NSNumber numberWithBool:NO], @"reset_session_timer_after",
+        [NSCalendarDate dateWithYear:2000 month:1 day:1 hour:6 minute:0 second:0 timeZone:utcZone], @"reset_session_timer_time",
+        [NSNumber numberWithInt:8], @"reset_session_timer_after_hours",
+        [NSArchiver archivedDataWithRootObject:elapsed], @"elapsed",
+        [NSArchiver archivedDataWithRootObject:taking], @"taking",
+        [NSArchiver archivedDataWithRootObject:background], @"background",
+        nil];
+    [[NSUserDefaults standardUserDefaults] registerDefaults:initial];
+        [dc setInitialValues:initial];
 
         // bind to defauls controller
-        id dc = [NSUserDefaultsController sharedUserDefaultsController];
         [self bind:@"micro_pause_period" toObject:dc withKeyPath:@"values.micro_pause_period" options:nil];
         [self bind:@"micro_pause_duration" toObject:dc withKeyPath:@"values.micro_pause_duration" options:nil];
@@ -202 +214 @@
         [self bind:@"sample_interval" toObject:dc withKeyPath:@"values.sample_interval" options:nil];
         [self bind:@"draw_dock_image" toObject:dc withKeyPath:@"values.draw_dock_image" options:nil];
+    [self bind:@"draw_dock_badge" toObject:dc withKeyPath:@"values.draw_dock_badge" options:nil];
         [self bind:@"lock_focus" toObject:dc withKeyPath:@"values.lock_focus" options:nil];
+    [self bind:@"reset_session_timer_daily" toObject:dc withKeyPath:@"values.reset_session_timer_daily" options:nil];
+    [self bind:@"reset_session_timer_after" toObject:dc withKeyPath:@"values.reset_session_timer_after" options:nil];
+    [self bind:@"reset_session_timer_time" toObject:dc withKeyPath:@"values.reset_session_timer_time" options:nil];
+    [self bind:@"reset_session_timer_after_hours" toObject:dc withKeyPath:@"values.reset_session_timer_after_hours" options:nil];
         NSDictionary* unarchive = [NSDictionary dictionaryWithObject:NSUnarchiveFromDataTransformerName forKey:@"NSValueTransformerName"];
         [self bind:@"elapsed" toObject:dc withKeyPath:@"values.elapsed" options:unarchive];
         [self bind:@"taking" toObject:dc withKeyPath:@"values.taking" options:unarchive];
         [self bind:@"background" toObject:dc withKeyPath:@"values.background" options:unarchive];
-
+    
+    // watch for timer changes
+    [dc addObserver:self forKeyPath:@"values.reset_session_timer_time" options:0 context:NULL];
+    
         // alert every binding
-        [[NSUserDefaultsController sharedUserDefaultsController] revert:self];
+        [dc revert:self];
 
         // start the timer
@@ -218 +238 @@
 }
 
+- (void)computeResetSessionDate;
+{
+    NSTimeZone *systemZone = [NSTimeZone systemTimeZone];
+    NSCalendarDate *today = [NSCalendarDate calendarDate];
+    NSCalendarDate *reset = [NSCalendarDate dateWithTimeIntervalSinceReferenceDate:[reset_session_timer_time timeIntervalSinceReferenceDate]];
+    [reset setTimeZone:[NSTimeZone timeZoneForSecondsFromGMT:0]];
+    reset = [NSCalendarDate dateWithYear:[today yearOfCommonEra]
+                                   month:[today monthOfYear]
+                                     day:[today dayOfMonth]
+                                    hour:[reset hourOfDay]
+                                  minute:[reset minuteOfHour]
+                                  second:0
+                                timeZone:systemZone];
+    if ([today compare:reset] != NSOrderedAscending)
+        reset = [reset dateByAddingYears:0 months:0 days:1 hours:0 minutes:0 seconds:0];
+    reset_session_date = [reset timeIntervalSinceReferenceDate];
+}
+
+- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context;
+{
+    if ([keyPath isEqualToString:@"values.reset_session_timer_time"])
+        [self computeResetSessionDate];
+}
+
 // tick every second and update status
 - (void)tick:(NSTimer *)timer
 {
         // calculate time since last tick
-        double new_date = [NSDate timeIntervalSinceReferenceDate];
-        double tick_time = new_date - date;
+        NSTimeInterval new_date = [NSDate timeIntervalSinceReferenceDate];
+        NSTimeInterval tick_time = new_date - date;
         date = new_date;
-        
+
+    if (reset_session_timer_daily && date >= reset_session_date) {
+        [self resetSession:nil];
+        [self computeResetSessionDate];
+        return;
+    }
+    
         // check if we are still on track of normal time, otherwise we might have slept or something
         if (tick_time > work_break_duration) {
@@ -268 +318 @@
     }
     // NSLog(@"CGEventSource %.2f, CGS %.2f", idle_time, cgs_idle_time);
+    
+    if (reset_session_timer_after && idle_time > reset_session_timer_after_hours * 3600) {
+        [self resetSession:nil];
+        return;
+    }
     
         // calculate slack, this gives a sort of 3 history filtered idea.
@@ -476 +531 @@
         [p stroke];
         
+    // draw session time
+    if (draw_dock_badge) {
+        static NSImage *badge = nil;
+        static int badge_session_minutes = -1;
+        int session_minutes = (int)session_t / 60;
+        if (badge_session_minutes != session_minutes) {
+            if (badge != nil) [badge release];
+            badge = [[dock_badge badgeOverlayImageForString: [NSString stringWithFormat:@"%d:%02d", session_minutes / 60, session_minutes % 60] insetX: 3 y: 3] retain];
+            badge_session_minutes = session_minutes;
+        }
+        [badge compositeToPoint:NSZeroPoint operation:NSCompositeSourceOver];
+    }
+    
         [dock_image unlockFocus];
 

trunk/Cocoa/AntiRSI/AntiRSI.xcodeproj/project.pbxproj

@@ -8 +8 @@
 
 /* Begin PBXBuildFile section */
+                464D9ADE0C6A622B005A0582 /* CTBadge.h in Headers */ = {isa = PBXBuildFile; fileRef = 464D9ADA0C6A622B005A0582 /* CTBadge.h */; };
+                464D9ADF0C6A622B005A0582 /* CTBadge.m in Sources */ = {isa = PBXBuildFile; fileRef = 464D9ADB0C6A622B005A0582 /* CTBadge.m */; };
+                464D9AE00C6A622B005A0582 /* CTGradient.h in Headers */ = {isa = PBXBuildFile; fileRef = 464D9ADC0C6A622B005A0582 /* CTGradient.h */; };
+                464D9AE10C6A622B005A0582 /* CTGradient.m in Sources */ = {isa = PBXBuildFile; fileRef = 464D9ADD0C6A622B005A0582 /* CTGradient.m */; };
+                464D9B790C6A760B005A0582 /* CTBadge_1.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 464D9B750C6A760B005A0582 /* CTBadge_1.pdf */; };
+                464D9B7A0C6A760B005A0582 /* CTBadge_3.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 464D9B760C6A760B005A0582 /* CTBadge_3.pdf */; };
+                464D9B7B0C6A760B005A0582 /* CTBadge_4.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 464D9B770C6A760B005A0582 /* CTBadge_4.pdf */; };
+                464D9B7C0C6A760B005A0582 /* CTBadge_5.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 464D9B780C6A760B005A0582 /* CTBadge_5.pdf */; };
                 4DB6164E061B59EA002EF355 /* AntiRSI.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DB6164C061B59EA002EF355 /* AntiRSI.h */; };
                 4DB6164F061B59EA002EF355 /* AntiRSI.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DB6164D061B59EA002EF355 /* AntiRSI.m */; };
@@ -31 +39 @@
                 29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
                 32CA4F630368D1EE00C91783 /* AntiRSI_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AntiRSI_Prefix.pch; sourceTree = "<group>"; };
+                464D9ADA0C6A622B005A0582 /* CTBadge.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CTBadge.h; path = CTBadge/CTBadge.h; sourceTree = "<group>"; };
+                464D9ADB0C6A622B005A0582 /* CTBadge.m */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 2; lastKnownFileType = sourcecode.c.objc; name = CTBadge.m; path = CTBadge/CTBadge.m; sourceTree = "<group>"; tabWidth = 4; usesTabs = 0; };
+                464D9ADC0C6A622B005A0582 /* CTGradient.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CTGradient.h; path = CTBadge/CTGradient.h; sourceTree = "<group>"; };
+                464D9ADD0C6A622B005A0582 /* CTGradient.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = CTGradient.m; path = CTBadge/CTGradient.m; sourceTree = "<group>"; };
+                464D9B750C6A760B005A0582 /* CTBadge_1.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = CTBadge_1.pdf; sourceTree = "<group>"; };
+                464D9B760C6A760B005A0582 /* CTBadge_3.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = CTBadge_3.pdf; sourceTree = "<group>"; };
+                464D9B770C6A760B005A0582 /* CTBadge_4.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = CTBadge_4.pdf; sourceTree = "<group>"; };
+                464D9B780C6A760B005A0582 /* CTBadge_5.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = CTBadge_5.pdf; sourceTree = "<group>"; };
                 4DB6164C061B59EA002EF355 /* AntiRSI.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = AntiRSI.h; sourceTree = "<group>"; };
                 4DB6164D061B59EA002EF355 /* AntiRSI.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = AntiRSI.m; sourceTree = "<group>"; wrapsLines = 1; };
@@ -99 +115 @@
                         children = (
                                 080E96DDFE201D6D7F000001 /* Classes */,
+                                464D9AE40C6A622F005A0582 /* CTBadge */,
                                 29B97315FDCFA39411CA2CEA /* Other Sources */,
                                 29B97317FDCFA39411CA2CEA /* Resources */,
@@ -134 +151 @@
                         );
                         name = Frameworks;
+                        sourceTree = "<group>";
+                };
+                464D9AE40C6A622F005A0582 /* CTBadge */ = {
+                        isa = PBXGroup;
+                        children = (
+                                464D9B740C6A760B005A0582 /* badges */,
+                                464D9ADA0C6A622B005A0582 /* CTBadge.h */,
+                                464D9ADB0C6A622B005A0582 /* CTBadge.m */,
+                                464D9ADC0C6A622B005A0582 /* CTGradient.h */,
+                                464D9ADD0C6A622B005A0582 /* CTGradient.m */,
+                        );
+                        name = CTBadge;
+                        sourceTree = "<group>";
+                };
+                464D9B740C6A760B005A0582 /* badges */ = {
+                        isa = PBXGroup;
+                        children = (
+                                464D9B750C6A760B005A0582 /* CTBadge_1.pdf */,
+                                464D9B760C6A760B005A0582 /* CTBadge_3.pdf */,
+                                464D9B770C6A760B005A0582 /* CTBadge_4.pdf */,
+                                464D9B780C6A760B005A0582 /* CTBadge_5.pdf */,
+                        );
+                        name = badges;
+                        path = CTBadge/badges;
                         sourceTree = "<group>";
                 };
@@ -147 +188 @@
                                 4DF73F68061E136200B0D9C9 /* AntiRSIView.h in Headers */,
                                 E1F60362098592D800806C3B /* AntiRSILevelIndicator.h in Headers */,
+                                464D9ADE0C6A622B005A0582 /* CTBadge.h in Headers */,
+                                464D9AE00C6A622B005A0582 /* CTGradient.h in Headers */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -202 +245 @@
                                 8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */,
                                 4DF73F86061E155C00B0D9C9 /* AntiRSI.icns in Resources */,
+                                464D9B790C6A760B005A0582 /* CTBadge_1.pdf in Resources */,
+                                464D9B7A0C6A760B005A0582 /* CTBadge_3.pdf in Resources */,
+                                464D9B7B0C6A760B005A0582 /* CTBadge_4.pdf in Resources */,
+                                464D9B7C0C6A760B005A0582 /* CTBadge_5.pdf in Resources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -216 +263 @@
                                 4DF73F67061E136200B0D9C9 /* AntiRSIView.m in Sources */,
                                 E1F60361098592D800806C3B /* AntiRSILevelIndicator.m in Sources */,
+                                464D9ADF0C6A622B005A0582 /* CTBadge.m in Sources */,
+                                464D9AE10C6A622B005A0582 /* CTGradient.m in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;

trunk/Cocoa/AntiRSI/English.lproj/MainMenu.nib/classes.nib

@@ -16 +16 @@
                 postpone = NSButton; 
                 progress = NSLevelIndicator; 
+                "reset_session_time" = NSDatePicker; 
                 "session_time" = NSTextField; 
                 "session_time_item" = NSMenuItem; 
@@ -32 +33 @@
         {CLASS = AntiRSIView; LANGUAGE = ObjC; SUPERCLASS = NSView; }, 
         {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
+        {CLASS = NSDatePicker; LANGUAGE = ObjC; SUPERCLASS = NSControl; }, 
         {CLASS = NSLevelIndicator; LANGUAGE = ObjC; SUPERCLASS = NSControl; }
     ); 

trunk/Cocoa/AntiRSI/English.lproj/MainMenu.nib/info.nib

@@ -8 +8 @@
         <dict>
                 <key>259</key>
-                <string>688 524 300 322 0 0 1680 1028 </string>
+                <string>668 524 300 322 0 0 1680 1028 </string>
                 <key>29</key>
                 <string>276 845 249 44 0 0 1680 1028 </string>
@@ -20 +20 @@
         <key>IBOpenObjects</key>
         <array>
-                <integer>21</integer>
                 <integer>259</integer>
         </array>

trunk/Cocoa/AntiRSI/Info.plist

@@ -18 +18 @@
         <string>ONNE</string>
         <key>CFBundleVersion</key>
-        <string>1.4njr1</string>
+        <string>1.4njr2</string>
         <key>NSMainNibFile</key>
         <string>MainMenu</string>