Revision: 7101
http://skim-app.svn.sourceforge.net/skim-app/?rev=7101&view=rev
Author: hofman
Date: 2011-02-13 16:20:37 +0000 (Sun, 13 Feb 2011)
Log Message:
-----------
combine two methods
Modified Paths:
--------------
trunk/SKApplicationController.m
trunk/SKDocumentController.h
trunk/SKDocumentController.m
Modified: trunk/SKApplicationController.m
===================================================================
--- trunk/SKApplicationController.m 2011-02-13 13:01:30 UTC (rev 7100)
+++ trunk/SKApplicationController.m 2011-02-13 16:20:37 UTC (rev 7101)
@@ -243,7 +243,7 @@
- (void)openDocumentFromURLOnPboard:(NSPasteboard *)pboard userData:(NSString
*)userData error:(NSString **)errorString {
NSError *error;
- id document = [[NSDocumentController sharedDocumentController]
openDocumentWithURLFromPasteboard:pboard error:&error];
+ id document = [[NSDocumentController sharedDocumentController]
openDocumentWithURLFromPasteboard:pboard showNotes:NO error:&error];
if (document == nil && errorString)
*errorString = [error localizedDescription];
@@ -259,7 +259,7 @@
- (void)openNotesDocumentFromURLOnPboard:(NSPasteboard *)pboard
userData:(NSString *)userData error:(NSString **)errorString {
NSError *error;
- id document = [[NSDocumentController sharedDocumentController]
openNotesDocumentWithURLFromPasteboard:pboard error:&error];
+ id document = [[NSDocumentController sharedDocumentController]
openDocumentWithURLFromPasteboard:pboard showNotes:YES error:&error];
if (document == nil && errorString)
*errorString = [error localizedDescription];
Modified: trunk/SKDocumentController.h
===================================================================
--- trunk/SKDocumentController.h 2011-02-13 13:01:30 UTC (rev 7100)
+++ trunk/SKDocumentController.h 2011-02-13 16:20:37 UTC (rev 7101)
@@ -69,11 +69,12 @@
}
- (IBAction)newDocumentFromClipboard:(id)sender;
+
- (id)openDocumentWithImageFromPasteboard:(NSPasteboard *)pboard
error:(NSError **)outError;
// this method may return an SKDownload instance
-- (id)openDocumentWithURLFromPasteboard:(NSPasteboard *)pboard error:(NSError
**)outError;
+- (id)openDocumentWithURLFromPasteboard:(NSPasteboard *)pboard
showNotes:(BOOL)showNotes error:(NSError **)outError;
+
- (id)openDocumentWithSetup:(NSDictionary *)setup error:(NSError **)outError;
-- (id)openNotesDocumentWithURLFromPasteboard:(NSPasteboard *)pboard
error:(NSError **)outError;
- (Class)documentClassForContentsOfURL:(NSURL *)inAbsoluteURL;
Modified: trunk/SKDocumentController.m
===================================================================
--- trunk/SKDocumentController.m 2011-02-13 13:01:30 UTC (rev 7100)
+++ trunk/SKDocumentController.m 2011-02-13 16:20:37 UTC (rev 7101)
@@ -242,32 +242,15 @@
return document;
}
-- (id)openDocumentWithURLFromPasteboard:(NSPasteboard *)pboard error:(NSError
**)outError {
+- (id)openDocumentWithURLFromPasteboard:(NSPasteboard *)pboard
showNotes:(BOOL)showNotes 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) {
- document = [[SKDownloadController sharedDownloadController]
addDownloadForURL:theURL];
- if ([[NSUserDefaults standardUserDefaults]
boolForKey:SKAutoOpenDownloadsWindowKey])
- [[SKDownloadController sharedDownloadController] showWindow:self];
- } else if (outError) {
- *outError = [NSError
readPasteboardErrorWithLocalizedDescription:NSLocalizedString(@"Unable to load
data from clipboard", @"Error description")];
- }
-
- return document;
-}
-
-- (id)openNotesDocumentWithURLFromPasteboard:(NSPasteboard *)pboard
error:(NSError **)outError {
- NSURL *theURL = [NSURL URLFromPasteboardAnyType:pboard];
- id document = nil;
-
- if ([theURL isFileURL]) {
NSError *error = nil;
NSString *type = [self typeForContentsOfURL:theURL error:&error];
- if ([[SKNotesDocument readableTypes] containsObject:type]) {
+ if (showNotes == NO || [[SKNotesDocument readableTypes]
containsObject:type]) {
document = [self openDocumentWithContentsOfURL:theURL display:YES
error:outError];
} else if ([[SKMainDocument readableTypes] containsObject:type]) {
for (document in [self documents]) {
@@ -300,6 +283,10 @@
}
}
}
+ } else if (showNotes == NO && theURL) {
+ document = [[SKDownloadController sharedDownloadController]
addDownloadForURL:theURL];
+ if ([[NSUserDefaults standardUserDefaults]
boolForKey:SKAutoOpenDownloadsWindowKey])
+ [[SKDownloadController sharedDownloadController] showWindow:self];
} else if (outError) {
*outError = [NSError
readPasteboardErrorWithLocalizedDescription:NSLocalizedString(@"Unable to load
data from clipboard", @"Error description")];
}
@@ -312,7 +299,7 @@
NSPasteboard *pboard = [NSPasteboard generalPasteboard];
id document = [self openDocumentWithImageFromPasteboard:pboard
error:&error];
if (document == nil)
- document = [self openDocumentWithURLFromPasteboard:pboard
error:&error];
+ document = [self openDocumentWithURLFromPasteboard:pboard showNotes:NO
error:&error];
if (document == nil && error && [error isUserCancelledError] == NO)
[NSApp presentError:error];
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
