mirror of
https://git.ryujinx.app/ryubing/ryujinx.git
synced 2026-06-04 19:39:15 +00:00
Split keyboard localisation into dedicated locale file
This commit is contained in:
Babib3l
1929
assets/Locales/KeyboardLayout.json
Normal file
1929
assets/Locales/KeyboardLayout.json
Normal file
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -56,7 +56,7 @@ namespace Ryujinx.Ava.Input
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
return new AvaloniaKeyboard(this, _keyboardIdentifers[0], LocaleManager.Instance[LocaleKeys.AllKeyboards]);
|
return new AvaloniaKeyboard(this, _keyboardIdentifers[0], LocaleManager.Instance[LocaleKeys.KeyboardLayout_AllKeyboards]);
|
||||||
}
|
}
|
||||||
|
|
||||||
public IEnumerable<IGamepad> GetGamepads() => [GetGamepad("0")];
|
public IEnumerable<IGamepad> GetGamepads() => [GetGamepad("0")];
|
||||||
|
|||||||
@@ -14,75 +14,75 @@ namespace Ryujinx.Ava.UI.Helpers
|
|||||||
|
|
||||||
private static readonly Dictionary<Key, LocaleKeys> _keysMap = new()
|
private static readonly Dictionary<Key, LocaleKeys> _keysMap = new()
|
||||||
{
|
{
|
||||||
{ Key.Unknown, LocaleKeys.KeyUnknown },
|
{ Key.Unknown, LocaleKeys.KeyboardLayout_KeyUnknown },
|
||||||
{ Key.ShiftLeft, LocaleKeys.KeyShiftLeft },
|
{ Key.ShiftLeft, LocaleKeys.KeyboardLayout_KeyShiftLeft },
|
||||||
{ Key.ShiftRight, LocaleKeys.KeyShiftRight },
|
{ Key.ShiftRight, LocaleKeys.KeyboardLayout_KeyShiftRight },
|
||||||
{ Key.ControlLeft, LocaleKeys.KeyControlLeft },
|
{ Key.ControlLeft, LocaleKeys.KeyboardLayout_KeyControlLeft },
|
||||||
{ Key.ControlRight, LocaleKeys.KeyControlRight },
|
{ Key.ControlRight, LocaleKeys.KeyboardLayout_KeyControlRight },
|
||||||
{ Key.AltLeft, LocaleKeys.KeyAltLeft },
|
{ Key.AltLeft, LocaleKeys.KeyboardLayout_KeyAltLeft },
|
||||||
{ Key.AltRight, LocaleKeys.KeyAltRight },
|
{ Key.AltRight, LocaleKeys.KeyboardLayout_KeyAltRight },
|
||||||
{ Key.WinLeft, LocaleKeys.KeyWinLeft },
|
{ Key.WinLeft, LocaleKeys.KeyboardLayout_KeyWinLeft },
|
||||||
{ Key.WinRight, LocaleKeys.KeyWinRight },
|
{ Key.WinRight, LocaleKeys.KeyboardLayout_KeyWinRight },
|
||||||
{ Key.Up, LocaleKeys.KeyUp },
|
{ Key.Up, LocaleKeys.KeyboardLayout_KeyUp },
|
||||||
{ Key.Down, LocaleKeys.KeyDown },
|
{ Key.Down, LocaleKeys.KeyboardLayout_KeyDown },
|
||||||
{ Key.Left, LocaleKeys.KeyLeft },
|
{ Key.Left, LocaleKeys.KeyboardLayout_KeyLeft },
|
||||||
{ Key.Right, LocaleKeys.KeyRight },
|
{ Key.Right, LocaleKeys.KeyboardLayout_KeyRight },
|
||||||
{ Key.Enter, LocaleKeys.KeyEnter },
|
{ Key.Enter, LocaleKeys.KeyboardLayout_KeyEnter },
|
||||||
{ Key.Escape, LocaleKeys.KeyEscape },
|
{ Key.Escape, LocaleKeys.KeyboardLayout_KeyEscape },
|
||||||
{ Key.Space, LocaleKeys.KeySpace },
|
{ Key.Space, LocaleKeys.KeyboardLayout_KeySpace },
|
||||||
{ Key.Tab, LocaleKeys.KeyTab },
|
{ Key.Tab, LocaleKeys.KeyboardLayout_KeyTab },
|
||||||
{ Key.BackSpace, LocaleKeys.KeyBackSpace },
|
{ Key.BackSpace, LocaleKeys.KeyboardLayout_KeyBackSpace },
|
||||||
{ Key.Insert, LocaleKeys.KeyInsert },
|
{ Key.Insert, LocaleKeys.KeyboardLayout_KeyInsert },
|
||||||
{ Key.Delete, LocaleKeys.KeyDelete },
|
{ Key.Delete, LocaleKeys.KeyboardLayout_KeyDelete },
|
||||||
{ Key.PageUp, LocaleKeys.KeyPageUp },
|
{ Key.PageUp, LocaleKeys.KeyboardLayout_KeyPageUp },
|
||||||
{ Key.PageDown, LocaleKeys.KeyPageDown },
|
{ Key.PageDown, LocaleKeys.KeyboardLayout_KeyPageDown },
|
||||||
{ Key.Home, LocaleKeys.KeyHome },
|
{ Key.Home, LocaleKeys.KeyboardLayout_KeyHome },
|
||||||
{ Key.End, LocaleKeys.KeyEnd },
|
{ Key.End, LocaleKeys.KeyboardLayout_KeyEnd },
|
||||||
{ Key.CapsLock, LocaleKeys.KeyCapsLock },
|
{ Key.CapsLock, LocaleKeys.KeyboardLayout_KeyCapsLock },
|
||||||
{ Key.ScrollLock, LocaleKeys.KeyScrollLock },
|
{ Key.ScrollLock, LocaleKeys.KeyboardLayout_KeyScrollLock },
|
||||||
{ Key.PrintScreen, LocaleKeys.KeyPrintScreen },
|
{ Key.PrintScreen, LocaleKeys.KeyboardLayout_KeyPrintScreen },
|
||||||
{ Key.Pause, LocaleKeys.KeyPause },
|
{ Key.Pause, LocaleKeys.KeyboardLayout_KeyPause },
|
||||||
{ Key.NumLock, LocaleKeys.KeyNumLock },
|
{ Key.NumLock, LocaleKeys.KeyboardLayout_KeyNumLock },
|
||||||
{ Key.Clear, LocaleKeys.KeyClear },
|
{ Key.Clear, LocaleKeys.KeyboardLayout_KeyClear },
|
||||||
{ Key.Keypad0, LocaleKeys.KeyKeypad0 },
|
{ Key.Keypad0, LocaleKeys.KeyboardLayout_KeyKeypad0 },
|
||||||
{ Key.Keypad1, LocaleKeys.KeyKeypad1 },
|
{ Key.Keypad1, LocaleKeys.KeyboardLayout_KeyKeypad1 },
|
||||||
{ Key.Keypad2, LocaleKeys.KeyKeypad2 },
|
{ Key.Keypad2, LocaleKeys.KeyboardLayout_KeyKeypad2 },
|
||||||
{ Key.Keypad3, LocaleKeys.KeyKeypad3 },
|
{ Key.Keypad3, LocaleKeys.KeyboardLayout_KeyKeypad3 },
|
||||||
{ Key.Keypad4, LocaleKeys.KeyKeypad4 },
|
{ Key.Keypad4, LocaleKeys.KeyboardLayout_KeyKeypad4 },
|
||||||
{ Key.Keypad5, LocaleKeys.KeyKeypad5 },
|
{ Key.Keypad5, LocaleKeys.KeyboardLayout_KeyKeypad5 },
|
||||||
{ Key.Keypad6, LocaleKeys.KeyKeypad6 },
|
{ Key.Keypad6, LocaleKeys.KeyboardLayout_KeyKeypad6 },
|
||||||
{ Key.Keypad7, LocaleKeys.KeyKeypad7 },
|
{ Key.Keypad7, LocaleKeys.KeyboardLayout_KeyKeypad7 },
|
||||||
{ Key.Keypad8, LocaleKeys.KeyKeypad8 },
|
{ Key.Keypad8, LocaleKeys.KeyboardLayout_KeyKeypad8 },
|
||||||
{ Key.Keypad9, LocaleKeys.KeyKeypad9 },
|
{ Key.Keypad9, LocaleKeys.KeyboardLayout_KeyKeypad9 },
|
||||||
{ Key.KeypadDivide, LocaleKeys.KeyKeypadDivide },
|
{ Key.KeypadDivide, LocaleKeys.KeyboardLayout_KeyKeypadDivide },
|
||||||
{ Key.KeypadMultiply, LocaleKeys.KeyKeypadMultiply },
|
{ Key.KeypadMultiply, LocaleKeys.KeyboardLayout_KeyKeypadMultiply },
|
||||||
{ Key.KeypadSubtract, LocaleKeys.KeyKeypadSubtract },
|
{ Key.KeypadSubtract, LocaleKeys.KeyboardLayout_KeyKeypadSubtract },
|
||||||
{ Key.KeypadAdd, LocaleKeys.KeyKeypadAdd },
|
{ Key.KeypadAdd, LocaleKeys.KeyboardLayout_KeyKeypadAdd },
|
||||||
{ Key.KeypadDecimal, LocaleKeys.KeyKeypadDecimal },
|
{ Key.KeypadDecimal, LocaleKeys.KeyboardLayout_KeyKeypadDecimal },
|
||||||
{ Key.KeypadEnter, LocaleKeys.KeyKeypadEnter },
|
{ Key.KeypadEnter, LocaleKeys.KeyboardLayout_KeyKeypadEnter },
|
||||||
{ Key.Number0, LocaleKeys.KeyNumber0 },
|
{ Key.Number0, LocaleKeys.KeyboardLayout_KeyNumber0 },
|
||||||
{ Key.Number1, LocaleKeys.KeyNumber1 },
|
{ Key.Number1, LocaleKeys.KeyboardLayout_KeyNumber1 },
|
||||||
{ Key.Number2, LocaleKeys.KeyNumber2 },
|
{ Key.Number2, LocaleKeys.KeyboardLayout_KeyNumber2 },
|
||||||
{ Key.Number3, LocaleKeys.KeyNumber3 },
|
{ Key.Number3, LocaleKeys.KeyboardLayout_KeyNumber3 },
|
||||||
{ Key.Number4, LocaleKeys.KeyNumber4 },
|
{ Key.Number4, LocaleKeys.KeyboardLayout_KeyNumber4 },
|
||||||
{ Key.Number5, LocaleKeys.KeyNumber5 },
|
{ Key.Number5, LocaleKeys.KeyboardLayout_KeyNumber5 },
|
||||||
{ Key.Number6, LocaleKeys.KeyNumber6 },
|
{ Key.Number6, LocaleKeys.KeyboardLayout_KeyNumber6 },
|
||||||
{ Key.Number7, LocaleKeys.KeyNumber7 },
|
{ Key.Number7, LocaleKeys.KeyboardLayout_KeyNumber7 },
|
||||||
{ Key.Number8, LocaleKeys.KeyNumber8 },
|
{ Key.Number8, LocaleKeys.KeyboardLayout_KeyNumber8 },
|
||||||
{ Key.Number9, LocaleKeys.KeyNumber9 },
|
{ Key.Number9, LocaleKeys.KeyboardLayout_KeyNumber9 },
|
||||||
{ Key.Tilde, LocaleKeys.KeyTilde },
|
{ Key.Tilde, LocaleKeys.KeyboardLayout_KeyTilde },
|
||||||
{ Key.Grave, LocaleKeys.KeyGrave },
|
{ Key.Grave, LocaleKeys.KeyboardLayout_KeyGrave },
|
||||||
{ Key.Minus, LocaleKeys.KeyMinus },
|
{ Key.Minus, LocaleKeys.KeyboardLayout_KeyMinus },
|
||||||
{ Key.Plus, LocaleKeys.KeyPlus },
|
{ Key.Plus, LocaleKeys.KeyboardLayout_KeyPlus },
|
||||||
{ Key.BracketLeft, LocaleKeys.KeyBracketLeft },
|
{ Key.BracketLeft, LocaleKeys.KeyboardLayout_KeyBracketLeft },
|
||||||
{ Key.BracketRight, LocaleKeys.KeyBracketRight },
|
{ Key.BracketRight, LocaleKeys.KeyboardLayout_KeyBracketRight },
|
||||||
{ Key.Semicolon, LocaleKeys.KeySemicolon },
|
{ Key.Semicolon, LocaleKeys.KeyboardLayout_KeySemicolon },
|
||||||
{ Key.Quote, LocaleKeys.KeyQuote },
|
{ Key.Quote, LocaleKeys.KeyboardLayout_KeyQuote },
|
||||||
{ Key.Comma, LocaleKeys.KeyComma },
|
{ Key.Comma, LocaleKeys.KeyboardLayout_KeyComma },
|
||||||
{ Key.Period, LocaleKeys.KeyPeriod },
|
{ Key.Period, LocaleKeys.KeyboardLayout_KeyPeriod },
|
||||||
{ Key.Slash, LocaleKeys.KeySlash },
|
{ Key.Slash, LocaleKeys.KeyboardLayout_KeySlash },
|
||||||
{ Key.BackSlash, LocaleKeys.KeyBackSlash },
|
{ Key.BackSlash, LocaleKeys.KeyboardLayout_KeyBackSlash },
|
||||||
{ Key.Unbound, LocaleKeys.KeyUnbound },
|
{ Key.Unbound, LocaleKeys.KeyboardLayout_KeyUnbound },
|
||||||
};
|
};
|
||||||
|
|
||||||
private static readonly Dictionary<GamepadInputId, LocaleKeys> _gamepadInputIdMap = new()
|
private static readonly Dictionary<GamepadInputId, LocaleKeys> _gamepadInputIdMap = new()
|
||||||
@@ -110,14 +110,14 @@ namespace Ryujinx.Ava.UI.Helpers
|
|||||||
{ GamepadInputId.SingleRightTrigger0, LocaleKeys.GamepadSingleRightTrigger0},
|
{ GamepadInputId.SingleRightTrigger0, LocaleKeys.GamepadSingleRightTrigger0},
|
||||||
{ GamepadInputId.SingleLeftTrigger1, LocaleKeys.GamepadSingleLeftTrigger1},
|
{ GamepadInputId.SingleLeftTrigger1, LocaleKeys.GamepadSingleLeftTrigger1},
|
||||||
{ GamepadInputId.SingleRightTrigger1, LocaleKeys.GamepadSingleRightTrigger1},
|
{ GamepadInputId.SingleRightTrigger1, LocaleKeys.GamepadSingleRightTrigger1},
|
||||||
{ GamepadInputId.Unbound, LocaleKeys.KeyUnbound},
|
{ GamepadInputId.Unbound, LocaleKeys.KeyboardLayout_KeyUnbound},
|
||||||
};
|
};
|
||||||
|
|
||||||
private static readonly Dictionary<StickInputId, LocaleKeys> _stickInputIdMap = new()
|
private static readonly Dictionary<StickInputId, LocaleKeys> _stickInputIdMap = new()
|
||||||
{
|
{
|
||||||
{ StickInputId.Left, LocaleKeys.StickLeft},
|
{ StickInputId.Left, LocaleKeys.StickLeft},
|
||||||
{ StickInputId.Right, LocaleKeys.StickRight},
|
{ StickInputId.Right, LocaleKeys.StickRight},
|
||||||
{ StickInputId.Unbound, LocaleKeys.KeyUnbound},
|
{ StickInputId.Unbound, LocaleKeys.KeyboardLayout_KeyUnbound},
|
||||||
};
|
};
|
||||||
|
|
||||||
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
|
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
|
||||||
@@ -134,12 +134,12 @@ namespace Ryujinx.Ava.UI.Helpers
|
|||||||
{
|
{
|
||||||
localeKey = localeKey switch
|
localeKey = localeKey switch
|
||||||
{
|
{
|
||||||
LocaleKeys.KeyControlLeft => LocaleKeys.KeyMacControlLeft,
|
LocaleKeys.KeyboardLayout_KeyControlLeft => LocaleKeys.KeyboardLayout_KeyMacControlLeft,
|
||||||
LocaleKeys.KeyControlRight => LocaleKeys.KeyMacControlRight,
|
LocaleKeys.KeyboardLayout_KeyControlRight => LocaleKeys.KeyboardLayout_KeyMacControlRight,
|
||||||
LocaleKeys.KeyAltLeft => LocaleKeys.KeyMacAltLeft,
|
LocaleKeys.KeyboardLayout_KeyAltLeft => LocaleKeys.KeyboardLayout_KeyMacAltLeft,
|
||||||
LocaleKeys.KeyAltRight => LocaleKeys.KeyMacAltRight,
|
LocaleKeys.KeyboardLayout_KeyAltRight => LocaleKeys.KeyboardLayout_KeyMacAltRight,
|
||||||
LocaleKeys.KeyWinLeft => LocaleKeys.KeyMacWinLeft,
|
LocaleKeys.KeyboardLayout_KeyWinLeft => LocaleKeys.KeyboardLayout_KeyMacWinLeft,
|
||||||
LocaleKeys.KeyWinRight => LocaleKeys.KeyMacWinRight,
|
LocaleKeys.KeyboardLayout_KeyWinRight => LocaleKeys.KeyboardLayout_KeyMacWinRight,
|
||||||
_ => localeKey
|
_ => localeKey
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user