jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UI: Fix issue where space/esc hotkeys would be blank 

This also modifies libobs.

This only happened on Linux.

Fixes https://obsproject.com/mantis/view.php?id=1018
master
Clayton Groeneveld 2019-03-31 05:09:43 -05:00
parent 29a1a97392
commit e321005b02
5 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
UI/data/locale/en-US.ini
View File

@ -875,6 +875,7 @@ Hotkeys.AppleKeypadSubtract="- (Keypad)"
Hotkeys.AppleKeypadDecimal=". (Keypad)"
Hotkeys.AppleKeypadEqual="= (Keypad)"
Hotkeys.MouseButton="Mouse %1"
Hotkeys.Escape="Esc"
# audio hotkeys
Mute="Mute"

1
UI/window-basic-main.cpp
View File

@ -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"),

1
libobs/obs-hotkey.c
View File

@ -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);

1
libobs/obs-hotkey.h
View File

@ -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

2
libobs/obs-nix.c
View File

@ -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:;
}