Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
尘离序散
obs-studio
提交
2d442452
O
obs-studio
项目概览
尘离序散
/
obs-studio
与 Fork 源项目一致
从无法访问的项目Fork
通知
30
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
obs-studio
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
2d442452
编写于
3月 31, 2019
作者:
J
Jim
提交者:
GitHub
3月 31, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1796 from cg2121/fix-hotkeys-not-showing
UI: Fix issue where space/esc hotkeys would be blank
上级
7e634ee3
e321005b
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
6 addition
and
0 deletion
+6
-0
UI/data/locale/en-US.ini
UI/data/locale/en-US.ini
+1
-0
UI/window-basic-main.cpp
UI/window-basic-main.cpp
+1
-0
libobs/obs-hotkey.c
libobs/obs-hotkey.c
+1
-0
libobs/obs-hotkey.h
libobs/obs-hotkey.h
+1
-0
libobs/obs-nix.c
libobs/obs-nix.c
+2
-0
未找到文件。
UI/data/locale/en-US.ini
浏览文件 @
2d442452
...
...
@@ -875,6 +875,7 @@ Hotkeys.AppleKeypadSubtract="- (Keypad)"
Hotkeys.AppleKeypadDecimal
=
". (Keypad)"
Hotkeys.AppleKeypadEqual
=
"= (Keypad)"
Hotkeys.MouseButton
=
"Mouse %1"
Hotkeys.Escape
=
"Esc"
# audio hotkeys
Mute
=
"Mute"
...
...
UI/window-basic-main.cpp
浏览文件 @
2d442452
...
...
@@ -2037,6 +2037,7 @@ void OBSBasic::InitHotkeys()
t
.
apple_keypad_decimal
=
Str
(
"Hotkeys.AppleKeypadDecimal"
);
t
.
apple_keypad_equal
=
Str
(
"Hotkeys.AppleKeypadEqual"
);
t
.
mouse_num
=
Str
(
"Hotkeys.MouseButton"
);
t
.
escape
=
Str
(
"Hotkeys.Escape"
);
obs_hotkeys_set_translations
(
&
t
);
obs_hotkeys_set_audio_hotkeys_translations
(
Str
(
"Mute"
),
Str
(
"Unmute"
),
...
...
libobs/obs-hotkey.c
浏览文件 @
2d442452
...
...
@@ -1479,6 +1479,7 @@ void obs_hotkeys_set_translations_s(
ADD_TRANSLATION
(
OBS_KEY_META
,
meta
);
ADD_TRANSLATION
(
OBS_KEY_MENU
,
menu
);
ADD_TRANSLATION
(
OBS_KEY_SPACE
,
space
);
ADD_TRANSLATION
(
OBS_KEY_ESCAPE
,
escape
);
#ifdef __APPLE__
const
char
*
numpad_str
=
t
.
apple_keypad_num
;
ADD_TRANSLATION
(
OBS_KEY_NUMSLASH
,
apple_keypad_divide
);
...
...
libobs/obs-hotkey.h
浏览文件 @
2d442452
...
...
@@ -126,6 +126,7 @@ struct obs_hotkeys_translations {
const
char
*
apple_keypad_decimal
;
const
char
*
apple_keypad_equal
;
const
char
*
mouse_num
;
/* For example, "Mouse %1" */
const
char
*
escape
;
};
/* This function is an optional way to provide translations for specific keys
...
...
libobs/obs-nix.c
浏览文件 @
2d442452
...
...
@@ -1114,6 +1114,8 @@ void obs_key_to_str(obs_key_t key, struct dstr *dstr)
case
OBS_KEY_NUMCOMMA
:
return
translate_key
(
key
,
"Numpad ,"
);
case
OBS_KEY_NUMPERIOD
:
return
translate_key
(
key
,
"Numpad ."
);
case
OBS_KEY_NUMSLASH
:
return
translate_key
(
key
,
"Numpad /"
);
case
OBS_KEY_SPACE
:
return
translate_key
(
key
,
"Space"
);
case
OBS_KEY_ESCAPE
:
return
translate_key
(
key
,
"Escape"
);
default:
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录