Revision: 14739
http://sourceforge.net/p/skim-app/code/14739
Author: hofman
Date: 2024-11-22 17:10:37 +0000 (Fri, 22 Nov 2024)
Log Message:
-----------
handle success and failure separately
Modified Paths:
--------------
trunk/SKDocumentController.h
trunk/SKDocumentController.m
Modified: trunk/SKDocumentController.h
===================================================================
--- trunk/SKDocumentController.h 2024-11-22 16:34:37 UTC (rev 14738)
+++ trunk/SKDocumentController.h 2024-11-22 17:10:37 UTC (rev 14739)
@@ -81,7 +81,7 @@
- (void)openDocumentWithBookmark:(SKBookmark *)bookmark
completionHandler:(void (^)(NSDocument * _Nullable document, BOOL
documentWasAlreadyOpen, NSError * _Nullable error))completionHandler;
- (void)openDocumentWithBookmarks:(NSArray<SKBookmark *> *)bookmarks
completionHandler:(void (^)(NSDocument * _Nullable document, BOOL
documentWasAlreadyOpen, NSError * _Nullable error))completionHandler;
-- (void)printDocumentsWithContentsOfURLs:(NSArray<NSURL *> *)urls
withSettings:(NSDictionary<NSString *, id> *)printSettings
showPrintPanels:(BOOL)showPrintPanels completionHandler:(void (^)(BOOL
didPrintSuccessfully, NSError *error))completionHandler;
+- (void)printDocumentsWithContentsOfURLs:(NSArray<NSURL *> *)urls
withSettings:(NSDictionary<NSString *, id> *)printSettings
showPrintPanels:(BOOL)showPrintPanels completionHandler:(void (^)(BOOL
didPrintSuccessfully, NSError * _Nullable error))completionHandler;
- (nullable Class)documentClassForContentsOfURL:(NSURL *)inAbsoluteURL;
Modified: trunk/SKDocumentController.m
===================================================================
--- trunk/SKDocumentController.m 2024-11-22 16:34:37 UTC (rev 14738)
+++ trunk/SKDocumentController.m 2024-11-22 17:10:37 UTC (rev 14739)
@@ -672,14 +672,12 @@
void (^block)(BOOL) = ^(BOOL success){
if (documentWasAlreadyOpen == NO)
[document close];
- if (success && nextURLs) {
+ if (success == NO)
+ completionHandler(NO, [NSError
printDocumentErrorWithLocalizedDescription:[NSString
stringWithFormat:NSLocalizedString(@"The file \"%@\" could not be printed",
@"Error description"), [document displayName]]]);
+ else if (nextURLs)
[self printDocumentsWithContentsOfURLs:nextURLs
withSettings:printSettings showPrintPanels:showPrintPanels
completionHandler:completionHandler];
- } else {
- NSError *err = nil;
- if (success == NO)
- err = [NSError
printDocumentErrorWithLocalizedDescription:[NSString
stringWithFormat:NSLocalizedString(@"The file \"%@\" could not be printed",
@"Error description"), [document displayName]]];
- completionHandler(success, err);
- }
+ else
+ completionHandler(YES, nil);
};
[document printDocumentWithSettings:printSettings
showPrintPanel:showPrintPanels delegate:self
didPrintSelector:@selector(document:didPrint:contextInfo:) contextInfo:(void
*)CFBridgingRetain(block)];
} else {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
