Revision: 7617
http://skim-app.svn.sourceforge.net/skim-app/?rev=7617&view=rev
Author: hofman
Date: 2011-12-30 18:31:03 +0000 (Fri, 30 Dec 2011)
Log Message:
-----------
simplify progress controller API, we only use it either as determinate or
indeterminate
Modified Paths:
--------------
trunk/SKMainDocument.m
trunk/SKMainWindowController.m
trunk/SKMainWindowController_Actions.m
trunk/SKProgressController.h
trunk/SKProgressController.m
Modified: trunk/SKMainDocument.m
===================================================================
--- trunk/SKMainDocument.m 2011-12-30 18:15:41 UTC (rev 7616)
+++ trunk/SKMainDocument.m 2011-12-30 18:31:03 UTC (rev 7617)
@@ -263,8 +263,10 @@
}
- (SKProgressController *)progressController {
- if (progressController == nil)
+ if (progressController == nil) {
progressController = [[SKProgressController alloc] init];
+ [progressController setIndeterminate:YES];
+ }
return progressController;
}
@@ -842,7 +844,6 @@
[[[self windowForSheet] attachedSheet] orderOut:self];
[[self progressController] setMessage:[NSLocalizedString(@"Reloading
document", @"Message for progress sheet") stringByAppendingEllipsis]];
- [[self progressController] setIndeterminate:YES];
[[self progressController] beginSheetModalForWindow:[self
windowForSheet]];
}
@@ -949,7 +950,6 @@
- (void)convertNotesUsingPDFDocument:(PDFDocument *)pdfDocWithoutNotes {
[[self progressController] setMessage:[NSLocalizedString(@"Converting
notes", @"Message for progress sheet") stringByAppendingEllipsis]];
- [[self progressController] setIndeterminate:YES];
[[self progressController] beginSheetModalForWindow:[self windowForSheet]];
PDFDocument *pdfDoc = [self pdfDocument];
@@ -1212,7 +1212,6 @@
- (void)saveDiskImageToFile:(NSString *)fileName email:(BOOL)email {
[[self progressController] setMessage:[NSLocalizedString(@"Saving Disk
Image", @"Message for progress sheet") stringByAppendingEllipsis]];
- [[self progressController] setIndeterminate:YES];
[[self progressController] show];
NSDictionary *info = [NSDictionary dictionaryWithObjectsAndKeys:[[self
fileURL] path], SOURCEPATH_KEY, fileName, TARGETPATH_KEY, [NSNumber
numberWithBool:email], EMAIL_KEY, nil];
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2011-12-30 18:15:41 UTC (rev 7616)
+++ trunk/SKMainWindowController.m 2011-12-30 18:31:03 UTC (rev 7617)
@@ -1936,7 +1936,6 @@
- (void)handleDocumentBeginWrite:(NSNotification *)notification {
// Establish maximum and current value for progress bar.
[[self progressController] setMaxValue:(double)[[pdfView document]
pageCount]];
- [[self progressController] setDoubleValue:0.0];
[[self progressController] setMessage:[NSLocalizedString(@"Exporting
PDF", @"Message for progress sheet") stringByAppendingEllipsis]];
// Bring up the save panel as a sheet.
Modified: trunk/SKMainWindowController_Actions.m
===================================================================
--- trunk/SKMainWindowController_Actions.m 2011-12-30 18:15:41 UTC (rev
7616)
+++ trunk/SKMainWindowController_Actions.m 2011-12-30 18:31:03 UTC (rev
7617)
@@ -571,7 +571,6 @@
return;
[[self progressController] setMaxValue:(double)MIN(18, count)];
- [[self progressController] setDoubleValue:0.0];
[[self progressController] setMessage:[NSLocalizedString(@"Cropping
Pages", @"Message for progress sheet") stringByAppendingEllipsis]];
[[self progressController] beginSheetModalForWindow:[self window]];
@@ -616,7 +615,6 @@
NSInteger i, iMax = [[pdfView document] pageCount];
[[self progressController] setMaxValue:(double)iMax];
- [[self progressController] setDoubleValue:0.0];
[[self progressController] setMessage:[NSLocalizedString(@"Cropping
Pages", @"Message for progress sheet") stringByAppendingEllipsis]];
[[self progressController] beginSheetModalForWindow:[self window]];
@@ -639,7 +637,6 @@
NSSize size = NSZeroSize;
[[self progressController] setMaxValue:1.1 * iMax];
- [[self progressController] setDoubleValue:0.0];
[[self progressController] setMessage:[NSLocalizedString(@"Cropping
Pages", @"Message for progress sheet") stringByAppendingEllipsis]];
[[self progressController] beginSheetModalForWindow:[self window]];
Modified: trunk/SKProgressController.h
===================================================================
--- trunk/SKProgressController.h 2011-12-30 18:15:41 UTC (rev 7616)
+++ trunk/SKProgressController.h 2011-12-30 18:31:03 UTC (rev 7617)
@@ -48,7 +48,7 @@
@property (nonatomic, retain) IBOutlet NSTextField *progressField;
@property (nonatomic, retain) NSString *message;
@property (nonatomic, getter=isIndeterminate) BOOL indeterminate;
-@property (nonatomic) double minValue, maxValue, doubleValue;
+@property (nonatomic) double maxValue, doubleValue;
- (void)incrementBy:(double)delta;
Modified: trunk/SKProgressController.m
===================================================================
--- trunk/SKProgressController.m 2011-12-30 18:15:41 UTC (rev 7616)
+++ trunk/SKProgressController.m 2011-12-30 18:31:03 UTC (rev 7617)
@@ -44,7 +44,7 @@
@implementation SKProgressController
@synthesize progressBar, progressField;
-@dynamic message, indeterminate, minValue, maxValue, doubleValue;
+@dynamic message, indeterminate, maxValue, doubleValue;
- (void)dealloc {
SKDESTROY(progressBar);
@@ -77,28 +77,20 @@
}
- (BOOL)isIndeterminate {
- [self window];
- return [progressBar isIndeterminate];
+ return [[self progressBar] isIndeterminate];
}
- (void)setIndeterminate:(BOOL)flag {
[[self progressBar] setIndeterminate:flag];
}
-- (double)minValue {
- return [[self progressBar] minValue];
-}
-
-- (void)setMinValue:(double)newMinimum {
- [[self progressBar] setMinValue:newMinimum];
-}
-
- (double)maxValue {
return [[self progressBar] maxValue];
}
- (void)setMaxValue:(double)newMaximum {
[[self progressBar] setMaxValue:newMaximum];
+ [[self progressBar] setDoubleValue:0.0];
}
- (double)doubleValue {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Ridiculously easy VDI. With Citrix VDI-in-a-Box, you don't need a complex
infrastructure or vast IT resources to deliver seamless, secure access to
virtual desktops. With this all-in-one solution, easily deploy virtual
desktops for less than the cost of PCs and save 60% on VDI infrastructure
costs. Try it free! http://p.sf.net/sfu/Citrix-VDIinabox
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
