Revision: 3831
http://skim-app.svn.sourceforge.net/skim-app/?rev=3831&view=rev
Author: hofman
Date: 2008-04-29 05:00:51 -0700 (Tue, 29 Apr 2008)
Log Message:
-----------
rename some string constants
Modified Paths:
--------------
trunk/SKMainWindowController.m
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2008-04-29 09:22:09 UTC (rev 3830)
+++ trunk/SKMainWindowController.m 2008-04-29 12:00:51 UTC (rev 3831)
@@ -125,10 +125,10 @@
static NSString *SKMainWindowRelevanceColumnIdentifer = @"relevance";
static NSString *SKMainWindowResultsColumnIdentifer = @"results";
-static NSString *SKSearchResultCountKey = @"count";
-static NSString *SKSearchResultPageKey = @"page";
-static NSString *SKSearchResultResultsKey = @"results";
-static NSString *SKSearchResultMaxCountKey = @"maxCount";
+static NSString *SKMainWindowSearchCountKey = @"count";
+static NSString *SKMainWindowSearchPageKey = @"page";
+static NSString *SKMainWindowSearchResultsKey = @"results";
+static NSString *SKMainWindowSearchMaxCountKey = @"maxCount";
static float segmentedControlHeight = 23.0;
static float segmentedControlOffset = 1.0;
@@ -451,7 +451,7 @@
[snapshotArrayController setSortDescriptors:[NSArray
arrayWithObjects:pageIndexSortDescriptor, nil]];
[ownerController setContent:self];
- NSSortDescriptor *countDescriptor = [[[NSSortDescriptor alloc]
initWithKey:SKSearchResultCountKey ascending:NO] autorelease];
+ NSSortDescriptor *countDescriptor = [[[NSSortDescriptor alloc]
initWithKey:SKMainWindowSearchCountKey ascending:NO] autorelease];
[groupedFindArrayController setSortDescriptors:[NSArray
arrayWithObjects:countDescriptor, nil]];
[[[groupedFindTableView
tableColumnWithIdentifier:SKMainWindowRelevanceColumnIdentifer] dataCell]
setEnabled:NO];
@@ -2900,20 +2900,20 @@
PDFPage *page = [[instance pages] objectAtIndex:0];
NSMutableDictionary *dict = [groupedSearchResults lastObject];
- NSNumber *maxCount = [dict valueForKey:SKSearchResultMaxCountKey];
- if ([[dict valueForKey:SKSearchResultPageKey] isEqual:page] == NO) {
- dict = [NSMutableDictionary dictionaryWithObjectsAndKeys:page,
SKSearchResultPageKey, [NSMutableArray array], SKSearchResultResultsKey,
maxCount, SKSearchResultMaxCountKey, nil];
+ NSNumber *maxCount = [dict valueForKey:SKMainWindowSearchMaxCountKey];
+ if ([[dict valueForKey:SKMainWindowSearchPageKey] isEqual:page] == NO)
{
+ dict = [NSMutableDictionary dictionaryWithObjectsAndKeys:page,
SKMainWindowSearchPageKey, [NSMutableArray array],
SKMainWindowSearchResultsKey, maxCount, SKMainWindowSearchMaxCountKey, nil];
[groupedSearchResults addObject:dict];
}
- NSMutableArray *results = [dict valueForKey:SKSearchResultResultsKey];
+ NSMutableArray *results = [dict
valueForKey:SKMainWindowSearchResultsKey];
[results addObject:instance];
- [dict setValue:[NSNumber numberWithUnsignedInt:[results count]]
forKey:SKSearchResultCountKey];
+ [dict setValue:[NSNumber numberWithUnsignedInt:[results count]]
forKey:SKMainWindowSearchCountKey];
if ([results count] > [maxCount unsignedIntValue]) {
NSEnumerator *dictEnum = [groupedSearchResults objectEnumerator];
maxCount = [NSNumber numberWithUnsignedInt:[results count]];
while (dict = [dictEnum nextObject])
- [dict setValue:maxCount forKey:SKSearchResultMaxCountKey];
+ [dict setValue:maxCount forKey:SKMainWindowSearchMaxCountKey];
}
}
}
@@ -4394,7 +4394,7 @@
PDFDestination *dest = [[[findArrayController arrangedObjects]
objectAtIndex:row] destination];
[self showHoverWindowForDestination:dest];
} else if ([tv isEqual:groupedFindTableView]) {
- PDFDestination *dest = [[[[[groupedFindArrayController
arrangedObjects] objectAtIndex:row] valueForKey:SKSearchResultResultsKey]
objectAtIndex:0] destination];
+ PDFDestination *dest = [[[[[groupedFindArrayController
arrangedObjects] objectAtIndex:row] valueForKey:SKMainWindowSearchResultsKey]
objectAtIndex:0] destination];
[self showHoverWindowForDestination:dest];
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
