Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
850cd659
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,发现更多精彩内容 >>
提交
850cd659
编写于
6月 19, 2019
作者:
P
Peng Lyu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
beautify macos keyboard layout label
上级
24cdcfa5
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
50 addition
and
7 deletion
+50
-7
src/vs/workbench/contrib/preferences/browser/keyboardLayoutPicker.ts
...bench/contrib/preferences/browser/keyboardLayoutPicker.ts
+9
-7
src/vs/workbench/services/keybinding/common/keymapService.ts
src/vs/workbench/services/keybinding/common/keymapService.ts
+41
-0
未找到文件。
src/vs/workbench/contrib/preferences/browser/keyboardLayoutPicker.ts
浏览文件 @
850cd659
...
...
@@ -6,7 +6,7 @@
import
*
as
nls
from
'
vs/nls
'
;
import
{
StatusbarAlignment
,
IStatusbarService
,
IStatusbarEntryAccessor
}
from
'
vs/platform/statusbar/common/statusbar
'
;
import
{
Disposable
,
MutableDisposable
}
from
'
vs/base/common/lifecycle
'
;
import
{
IKeymapService
,
areKeyboardLayoutsEqual
}
from
'
vs/workbench/services/keybinding/common/keymapService
'
;
import
{
IKeymapService
,
areKeyboardLayoutsEqual
,
parseKeyboardLayout
}
from
'
vs/workbench/services/keybinding/common/keymapService
'
;
import
{
LifecyclePhase
}
from
'
vs/platform/lifecycle/common/lifecycle
'
;
import
{
Registry
}
from
'
vs/platform/registry/common/platform
'
;
import
{
Extensions
as
WorkbenchExtensions
,
IWorkbenchContribution
,
IWorkbenchContributionsRegistry
}
from
'
vs/workbench/common/contributions
'
;
...
...
@@ -34,10 +34,10 @@ export class KeyboardLayoutPickerContribution extends Disposable implements IWor
let
layout
=
this
.
keymapService
.
getCurrentKeyboardLayout
();
if
(
layout
)
{
let
layoutInfo
=
(
<
any
>
layout
).
text
||
(
<
any
>
layout
).
lang
||
(
<
any
>
layout
).
model
;
let
layoutInfo
=
parseKeyboardLayout
(
layout
)
;
this
.
pickerElement
.
value
=
this
.
statusbarService
.
addEntry
(
{
text
:
`Layout:
${
layoutInfo
}
`
,
text
:
`Layout:
${
layoutInfo
.
label
}
`
,
// tooltip: nls.localize('keyboard.layout.tooltip', "If you are not using a Screen Reader, please change the setting `editor.accessibilitySupport` to \"off\"."),
command
:
KEYBOARD_LAYOUT_OPEN_PICKER
},
...
...
@@ -49,11 +49,11 @@ export class KeyboardLayoutPickerContribution extends Disposable implements IWor
this
.
_register
(
keymapService
.
onDidChangeKeyboardMapper
(()
=>
{
let
layout
=
this
.
keymapService
.
getCurrentKeyboardLayout
();
let
layoutInfo
=
(
<
any
>
layout
).
text
||
(
<
any
>
layout
).
lang
||
(
<
any
>
layout
).
model
;
let
layoutInfo
=
parseKeyboardLayout
(
layout
)
;
if
(
this
.
pickerElement
.
value
)
{
this
.
pickerElement
.
value
.
update
({
text
:
`Layout:
${
layoutInfo
}
`
,
text
:
`Layout:
${
layoutInfo
.
label
}
`
,
command
:
KEYBOARD_LAYOUT_OPEN_PICKER
});
}
else
{
...
...
@@ -111,9 +111,11 @@ export class KeyboardLayoutPickerAction extends Action {
const
picks
:
QuickPickInput
[]
=
layouts
.
map
(
layout
=>
{
const
picked
=
!
isAutoDetect
&&
areKeyboardLayoutsEqual
(
currentLayout
,
layout
);
const
layoutInfo
=
parseKeyboardLayout
(
layout
);
return
{
label
:
(
<
any
>
layout
).
text
||
(
<
any
>
layout
).
lang
||
(
<
any
>
layout
).
layout
,
description
:
((
<
any
>
layout
).
id
||
''
)
+
(
picked
?
'
(Current selection)
'
:
''
),
label
:
layoutInfo
.
label
,
id
:
(
<
any
>
layout
).
text
||
(
<
any
>
layout
).
lang
||
(
<
any
>
layout
).
layout
,
description
:
layoutInfo
.
description
+
(
picked
?
'
(Current selection)
'
:
''
),
picked
:
!
isAutoDetect
&&
areKeyboardLayoutsEqual
(
currentLayout
,
layout
)
};
});
...
...
src/vs/workbench/services/keybinding/common/keymapService.ts
浏览文件 @
850cd659
...
...
@@ -122,3 +122,44 @@ export function areKeyboardLayoutsEqual(a: IKeyboardLayoutInfo | null, b: IKeybo
return
false
;
}
export
function
parseKeyboardLayout
(
layout
:
IKeyboardLayoutInfo
|
null
):
{
label
:
string
,
description
:
string
}
{
if
((
<
IWindowsKeyboardLayoutInfo
>
layout
).
name
)
{
// windows
let
windowsLayout
=
<
IWindowsKeyboardLayoutInfo
>
layout
;
return
{
label
:
windowsLayout
.
text
,
description
:
''
};
}
if
((
<
IMacKeyboardLayoutInfo
>
layout
).
id
)
{
let
macLayout
=
<
IMacKeyboardLayoutInfo
>
layout
;
if
(
/^com
\.
apple
\.
keylayout
\.
/
.
test
(
macLayout
.
id
))
{
return
{
label
:
macLayout
.
id
.
replace
(
/^com
\.
apple
\.
keylayout
\.
/
,
''
).
replace
(
/-/
,
'
'
),
description
:
''
};
}
if
(
/^.*inputmethod
\.
/
.
test
(
macLayout
.
id
))
{
return
{
label
:
macLayout
.
id
.
replace
(
/^.*inputmethod
\.
/
,
''
).
replace
(
/
[
-
\.]
/
,
'
'
),
description
:
`Input Method (
${
macLayout
.
lang
}
)`
};
}
return
{
label
:
macLayout
.
lang
,
description
:
''
};
}
let
linuxLayout
=
<
ILinuxKeyboardLayoutInfo
>
layout
;
return
{
label
:
linuxLayout
.
layout
,
description
:
''
};
}
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录