Revision: 6499
          http://skim-app.svn.sourceforge.net/skim-app/?rev=6499&view=rev
Author:   hofman
Date:     2010-04-28 17:15:34 +0000 (Wed, 28 Apr 2010)

Log Message:
-----------
rename methods referring to pdf tooltip context

Modified Paths:
--------------
    trunk/SKImageToolTipWindow.h
    trunk/SKImageToolTipWindow.m
    trunk/SKMainWindowController_UI.m
    trunk/SKPDFView.m
    trunk/SKPresentationOptionsSheetController.m
    trunk/SKTableView.h
    trunk/SKTableView.m
    trunk/SKTocOutlineView.h
    trunk/SKTocOutlineView.m

Modified: trunk/SKImageToolTipWindow.h
===================================================================
--- trunk/SKImageToolTipWindow.h        2010-04-28 17:12:23 UTC (rev 6498)
+++ trunk/SKImageToolTipWindow.h        2010-04-28 17:15:34 UTC (rev 6499)
@@ -49,8 +49,8 @@
 + (id)sharedToolTipWindow;
 
 // aContext can be a PDFAnnotation, PDFDestination, or PDFPage
-- (void)showForPDFContext:(id<SKImageToolTipContext>)aContext 
atPoint:(NSPoint)aPoint;
+- (void)showForImageContext:(id<SKImageToolTipContext>)aContext 
atPoint:(NSPoint)aPoint;
 
-...@property (nonatomic, readonly) id<SKImageToolTipContext> currentPDFContext;
+...@property (nonatomic, readonly) id<SKImageToolTipContext> 
currentImageContext;
 
 @end

Modified: trunk/SKImageToolTipWindow.m
===================================================================
--- trunk/SKImageToolTipWindow.m        2010-04-28 17:12:23 UTC (rev 6498)
+++ trunk/SKImageToolTipWindow.m        2010-04-28 17:15:34 UTC (rev 6499)
@@ -54,7 +54,7 @@
 
 @implementation SKImageToolTipWindow
 
-...@synthesize currentPDFContext=context;
+...@synthesize currentImageContext=context;
 
 + (id)sharedToolTipWindow {
     static SKImageToolTipWindow *sharedToolTipWindow = nil;
@@ -131,7 +131,7 @@
     [[self class] cancelPreviousPerformRequestsWithTarget:self 
selector:@selector(showDelayed) object:nil];
 }
 
-- (void)showForPDFContext:(id<SKImageToolTipContext>)aContext 
atPoint:(NSPoint)aPoint {
+- (void)showForImageContext:(id<SKImageToolTipContext>)aContext 
atPoint:(NSPoint)aPoint {
     point = aPoint;
     
     if ([aContext isEqual:context] == NO) {

Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m   2010-04-28 17:12:23 UTC (rev 6498)
+++ trunk/SKMainWindowController_UI.m   2010-04-28 17:15:34 UTC (rev 6499)
@@ -493,13 +493,13 @@
     return nil;
 }
 
-- (BOOL)tableView:(NSTableView *)tv hasPDFContextForTableColumn:(NSTableColumn 
*)aTableColumn row:(NSInteger)row {
+- (BOOL)tableView:(NSTableView *)tv 
hasImageContextForTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)row {
     if (([tv isEqual:leftSideController.findTableView] || [tv 
isEqual:leftSideController.groupedFindTableView]))
         return [[NSUserDefaults standardUserDefaults] 
boolForKey:SKDisableTableToolTipsKey] == NO;
     return NO;
 }
 
-- (id<SKImageToolTipContext>)tableView:(NSTableView *)tv 
PDFContextForTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)row {
+- (id<SKImageToolTipContext>)tableView:(NSTableView *)tv 
imageContextForTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)row {
     if ([tv isEqual:leftSideController.findTableView])
         return [[[leftSideController.findArrayController arrangedObjects] 
objectAtIndex:row] destination];
     else if ([tv isEqual:leftSideController.groupedFindTableView])
@@ -799,13 +799,13 @@
     return nil;
 }
 
-- (BOOL)outlineView:(NSOutlineView *)ov 
hasPDFContextForTableColumn:(NSTableColumn *)aTableColumn item:(id)item {
+- (BOOL)outlineView:(NSOutlineView *)ov 
hasImageContextForTableColumn:(NSTableColumn *)aTableColumn item:(id)item {
     if ([ov isEqual:leftSideController.tocOutlineView])
         return [[NSUserDefaults standardUserDefaults] 
boolForKey:SKDisableTableToolTipsKey] == NO;
     return NO;
 }
 
-- (id<SKImageToolTipContext>)outlineView:(NSOutlineView *)ov 
PDFContextForTableColumn:(NSTableColumn *)aTableColumn item:(id)item {
+- (id<SKImageToolTipContext>)outlineView:(NSOutlineView *)ov 
imageContextForTableColumn:(NSTableColumn *)aTableColumn item:(id)item {
     if ([ov isEqual:leftSideController.tocOutlineView])
         return [item destination];
     return nil;

Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m   2010-04-28 17:12:23 UTC (rev 6498)
+++ trunk/SKPDFView.m   2010-04-28 17:15:34 UTC (rev 6499)
@@ -1428,7 +1428,7 @@
     if ([eventArea owner] == self && [eventArea isEqual:trackingArea]) {
         [[self window] setAcceptsMouseMovedEvents:YES];
     } else if ([eventArea owner] == self && (annotation = [[eventArea 
userInfo] objectForKey:@"SKAnnotation"])) {
-        [[SKImageToolTipWindow sharedToolTipWindow] 
showForPDFContext:annotation atPoint:NSZeroPoint];
+        [[SKImageToolTipWindow sharedToolTipWindow] 
showForImageContext:annotation atPoint:NSZeroPoint];
     } else {
         [super mouseEntered:theEvent];
     }
@@ -1440,7 +1440,7 @@
     if ([eventArea owner] == self && [eventArea isEqual:trackingArea]) {
         [[self window] setAcceptsMouseMovedEvents:([self interactionMode] == 
SKFullScreenMode)];
     } else if ([eventArea owner] == self && (annotation = [[eventArea 
userInfo] objectForKey:@"SKAnnotation"])) {
-        if ([annotation isEqual:[[SKImageToolTipWindow sharedToolTipWindow] 
currentPDFContext]])
+        if ([annotation isEqual:[[SKImageToolTipWindow sharedToolTipWindow] 
currentImageContext]])
             [[SKImageToolTipWindow sharedToolTipWindow] fadeOut];
     } else {
         [super mouseExited:theEvent];
@@ -2075,7 +2075,7 @@
             NSPoint point = NSMakePoint(NSMinX(bounds) + 0.3 * 
NSWidth(bounds), NSMinY(bounds) + 0.3 * NSHeight(bounds));
             point = [self convertPoint:[self convertPoint:point 
fromPage:[annotation page]] toView:nil];
             point = [[self window] 
convertBaseToScreen:NSMakePoint(round(point.x), round(point.y))];
-            [[SKImageToolTipWindow sharedToolTipWindow] 
showForPDFContext:annotation atPoint:point];
+            [[SKImageToolTipWindow sharedToolTipWindow] 
showForImageContext:annotation atPoint:point];
         } else {
             [[SKImageToolTipWindow sharedToolTipWindow] orderOut:self];
         }
@@ -2124,7 +2124,7 @@
             NSPoint point = NSMakePoint(NSMinX(bounds) + 0.3 * 
NSWidth(bounds), NSMinY(bounds) + 0.3 * NSHeight(bounds));
             point = [self convertPoint:[self convertPoint:point 
fromPage:[annotation page]] toView:nil];
             point = [[self window] 
convertBaseToScreen:NSMakePoint(round(point.x), round(point.y))];
-            [[SKImageToolTipWindow sharedToolTipWindow] 
showForPDFContext:annotation atPoint:point];
+            [[SKImageToolTipWindow sharedToolTipWindow] 
showForImageContext:annotation atPoint:point];
         } else {
             [[SKImageToolTipWindow sharedToolTipWindow] orderOut:self];
         }

Modified: trunk/SKPresentationOptionsSheetController.m
===================================================================
--- trunk/SKPresentationOptionsSheetController.m        2010-04-28 17:12:23 UTC 
(rev 6498)
+++ trunk/SKPresentationOptionsSheetController.m        2010-04-28 17:15:34 UTC 
(rev 6499)
@@ -393,13 +393,13 @@
     return NO;
 }
 
-- (BOOL)tableView:(NSTableView *)tv hasPDFContextForTableColumn:(NSTableColumn 
*)tableColumn row:(NSInteger)row {
+- (BOOL)tableView:(NSTableView *)tv 
hasImageContextForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row {
     if ([[tableColumn identifier] isEqualToString:IMAGE_COLUMNID])
         return YES;
     return NO;
 }
 
-- (id<SKImageToolTipContext>)tableView:(NSTableView *)tv 
PDFContextForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row {
+- (id<SKImageToolTipContext>)tableView:(NSTableView *)tv 
imageContextForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row {
     if ([[tableColumn identifier] isEqualToString:IMAGE_COLUMNID])
         return [[controller pdfDocument] pageAtIndex:row];
     return nil;

Modified: trunk/SKTableView.h
===================================================================
--- trunk/SKTableView.h 2010-04-28 17:12:23 UTC (rev 6498)
+++ trunk/SKTableView.h 2010-04-28 17:15:34 UTC (rev 6499)
@@ -76,8 +76,8 @@
 - (void)tableViewPaste:(NSTableView *)aTableView;
 - (BOOL)tableViewCanPaste:(NSTableView *)aTableView;
 
-- (BOOL)tableView:(NSTableView *)aTableView 
hasPDFContextForTableColumn:(NSTableColumn *)tableColumn 
row:(NSInteger)rowIndex;
-- (id<SKImageToolTipContext>)tableView:(NSTableView *)aTableView 
PDFContextForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)rowIndex;
+- (BOOL)tableView:(NSTableView *)aTableView 
hasImageContextForTableColumn:(NSTableColumn *)tableColumn 
row:(NSInteger)rowIndex;
+- (id<SKImageToolTipContext>)tableView:(NSTableView *)aTableView 
imageContextForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)rowIndex;
 
 - (NSArray *)tableView:(NSTableView *)aTableView 
typeSelectHelperSelectionItems:(SKTypeSelectHelper *)aTypeSelectHelper;
 - (void)tableView:(NSTableView *)aTableView 
typeSelectHelper:(SKTypeSelectHelper *)aTypeSelectHelper 
didFailToFindMatchForSearchString:(NSString *)searchString;

Modified: trunk/SKTableView.m
===================================================================
--- trunk/SKTableView.m 2010-04-28 17:12:23 UTC (rev 6498)
+++ trunk/SKTableView.m 2010-04-28 17:15:34 UTC (rev 6499)
@@ -250,8 +250,8 @@
 }
 
 - (void)rebuildTrackingAreas {
-    if ([[self delegate] 
respondsToSelector:@selector(tableView:hasPDFContextForTableColumn:row:)] == NO 
||
-        [[self delegate] 
respondsToSelector:@selector(tableView:PDFContextForTableColumn:row:)] == NO)
+    if ([[self delegate] 
respondsToSelector:@selector(tableView:hasImageContextForTableColumn:row:)] == 
NO ||
+        [[self delegate] 
respondsToSelector:@selector(tableView:imageContextForTableColumn:row:)] == NO)
         return;
     
     if (trackingAreas == nil)
@@ -267,13 +267,13 @@
         NSTableColumn *tableColumn;
         
         for (row = rowRange.location; row < NSMaxRange(rowRange); row++) {
-            if ([[self delegate] tableView:self 
hasPDFContextForTableColumn:nil row:row]) {
+            if ([[self delegate] tableView:self 
hasImageContextForTableColumn:nil row:row]) {
                 [self addTrackingAreaForColumn:-1 row:row];
             } else {
                 column = [columnIndexes firstIndex];
                 while (column != NSNotFound) {
                     tableColumn = [[self tableColumns] objectAtIndex:column];
-                    if ([[self delegate] tableView:self 
hasPDFContextForTableColumn:tableColumn row:row])
+                    if ([[self delegate] tableView:self 
hasImageContextForTableColumn:tableColumn row:row])
                         [self addTrackingAreaForColumn:column row:row];
                     column = [columnIndexes indexGreaterThanIndex:column];
                 }
@@ -300,9 +300,9 @@
         NSInteger column = [columnNumber integerValue];
         NSInteger row = [rowNumber integerValue];
         NSTableColumn *tableColumn = (columnNumber == nil || column == -1) ? 
nil : [[self tableColumns] objectAtIndex:column];
-        id<SKImageToolTipContext> context = [[self delegate] tableView:self 
PDFContextForTableColumn:tableColumn row:row];
+        id<SKImageToolTipContext> context = [[self delegate] tableView:self 
imageContextForTableColumn:tableColumn row:row];
         if (context)
-            [[SKImageToolTipWindow sharedToolTipWindow] 
showForPDFContext:context atPoint:NSZeroPoint];
+            [[SKImageToolTipWindow sharedToolTipWindow] 
showForImageContext:context atPoint:NSZeroPoint];
     }
 }
 

Modified: trunk/SKTocOutlineView.h
===================================================================
--- trunk/SKTocOutlineView.h    2010-04-28 17:12:23 UTC (rev 6498)
+++ trunk/SKTocOutlineView.h    2010-04-28 17:15:34 UTC (rev 6499)
@@ -54,7 +54,7 @@
 @optional
 
 - (NSArray *)outlineViewHighlightedRows:(NSOutlineView *)anOutlineView;
-- (BOOL)outlineView:(NSOutlineView *)anOutlineView 
hasPDFContextForTableColumn:(NSTableColumn *)aTableColumn item:(id)item;
-- (id<SKImageToolTipContext>)outlineView:(NSOutlineView *)anOutlineView 
PDFContextForTableColumn:(NSTableColumn *)aTableColumn item:(id)item;
+- (BOOL)outlineView:(NSOutlineView *)anOutlineView 
hasImageContextForTableColumn:(NSTableColumn *)aTableColumn item:(id)item;
+- (id<SKImageToolTipContext>)outlineView:(NSOutlineView *)anOutlineView 
imageContextForTableColumn:(NSTableColumn *)aTableColumn item:(id)item;
 
 @end

Modified: trunk/SKTocOutlineView.m
===================================================================
--- trunk/SKTocOutlineView.m    2010-04-28 17:12:23 UTC (rev 6498)
+++ trunk/SKTocOutlineView.m    2010-04-28 17:15:34 UTC (rev 6499)
@@ -143,8 +143,8 @@
 }
 
 - (void)rebuildTrackingAreas {
-    if ([[self delegate] 
respondsToSelector:@selector(outlineView:hasPDFContextForTableColumn:item:)] == 
NO ||
-        [[self delegate] 
respondsToSelector:@selector(outlineView:PDFContextForTableColumn:item:)] == NO)
+    if ([[self delegate] 
respondsToSelector:@selector(outlineView:hasImageContextForTableColumn:item:)] 
== NO ||
+        [[self delegate] 
respondsToSelector:@selector(outlineView:imageContextForTableColumn:item:)] == 
NO)
         return;
     
     if (trackingAreas == nil)
@@ -162,13 +162,13 @@
         
         for (row = rowRange.location; row < NSMaxRange(rowRange); row++) {
             item = [self itemAtRow:row];
-            if ([[self delegate] outlineView:self 
hasPDFContextForTableColumn:nil item:item]) {
+            if ([[self delegate] outlineView:self 
hasImageContextForTableColumn:nil item:item]) {
                 [self addTrackingAreaForColumn:-1 row:row];
             } else {
                 column = [columnIndexes firstIndex];
                 while (column != NSNotFound) {
                     tableColumn = [[self tableColumns] objectAtIndex:column];
-                    if ([[self delegate] outlineView:self 
hasPDFContextForTableColumn:tableColumn item:item])
+                    if ([[self delegate] outlineView:self 
hasImageContextForTableColumn:tableColumn item:item])
                         [self addTrackingAreaForColumn:column row:row];
                     column = [columnIndexes indexGreaterThanIndex:column];
                 }
@@ -200,9 +200,9 @@
         NSInteger column = [columnNumber integerValue];
         id item = [self itemAtRow:[rowNumber integerValue]];
         NSTableColumn *tableColumn = (columnNumber == nil || column == -1) ? 
nil : [[self tableColumns] objectAtIndex:column];
-        id<SKImageToolTipContext> context = [[self delegate] outlineView:self 
PDFContextForTableColumn:tableColumn item:item];
+        id<SKImageToolTipContext> context = [[self delegate] outlineView:self 
imageContextForTableColumn:tableColumn item:item];
         if (context)
-            [[SKImageToolTipWindow sharedToolTipWindow] 
showForPDFContext:context atPoint:NSZeroPoint];
+            [[SKImageToolTipWindow sharedToolTipWindow] 
showForImageContext:context atPoint:NSZeroPoint];
     }
 }
 


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit

Reply via email to