Revision: 3147
http://skim-app.svn.sourceforge.net/skim-app/?rev=3147&view=rev
Author: hofman
Date: 2007-11-04 10:47:35 -0800 (Sun, 04 Nov 2007)
Log Message:
-----------
Some more UTI handling for future compatibility, currently we don't use UTIs.
Modified Paths:
--------------
trunk/SKDocument.m
trunk/SKPSProgressController.m
Modified: trunk/SKDocument.m
===================================================================
--- trunk/SKDocument.m 2007-11-04 16:05:36 UTC (rev 3146)
+++ trunk/SKDocument.m 2007-11-04 18:47:35 UTC (rev 3147)
@@ -415,7 +415,7 @@
} else if ([typeName isEqualToString:SKNotesFDFDocumentType] || [typeName
isEqualToString:SKFDFDocumentUTI]) {
NSString *filePath = [[self fileURL] path];
NSString *filename = [filePath lastPathComponent];
- if (filename && [[self fileType]
isEqualToString:SKPDFBundleDocumentType]) {
+ if (filename && ([[self fileType]
isEqualToString:SKPDFBundleDocumentType] || [[self fileType]
isEqualToString:SKPDFBundleDocumentUTI])) {
NSString *pdfFile = [[NSFileManager defaultManager]
subfileWithExtension:@"pdf" inPDFBundleAtPath:filePath];
filename = pdfFile ? [filename
stringByAppendingPathComponent:pdfFile] : nil;
}
@@ -1494,7 +1494,7 @@
- (NSString *)notesFDFString {
NSString *filePath = [[self fileURL] path];
NSString *filename = [filePath lastPathComponent];
- if (filename && [[self fileType] isEqualToString:SKPDFBundleDocumentType])
{
+ if (filename && ([[self fileType] isEqualToString:SKPDFBundleDocumentType]
|| [[self fileType] isEqualToString:SKPDFBundleDocumentUTI])) {
NSString *pdfFile = [[NSFileManager defaultManager]
subfileWithExtension:@"pdf" inPDFBundleAtPath:filePath];
filename = pdfFile ? [filename stringByAppendingPathComponent:pdfFile]
: nil;
}
Modified: trunk/SKPSProgressController.m
===================================================================
--- trunk/SKPSProgressController.m 2007-11-04 16:05:36 UTC (rev 3146)
+++ trunk/SKPSProgressController.m 2007-11-04 18:47:35 UTC (rev 3147)
@@ -184,7 +184,7 @@
- (void)conversionStarted;
{
[progressBar startAnimation:nil];
- [textField setStringValue:[[NSString
stringWithFormat:NSLocalizedString(@"Converting %@", @"PS conversion progress
message"), [self fileType]] stringByAppendingEllipsis]];
+ [textField setStringValue:[[NSString
stringWithFormat:NSLocalizedString(@"Converting %@", @"PS conversion progress
message"), [[NSDocumentController sharedDocumentController]
displayNameForType:[self fileType]]] stringByAppendingEllipsis]];
}
@end
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
