Revision: 7736
http://skim-app.svn.sourceforge.net/skim-app/?rev=7736&view=rev
Author: hofman
Date: 2012-10-19 15:22:12 +0000 (Fri, 19 Oct 2012)
Log Message:
-----------
remove convenience shorthand for running sheet without completion handler
Modified Paths:
--------------
trunk/NSWindowController_SKExtensions.h
trunk/NSWindowController_SKExtensions.m
trunk/SKDownloadController.m
trunk/SKMainDocument.m
trunk/SKMainWindowController.m
trunk/SKMainWindowController_Actions.m
Modified: trunk/NSWindowController_SKExtensions.h
===================================================================
--- trunk/NSWindowController_SKExtensions.h 2012-10-19 15:04:34 UTC (rev
7735)
+++ trunk/NSWindowController_SKExtensions.h 2012-10-19 15:22:12 UTC (rev
7736)
@@ -45,7 +45,6 @@
- (BOOL)isNoteWindowController;
-- (void)beginSheetModalForWindow:(NSWindow *)window;
- (void)beginSheetModalForWindow:(NSWindow *)window completionHandler:(void
(^)(NSInteger result))handler;
- (IBAction)dismissSheet:(id)sender;
Modified: trunk/NSWindowController_SKExtensions.m
===================================================================
--- trunk/NSWindowController_SKExtensions.m 2012-10-19 15:04:34 UTC (rev
7735)
+++ trunk/NSWindowController_SKExtensions.m 2012-10-19 15:22:12 UTC (rev
7736)
@@ -75,10 +75,6 @@
}
}
-- (void)beginSheetModalForWindow:(NSWindow *)window {
- [self beginSheetModalForWindow:window completionHandler:NULL];
-}
-
- (void)beginSheetModalForWindow:(NSWindow *)window completionHandler:(void
(^)(NSInteger result))handler {
[self retain]; // make sure we stay around long enough
Modified: trunk/SKDownloadController.m
===================================================================
--- trunk/SKDownloadController.m 2012-10-19 15:04:34 UTC (rev 7735)
+++ trunk/SKDownloadController.m 2012-10-19 15:22:12 UTC (rev 7736)
@@ -259,7 +259,7 @@
- (IBAction)showDownloadPreferences:(id)sender {
SKDownloadPreferenceController *prefController =
[[[SKDownloadPreferenceController alloc] init] autorelease];
- [prefController beginSheetModalForWindow:[self window]];
+ [prefController beginSheetModalForWindow:[self window]
completionHandler:NULL];
}
- (IBAction)clearDownloads:(id)sender {
Modified: trunk/SKMainDocument.m
===================================================================
--- trunk/SKMainDocument.m 2012-10-19 15:04:34 UTC (rev 7735)
+++ trunk/SKMainDocument.m 2012-10-19 15:22:12 UTC (rev 7736)
@@ -896,7 +896,7 @@
[[[self windowForSheet] attachedSheet] orderOut:self];
[[self progressController] setMessage:[NSLocalizedString(@"Reloading
document", @"Message for progress sheet") stringByAppendingEllipsis]];
- [[self progressController] beginSheetModalForWindow:[self
windowForSheet]];
+ [[self progressController] beginSheetModalForWindow:[self
windowForSheet] completionHandler:NULL];
}
BOOL success = [super revertToContentsOfURL:absoluteURL ofType:typeName
error:outError];
@@ -997,7 +997,7 @@
- (void)convertNotesUsingPDFDocument:(PDFDocument *)pdfDocWithoutNotes {
[[self progressController] setMessage:[NSLocalizedString(@"Converting
notes", @"Message for progress sheet") stringByAppendingEllipsis]];
- [[self progressController] beginSheetModalForWindow:[self windowForSheet]];
+ [[self progressController] beginSheetModalForWindow:[self windowForSheet]
completionHandler:NULL];
PDFDocument *pdfDoc = [self pdfDocument];
NSInteger i, count = [pdfDoc pageCount];
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2012-10-19 15:04:34 UTC (rev 7735)
+++ trunk/SKMainWindowController.m 2012-10-19 15:22:12 UTC (rev 7736)
@@ -1954,7 +1954,7 @@
[[self progressController] setMessage:[NSLocalizedString(@"Exporting
PDF", @"Message for progress sheet") stringByAppendingEllipsis]];
// Bring up the save panel as a sheet.
- [[self progressController] beginSheetModalForWindow:[self window]];
+ [[self progressController] beginSheetModalForWindow:[self window]
completionHandler:NULL];
}
- (void)handleDocumentEndWrite:(NSNotification *)notification {
Modified: trunk/SKMainWindowController_Actions.m
===================================================================
--- trunk/SKMainWindowController_Actions.m 2012-10-19 15:04:34 UTC (rev
7735)
+++ trunk/SKMainWindowController_Actions.m 2012-10-19 15:22:12 UTC (rev
7736)
@@ -572,7 +572,7 @@
[[self progressController] setMaxValue:(double)MIN(18, count)];
[[self progressController] setMessage:[NSLocalizedString(@"Cropping
Pages", @"Message for progress sheet") stringByAppendingEllipsis]];
- [[self progressController] beginSheetModalForWindow:[self window]];
+ [[self progressController] beginSheetModalForWindow:[self window]
completionHandler:NULL];
if (count == 1) {
rect[0] = [[[pdfView document] pageAtIndex:0] foregroundBox];
@@ -616,7 +616,7 @@
[[self progressController] setMaxValue:(double)iMax];
[[self progressController] setMessage:[NSLocalizedString(@"Cropping
Pages", @"Message for progress sheet") stringByAppendingEllipsis]];
- [[self progressController] beginSheetModalForWindow:[self window]];
+ [[self progressController] beginSheetModalForWindow:[self window]
completionHandler:NULL];
for (i = 0; i < iMax; i++) {
NSRect rect = [[pdfDoc pageAtIndex:i] foregroundBox];
@@ -638,7 +638,7 @@
[[self progressController] setMaxValue:1.1 * iMax];
[[self progressController] setMessage:[NSLocalizedString(@"Cropping
Pages", @"Message for progress sheet") stringByAppendingEllipsis]];
- [[self progressController] beginSheetModalForWindow:[self window]];
+ [[self progressController] beginSheetModalForWindow:[self window]
completionHandler:NULL];
for (i = 0; i < iMax; i++) {
NSRect bbox = [[pdfDoc pageAtIndex:i] foregroundBox];
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_sfd2d_oct
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
