Revision: 3678
http://skim-app.svn.sourceforge.net/skim-app/?rev=3678&view=rev
Author: hofman
Date: 2008-04-08 10:10:38 -0700 (Tue, 08 Apr 2008)
Log Message:
-----------
Use separate methods to open a document with data from the a pasteboard rather
than passing a types mask.
Modified Paths:
--------------
trunk/SKApplicationController.m
trunk/SKDocumentController.h
trunk/SKDocumentController.m
Modified: trunk/SKApplicationController.m
===================================================================
--- trunk/SKApplicationController.m 2008-04-08 16:48:24 UTC (rev 3677)
+++ trunk/SKApplicationController.m 2008-04-08 17:10:38 UTC (rev 3678)
@@ -225,7 +225,7 @@
- (void)openDocumentFromURLOnPboard:(NSPasteboard *)pboard userData:(NSString
*)userData error:(NSString **)error {
NSError *outError;
- id document = [[NSDocumentController sharedDocumentController]
openDocumentWithContentsOfPasteboard:pboard typesMask:SKURLPboardTypesMask
error:&outError];
+ id document = [[NSDocumentController sharedDocumentController]
openDocumentWithURLFromPasteboard:pboard error:&outError];
if (document == nil && outError && error)
*error = [outError localizedDescription];
@@ -233,7 +233,7 @@
- (void)openDocumentFromDataOnPboard:(NSPasteboard *)pboard userData:(NSString
*)userData error:(NSString **)error {
NSError *outError;
- id document = [[NSDocumentController sharedDocumentController]
openDocumentWithContentsOfPasteboard:pboard typesMask:SKImagePboardTypesMask
error:&outError];
+ id document = [[NSDocumentController sharedDocumentController]
openDocumentWithImageFromPasteboard:pboard error:&outError];
if (document == nil && outError && error)
*error = [outError localizedDescription];
Modified: trunk/SKDocumentController.h
===================================================================
--- trunk/SKDocumentController.h 2008-04-08 16:48:24 UTC (rev 3677)
+++ trunk/SKDocumentController.h 2008-04-08 17:10:38 UTC (rev 3678)
@@ -64,12 +64,9 @@
extern NSString *SKPostScriptDocumentType;
extern NSString *SKDVIDocumentType;
-enum {
- SKImagePboardTypesMask = 1,
- SKURLPboardTypesMask = 2
-};
-
@interface SKDocumentController : NSDocumentController
- (void)newDocumentFromClipboard:(id)sender;
-- (id)openDocumentWithContentsOfPasteboard:(NSPasteboard *)pboard
typesMask:(int)mask error:(NSError **)outError;
+- (id)openDocumentWithContentsOfPasteboard:(NSPasteboard *)pboard
error:(NSError **)outError;
+- (id)openDocumentWithImageFromPasteboard:(NSPasteboard *)pboard
error:(NSError **)outError;
+- (id)openDocumentWithURLFromPasteboard:(NSPasteboard *)pboard error:(NSError
**)outError;
@end
Modified: trunk/SKDocumentController.m
===================================================================
--- trunk/SKDocumentController.m 2008-04-08 16:48:24 UTC (rev 3677)
+++ trunk/SKDocumentController.m 2008-04-08 17:10:38 UTC (rev 3678)
@@ -231,14 +231,13 @@
return pdfData;
}
-- (id)openDocumentWithContentsOfPasteboard:(NSPasteboard *)pboard
typesMask:(int)mask error:(NSError **)outError {
+- (id)openDocumentWithImageFromPasteboard:(NSPasteboard *)pboard
error:(NSError **)outError {
// allow any filter services to convert to TIFF data if we can't get PDF
or PS directly
pboard = [NSPasteboard pasteboardByFilteringTypesInPasteboard:pboard];
- NSString *pboardType;
- NSURL *theURL = nil;
+ NSString *pboardType = [pboard availableTypeFromArray:[NSArray
arrayWithObjects:NSPDFPboardType, NSPostScriptPboardType, NSTIFFPboardType,
nil]];
id document = nil;
- if ((mask & SKImagePboardTypesMask) && (pboardType = [pboard
availableTypeFromArray:[NSArray arrayWithObjects:NSPDFPboardType,
NSPostScriptPboardType, NSTIFFPboardType, nil]])) {
+ if (pboardType) {
NSData *data = [pboard dataForType:pboardType];
@@ -263,18 +262,6 @@
*outError = error;
}
- } else if ((mask & SKURLPboardTypesMask) && (theURL = [NSURL
URLFromPasteboardAnyType:pboard])) {
-
- if ([theURL isFileURL]) {
- document = [self openDocumentWithContentsOfURL:theURL display:YES
error:outError];
- } else {
- [[SKDownloadController sharedDownloadController]
addDownloadForURL:theURL];
- if ([[NSUserDefaults standardUserDefaults]
boolForKey:SKAutoOpenDownloadsWindowKey])
- [[SKDownloadController sharedDownloadController]
showWindow:self];
- if (outError)
- *outError = nil;
- }
-
} else if (outError) {
*outError = [NSError errorWithDomain:SKDocumentErrorDomain code:0
userInfo:[NSDictionary dictionaryWithObjectsAndKeys:NSLocalizedString(@"Unable
to load data from clipboard", @"Error description"), NSLocalizedDescriptionKey,
nil]];
}
@@ -282,9 +269,35 @@
return document;
}
+- (id)openDocumentWithURLFromPasteboard:(NSPasteboard *)pboard error:(NSError
**)outError {
+ NSURL *theURL = [NSURL URLFromPasteboardAnyType:pboard];
+ id document = nil;
+
+ if ([theURL isFileURL]) {
+ document = [self openDocumentWithContentsOfURL:theURL display:YES
error:outError];
+ } else if (theURL) {
+ [[SKDownloadController sharedDownloadController]
addDownloadForURL:theURL];
+ if ([[NSUserDefaults standardUserDefaults]
boolForKey:SKAutoOpenDownloadsWindowKey])
+ [[SKDownloadController sharedDownloadController] showWindow:self];
+ if (outError)
+ *outError = nil;
+ } else if (outError) {
+ *outError = [NSError errorWithDomain:SKDocumentErrorDomain code:0
userInfo:[NSDictionary dictionaryWithObjectsAndKeys:NSLocalizedString(@"Unable
to load data from clipboard", @"Error description"), NSLocalizedDescriptionKey,
nil]];
+ }
+
+ return document;
+}
+
+- (id)openDocumentWithContentsOfPasteboard:(NSPasteboard *)pboard
error:(NSError **)outError {
+ id document = [self openDocumentWithImageFromPasteboard:pboard
error:outError];
+ if (document == nil)
+ document = [self openDocumentWithURLFromPasteboard:pboard
error:outError];
+ return document;
+}
+
- (void)newDocumentFromClipboard:(id)sender {
NSError *error = nil;
- id document = [self openDocumentWithContentsOfPasteboard:[NSPasteboard
generalPasteboard] typesMask:SKImagePboardTypesMask | SKURLPboardTypesMask
error:&error];
+ id document = [self openDocumentWithContentsOfPasteboard:[NSPasteboard
generalPasteboard] error:&error];
if (document == nil && error)
[NSApp presentError:error];
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
Register now and save $200. Hurry, offer ends at 11:59 p.m.,
Monday, April 7! Use priority code J8TLD2.
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