Revision: 7488
http://skim-app.svn.sourceforge.net/skim-app/?rev=7488&view=rev
Author: hofman
Date: 2011-09-13 10:30:10 +0000 (Tue, 13 Sep 2011)
Log Message:
-----------
make sure downloads window is shown before selecting new download in table
Modified Paths:
--------------
trunk/SKApplicationController.m
trunk/SKDocumentController.m
trunk/SKDownloadController.h
trunk/SKDownloadController.m
Modified: trunk/SKApplicationController.m
===================================================================
--- trunk/SKApplicationController.m 2011-09-10 12:09:15 UTC (rev 7487)
+++ trunk/SKApplicationController.m 2011-09-13 10:30:10 UTC (rev 7488)
@@ -413,9 +413,7 @@
if (document == nil && errorReporting && error && [error
isUserCancelledError] == NO)
[NSApp presentError:error];
} else {
- document = [[SKDownloadController sharedDownloadController]
addDownloadForURL:theURL];
- if (document && [[NSUserDefaults standardUserDefaults]
boolForKey:SKAutoOpenDownloadsWindowKey])
- [[SKDownloadController sharedDownloadController]
showWindow:nil];
+ document = [[SKDownloadController sharedDownloadController]
addDownloadForURL:theURL wantsWindow:YES];
}
}
}
Modified: trunk/SKDocumentController.m
===================================================================
--- trunk/SKDocumentController.m 2011-09-10 12:09:15 UTC (rev 7487)
+++ trunk/SKDocumentController.m 2011-09-13 10:30:10 UTC (rev 7488)
@@ -284,9 +284,7 @@
}
}
} else if (showNotes == NO && theURL) {
- document = [[SKDownloadController sharedDownloadController]
addDownloadForURL:theURL];
- if ([[NSUserDefaults standardUserDefaults]
boolForKey:SKAutoOpenDownloadsWindowKey])
- [[SKDownloadController sharedDownloadController] showWindow:self];
+ document = [[SKDownloadController sharedDownloadController]
addDownloadForURL:theURL wantsWindow:YES];
} else if (outError) {
*outError = [NSError
readPasteboardErrorWithLocalizedDescription:NSLocalizedString(@"Unable to load
data from clipboard", @"Error description")];
}
Modified: trunk/SKDownloadController.h
===================================================================
--- trunk/SKDownloadController.h 2011-09-10 12:09:15 UTC (rev 7487)
+++ trunk/SKDownloadController.h 2011-09-13 10:30:10 UTC (rev 7488)
@@ -62,7 +62,7 @@
+ (NSImage *)deleteImage;
+ (NSImage *)resumeImage;
-- (SKDownload *)addDownloadForURL:(NSURL *)aURL;
+- (SKDownload *)addDownloadForURL:(NSURL *)aURL wantsWindow:(BOOL)flag;
- (IBAction)showDownloadPreferences:(id)sender;
- (IBAction)clearDownloads:(id)sender;
Modified: trunk/SKDownloadController.m
===================================================================
--- trunk/SKDownloadController.m 2011-09-10 12:09:15 UTC (rev 7487)
+++ trunk/SKDownloadController.m 2011-09-13 10:30:10 UTC (rev 7488)
@@ -115,12 +115,14 @@
[tableView registerForDraggedTypes:[NSArray
arrayWithObjects:NSURLPboardType, SKWeblocFilePboardType, NSStringPboardType,
nil]];
}
-- (SKDownload *)addDownloadForURL:(NSURL *)aURL {
+- (SKDownload *)addDownloadForURL:(NSURL *)aURL wantsWindow:(BOOL)flag {
SKDownload *download = nil;
if (aURL) {
download = [[[SKDownload alloc] initWithURL:aURL] autorelease];
NSInteger row = [self countOfDownloads];
[[self mutableArrayValueForKey:DOWNLOADS_KEY] addObject:download];
+ if (flag && [[NSUserDefaults standardUserDefaults]
boolForKey:SKAutoOpenDownloadsWindowKey])
+ [self showWindow:nil];
[tableView selectRowIndexes:[NSIndexSet indexSetWithIndex:row]
byExtendingSelection:NO];
[tableView scrollRowToVisible:row];
}
@@ -375,7 +377,7 @@
if ([[NSDocumentController sharedDocumentController]
openDocumentWithContentsOfURL:theURL display:YES error:NULL])
return YES;
} else if (theURL) {
- [self addDownloadForURL:theURL];
+ [self addDownloadForURL:theURL wantsWindow:NO];
return YES;
}
return NO;
@@ -448,7 +450,7 @@
if ([theURL isFileURL])
[[NSDocumentController sharedDocumentController]
openDocumentWithContentsOfURL:theURL display:YES error:NULL];
else if (theURL)
- [self addDownloadForURL:theURL];
+ [self addDownloadForURL:theURL wantsWindow:NO];
}
- (BOOL)tableView:(NSTableView *)tv canPasteFromPasteboard:(NSPasteboard
*)pboard {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
BlackBerry® DevCon Americas, Oct. 18-20, San Francisco, CA
Learn about the latest advances in developing for the
BlackBerry® mobile platform with sessions, labs & more.
See new tools and technologies. Register for BlackBerry® DevCon today!
http://p.sf.net/sfu/rim-devcon-copy1
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
