Revision: 5331
http://skim-app.svn.sourceforge.net/skim-app/?rev=5331&view=rev
Author: hofman
Date: 2009-04-26 11:48:19 +0000 (Sun, 26 Apr 2009)
Log Message:
-----------
return a download when opening a 'document' from a URL from a pasteboard
Modified Paths:
--------------
trunk/SKApplicationController.m
trunk/SKDocumentController.h
trunk/SKDocumentController.m
trunk/SKDownloadController.h
trunk/SKDownloadController.m
Modified: trunk/SKApplicationController.m
===================================================================
--- trunk/SKApplicationController.m 2009-04-25 18:03:46 UTC (rev 5330)
+++ trunk/SKApplicationController.m 2009-04-26 11:48:19 UTC (rev 5331)
@@ -272,20 +272,20 @@
#pragma mark Services Support
-- (void)openDocumentFromURLOnPboard:(NSPasteboard *)pboard userData:(NSString
*)userData error:(NSString **)error {
- NSError *outError;
- id document = [[NSDocumentController sharedDocumentController]
openDocumentWithURLFromPasteboard:pboard error:&outError];
+- (void)openDocumentFromURLOnPboard:(NSPasteboard *)pboard userData:(NSString
*)userData error:(NSString **)errorString {
+ NSError *error;
+ id document = [[NSDocumentController sharedDocumentController]
openDocumentWithURLFromPasteboard:pboard error:&error];
- if (document == nil && outError && error)
- *error = [outError localizedDescription];
+ if (document == nil && errorString)
+ *errorString = [error localizedDescription];
}
-- (void)openDocumentFromDataOnPboard:(NSPasteboard *)pboard userData:(NSString
*)userData error:(NSString **)error {
- NSError *outError;
- id document = [[NSDocumentController sharedDocumentController]
openDocumentWithImageFromPasteboard:pboard error:&outError];
+- (void)openDocumentFromDataOnPboard:(NSPasteboard *)pboard userData:(NSString
*)userData error:(NSString **)errorString {
+ NSError *error;
+ id document = [[NSDocumentController sharedDocumentController]
openDocumentWithImageFromPasteboard:pboard error:&error];
- if (document == nil && outError && error)
- *error = [outError localizedDescription];
+ if (document == nil && errorString)
+ *errorString = [error localizedDescription];
}
#pragma mark Actions
Modified: trunk/SKDocumentController.h
===================================================================
--- trunk/SKDocumentController.h 2009-04-25 18:03:46 UTC (rev 5330)
+++ trunk/SKDocumentController.h 2009-04-26 11:48:19 UTC (rev 5331)
@@ -78,8 +78,10 @@
}
- (void)newDocumentFromClipboard:(id)sender;
+// this method may return an SKDownload instance
- (id)openDocumentWithContentsOfPasteboard:(NSPasteboard *)pboard
error:(NSError **)outError;
- (id)openDocumentWithImageFromPasteboard:(NSPasteboard *)pboard
error:(NSError **)outError;
+// this method may return an SKDownload instance
- (id)openDocumentWithURLFromPasteboard:(NSPasteboard *)pboard error:(NSError
**)outError;
- (id)openDocumentWithSetup:(NSDictionary *)setup error:(NSError **)outError;
Modified: trunk/SKDocumentController.m
===================================================================
--- trunk/SKDocumentController.m 2009-04-25 18:03:46 UTC (rev 5330)
+++ trunk/SKDocumentController.m 2009-04-26 11:48:19 UTC (rev 5331)
@@ -309,11 +309,9 @@
if ([theURL isFileURL]) {
document = [self openDocumentWithContentsOfURL:theURL display:YES
error:outError];
} else if (theURL) {
- [[SKDownloadController sharedDownloadController]
addDownloadForURL:theURL];
+ document = [[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]];
}
@@ -322,9 +320,13 @@
}
- (id)openDocumentWithContentsOfPasteboard:(NSPasteboard *)pboard
error:(NSError **)outError {
- id document = [self openDocumentWithImageFromPasteboard:pboard
error:outError];
- if (document == nil)
- document = [self openDocumentWithURLFromPasteboard:pboard
error:outError];
+ NSError *error;
+ id document = [self openDocumentWithImageFromPasteboard:pboard
error:&error];
+ if (document == nil) {
+ document = [self openDocumentWithURLFromPasteboard:pboard
error:&error];
+ if (document == nil && outError)
+ *outError = error;
+ }
return document;
}
@@ -332,7 +334,7 @@
NSError *error = nil;
id document = [self openDocumentWithContentsOfPasteboard:[NSPasteboard
generalPasteboard] error:&error];
- if (document == nil && error)
+ if (document == nil)
[NSApp presentError:error];
}
Modified: trunk/SKDownloadController.h
===================================================================
--- trunk/SKDownloadController.h 2009-04-25 18:03:46 UTC (rev 5330)
+++ trunk/SKDownloadController.h 2009-04-26 11:48:19 UTC (rev 5331)
@@ -50,7 +50,7 @@
+ (id)sharedDownloadController;
-- (void)addDownloadForURL:(NSURL *)aURL;
+- (SKDownload *)addDownloadForURL:(NSURL *)aURL;
- (IBAction)clearDownloads:(id)sender;
- (IBAction)removeDownload:(id)sender;
Modified: trunk/SKDownloadController.m
===================================================================
--- trunk/SKDownloadController.m 2009-04-25 18:03:46 UTC (rev 5330)
+++ trunk/SKDownloadController.m 2009-04-26 11:48:19 UTC (rev 5331)
@@ -107,15 +107,17 @@
[tableView registerForDraggedTypes:[NSArray
arrayWithObjects:NSURLPboardType, SKWeblocFilePboardType, NSStringPboardType,
nil]];
}
-- (void)addDownloadForURL:(NSURL *)aURL {
+- (SKDownload *)addDownloadForURL:(NSURL *)aURL {
+ SKDownload *download = nil;
if (aURL) {
- SKDownload *download = [[[SKDownload alloc] initWithURL:aURL
delegate:self] autorelease];
+ download = [[[SKDownload alloc] initWithURL:aURL delegate:self]
autorelease];
NSInteger row = [self countOfDownloads];
[[self mutableArrayValueForKey:DOWNLOADS_KEY] addObject:download];
[download start];
[tableView selectRowIndexes:[NSIndexSet indexSetWithIndex:row]
byExtendingSelection:NO];
[tableView scrollRowToVisible:row];
}
+ return download;
}
#pragma mark Accessors
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Crystal Reports - New Free Runtime and 30 Day Trial
Check out the new simplified licensign option that enables unlimited
royalty-free distribution of the report engine for externally facing
server and web deployment.
http://p.sf.net/sfu/businessobjects
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit