Revision: 2931
http://skim-app.svn.sourceforge.net/skim-app/?rev=2931&view=rev
Author: hofman
Date: 2007-09-16 04:57:43 -0700 (Sun, 16 Sep 2007)
Log Message:
-----------
Always show progress sheet when reverting the document.
Modified Paths:
--------------
trunk/SKDocument.m
Modified: trunk/SKDocument.m
===================================================================
--- trunk/SKDocument.m 2007-09-16 11:46:38 UTC (rev 2930)
+++ trunk/SKDocument.m 2007-09-16 11:57:43 UTC (rev 2931)
@@ -415,7 +415,13 @@
}
- (BOOL)revertToContentsOfURL:(NSURL *)absoluteURL ofType:(NSString *)typeName
error:(NSError **)outError{
- if ([super revertToContentsOfURL:absoluteURL ofType:typeName
error:outError]) {
+ [[self progressController] setMessage:[NSLocalizedString(@"Reloading
document", @"Message for progress sheet") stringByAppendingEllipsis]];
+ [[self progressController] setIndeterminate:YES];
+ [[self progressController] beginSheetModalForWindow:[self windowForSheet]];
+
+ BOOL success = [super revertToContentsOfURL:absoluteURL ofType:typeName
error:outError];
+
+ if (success) {
[[self mainWindowController] setPdfDocument:pdfDocument];
[pdfDocument autorelease];
pdfDocument = nil;
@@ -427,8 +433,11 @@
// file watching could have been disabled if the file was deleted
if (watchedFile == nil && fileUpdateTimer == nil)
[self checkFileUpdatesIfNeeded];
- return YES;
- } else return NO;
+ }
+
+ [[self progressController] endSheet];
+
+ return success;
}
- (NSDictionary *)fileAttributesToWriteToURL:(NSURL *)absoluteURL
ofType:(NSString *)typeName forSaveOperation:(NSSaveOperationType)saveOperation
originalContentsURL:(NSURL *)absoluteOriginalContentsURL error:(NSError
**)outError {
@@ -982,19 +991,10 @@
autoUpdate = NO;
} else {
NSError *error = nil;
- BOOL success;
[[alert window] orderOut:nil];
- [[self progressController] setMessage:[NSLocalizedString(@"Reloading
document", @"Message for progress sheet") stringByAppendingEllipsis]];
- [[self progressController] setIndeterminate:YES];
- [[self progressController] beginSheetModalForWindow:[self
windowForSheet]];
-
- success = [self revertToContentsOfURL:[self fileURL] ofType:[self
fileType] error:&error];
-
- [[self progressController] endSheet];
-
- if (success == NO && error)
+ if ([self revertToContentsOfURL:[self fileURL] ofType:[self fileType]
error:&error] == NO && error)
[self presentError:error modalForWindow:[self windowForSheet]
delegate:nil didPresentSelector:NULL contextInfo:NULL];
if (returnCode == NSAlertAlternateReturn)
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: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
