Revision: 3164
http://skim-app.svn.sourceforge.net/skim-app/?rev=3164&view=rev
Author: hofman
Date: 2007-11-06 08:30:56 -0800 (Tue, 06 Nov 2007)
Log Message:
-----------
Simplify grouping search results.
Modified Paths:
--------------
trunk/Dutch.lproj/MainWindow.nib/keyedobjects.nib
trunk/English.lproj/MainWindow.nib/info.nib
trunk/English.lproj/MainWindow.nib/keyedobjects.nib
trunk/French.lproj/MainWindow.nib/info.nib
trunk/French.lproj/MainWindow.nib/keyedobjects.nib
trunk/Italian.lproj/MainWindow.nib/info.nib
trunk/Italian.lproj/MainWindow.nib/keyedobjects.nib
trunk/SKMainWindowController.m
trunk/Spanish.lproj/MainWindow.nib/info.nib
trunk/Spanish.lproj/MainWindow.nib/keyedobjects.nib
Modified: trunk/Dutch.lproj/MainWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/English.lproj/MainWindow.nib/info.nib
===================================================================
--- trunk/English.lproj/MainWindow.nib/info.nib 2007-11-06 11:39:53 UTC (rev
3163)
+++ trunk/English.lproj/MainWindow.nib/info.nib 2007-11-06 16:30:56 UTC (rev
3164)
@@ -33,17 +33,17 @@
<array/>
<key>IBOpenObjects</key>
<array>
+ <integer>256</integer>
+ <integer>314</integer>
+ <integer>5</integer>
<integer>694</integer>
+ <integer>511</integer>
+ <integer>168</integer>
+ <integer>224</integer>
<integer>796</integer>
- <integer>314</integer>
- <integer>256</integer>
- <integer>511</integer>
<integer>830</integer>
+ <integer>687</integer>
<integer>502</integer>
- <integer>224</integer>
- <integer>5</integer>
- <integer>168</integer>
- <integer>687</integer>
</array>
<key>IBSystem Version</key>
<string>8R218</string>
Modified: trunk/English.lproj/MainWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/French.lproj/MainWindow.nib/info.nib
===================================================================
--- trunk/French.lproj/MainWindow.nib/info.nib 2007-11-06 11:39:53 UTC (rev
3163)
+++ trunk/French.lproj/MainWindow.nib/info.nib 2007-11-06 16:30:56 UTC (rev
3164)
@@ -23,9 +23,9 @@
<key>694</key>
<string>690 581 220 442 0 0 1600 1178 </string>
<key>789</key>
- <string>642 252 220 442 0 0 1440 938 </string>
+ <string>610 420 220 442 0 0 1440 938 </string>
<key>791</key>
- <string>642 592 115 102 0 0 1440 938 </string>
+ <string>662 590 115 102 0 0 1440 938 </string>
</dict>
<key>IBFramework Version</key>
<string>446.1</string>
@@ -33,13 +33,13 @@
<array/>
<key>IBOpenObjects</key>
<array>
+ <integer>502</integer>
<integer>168</integer>
+ <integer>5</integer>
<integer>789</integer>
+ <integer>256</integer>
+ <integer>314</integer>
<integer>791</integer>
- <integer>314</integer>
- <integer>502</integer>
- <integer>5</integer>
- <integer>256</integer>
</array>
<key>IBSystem Version</key>
<string>8R218</string>
Modified: trunk/French.lproj/MainWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/Italian.lproj/MainWindow.nib/info.nib
===================================================================
--- trunk/Italian.lproj/MainWindow.nib/info.nib 2007-11-06 11:39:53 UTC (rev
3163)
+++ trunk/Italian.lproj/MainWindow.nib/info.nib 2007-11-06 16:30:56 UTC (rev
3164)
@@ -34,16 +34,16 @@
<key>IBOpenObjects</key>
<array>
<integer>256</integer>
- <integer>511</integer>
- <integer>224</integer>
- <integer>168</integer>
+ <integer>502</integer>
<integer>677</integer>
- <integer>502</integer>
<integer>676</integer>
<integer>773</integer>
+ <integer>5</integer>
+ <integer>224</integer>
+ <integer>511</integer>
+ <integer>168</integer>
<integer>314</integer>
<integer>791</integer>
- <integer>5</integer>
</array>
<key>IBSystem Version</key>
<string>8R218</string>
Modified: trunk/Italian.lproj/MainWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2007-11-06 11:39:53 UTC (rev 3163)
+++ trunk/SKMainWindowController.m 2007-11-06 16:30:56 UTC (rev 3164)
@@ -2628,7 +2628,14 @@
}
- (void)documentDidEndPageFind:(NSNotification *)note {
- [[statusBar progressIndicator] setDoubleValue:[[[note userInfo]
objectForKey:@"PDFDocumentPageIndex"] doubleValue]];
+ NSNumber *pageIndex = [[note userInfo]
objectForKey:@"PDFDocumentPageIndex"];
+ [[statusBar progressIndicator] setDoubleValue:[pageIndex doubleValue]];
+ if ([pageIndex unsignedIntValue] % 10 == 0) {
+ [self willChangeValueForKey:@"searchResults"];
+ [self didChangeValueForKey:@"searchResults"];
+ [self willChangeValueForKey:@"groupedSearchResults"];
+ [self didChangeValueForKey:@"groupedSearchResults"];
+ }
}
- (void)didMatchString:(PDFSelection *)instance {
@@ -2637,30 +2644,16 @@
PDFPage *page = [[instance pages] objectAtIndex:0];
NSMutableDictionary *dict = [groupedSearchResults lastObject];
- if ([[dict valueForKey:@"pageIndex"] unsignedIntValue] != [page
pageIndex]) {
- dict = [NSMutableDictionary dictionaryWithObjectsAndKeys:
- [NSNumber numberWithUnsignedInt:[page pageIndex]],
@"pageIndex",
- [page label], @"pageLabel",
- [NSMutableArray array], @"results", nil];
+ if ([[dict valueForKey:@"page"] isEqual:page] == NO) {
+ dict = [NSMutableDictionary dictionaryWithObjectsAndKeys:page,
@"page", [NSMutableArray array], @"results", nil];
[groupedSearchResults addObject:dict];
}
[[dict valueForKey:@"results"] addObject:instance];
- unsigned int max = 0;
+ float maxCount = [[groupedSearchResults valueForKeyPath:@"@[EMAIL
PROTECTED]"] floatValue];
NSEnumerator *dictEnum = [groupedSearchResults objectEnumerator];
while (dict = [dictEnum nextObject])
- max = MAX(max, [[dict valueForKey:@"results"] count]);
-
- dictEnum = [groupedSearchResults objectEnumerator];
- while (dict = [dictEnum nextObject])
- [dict setValue:[NSNumber numberWithFloat:(float)[[dict
valueForKey:@"results"] count] / max] forKey:@"score"];
-
- if ([searchResults count] % 50 == 0) {
- [self willChangeValueForKey:@"searchResults"];
- [self didChangeValueForKey:@"searchResults"];
- [self willChangeValueForKey:@"groupedSearchResults"];
- [self didChangeValueForKey:@"groupedSearchResults"];
- }
+ [dict setValue:[NSNumber numberWithFloat:(float)[[dict
valueForKey:@"results"] count] / maxCount] forKey:@"score"];
}
}
Modified: trunk/Spanish.lproj/MainWindow.nib/info.nib
===================================================================
--- trunk/Spanish.lproj/MainWindow.nib/info.nib 2007-11-06 11:39:53 UTC (rev
3163)
+++ trunk/Spanish.lproj/MainWindow.nib/info.nib 2007-11-06 16:30:56 UTC (rev
3164)
@@ -33,14 +33,14 @@
<array/>
<key>IBOpenObjects</key>
<array>
- <integer>794</integer>
+ <integer>811</integer>
+ <integer>511</integer>
<integer>168</integer>
- <integer>224</integer>
<integer>502</integer>
- <integer>811</integer>
<integer>5</integer>
- <integer>511</integer>
+ <integer>794</integer>
<integer>687</integer>
+ <integer>224</integer>
</array>
<key>IBSystem Version</key>
<string>8R218</string>
Modified: trunk/Spanish.lproj/MainWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
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: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
