Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
d69e8d3b
V
vscode
项目概览
xxadev
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
d69e8d3b
编写于
10月 01, 2018
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
debt - use statusbar service for global progress message
上级
f666c4b0
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
15 addition
and
71 deletion
+15
-71
src/vs/workbench/services/progress/browser/progressService2.ts
...s/workbench/services/progress/browser/progressService2.ts
+15
-71
未找到文件。
src/vs/workbench/services/progress/browser/progressService2.ts
浏览文件 @
d69e8d3b
...
...
@@ -5,16 +5,13 @@
'
use strict
'
;
import
'
vs/css!./media/progressService2
'
;
import
*
as
dom
from
'
vs/base/browser/dom
'
;
import
{
localize
}
from
'
vs/nls
'
;
import
{
IDisposable
,
dispose
}
from
'
vs/base/common/lifecycle
'
;
import
{
IProgressService2
,
IProgressOptions
,
IProgressStep
,
ProgressLocation
}
from
'
vs/workbench/services/progress/common/progress
'
;
import
{
IProgress
,
emptyProgress
,
Progress
}
from
'
vs/platform/progress/common/progress
'
;
import
{
IViewletService
}
from
'
vs/workbench/services/viewlet/browser/viewlet
'
;
import
{
OcticonLabel
}
from
'
vs/base/browser/ui/octiconLabel/octiconLabel
'
;
import
{
Registry
}
from
'
vs/platform/registry/common/platform
'
;
import
{
IStatusbarRegistry
,
StatusbarItemDescriptor
,
Extensions
,
IStatusbarItem
}
from
'
vs/workbench/browser/parts/statusbar/statusbar
'
;
import
{
StatusbarAlignment
}
from
'
vs/platform/statusbar/common/statusbar
'
;
import
{
StatusbarAlignment
,
IStatusbarService
}
from
'
vs/platform/statusbar/common/statusbar
'
;
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
{
always
,
timeout
}
from
'
vs/base/common/async
'
;
import
{
ProgressBadge
,
IActivityService
}
from
'
vs/workbench/services/activity/common/activity
'
;
...
...
@@ -23,69 +20,18 @@ import { Action } from 'vs/base/common/actions';
import
{
once
}
from
'
vs/base/common/event
'
;
import
{
ViewContainer
}
from
'
vs/workbench/common/views
'
;
class
WindowProgressItem
implements
IStatusbarItem
{
static
Instance
:
WindowProgressItem
;
private
_element
:
HTMLElement
;
private
_label
:
OcticonLabel
;
constructor
()
{
WindowProgressItem
.
Instance
=
this
;
}
render
(
element
:
HTMLElement
):
IDisposable
{
this
.
_element
=
element
;
this
.
_element
.
classList
.
add
(
'
progress
'
);
const
container
=
document
.
createElement
(
'
span
'
);
this
.
_element
.
appendChild
(
container
);
const
spinnerContainer
=
document
.
createElement
(
'
span
'
);
spinnerContainer
.
classList
.
add
(
'
spinner-container
'
);
container
.
appendChild
(
spinnerContainer
);
const
spinner
=
new
OcticonLabel
(
spinnerContainer
);
spinner
.
text
=
'
$(sync~spin)
'
;
const
labelContainer
=
document
.
createElement
(
'
span
'
);
container
.
appendChild
(
labelContainer
);
this
.
_label
=
new
OcticonLabel
(
labelContainer
);
this
.
hide
();
return
null
;
}
set
text
(
value
:
string
)
{
this
.
_label
.
text
=
value
;
}
set
title
(
value
:
string
)
{
this
.
_label
.
title
=
value
;
}
hide
()
{
dom
.
hide
(
this
.
_element
);
}
show
()
{
dom
.
show
(
this
.
_element
);
}
}
export
class
ProgressService2
implements
IProgressService2
{
_serviceBrand
:
any
;
private
_stack
:
[
IProgressOptions
,
Progress
<
IProgressStep
>
][]
=
[];
private
readonly
_stack
:
[
IProgressOptions
,
Progress
<
IProgressStep
>
][]
=
[];
private
_globalStatusEntry
:
IDisposable
;
constructor
(
@
IActivityService
private
readonly
_activityBar
:
IActivityService
,
@
IViewletService
private
readonly
_viewletService
:
IViewletService
,
@
INotificationService
private
readonly
_notificationService
:
INotificationService
@
INotificationService
private
readonly
_notificationService
:
INotificationService
,
@
IStatusbarService
private
readonly
_statusbarService
:
IStatusbarService
,
)
{
//
}
...
...
@@ -148,9 +94,11 @@ export class ProgressService2 implements IProgressService2 {
}
private
_updateWindowProgress
(
idx
:
number
=
0
)
{
if
(
idx
>=
this
.
_stack
.
length
)
{
WindowProgressItem
.
Instance
.
hide
();
}
else
{
dispose
(
this
.
_globalStatusEntry
);
if
(
idx
<
this
.
_stack
.
length
)
{
const
[
options
,
progress
]
=
this
.
_stack
[
idx
];
let
progressTitle
=
options
.
title
;
...
...
@@ -179,9 +127,10 @@ export class ProgressService2 implements IProgressService2 {
return
;
}
WindowProgressItem
.
Instance
.
text
=
text
;
WindowProgressItem
.
Instance
.
title
=
title
;
WindowProgressItem
.
Instance
.
show
();
this
.
_globalStatusEntry
=
this
.
_statusbarService
.
addEntry
({
text
:
`$(sync~spin)
${
text
}
`
,
tooltip
:
title
},
StatusbarAlignment
.
LEFT
);
}
}
...
...
@@ -325,8 +274,3 @@ export class ProgressService2 implements IProgressService2 {
return
promise
;
}
}
Registry
.
as
<
IStatusbarRegistry
>
(
Extensions
.
Statusbar
).
registerStatusbarItem
(
new
StatusbarItemDescriptor
(
WindowProgressItem
,
StatusbarAlignment
.
LEFT
)
);
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录