Changeset 331 for trunk/Cocoa

Timestamp:

08/06/07 21:55:03 (17 years ago)

Author:

Nicholas Riley

Message:

AntiRSI.[hm]: Reset all timers on session reset. Display hours in session time correctly. Use Myriad only if available.

MainMenu.nib: Use Helvetica Neue if Myriad is unavailable. Fix initial first responder in preferences window.

Location:

trunk/Cocoa/AntiRSI

Files:

• AntiRSI.h (modified) (1 diff)
• AntiRSI.m (modified) (5 diffs)
• English.lproj/MainMenu.nib/info.nib (modified) (1 diff)
• English.lproj/MainMenu.nib/keyedobjects.nib (modified) ( previous)

trunk/Cocoa/AntiRSI/AntiRSI.h

@@ -126 +126 @@
 - (void)tick:(NSTimer *)timer;
 
+// reset all timers
+- (void)resetTimers;
+
 // draw the dock icon
 - (void)drawDockImage;

trunk/Cocoa/AntiRSI/AntiRSI.m

@@ -114 +114 @@
 // end of bindings
 
-- (void)awakeFromNib
-{
-        // want transparancy
-        [NSColor setIgnoresAlpha:NO];
-        
-        // initial colors
-        elapsed = [[NSColor colorWithCalibratedRed:0.3 green:0.3 blue:0.9 alpha:0.95] retain];
-        taking = [[NSColor colorWithCalibratedRed:0.3 green:0.9 blue:0.3 alpha:0.90] retain];
-        background = [NSColor colorWithCalibratedRed:0.9 green:0.9 blue:0.9 alpha:0.7];
-        
-        //initial values
-        micro_pause_period = 4*60;
-        micro_pause_duration = 13;
-        work_break_period = 50*60;
-        work_break_duration = 8*60;
-        sample_interval = 1;
-        
-        // set current state
-        state = s_normal;
-        
+- (void)resetTimers;
+{
         // set timers to 0
         micro_pause_t = 0;
@@ -141 +123 @@
         work_break_taking_cached_t = 0;
         work_break_taking_cached_date = 0;
+    session_t = 0;
+}
+
+- (void)awakeFromNib
+{
+        // want transparancy
+        [NSColor setIgnoresAlpha:NO];
+        
+        // initial colors
+        elapsed = [[NSColor colorWithCalibratedRed:0.3 green:0.3 blue:0.9 alpha:0.95] retain];
+        taking = [[NSColor colorWithCalibratedRed:0.3 green:0.9 blue:0.3 alpha:0.90] retain];
+        background = [NSColor colorWithCalibratedRed:0.9 green:0.9 blue:0.9 alpha:0.7];
+        
+        //initial values
+        micro_pause_period = 4*60;
+        micro_pause_duration = 13;
+        work_break_period = 50*60;
+        work_break_duration = 8*60;
+        sample_interval = 1;
+        
+        // set current state
+        state = s_normal;
+    [self resetTimers];
         
         // initialize dock image
@@ -161 +166 @@
         [main_window setContentView:view];
     [progress setEnabled:NO];
+    NSFont *myriad = [NSFont fontWithName: @"Myriad" size: 40];
+    if (myriad) [status setFont: myriad];
         
         // initialze history filter
@@ -523 +530 @@
 - (NSString *)sessionTimeString;
 {
-    return [NSString stringWithFormat:@"Session: %d:%02d:%02d", (int)session_t / 3600, (int)session_t / 60, lrint(session_t) % 60];
+    return [NSString stringWithFormat:@"Session: %d:%02d:%02d", (int)session_t / 3600,
+        ((int)session_t / 60) % 60, lrint(session_t) % 60];
 }
 
@@ -616 +624 @@
         [self endBreak];
     }
-    session_t = 0;
+    [self resetTimers];
 }
 

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

@@ -21 +21 @@
         <array>
                 <integer>21</integer>
+                <integer>259</integer>
         </array>
         <key>IBSystem Version</key>