Revision: 5821
http://skim-app.svn.sourceforge.net/skim-app/?rev=5821&view=rev
Author: hofman
Date: 2009-09-27 20:55:41 +0000 (Sun, 27 Sep 2009)
Log Message:
-----------
use windowcontroller category methods to show progress sheet
Modified Paths:
--------------
trunk/NSWindowController_SKExtensions.h
trunk/NSWindowController_SKExtensions.m
trunk/SKMainDocument.m
trunk/SKMainWindowController.m
trunk/SKMainWindowController_Actions.m
trunk/SKProgressController.h
trunk/SKProgressController.m
Modified: trunk/NSWindowController_SKExtensions.h
===================================================================
--- trunk/NSWindowController_SKExtensions.h 2009-09-27 16:32:08 UTC (rev
5820)
+++ trunk/NSWindowController_SKExtensions.h 2009-09-27 20:55:41 UTC (rev
5821)
@@ -46,6 +46,7 @@
- (BOOL)isNoteWindowController;
- (BOOL)isSnapshotWindowController;
+- (void)beginSheetModalForWindow:(NSWindow *)window;
- (void)beginSheetModalForWindow:(NSWindow *)window modalDelegate:(id)delegate
didEndSelector:(SEL)didEndSelector contextInfo:(void *)contextInfo;
- (IBAction)dismiss:(id)sender;
Modified: trunk/NSWindowController_SKExtensions.m
===================================================================
--- trunk/NSWindowController_SKExtensions.m 2009-09-27 16:32:08 UTC (rev
5820)
+++ trunk/NSWindowController_SKExtensions.m 2009-09-27 20:55:41 UTC (rev
5821)
@@ -77,6 +77,10 @@
}
}
+- (void)beginSheetModalForWindow:(NSWindow *)window {
+ [self beginSheetModalForWindow:window modalDelegate:nil
didEndSelector:NULL contextInfo:NULL];
+}
+
- (void)beginSheetModalForWindow:(NSWindow *)window modalDelegate:(id)delegate
didEndSelector:(SEL)didEndSelector contextInfo:(void *)contextInfo {
NSInvocation *invocation = nil;
if (delegate != nil && didEndSelector != NULL) {
Modified: trunk/SKMainDocument.m
===================================================================
--- trunk/SKMainDocument.m 2009-09-27 16:32:08 UTC (rev 5820)
+++ trunk/SKMainDocument.m 2009-09-27 20:55:41 UTC (rev 5821)
@@ -584,7 +584,7 @@
tmpData = nil;
if (disableAlert == NO)
- [[self progressController] endSheet];
+ [[self progressController] dismiss:nil];
return success;
}
@@ -995,7 +995,7 @@
[pdfDocWithoutNotes release];
- [[self progressController] endSheet];
+ [[self progressController] dismiss:nil];
}
- (void)convertNotesSheetDidEnd:(NSAlert *)alert
returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo {
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2009-09-27 16:32:08 UTC (rev 5820)
+++ trunk/SKMainWindowController.m 2009-09-27 20:55:41 UTC (rev 5821)
@@ -2158,7 +2158,7 @@
}
- (void)handleDocumentEndWrite:(NSNotification *)notification {
- [[self progressController] endSheet];
+ [[self progressController] dismiss:nil];
}
- (void)handleDocumentEndPageWrite:(NSNotification *)notification {
Modified: trunk/SKMainWindowController_Actions.m
===================================================================
--- trunk/SKMainWindowController_Actions.m 2009-09-27 16:32:08 UTC (rev
5820)
+++ trunk/SKMainWindowController_Actions.m 2009-09-27 20:55:41 UTC (rev
5821)
@@ -692,7 +692,7 @@
[pdfView setCurrentSelectionRect:NSZeroRect];
if (emptySelection) {
- [[self progressController] endSheet];
+ [[self progressController] dismiss:nil];
}
}
@@ -715,7 +715,7 @@
}
[self cropPagesToRects:rectArray];
- [[self progressController] endSheet];
+ [[self progressController] dismiss:nil];
}
- (IBAction)smartAutoCropAll:(id)sender {
@@ -757,7 +757,7 @@
[[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode
beforeDate:[NSDate dateWithTimeIntervalSinceNow:0.1]];
[self cropPagesToRects:rectArray];
- [[self progressController] endSheet];
+ [[self progressController] dismiss:nil];
}
- (IBAction)autoSelectContent:(id)sender {
Modified: trunk/SKProgressController.h
===================================================================
--- trunk/SKProgressController.h 2009-09-27 16:32:08 UTC (rev 5820)
+++ trunk/SKProgressController.h 2009-09-27 20:55:41 UTC (rev 5821)
@@ -63,9 +63,6 @@
- (void)incrementBy:(double)delta;
-- (void)beginSheetModalForWindow:(NSWindow *)window;
-- (void)endSheet;
-
- (void)show;
- (void)hide;
Modified: trunk/SKProgressController.m
===================================================================
--- trunk/SKProgressController.m 2009-09-27 16:32:08 UTC (rev 5820)
+++ trunk/SKProgressController.m 2009-09-27 20:55:41 UTC (rev 5821)
@@ -38,6 +38,7 @@
#import "SKProgressController.h"
#import "SKApplication.h"
+#import "NSWindowController_SKExtensions.h"
@implementation SKProgressController
@@ -105,17 +106,16 @@
[[self progressBar] displayIfNeeded];
}
-- (void)beginSheetModalForWindow:(NSWindow *)window {
+- (void)beginSheetModalForWindow:(NSWindow *)window modalDelegate:(id)delegate
didEndSelector:(SEL)didEndSelector contextInfo:(void *)contextInfo {
[[self progressBar] startAnimation:self];
[(SKApplication *)NSApp setUserAttentionDisabled:YES];
- [NSApp beginSheet:[self window] modalForWindow:window modalDelegate:nil
didEndSelector:NULL contextInfo:NULL];
+ [super beginSheetModalForWindow:window modalDelegate:delegate
didEndSelector:didEndSelector contextInfo:contextInfo];
[(SKApplication *)NSApp setUserAttentionDisabled:NO];
}
-- (void)endSheet {
+- (IBAction)dismiss:(id)sender {
[[self progressBar] stopAnimation:self];
- [NSApp endSheet:[self window]];
- [[self window] orderOut:self];
+ [super dismiss:sender];
}
- (void)show {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Come build with us! The BlackBerry® Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9-12, 2009. Register now!
http://p.sf.net/sfu/devconf
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit