Fixed property warnings that appeared due to target changes and clean…

…ed up some observer methods.
murci · Sep 22, 2010 · fd3d371 · fd3d371
1 parent f3140e3
commit fd3d371
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/Session/TSSTPageView.h b/Session/TSSTPageView.h
@@ -100,7 +100,7 @@ typedef struct {
 	NSRect cropRect;
 }
 
-@property (assign) NSInteger rotation;
+@property (nonatomic, assign) NSInteger rotation;
 @property (assign)IBOutlet TSSTSessionWindowController * sessionController;
 
 

diff --git a/Session/TSSTPageView.m b/Session/TSSTPageView.m
@@ -482,7 +482,6 @@ - (void)setRotation:(NSInteger)rot
 }
 
 
-
 - (void)rotationTransformWithFrame:(NSRect)rect
 {
     NSAffineTransform * transform = [NSAffineTransform transform];

diff --git a/Session/TSSTSessionWindowController.m b/Session/TSSTSessionWindowController.m
@@ -150,12 +150,12 @@ - (void)awakeFromNib
 
     NSUserDefaults * defaults = [NSUserDefaults standardUserDefaults];
 
-    [defaults addObserver: self forKeyPath: @"constrainScale" options: 0 context: nil];
-    [defaults addObserver: self forKeyPath: @"statusBarVisisble" options: 0 context: nil];
-    [defaults addObserver: self forKeyPath: @"scrollersVisible" options: 0 context: nil];
-    [defaults addObserver: self forKeyPath: @"pageBackgroundColor" options: 0 context: nil];
-    [defaults addObserver: self forKeyPath: @"loupeDiameter" options: 0 context: nil];
-	[defaults addObserver: self forKeyPath: @"loupePower" options: 0 context: nil];
+    [defaults addObserver: self forKeyPath: TSSTConstrainScale options: 0 context: nil];
+    [defaults addObserver: self forKeyPath: TSSTStatusbarVisible options: 0 context: nil];
+    [defaults addObserver: self forKeyPath: TSSTScrollersVisible options: 0 context: nil];
+    [defaults addObserver: self forKeyPath: TSSTBackgroundColor options: 0 context: nil];
+    [defaults addObserver: self forKeyPath: TSSTLoupeDiameter options: 0 context: nil];
+	[defaults addObserver: self forKeyPath: TSSTLoupePower options: 0 context: nil];
     [session addObserver: self forKeyPath: TSSTFullscreen options: 0 context: nil];
     [session addObserver: self forKeyPath: TSSTPageOrder options: 0 context: nil];
     [session addObserver: self forKeyPath: TSSTPageScaleOptions options: 0 context: nil];
@@ -203,12 +203,12 @@ - (void)dealloc
 	[(TSSTThumbnailView *)exposeView setDataSource: nil];
     NSUserDefaults * defaults = [NSUserDefaults standardUserDefaults];
 
-    [defaults removeObserver: self forKeyPath: @"statusBarVisisble"];
-    [defaults removeObserver: self forKeyPath: @"scrollersVisible"];
-	[defaults removeObserver: self forKeyPath: @"pageBackgroundColor"];
-    [defaults removeObserver: self forKeyPath: @"constrainScale"];
-	[defaults removeObserver: self forKeyPath: @"loupeDiameter"];
-	[defaults removeObserver: self forKeyPath: @"loupePower"];
+    [defaults removeObserver: self forKeyPath: TSSTStatusbarVisible];
+    [defaults removeObserver: self forKeyPath: TSSTScrollersVisible];
+	[defaults removeObserver: self forKeyPath: TSSTBackgroundColor];
+    [defaults removeObserver: self forKeyPath: TSSTConstrainScale];
+	[defaults removeObserver: self forKeyPath: TSSTLoupeDiameter];
+	[defaults removeObserver: self forKeyPath: TSSTLoupePower];
     [pageController removeObserver: self forKeyPath: @"selectionIndex"];
     [pageController removeObserver: self forKeyPath: @"arrangedObjects.@count"];
     [[NSNotificationCenter defaultCenter] removeObserver: self];
@@ -253,7 +253,7 @@ - (void)observeValueForKeyPath:(NSString *)keyPath
         [self fullscreen];
     }
     else if([keyPath isEqualToString: TSSTPageScaleOptions] || 
-            [keyPath isEqualToString: @"scrollersVisible"])
+            [keyPath isEqualToString: TSSTScrollersVisible])
     {
         [self scaleToWindow];
     }
@@ -279,16 +279,16 @@ - (void)observeValueForKeyPath:(NSString *)keyPath
 		[(TSSTThumbnailView *)exposeView buildTrackingRects];
         [self changeViewImages];
 	}
-	else if([keyPath isEqualToString: @"pageBackgroundColor"])
+	else if([keyPath isEqualToString: TSSTBackgroundColor])
 	{
 		NSColor * color = [NSUnarchiver unarchiveObjectWithData: [defaults valueForKey: TSSTBackgroundColor]];
 		[pageScrollView setBackgroundColor: color];
 	}
-    else if([keyPath isEqualToString: @"statusBarVisisble"])
+    else if([keyPath isEqualToString: TSSTStatusbarVisible])
     {
         [self adjustStatusBar];
     }
-	else if([keyPath isEqualToString: @"loupeDiameter"])
+	else if([keyPath isEqualToString: TSSTLoupeDiameter])
     {
 		int loupeDiameter = [[defaults valueForKey: TSSTLoupeDiameter] intValue];
 		[loupeWindow resizeToDiameter: loupeDiameter];
@@ -297,7 +297,7 @@ - (void)observeValueForKeyPath:(NSString *)keyPath
     {
 		[self refreshLoupePanel];
 	}
-	else if([keyPath isEqualToString: @"loupePower"])
+	else if([keyPath isEqualToString: TSSTLoupePower])
 	{
 		[self refreshLoupePanel];
 	}
@@ -1451,6 +1451,7 @@ - (NSManagedObjectContext *)managedObjectContext
 }
 
 
+
 - (BOOL)canTurnPageLeft
 {
 	if([[session valueForKey: TSSTPageOrder] boolValue])