fix: identify inspector LUT requests by generation and clarify import cancellation
这个提交包含在:
1 父节点
ddcaa821be
当前提交
875add7adf
2 个文件已更改
+13
-12
没有与搜索条件相匹配的文件
@@ -316,13 +316,13 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b
|
||||
_statusLabel.toolTip=_libraryTask.localizedAdditionalDescription?:_statusLabel.stringValue;
|
||||
}
|
||||
- (void)beginLibraryTask:(NSProgress *)task {
|
||||
[_libraryTask release];_libraryTask=[task retain];_importFiles.enabled=NO;_importFolder.enabled=NO;_refresh.title=@"取消";
|
||||
[_libraryTask release];_libraryTask=[task retain];_importFiles.enabled=NO;_importFolder.enabled=NO;_refresh.title=@"取消";_done.title=@"停止并关闭";_done.toolTip=@"关闭将取消本次加载,原有 LUT 保留";
|
||||
[_progressTimer invalidate];[_progressTimer release];_progressTimer=[[NSTimer timerWithTimeInterval:.1 target:self selector:@selector(pollLibraryProgress:) userInfo:nil repeats:YES]retain];
|
||||
[[NSRunLoop mainRunLoop]addTimer:_progressTimer forMode:NSRunLoopCommonModes];[self pollLibraryProgress:nil];
|
||||
}
|
||||
- (void)endLibraryTask {
|
||||
[_libraryTask release];_libraryTask=nil;[_progressTimer invalidate];[_progressTimer release];_progressTimer=nil;
|
||||
_importFiles.enabled=YES;_importFolder.enabled=YES;_refresh.title=@"刷新";
|
||||
_importFiles.enabled=YES;_importFolder.enabled=YES;_refresh.title=@"刷新";_done.title=@"完成";_done.toolTip=nil;
|
||||
}
|
||||
- (void)reloadLibrary:(id)sender{
|
||||
if(_libraryTask){[_libraryTask cancel];[self setStatus:@"正在取消…"];return;}
|
||||
|
||||
在新工单中引用
屏蔽一个用户