Revision: 2718
http://skim-app.svn.sourceforge.net/skim-app/?rev=2718&view=rev
Author: hofman
Date: 2007-08-24 10:17:30 -0700 (Fri, 24 Aug 2007)
Log Message:
-----------
Remove accents from type-select values, as we don't support accents in
type-select anyway. This makes type-select ignore accents.
Modified Paths:
--------------
trunk/NSString_SKExtensions.h
trunk/NSString_SKExtensions.m
trunk/SKBookmarkController.m
trunk/SKDownloadController.m
trunk/SKMainWindowController.m
trunk/SKNotesDocument.m
Modified: trunk/NSString_SKExtensions.h
===================================================================
--- trunk/NSString_SKExtensions.h 2007-08-24 14:16:09 UTC (rev 2717)
+++ trunk/NSString_SKExtensions.h 2007-08-24 17:17:30 UTC (rev 2718)
@@ -51,6 +51,8 @@
- (NSArray *)shellScriptArgumentsArray;
- (NSComparisonResult)localizedCaseInsensitiveNumericCompare:(NSString *)aStr;
+- (NSString *)lossyASCIIString;
+
- (NSRange)rangeOfLeadingEmptyLine;
- (NSRange)rangeOfLeadingEmptyLineInRange:(NSRange)range;
- (NSRange)rangeOfTrailingEmptyLine;
Modified: trunk/NSString_SKExtensions.m
===================================================================
--- trunk/NSString_SKExtensions.m 2007-08-24 14:16:09 UTC (rev 2717)
+++ trunk/NSString_SKExtensions.m 2007-08-24 17:17:30 UTC (rev 2718)
@@ -199,6 +199,10 @@
locale:[[NSUserDefaults standardUserDefaults]
dictionaryRepresentation]];
}
+- (NSString *)lossyASCIIString {
+ return [[[NSString alloc] initWithData:[self
dataUsingEncoding:NSASCIIStringEncoding allowLossyConversion:YES]
encoding:NSASCIIStringEncoding] autorelease];
+}
+
#pragma mark Empty lines
// whitespace at the beginning of the string up to the end or until (and
including) a newline
Modified: trunk/SKBookmarkController.m
===================================================================
--- trunk/SKBookmarkController.m 2007-08-24 14:16:09 UTC (rev 2717)
+++ trunk/SKBookmarkController.m 2007-08-24 17:17:30 UTC (rev 2718)
@@ -360,7 +360,7 @@
#pragma mark SKTypeSelectHelper datasource protocol
- (NSArray *)typeSelectHelperSelectionItems:(SKTypeSelectHelper
*)typeSelectHelper {
- return [bookmarks valueForKey:@"label"];
+ return [bookmarks valueForKeyPath:@"label.lossyASCIIString"];
}
- (unsigned int)typeSelectHelperCurrentlySelectedIndex:(SKTypeSelectHelper
*)typeSelectHelper {
Modified: trunk/SKDownloadController.m
===================================================================
--- trunk/SKDownloadController.m 2007-08-24 14:16:09 UTC (rev 2717)
+++ trunk/SKDownloadController.m 2007-08-24 17:17:30 UTC (rev 2718)
@@ -327,7 +327,7 @@
#pragma mark SKTypeSelectHelper datasource protocol
- (NSArray *)typeSelectHelperSelectionItems:(SKTypeSelectHelper
*)typeSelectHelper {
- return [downloads valueForKeyPath:@"fileName"];
+ return [downloads valueForKey:@"fileName"];
}
- (unsigned int)typeSelectHelperCurrentlySelectedIndex:(SKTypeSelectHelper
*)typeSelectHelper {
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2007-08-24 14:16:09 UTC (rev 2717)
+++ trunk/SKMainWindowController.m 2007-08-24 17:17:30 UTC (rev 2718)
@@ -3604,12 +3604,12 @@
if ([typeSelectHelper isEqual:[thumbnailTableView typeSelectHelper]] ||
[typeSelectHelper isEqual:[pdfView typeSelectHelper]]) {
return pageLabels;
} else if ([typeSelectHelper isEqual:[noteOutlineView typeSelectHelper]]) {
- return [[noteArrayController arrangedObjects] valueForKey:@"contents"];
+ return [[noteArrayController arrangedObjects]
valueForKeyPath:@"contents.lossyASCIIString"];
} else if ([typeSelectHelper isEqual:[outlineView typeSelectHelper]]) {
int i, count = [outlineView numberOfRows];
NSMutableArray *array = [NSMutableArray arrayWithCapacity:count];
for (i = 0; i < count; i++)
- [array addObject:[(PDFOutline *)[outlineView itemAtRow:i] label]];
+ [array addObject:[[(PDFOutline *)[outlineView itemAtRow:i] label]
lossyASCIIString]];
return array;
}
return nil;
Modified: trunk/SKNotesDocument.m
===================================================================
--- trunk/SKNotesDocument.m 2007-08-24 14:16:09 UTC (rev 2717)
+++ trunk/SKNotesDocument.m 2007-08-24 17:17:30 UTC (rev 2718)
@@ -329,7 +329,7 @@
#pragma mark SKTypeSelectHelper datasource protocol
- (NSArray *)typeSelectHelperSelectionItems:(SKTypeSelectHelper
*)typeSelectHelper {
- return [[arrayController arrangedObjects] valueForKey:@"contents"];
+ return [[arrayController arrangedObjects]
valueForKeyPath:@"contents.lossyASCIIString"];
}
- (unsigned int)typeSelectHelperCurrentlySelectedIndex:(SKTypeSelectHelper
*)typeSelectHelper {
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
