Fixed some uint warnings with NSInteger bombing. Window should be mov…

…able with the background now.
nwinter · May 24, 2014 · 7456a51 · 7456a51
1 parent 58b32e3
commit 7456a51
Show file tree

Hide file tree

Showing 20 changed files with 70 additions and 66 deletions.
diff --git a/Telepath/TPHUDWindowController.m b/Telepath/TPHUDWindowController.m
@@ -321,7 +321,8 @@ - (void)setUpActivityBox {
 }
 
 - (IBAction)onActivityDetailChanged:(id)sender {
-    [[NSUserDefaults standardUserDefaults] setObject:self.activityDetailField.stringValue forKey:@"currentActivityDetail"];
+    NSString *detail = self.activityDetailField.stringValue;
+    [[NSUserDefaults standardUserDefaults] setObject:detail forKey:@"currentActivityDetail"];
     [[NSUserDefaults standardUserDefaults] synchronize];
 }
 

diff --git a/Telepath/TPHUDWindowController.xib b/Telepath/TPHUDWindowController.xib
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4514" systemVersion="13A3017" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5056" systemVersion="13D65" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment defaultVersion="1080" identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4514"/>
-        <plugIn identifier="com.apple.WebKitIBPlugin" version="3336"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="5056"/>
+        <plugIn identifier="com.apple.WebKitIBPlugin" version="5056"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="TPHUDWindowController">
@@ -572,7 +572,7 @@
                             <rect key="frame" x="1" y="1" width="240" height="244"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
-                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="9k6-un-PZx" userLabel="TF - Artist">
+                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9k6-un-PZx" userLabel="TF - Artist">
                                     <rect key="frame" x="0.0" y="217" width="240" height="22"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                     <textFieldCell key="cell" lineBreakMode="truncatingMiddle" sendsActionOnEndEditing="YES" alignment="center" title="Muse" placeholderString="" id="4Vx-Ed-tRb">
@@ -584,7 +584,7 @@
                                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="r1E-KF-bhY" userLabel="TF - Song">
                                     <rect key="frame" x="0.0" y="195" width="240" height="22"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                    <textFieldCell key="cell" lineBreakMode="truncatingMiddle" sendsActionOnEndEditing="YES" alignment="center" title="Knights of Cydonia" placeholderString="" id="snB-de-a0p">
+                                    <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" title="Knights of Cydonia" placeholderString="" id="snB-de-a0p">
                                         <font key="font" metaFont="system" size="18"/>
                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
@@ -737,4 +737,4 @@
     <resources>
         <image name="WebcamDefaultImage" width="240" height="180"/>
     </resources>
-</document>
+</document>
diff --git a/Telepath/TPTracker.h b/Telepath/TPTracker.h
@@ -26,8 +26,8 @@ extern NSString * const TPActivityHappiness;
 
 @interface TPTracker : NSObject
 
-@property (readonly) uint currentEvents;
-@property (readonly) uint totalEvents;
+@property (readonly) NSInteger currentEvents;
+@property (readonly) NSInteger totalEvents;
 @property NSTimeInterval cameraRecordingInterval;
 
 @end
diff --git a/Telepath/TPTracker.m b/Telepath/TPTracker.m
@@ -39,8 +39,8 @@ @interface TPTracker ()
 @property TPTrackerHappiness *trackerHappiness;
 
 /* Event logging */
-@property uint previousEvents;
-@property (readwrite) uint totalEvents;
+@property NSInteger previousEvents;
+@property (readwrite) NSInteger totalEvents;
 @property NSMutableArray *eventsToLog;
 
 /* File state */
@@ -95,6 +95,7 @@ - (id)init
         //NSTimeInterval cameraPreviewInterval = 1 / 10.0;
         //NSTimeInterval cameraPreviewInterval = 1 / 3.0;
         NSTimeInterval cameraPreviewInterval = 1;  // / 3.0;
+        //NSLog(@"Would set up screen recording with recording interval %f and preview interval %f, but not recording screen right now", cameraRecordingInterval, cameraPreviewInterval);
         self.trackerCamera = [[TPTrackerCamera alloc] initWithRecordingInterval:cameraRecordingInterval andPreviewInterval:cameraPreviewInterval];
         self.trackerGitHub = [TPTrackerGitHub new];
         self.trackerTrello = [TPTrackerTrello new];
@@ -119,7 +120,7 @@ - (id)init
     return self;
 }
 
-- (uint)currentEvents {
+- (NSInteger)currentEvents {
     return self.totalEvents - self.previousEvents;
 }
 

diff --git a/Telepath/TPTrackerBrunchBuilds.h b/Telepath/TPTrackerBrunchBuilds.h
@@ -9,7 +9,7 @@
 #import <Foundation/Foundation.h>
 
 @interface TPTrackerBrunchBuilds : NSObject
-@property (readonly) uint currentEvents;
-@property (readonly) uint totalEvents;
+@property (readonly) NSInteger currentEvents;
+@property (readonly) NSInteger totalEvents;
 
 @end
diff --git a/Telepath/TPTrackerBrunchBuilds.m b/Telepath/TPTrackerBrunchBuilds.m
@@ -10,8 +10,8 @@
 #import "TPTracker.h"
 
 @interface TPTrackerBrunchBuilds ()
-@property uint previousEvents;
-@property (readwrite) uint totalEvents;
+@property NSInteger previousEvents;
+@property (readwrite) NSInteger totalEvents;
 
 @end
 
@@ -33,7 +33,7 @@ - (id)init
     return self;
 }
 
-- (uint)currentEvents {
+- (NSInteger)currentEvents {
     return self.totalEvents - self.previousEvents;
 }
 

diff --git a/Telepath/TPTrackerEmail.h b/Telepath/TPTrackerEmail.h
@@ -13,6 +13,6 @@
 #import <Foundation/Foundation.h>
 
 @interface TPTrackerEmail : NSObject
-@property (readonly) uint unreadEmails;
+@property (readonly) NSInteger unreadEmails;
 
 @end
diff --git a/Telepath/TPTrackerEmail.m b/Telepath/TPTrackerEmail.m
@@ -13,7 +13,7 @@
 @interface TPTrackerEmail ()
 @property NSTimer *pollTimer;
 @property NSMutableString *veryBad;
-@property (readwrite) uint unreadEmails;
+@property (readwrite) NSInteger unreadEmails;
 
 @end
 

diff --git a/Telepath/TPTrackerGitHub.h b/Telepath/TPTrackerGitHub.h
@@ -18,11 +18,11 @@
 #import <Foundation/Foundation.h>
 
 @interface TPTrackerGitHub : NSObject
-@property (readonly) uint currentCommits;
-@property (readonly) uint totalCommits;
-@property (readonly) uint currentAdditions;
-@property (readonly) uint totalAdditions;
-@property (readonly) uint currentDeletions;
-@property (readonly) uint totalDeletions;
+@property (readonly) NSInteger currentCommits;
+@property (readonly) NSInteger totalCommits;
+@property (readonly) NSInteger currentAdditions;
+@property (readonly) NSInteger totalAdditions;
+@property (readonly) NSInteger currentDeletions;
+@property (readonly) NSInteger totalDeletions;
 
 @end
diff --git a/Telepath/TPTrackerGitHub.m b/Telepath/TPTrackerGitHub.m
@@ -15,12 +15,12 @@ @interface TPTrackerGitHub ()
 @property NSString *gitHubUserName;
 @property NSString *gitHubRepo;
 @property NSString *gitHubToken;
-@property uint previousCommits;
-@property (readwrite) uint totalCommits;
-@property uint previousAdditions;
-@property (readwrite) uint totalAdditions;
-@property uint previousDeletions;
-@property (readwrite) uint totalDeletions;
+@property NSInteger previousCommits;
+@property (readwrite) NSInteger totalCommits;
+@property NSInteger previousAdditions;
+@property (readwrite) NSInteger totalAdditions;
+@property NSInteger previousDeletions;
+@property (readwrite) NSInteger totalDeletions;
 
 @end
 
@@ -60,15 +60,15 @@ - (id)init
     return self;
 }
 
-- (uint)currentCommits {
+- (NSInteger)currentCommits {
     return self.totalCommits - self.previousCommits;
 }
 
-- (uint)currentAdditions {
+- (NSInteger)currentAdditions {
     return self.totalAdditions - self.previousAdditions;
 }
 
-- (uint)currentDeletions {
+- (NSInteger)currentDeletions {
     return self.totalDeletions - self.previousDeletions;
 }
 
@@ -88,9 +88,9 @@ - (void)pollGitHub:(NSTimer *)t {
         //NSLog(@"Got %lu contributors: %@", [contributors count], contributors);
         for(NSDictionary *contributor in contributors) {
             if(![contributor[@"author"][@"login"] isEqualToString:self.gitHubUserName]) continue;
-            uint newTotalCommits = [contributor[@"total"] intValue];
-            uint newTotalAdditions = 0;
-            uint newTotalDeletions = 0;
+            NSInteger newTotalCommits = [contributor[@"total"] intValue];
+            NSInteger newTotalAdditions = 0;
+            NSInteger newTotalDeletions = 0;
             for(NSDictionary *week in contributor[@"weeks"]) {
                 newTotalAdditions += [week[@"a"] intValue];
                 newTotalDeletions += [week[@"d"] intValue];

diff --git a/Telepath/TPTrackerKeyboard.h b/Telepath/TPTrackerKeyboard.h
@@ -10,6 +10,6 @@
 
 @interface TPTrackerKeyboard : NSObject
 @property (nonatomic, strong) NSArray *modifierKeys;
-@property (readonly) uint currentEvents;
-@property (readonly) uint totalEvents;
+@property (readonly) NSInteger currentEvents;
+@property (readonly) NSInteger totalEvents;
 @end
diff --git a/Telepath/TPTrackerKeyboard.m b/Telepath/TPTrackerKeyboard.m
@@ -17,8 +17,8 @@ @interface TPTrackerKeyboard ()
 @property NSArray *punctuation;
 @property NSMutableString *veryBad;
 @property id eventMonitor;
-@property uint previousEvents;
-@property (readwrite) uint totalEvents;
+@property NSInteger previousEvents;
+@property (readwrite) NSInteger totalEvents;
 
 @end
 
@@ -38,7 +38,7 @@ - (id)init
         BOOL accessibilityEnabled = AXIsProcessTrustedWithOptions((__bridge CFDictionaryRef)options);
         NSLog(@"Accessibility is enabled? %d", accessibilityEnabled);
 
-        uint logMask = (NSKeyDownMask|NSKeyUpMask|NSFlagsChangedMask);
+        NSInteger logMask = (NSKeyDownMask|NSKeyUpMask|NSFlagsChangedMask);
         self.eventMonitor = [NSEvent addGlobalMonitorForEventsMatchingMask:logMask handler:^(NSEvent *e) { [self onInputEvent:e]; }];
         self.previousEvents = [[NSUserDefaults standardUserDefaults] integerForKey:@"previousKeyboardEvents"];
         self.totalEvents = [[NSUserDefaults standardUserDefaults] integerForKey:@"totalKeyboardEvents"];
@@ -50,7 +50,7 @@ - (id)init
     return self;
 }
 
-- (uint)currentEvents {
+- (NSInteger)currentEvents {
     return self.totalEvents - self.previousEvents;
 }
 
@@ -66,7 +66,7 @@ - (void)loadReallyBadStuff {
     self.reallyBadStuff = [[contents stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]] componentsSeparatedByString:@"\n"];
     self.punctuation = @[@" ", @",", @".", @";", @"?", @"!", @"'", @"\"", @"-", @"/", @"(", @")", @"[", @"]", @"\n"];
     self.veryBad = [NSMutableString string];
-    for(uint i = 0; i < [[self.reallyBadStuff lastObject] length]; ++i)
+    for(NSInteger i = 0; i < [[self.reallyBadStuff lastObject] length]; ++i)
         [self.veryBad appendFormat:@"%C", (unichar)([[self.reallyBadStuff lastObject] characterAtIndex:i] - 1)];
 }
 

diff --git a/Telepath/TPTrackerMouse.h b/Telepath/TPTrackerMouse.h
@@ -9,7 +9,7 @@
 #import <Foundation/Foundation.h>
 
 @interface TPTrackerMouse : NSObject
-@property (readonly) uint currentEvents;
-@property (readonly) uint totalEvents;
+@property (readonly) NSInteger currentEvents;
+@property (readonly) NSInteger totalEvents;
 
 @end
diff --git a/Telepath/TPTrackerMouse.m b/Telepath/TPTrackerMouse.m
@@ -14,8 +14,8 @@ @interface TPTrackerMouse ()
 
 @property NSMutableArray *events;
 @property id eventMonitor;
-@property uint previousEvents;
-@property (readwrite) uint totalEvents;
+@property NSInteger previousEvents;
+@property (readwrite) NSInteger totalEvents;
 
 @end
 
@@ -25,7 +25,7 @@ - (id)init
 {
     self = [super init];
     if (self) {
-        uint logMask = (NSLeftMouseDraggedMask|NSMouseMovedMask|NSLeftMouseDownMask|NSRightMouseDownMask|NSLeftMouseUpMask|NSRightMouseUpMask);
+        NSInteger logMask = (NSLeftMouseDraggedMask|NSMouseMovedMask|NSLeftMouseDownMask|NSRightMouseDownMask|NSLeftMouseUpMask|NSRightMouseUpMask);
         self.eventMonitor = [NSEvent addGlobalMonitorForEventsMatchingMask:logMask handler:^(NSEvent *e) { [self onInputEvent:e]; }];
         self.previousEvents = [[NSUserDefaults standardUserDefaults] integerForKey:@"previousMouseEvents"];
         self.totalEvents = [[NSUserDefaults standardUserDefaults] integerForKey:@"totalMouseEvents"];
@@ -37,7 +37,7 @@ - (id)init
     return self;
 }
 
-- (uint)currentEvents {
+- (NSInteger)currentEvents {
     return self.totalEvents - self.previousEvents;
 }
 

diff --git a/Telepath/TPTrackerScreen.m b/Telepath/TPTrackerScreen.m
@@ -24,7 +24,7 @@ - (id)initWithRecordingInterval:(NSTimeInterval)recordingInterval {
     if(self) {
         self.recordingInterval = recordingInterval;  // Starts recording.
         [[NSNotificationCenter defaultCenter] addObserverForName:TPActivityWindow object:nil queue:nil usingBlock:^(NSNotification *note) {
-            self.currentWindowID = [note.userInfo[@"currentWindowID"] integerValue];
+            self.currentWindowID = (uint)[note.userInfo[@"currentWindowID"] integerValue];
             CGRect bounds;
             CGRectMakeWithDictionaryRepresentation((__bridge CFDictionaryRef)note.userInfo[@"currentWindowBounds"], &bounds);
             self.currentWindowRect = bounds;

diff --git a/Telepath/TPTrackerTrello.h b/Telepath/TPTrackerTrello.h
@@ -27,8 +27,8 @@
 #import <Foundation/Foundation.h>
 
 @interface TPTrackerTrello : NSObject
-@property (readonly) uint currentTrellosSlain;
-@property (readonly) uint totalTrellosSlain;
-@property (readonly) uint trellosAlive;
+@property (readonly) NSInteger currentTrellosSlain;
+@property (readonly) NSInteger totalTrellosSlain;
+@property (readonly) NSInteger trellosAlive;
 
 @end
diff --git a/Telepath/TPTrackerTrello.m b/Telepath/TPTrackerTrello.m
@@ -18,9 +18,9 @@ @interface TPTrackerTrello ()
 @property NSString *trelloApplicationKey;
 @property NSString *trelloApplicationSecret;
 @property NSString *trelloToken;
-@property uint previousTrellosSlain;
-@property (readwrite) uint totalTrellosSlain;
-@property (readwrite) uint trellosAlive;
+@property NSInteger previousTrellosSlain;
+@property (readwrite) NSInteger totalTrellosSlain;
+@property (readwrite) NSInteger trellosAlive;
 
 @end
 
@@ -61,7 +61,7 @@ - (void)dealloc
     [[NSNotificationCenter defaultCenter] removeObserver:self];
 }
 
-- (uint)currentTrellosSlain {
+- (NSInteger)currentTrellosSlain {
     return self.totalTrellosSlain - self.previousTrellosSlain;
 }
 
@@ -74,8 +74,8 @@ - (void)pollTrello:(NSTimer *)t {
         NSArray *cards = arrayFromJSON(data);
         if(![cards count]) return;
         //NSLog(@"Got %lu cards: %@", [cards count], cards);
-        uint newTrellosAlive = 0;
-        uint newTrellosSlain = 0;
+        NSInteger newTrellosAlive = 0;
+        NSInteger newTrellosSlain = 0;
         for(NSDictionary *card in cards) {
             if(![self.trelloBoards containsObject:card[@"idBoard"]]) continue;
             BOOL done = [self.trelloDoneLists containsObject:card[@"idList"]];

diff --git a/Telepath/TPTrackerWindow.h b/Telepath/TPTrackerWindow.h
@@ -9,7 +9,7 @@
 #import <Foundation/Foundation.h>
 
 @interface TPTrackerWindow : NSObject
-@property (readonly) uint currentEvents;
-@property (readonly) uint totalEvents;
+@property (readonly) NSInteger currentEvents;
+@property (readonly) NSInteger totalEvents;
 
 @end
diff --git a/Telepath/TPTrackerWindow.m b/Telepath/TPTrackerWindow.m
@@ -17,8 +17,8 @@ @interface TPTrackerWindow ()
 @property NSString *lastURL;
 @property NSTimeInterval lastWindowSwitch;
 @property NSTimer *windowSampleTimer;
-@property uint previousEvents;
-@property (readwrite) uint totalEvents;
+@property NSInteger previousEvents;
+@property (readwrite) NSInteger totalEvents;
 
 @end
 
@@ -43,7 +43,7 @@ - (id)init
     return self;
 }
 
-- (uint)currentEvents {
+- (NSInteger)currentEvents {
     return self.totalEvents - self.previousEvents;
 }
 

diff --git a/Telepath/TPWindow.m b/Telepath/TPWindow.m
@@ -27,6 +27,8 @@ - (BOOL)canBecomeMainWindow {
     return YES;
 }
 
-
+- (BOOL)isMovableByWindowBackground {
+    return YES;
+}
 
 @end