diff options
| author | rowanbeentje <rowan@beent.je> | 2010-12-05 22:25:24 +0000 |
|---|---|---|
| committer | rowanbeentje <rowan@beent.je> | 2010-12-05 22:25:24 +0000 |
| commit | 3de284fa904c295f306ec047fc29289399424836 (patch) | |
| tree | 631625497103deed521ccd2508a56a81afa6671f | |
| parent | bedc1d11d6bedb4239b8f083b88b26d171ced3b3 (diff) | |
| download | sequelpro-3de284fa904c295f306ec047fc29289399424836.tar.gz sequelpro-3de284fa904c295f306ec047fc29289399424836.tar.bz2 sequelpro-3de284fa904c295f306ec047fc29289399424836.zip | |
- Add the ability to stop animation of the task indicator, and use it to pause the task indicator animation when custom queries are paused and waiting for user interaction after an error
| -rw-r--r-- | Source/SPCustomQuery.m | 2 | ||||
| -rw-r--r-- | Source/SPDatabaseDocument.h | 1 | ||||
| -rw-r--r-- | Source/SPDatabaseDocument.m | 13 |
3 files changed, 16 insertions, 0 deletions
diff --git a/Source/SPCustomQuery.m b/Source/SPCustomQuery.m index 372fa512..5e1a85e4 100644 --- a/Source/SPCustomQuery.m +++ b/Source/SPCustomQuery.m @@ -667,6 +667,7 @@ // ask the user to continue after detecting an error if (![mySQLConnection queryCancelled]) { + [tableDocumentInstance setTaskIndicatorShouldAnimate:NO]; SPBeginWaitingAlertSheet(@"title", NSLocalizedString(@"Run All", @"run all button"), NSLocalizedString(@"Continue", @"continue button"), NSLocalizedString(@"Stop", @"stop button"), NSWarningAlertStyle, [tableDocumentInstance parentWindow], self, @@ -676,6 +677,7 @@ [mySQLConnection getLastErrorMessage], runAllContinueStopSheetReturnCode ); + [tableDocumentInstance setTaskIndicatorShouldAnimate:YES]; switch (runAllContinueStopSheetReturnCode) { case NSAlertDefaultReturn: diff --git a/Source/SPDatabaseDocument.h b/Source/SPDatabaseDocument.h index 57131de8..e7fac8bf 100644 --- a/Source/SPDatabaseDocument.h +++ b/Source/SPDatabaseDocument.h @@ -254,6 +254,7 @@ - (BOOL)isWorking; - (void)setDatabaseListIsSelectable:(BOOL)isSelectable; - (void)centerTaskWindow; +- (void)setTaskIndicatorShouldAnimate:(BOOL)shouldAnimate; // Encoding methods - (void)setConnectionEncoding:(NSString *)mysqlEncoding reloadingViews:(BOOL)reloadViews; diff --git a/Source/SPDatabaseDocument.m b/Source/SPDatabaseDocument.m index 43d71b01..9f14c3ed 100644 --- a/Source/SPDatabaseDocument.m +++ b/Source/SPDatabaseDocument.m @@ -1223,6 +1223,19 @@ [taskProgressWindow setFrameOrigin:newBottomLeftPoint]; } +/** + * Support pausing and restarting the task progress indicator. + * Only works while the indicator is in indeterminate mode. + */ +- (void) setTaskIndicatorShouldAnimate:(BOOL)shouldAnimate +{ + if (shouldAnimate) { + [[taskProgressIndicator onMainThread] startAnimation:self]; + } else { + [[taskProgressIndicator onMainThread] stopAnimation:self]; + } +} + #pragma mark - #pragma mark Encoding Methods |