Revision: 6935
http://skim-app.svn.sourceforge.net/skim-app/?rev=6935&view=rev
Author: hofman
Date: 2010-12-05 12:48:19 +0000 (Sun, 05 Dec 2010)
Log Message:
-----------
don't show user cancelled errors
Modified Paths:
--------------
trunk/SKApplicationController.m
trunk/SKBookmarkController.m
trunk/SKDocumentController.m
trunk/SKDownloadController.m
trunk/SKMainDocument.m
trunk/SKMainWindowController_UI.m
trunk/SKNotesDocument.m
Modified: trunk/SKApplicationController.m
===================================================================
--- trunk/SKApplicationController.m 2010-12-05 12:25:39 UTC (rev 6934)
+++ trunk/SKApplicationController.m 2010-12-05 12:48:19 UTC (rev 6935)
@@ -174,7 +174,8 @@
while (dict = [fileEnum nextObject]) {
error = nil;
- if (nil == [[NSDocumentController sharedDocumentController]
openDocumentWithSetup:dict error:&error] && error)
+ if (nil == [[NSDocumentController sharedDocumentController]
openDocumentWithSetup:dict error:&error] && error &&
+ ([[error domain] isEqualToString:NSCocoaErrorDomain] == NO ||
[error code] != NSUserCancelledError))
[NSApp presentError:error];
}
}
Modified: trunk/SKBookmarkController.m
===================================================================
--- trunk/SKBookmarkController.m 2010-12-05 12:25:39 UTC (rev 6934)
+++ trunk/SKBookmarkController.m 2010-12-05 12:48:19 UTC (rev 6935)
@@ -386,7 +386,7 @@
[bookmark pageIndex] != NSNotFound)
[[document mainWindowController] setPageNumber:[bookmark
pageIndex] + 1];
}
- if (document == nil && error)
+ if (document == nil && error && ([[error domain]
isEqualToString:NSCocoaErrorDomain] == NO || [error code] !=
NSUserCancelledError))
[NSApp presentError:error];
}
Modified: trunk/SKDocumentController.m
===================================================================
--- trunk/SKDocumentController.m 2010-12-05 12:25:39 UTC (rev 6934)
+++ trunk/SKDocumentController.m 2010-12-05 12:48:19 UTC (rev 6935)
@@ -266,7 +266,7 @@
NSError *error = nil;
id document = [self openDocumentWithContentsOfPasteboard:[NSPasteboard
generalPasteboard] error:&error];
- if (document == nil)
+ if (document == nil && error && ([[error domain]
isEqualToString:NSCocoaErrorDomain] == NO || [error code] !=
NSUserCancelledError))
[NSApp presentError:error];
}
Modified: trunk/SKDownloadController.m
===================================================================
--- trunk/SKDownloadController.m 2010-12-05 12:25:39 UTC (rev 6934)
+++ trunk/SKDownloadController.m 2010-12-05 12:48:19 UTC (rev 6935)
@@ -269,7 +269,8 @@
} else {
NSURL *fileURL = [NSURL fileURLWithPath:[download filePath]];
NSError *error;
- if (nil == [[NSDocumentController sharedDocumentController]
openDocumentWithContentsOfURL:fileURL display:YES error:&error])
+ if (nil == [[NSDocumentController sharedDocumentController]
openDocumentWithContentsOfURL:fileURL display:YES error:&error] &&
+ ([[error domain] isEqualToString:NSCocoaErrorDomain] == NO ||
[error code] != NSUserCancelledError))
[NSApp presentError:error];
}
}
@@ -306,7 +307,7 @@
NSURL *URL = [NSURL fileURLWithPath:[download filePath]];
NSError *error = nil;
id document = [[NSDocumentController sharedDocumentController]
openDocumentWithContentsOfURL:URL display:YES error:&error];
- if (document == nil)
+ if (document == nil && ([[error domain]
isEqualToString:NSCocoaErrorDomain] == NO || [error code] !=
NSUserCancelledError))
[NSApp presentError:error];
if ([[NSUserDefaults standardUserDefaults]
boolForKey:SKAutoRemoveFinishedDownloadsKey]) {
Modified: trunk/SKMainDocument.m
===================================================================
--- trunk/SKMainDocument.m 2010-12-05 12:25:39 UTC (rev 6934)
+++ trunk/SKMainDocument.m 2010-12-05 12:48:19 UTC (rev 6935)
@@ -1217,7 +1217,8 @@
- (void)revertAlertDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode
contextInfo:(void *)contextInfo {
if (returnCode == NSAlertDefaultReturn) {
NSError *error = nil;
- if (NO == [self revertToContentsOfURL:[self fileURL] ofType:[self
fileType] error:&error]) {
+ if (NO == [self revertToContentsOfURL:[self fileURL] ofType:[self
fileType] error:&error] &&
+ ([[error domain] isEqualToString:NSCocoaErrorDomain] == NO ||
[error code] != NSUserCancelledError)) {
[[alert window] orderOut:nil];
[self presentError:error modalForWindow:[self windowForSheet]
delegate:nil didPresentSelector:NULL contextInfo:NULL];
}
@@ -1358,7 +1359,7 @@
if ([self revertToContentsOfURL:[self fileURL] ofType:[self fileType]
error:&error])
docFlags.receivedFileUpdateNotification = NO;
- else if (error)
+ else if (error && ([[error domain] isEqualToString:NSCocoaErrorDomain]
== NO || [error code] != NSUserCancelledError))
[self presentError:error modalForWindow:[self windowForSheet]
delegate:nil didPresentSelector:NULL contextInfo:NULL];
if (returnCode == NSAlertAlternateReturn)
docFlags.autoUpdate = YES;
Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m 2010-12-05 12:25:39 UTC (rev 6934)
+++ trunk/SKMainWindowController_UI.m 2010-12-05 12:48:19 UTC (rev 6935)
@@ -1153,7 +1153,7 @@
PDFDestination *dest = [[[PDFDestination alloc]
initWithPage:page atPoint:[action point]] autorelease];
[[document pdfView] goToDestination:dest];
}
- } else if (error) {
+ } else if (error && ([[error domain]
isEqualToString:NSCocoaErrorDomain] == NO || [error code] !=
NSUserCancelledError)) {
[NSApp presentError:error];
}
} else if (fileURL) {
Modified: trunk/SKNotesDocument.m
===================================================================
--- trunk/SKNotesDocument.m 2010-12-05 12:25:39 UTC (rev 6934)
+++ trunk/SKNotesDocument.m 2010-12-05 12:48:19 UTC (rev 6935)
@@ -400,7 +400,8 @@
}
if (url == nil)
url = [NSURL fileURLWithPath:path];
- if (nil == [[NSDocumentController sharedDocumentController]
openDocumentWithContentsOfURL:url display:YES error:&error])
+ if (nil == [[NSDocumentController sharedDocumentController]
openDocumentWithContentsOfURL:url display:YES error:&error] &&
+ ([[error domain] isEqualToString:NSCocoaErrorDomain] == NO ||
[error code] != NSUserCancelledError))
[NSApp presentError:error];
} else NSBeep();
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
What happens now with your Lotus Notes apps - do you make another costly
upgrade, or settle for being marooned without product support? Time to move
off Lotus Notes and onto the cloud with Force.com, apps are easier to build,
use, and manage than apps on traditional platforms. Sign up for the Lotus
Notes Migration Kit to learn more. http://p.sf.net/sfu/salesforce-d2d
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit