Revision: 7610
http://skim-app.svn.sourceforge.net/skim-app/?rev=7610&view=rev
Author: hofman
Date: 2011-12-29 11:27:55 +0000 (Thu, 29 Dec 2011)
Log Message:
-----------
rename some type select methods and category
Modified Paths:
--------------
trunk/SKBookmarkController.m
trunk/SKDownloadController.m
trunk/SKMainWindowController_UI.m
trunk/SKNotesDocument.m
trunk/SKOutlineView.h
trunk/SKOutlineView.m
trunk/SKPDFView.m
trunk/SKPresentationOptionsSheetController.m
trunk/SKTableView.h
trunk/SKTableView.m
trunk/SKTypeSelectHelper.h
trunk/SKTypeSelectHelper.m
Modified: trunk/SKBookmarkController.m
===================================================================
--- trunk/SKBookmarkController.m 2011-12-28 12:36:45 UTC (rev 7609)
+++ trunk/SKBookmarkController.m 2011-12-29 11:27:55 UTC (rev 7610)
@@ -778,7 +778,7 @@
return nil != [pboard availableTypeFromArray:[NSArray
arrayWithObjects:NSFilenamesPboardType, nil]];
}
-- (NSArray *)outlineView:(NSOutlineView *)ov
typeSelectHelperSelectionItems:(SKTypeSelectHelper *)typeSelectHelper {
+- (NSArray *)outlineView:(NSOutlineView *)ov
typeSelectHelperSelectionStrings:(SKTypeSelectHelper *)typeSelectHelper {
NSInteger i, count = [outlineView numberOfRows];
NSMutableArray *labels = [NSMutableArray arrayWithCapacity:count];
for (i = 0; i < count; i++) {
Modified: trunk/SKDownloadController.m
===================================================================
--- trunk/SKDownloadController.m 2011-12-28 12:36:45 UTC (rev 7609)
+++ trunk/SKDownloadController.m 2011-12-29 11:27:55 UTC (rev 7610)
@@ -461,7 +461,7 @@
return (nil != [pboard availableTypeFromArray:[NSArray
arrayWithObjects:NSURLPboardType, SKWeblocFilePboardType, NSStringPboardType,
nil]]);
}
-- (NSArray *)tableView:(NSTableView *)aTableView
typeSelectHelperSelectionItems:(SKTypeSelectHelper *)typeSelectHelper {
+- (NSArray *)tableView:(NSTableView *)aTableView
typeSelectHelperSelectionStrings:(SKTypeSelectHelper *)typeSelectHelper {
return [downloads valueForKey:SKDownloadFileNameKey];
}
Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m 2011-12-28 12:36:45 UTC (rev 7609)
+++ trunk/SKMainWindowController_UI.m 2011-12-29 11:27:55 UTC (rev 7610)
@@ -538,7 +538,7 @@
return nil;
}
-- (NSArray *)tableView:(NSTableView *)tv
typeSelectHelperSelectionItems:(SKTypeSelectHelper *)typeSelectHelper {
+- (NSArray *)tableView:(NSTableView *)tv
typeSelectHelperSelectionStrings:(SKTypeSelectHelper *)typeSelectHelper {
if ([tv isEqual:leftSideController.thumbnailTableView]) {
return pageLabels;
}
@@ -877,7 +877,7 @@
}
}
-- (NSArray *)outlineView:(NSOutlineView *)ov
typeSelectHelperSelectionItems:(SKTypeSelectHelper *)typeSelectHelper {
+- (NSArray *)outlineView:(NSOutlineView *)ov
typeSelectHelperSelectionStrings:(SKTypeSelectHelper *)typeSelectHelper {
if ([ov isEqual:rightSideController.noteOutlineView]) {
NSInteger i, count = [rightSideController.noteOutlineView
numberOfRows];
NSMutableArray *texts = [NSMutableArray arrayWithCapacity:count];
Modified: trunk/SKNotesDocument.m
===================================================================
--- trunk/SKNotesDocument.m 2011-12-28 12:36:45 UTC (rev 7609)
+++ trunk/SKNotesDocument.m 2011-12-29 11:27:55 UTC (rev 7610)
@@ -683,7 +683,7 @@
return [item string];
}
-- (NSArray *)outlineView:(NSOutlineView *)ov
typeSelectHelperSelectionItems:(SKTypeSelectHelper *)typeSelectHelper {
+- (NSArray *)outlineView:(NSOutlineView *)ov
typeSelectHelperSelectionStrings:(SKTypeSelectHelper *)typeSelectHelper {
NSInteger i, count = [outlineView numberOfRows];
NSMutableArray *texts = [NSMutableArray arrayWithCapacity:count];
for (i = 0; i < count; i++) {
Modified: trunk/SKOutlineView.h
===================================================================
--- trunk/SKOutlineView.h 2011-12-28 12:36:45 UTC (rev 7609)
+++ trunk/SKOutlineView.h 2011-12-29 11:27:55 UTC (rev 7610)
@@ -41,7 +41,7 @@
@protocol SKOutlineViewDelegate, SKOutlineViewDataSource;
-@interface SKOutlineView : NSOutlineView <SKTypeSelectDataSource> {
+@interface SKOutlineView : NSOutlineView <SKTypeSelectDelegate> {
SKTypeSelectHelper *typeSelectHelper;
}
@@ -78,7 +78,7 @@
- (void)outlineView:(NSOutlineView *)anOutlineView
pasteFromPasteboard:(NSPasteboard *)pboard;
- (BOOL)outlineView:(NSOutlineView *)anOutlineView
canPasteFromPasteboard:(NSPasteboard *)pboard;
-- (NSArray *)outlineView:(NSOutlineView *)anOutlineView
typeSelectHelperSelectionItems:(SKTypeSelectHelper *)aTypeSelectHelper;
+- (NSArray *)outlineView:(NSOutlineView *)anOutlineView
typeSelectHelperSelectionStrings:(SKTypeSelectHelper *)aTypeSelectHelper;
- (void)outlineView:(NSOutlineView *)anOutlineView
typeSelectHelper:(SKTypeSelectHelper *)aTypeSelectHelper
didFailToFindMatchForSearchString:(NSString *)searchString;
- (void)outlineView:(NSOutlineView *)anOutlineView
typeSelectHelper:(SKTypeSelectHelper *)aTypeSelectHelper
updateSearchString:(NSString *)searchString;
Modified: trunk/SKOutlineView.m
===================================================================
--- trunk/SKOutlineView.m 2011-12-28 12:36:45 UTC (rev 7609)
+++ trunk/SKOutlineView.m 2011-12-29 11:27:55 UTC (rev 7610)
@@ -52,7 +52,7 @@
@dynamic selectedItems, canDelete, canCopy, canPaste;
- (void)dealloc {
- [typeSelectHelper setDataSource:nil];
+ [typeSelectHelper setDelegate:nil];
SKDESTROY(typeSelectHelper);
[super dealloc];
}
@@ -71,11 +71,11 @@
- (void)setTypeSelectHelper:(SKTypeSelectHelper *)newTypeSelectHelper {
if (typeSelectHelper != newTypeSelectHelper) {
- if ([typeSelectHelper dataSource] == self)
- [typeSelectHelper setDataSource:nil];
+ if ([typeSelectHelper delegate] == self)
+ [typeSelectHelper setDelegate:nil];
[typeSelectHelper release];
typeSelectHelper = [newTypeSelectHelper retain];
- [typeSelectHelper setDataSource:self];
+ [typeSelectHelper setDelegate:self];
}
}
@@ -111,7 +111,7 @@
[self scrollToEndOfDocument:nil];
} else if ((eventChar == NSDeleteCharacter || eventChar ==
NSDeleteFunctionKey) && modifierFlags == 0 && [self canDelete]) {
[self delete:self];
- } else if ([typeSelectHelper processKeyDownEvent:theEvent] == NO) {
+ } else if ([typeSelectHelper handleEvent:theEvent] == NO) {
[super keyDown:theEvent];
}
}
@@ -227,9 +227,9 @@
#pragma mark SKTypeSelectHelper datasource protocol
-- (NSArray *)typeSelectHelperSelectionItems:(SKTypeSelectHelper
*)aTypeSelectHelper {
- if ([[self delegate]
respondsToSelector:@selector(outlineView:typeSelectHelperSelectionItems:)])
- return [[self delegate] outlineView:self
typeSelectHelperSelectionItems:aTypeSelectHelper];
+- (NSArray *)typeSelectHelperSelectionStrings:(SKTypeSelectHelper
*)aTypeSelectHelper {
+ if ([[self delegate]
respondsToSelector:@selector(outlineView:typeSelectHelperSelectionStrings:)])
+ return [[self delegate] outlineView:self
typeSelectHelperSelectionStrings:aTypeSelectHelper];
return nil;
}
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2011-12-28 12:36:45 UTC (rev 7609)
+++ trunk/SKPDFView.m 2011-12-29 11:27:55 UTC (rev 7610)
@@ -289,7 +289,6 @@
SKDESTROY(syncTimer);
SKDESTROY(trackingArea);
SKDESTROY(activeAnnotation);
- [typeSelectHelper setDataSource:nil];
SKDESTROY(typeSelectHelper);
SKDESTROY(transitionController);
SKDESTROY(navWindow);
@@ -1088,7 +1087,7 @@
[self setAnnotationMode:SKLineNote];
} else if ([self toolMode] == SKNoteToolMode && (eventChar == 'f') &&
(modifiers == 0)) {
[self setAnnotationMode:SKInkNote];
- } else if ([typeSelectHelper processKeyDownEvent:theEvent] == NO) {
+ } else if ([typeSelectHelper handleEvent:theEvent] == NO) {
[super keyDown:theEvent];
}
Modified: trunk/SKPresentationOptionsSheetController.m
===================================================================
--- trunk/SKPresentationOptionsSheetController.m 2011-12-28 12:36:45 UTC
(rev 7609)
+++ trunk/SKPresentationOptionsSheetController.m 2011-12-29 11:27:55 UTC
(rev 7610)
@@ -439,7 +439,7 @@
return ([tableView selectedRow] != -1 && [pboard
availableTypeFromArray:[NSArray arrayWithObject:SKTransitionPboardType]]);
}
-- (NSArray *)tableView:(NSTableView *)tv
typeSelectHelperSelectionItems:(SKTypeSelectHelper *)typeSelectHelper {
+- (NSArray *)tableView:(NSTableView *)tv
typeSelectHelperSelectionStrings:(SKTypeSelectHelper *)typeSelectHelper {
return [transitions valueForKeyPath:@"thumbnail.label"];
}
Modified: trunk/SKTableView.h
===================================================================
--- trunk/SKTableView.h 2011-12-28 12:36:45 UTC (rev 7609)
+++ trunk/SKTableView.h 2011-12-29 11:27:55 UTC (rev 7610)
@@ -42,7 +42,7 @@
@protocol SKTableViewDelegate;
-@interface SKTableView : NSTableView <SKTypeSelectDataSource> {
+@interface SKTableView : NSTableView <SKTypeSelectDelegate> {
NSMutableSet *trackingAreas;
SKTypeSelectHelper *typeSelectHelper;
}
@@ -80,7 +80,7 @@
- (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;
+- (NSArray *)tableView:(NSTableView *)aTableView
typeSelectHelperSelectionStrings:(SKTypeSelectHelper *)aTypeSelectHelper;
- (void)tableView:(NSTableView *)aTableView
typeSelectHelper:(SKTypeSelectHelper *)aTypeSelectHelper
didFailToFindMatchForSearchString:(NSString *)searchString;
- (void)tableView:(NSTableView *)aTableView
typeSelectHelper:(SKTypeSelectHelper *)aTypeSelectHelper
updateSearchString:(NSString *)searchString;
Modified: trunk/SKTableView.m
===================================================================
--- trunk/SKTableView.m 2011-12-28 12:36:45 UTC (rev 7609)
+++ trunk/SKTableView.m 2011-12-29 11:27:55 UTC (rev 7610)
@@ -59,18 +59,18 @@
- (void)dealloc {
SKDESTROY(trackingAreas);
- [typeSelectHelper setDataSource:nil];
+ [typeSelectHelper setDelegate:nil];
SKDESTROY(typeSelectHelper);
[super dealloc];
}
- (void)setTypeSelectHelper:(SKTypeSelectHelper *)newTypeSelectHelper {
if (typeSelectHelper != newTypeSelectHelper) {
- if ([typeSelectHelper dataSource] == self)
- [typeSelectHelper setDataSource:nil];
+ if ([typeSelectHelper delegate] == self)
+ [typeSelectHelper setDelegate:nil];
[typeSelectHelper release];
typeSelectHelper = [newTypeSelectHelper retain];
- [typeSelectHelper setDataSource:self];
+ [typeSelectHelper setDelegate:self];
}
}
@@ -97,7 +97,7 @@
[self scrollToBeginningOfDocument:nil];
} else if (eventChar == NSEndFunctionKey && (modifierFlags &
~NSFunctionKeyMask) == 0) {
[self scrollToEndOfDocument:nil];
- } else if ([typeSelectHelper processKeyDownEvent:theEvent] == NO) {
+ } else if ([typeSelectHelper handleEvent:theEvent] == NO) {
[super keyDown:theEvent];
}
}
@@ -286,9 +286,9 @@
#pragma mark SKTypeSelectHelper datasource protocol
-- (NSArray *)typeSelectHelperSelectionItems:(SKTypeSelectHelper
*)aTypeSelectHelper {
- if ([[self delegate]
respondsToSelector:@selector(tableView:typeSelectHelperSelectionItems:)])
- return [[self delegate] tableView:self
typeSelectHelperSelectionItems:aTypeSelectHelper];
+- (NSArray *)typeSelectHelperSelectionStrings:(SKTypeSelectHelper
*)aTypeSelectHelper {
+ if ([[self delegate]
respondsToSelector:@selector(tableView:typeSelectHelperSelectionStrings:)])
+ return [[self delegate] tableView:self
typeSelectHelperSelectionStrings:aTypeSelectHelper];
return nil;
}
Modified: trunk/SKTypeSelectHelper.h
===================================================================
--- trunk/SKTypeSelectHelper.h 2011-12-28 12:36:45 UTC (rev 7609)
+++ trunk/SKTypeSelectHelper.h 2011-12-29 11:27:55 UTC (rev 7610)
@@ -46,10 +46,10 @@
};
typedef NSInteger SKTypeSelectMatchOption;
-@protocol SKTypeSelectDataSource;
+@protocol SKTypeSelectDelegate;
@interface SKTypeSelectHelper : NSObject <NSTextViewDelegate> {
- id <SKTypeSelectDataSource> dataSource;
+ id <SKTypeSelectDelegate> delegate;
SKTypeSelectMatchOption matchOption;
BOOL isProcessing;
NSArray *searchCache;
@@ -57,7 +57,7 @@
NSTimer *timer;
}
-@property (nonatomic, assign) id <SKTypeSelectDataSource> dataSource;
+@property (nonatomic, assign) id <SKTypeSelectDelegate> delegate;
@property (nonatomic) SKTypeSelectMatchOption matchOption;
@property (nonatomic, retain) NSString *searchString;
@property (nonatomic, readonly) BOOL isProcessing;
@@ -69,14 +69,14 @@
- (void)rebuildTypeSelectSearchCache;
-- (BOOL)processKeyDownEvent:(NSEvent *)keyEvent;
+- (BOOL)handleEvent:(NSEvent *)keyEvent;
@end
-@protocol SKTypeSelectDataSource <NSObject>
+@protocol SKTypeSelectDelegate <NSObject>
-- (NSArray *)typeSelectHelperSelectionItems:(SKTypeSelectHelper
*)typeSelectHelper; // required
+- (NSArray *)typeSelectHelperSelectionStrings:(SKTypeSelectHelper
*)typeSelectHelper; // required
- (NSUInteger)typeSelectHelperCurrentlySelectedIndex:(SKTypeSelectHelper
*)typeSelectHelper; // required
- (void)typeSelectHelper:(SKTypeSelectHelper *)typeSelectHelper
selectItemAtIndex:(NSUInteger)itemIndex; // required
Modified: trunk/SKTypeSelectHelper.m
===================================================================
--- trunk/SKTypeSelectHelper.m 2011-12-28 12:36:45 UTC (rev 7609)
+++ trunk/SKTypeSelectHelper.m 2011-12-29 11:27:55 UTC (rev 7610)
@@ -71,7 +71,7 @@
@implementation SKTypeSelectHelper
-@synthesize dataSource, searchString, matchOption, isProcessing;
+@synthesize delegate, searchString, matchOption, isProcessing;
+ (id)typeSelectHelper {
@@ -85,7 +85,7 @@
- (id)initWithMatchOption:(SKTypeSelectMatchOption)aMatchOption {
self = [super init];
if (self){
- dataSource = nil;
+ delegate = nil;
searchCache = nil;
searchString = nil;
matchOption = aMatchOption;
@@ -109,9 +109,9 @@
#pragma mark Accessors
-- (void)setDataSource:(id)newDataSource {
- if (dataSource != newDataSource) {
- dataSource = newDataSource;
+- (void)setDelegate:(id)newDelegate {
+ if (delegate != newDelegate) {
+ delegate = newDelegate;
[self rebuildTypeSelectSearchCache];
}
}
@@ -122,7 +122,7 @@
SKDESTROY(searchCache);
}
-- (BOOL)processKeyDownEvent:(NSEvent *)keyEvent {
+- (BOOL)handleEvent:(NSEvent *)keyEvent {
if ([keyEvent type] != NSKeyDown) {
return NO;
} else if ([self isSearchEvent:keyEvent]) {
@@ -157,8 +157,8 @@
[fieldEditor interpretKeyEvents:[NSArray arrayWithObject:keyEvent]];
[self setSearchString:[fieldEditor string]];
- if ([dataSource
respondsToSelector:@selector(typeSelectHelper:updateSearchString:)])
- [dataSource typeSelectHelper:self updateSearchString:searchString];
+ if ([delegate
respondsToSelector:@selector(typeSelectHelper:updateSearchString:)])
+ [delegate typeSelectHelper:self updateSearchString:searchString];
// Reset the timer if it hasn't expired yet
[self startTimerForSelector:@selector(typeSelectSearchTimeout:)];
@@ -172,8 +172,8 @@
- (void)repeatSearch {
[self searchWithStickyMatch:NO];
- if ([searchString length] && [dataSource
respondsToSelector:@selector(typeSelectHelper:updateSearchString:)])
- [dataSource typeSelectHelper:self updateSearchString:searchString];
+ if ([searchString length] && [delegate
respondsToSelector:@selector(typeSelectHelper:updateSearchString:)])
+ [delegate typeSelectHelper:self updateSearchString:searchString];
[self startTimerForSelector:@selector(typeSelectCleanTimeout:)];
@@ -217,7 +217,7 @@
- (NSArray *)searchCache {
if (searchCache == nil)
- searchCache = [[dataSource typeSelectHelperSelectionItems:self]
retain];
+ searchCache = [[delegate typeSelectHelperSelectionStrings:self]
retain];
return searchCache;
}
@@ -240,8 +240,8 @@
}
- (void)typeSelectCleanTimeout:(id)sender {
- if ([dataSource
respondsToSelector:@selector(typeSelectHelper:updateSearchString:)])
- [dataSource typeSelectHelper:self updateSearchString:nil];
+ if ([delegate
respondsToSelector:@selector(typeSelectHelper:updateSearchString:)])
+ [delegate typeSelectHelper:self updateSearchString:nil];
[[NSNotificationCenter defaultCenter] removeObserver:self];
[self stopTimer];
isProcessing = NO;
@@ -270,7 +270,7 @@
NSUInteger selectedIndex, startIndex, foundIndex;
if (matchOption != SKFullStringMatch) {
- selectedIndex = [dataSource
typeSelectHelperCurrentlySelectedIndex:self];
+ selectedIndex = [delegate
typeSelectHelperCurrentlySelectedIndex:self];
if (selectedIndex >= [[self searchCache] count])
selectedIndex = NSNotFound;
} else {
@@ -284,11 +284,11 @@
foundIndex = [self indexOfMatchedItemAfterIndex:startIndex];
if (foundIndex == NSNotFound) {
- if ([dataSource
respondsToSelector:@selector(typeSelectHelper:didFailToFindMatchForSearchString:)])
- [dataSource typeSelectHelper:self
didFailToFindMatchForSearchString:searchString];
+ if ([delegate
respondsToSelector:@selector(typeSelectHelper:didFailToFindMatchForSearchString:)])
+ [delegate typeSelectHelper:self
didFailToFindMatchForSearchString:searchString];
} else if (foundIndex != selectedIndex) {
// Avoid flashing a selection all over the place while you're
still typing the thing you have selected
- [dataSource typeSelectHelper:self selectItemAtIndex:foundIndex];
+ [delegate typeSelectHelper:self selectItemAtIndex:foundIndex];
}
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Ridiculously easy VDI. With Citrix VDI-in-a-Box, you don't need a complex
infrastructure or vast IT resources to deliver seamless, secure access to
virtual desktops. With this all-in-one solution, easily deploy virtual
desktops for less than the cost of PCs and save 60% on VDI infrastructure
costs. Try it free! http://p.sf.net/sfu/Citrix-VDIinabox
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
