Revision: 7033
http://skim-app.svn.sourceforge.net/skim-app/?rev=7033&view=rev
Author: hofman
Date: 2011-01-03 12:50:17 +0000 (Mon, 03 Jan 2011)
Log Message:
-----------
Check for locking in tryToUnlockDocument:, avoid one unnecessary call of this
method, small code changes
Modified Paths:
--------------
trunk/SKMainDocument.m
Modified: trunk/SKMainDocument.m
===================================================================
--- trunk/SKMainDocument.m 2011-01-03 12:26:05 UTC (rev 7032)
+++ trunk/SKMainDocument.m 2011-01-03 12:50:17 UTC (rev 7033)
@@ -182,8 +182,7 @@
- (void)setDataFromTmpData {
PDFDocument *pdfDoc = [tmpData pdfDocument];
- if ([pdfDoc isLocked])
- [self tryToUnlockDocument:pdfDoc];
+ [self tryToUnlockDocument:pdfDoc];
[[self mainWindowController] setPdfDocument:pdfDoc];
[[self mainWindowController] addAnnotationsFromDictionaries:[tmpData
noteDicts] replace:YES];
@@ -962,8 +961,8 @@
return;
}
- if (pdfDocWithoutNotes && [pdfDocWithoutNotes
unlockWithPassword:[controller stringValue]] == NO) {
- [[controller window] orderOut:self];
+ if (pdfDocWithoutNotes && [pdfDocWithoutNotes isLocked] &&
[pdfDocWithoutNotes unlockWithPassword:[controller stringValue]] == NO) {
+ [[controller window] orderOut:nil];
SKPasswordSheetController *passwordSheetController =
[[[SKPasswordSheetController alloc] init] autorelease];
@@ -975,8 +974,8 @@
return;
}
- [[[self windowForSheet] attachedSheet] orderOut:self];
-
+ [[controller window] orderOut:nil];
+
[[self progressController] setMessage:[NSLocalizedString(@"Converting
notes", @"Message for progress sheet") stringByAppendingEllipsis]];
[[self progressController] setIndeterminate:YES];
[[self progressController] beginSheetModalForWindow:[self windowForSheet]];
@@ -1016,10 +1015,9 @@
}
if (didConvert) {
+ // if pdfDocWithoutNotes was nil, the document was not encrypted, so
no need to try to unlock
if (pdfDocWithoutNotes == nil)
pdfDocWithoutNotes = [[PDFDocument alloc] initWithData:pdfData];
- if ([pdfDocWithoutNotes isLocked])
- [self tryToUnlockDocument:pdfDocWithoutNotes];
count = [pdfDocWithoutNotes pageCount];
for (i = 0; i < count; i++) {
PDFPage *page = [pdfDocWithoutNotes pageAtIndex:i];
@@ -1048,8 +1046,8 @@
if ([[self pdfDocument] isEncrypted]) {
pdfDocWithoutNotes = [[PDFDocument alloc] initWithData:pdfData];
- if ([pdfDocWithoutNotes isLocked] && [self
tryToUnlockDocument:pdfDocWithoutNotes] == NO) {
- [[[self windowForSheet] attachedSheet] orderOut:self];
+ if ([self tryToUnlockDocument:pdfDocWithoutNotes] == NO) {
+ [[alert window] orderOut:nil];
SKPasswordSheetController *passwordSheetController =
[[[SKPasswordSheetController alloc] init] autorelease];
@@ -1682,7 +1680,9 @@
- (BOOL)tryToUnlockDocument:(PDFDocument *)document {
BOOL didUnlock = NO;
- if (NSAlertAlternateReturn != [[NSUserDefaults standardUserDefaults]
integerForKey:SKSavePasswordOptionKey]) {
+ if ([document isLocked] == NO) {
+ didUnlock = YES;
+ } else if (NSAlertAlternateReturn != [[NSUserDefaults
standardUserDefaults] integerForKey:SKSavePasswordOptionKey]) {
NSString *fileID = [[self fileIDStrings] lastObject] ?: [pdfData
md5String];
if (fileID) {
NSString *password = nil;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit