JJBanana13/ryujinx
1
0
Fork 0
mirror of https://git.ryujinx.app/ryubing/ryujinx.git synced 2026-06-05 11:59:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Update Locale ID's for better readability"

Browse Source 
Reverting the "readability" updates to the locale IDs due to helpful feedback from LotP. If these go get changed, then only in a similar MR.
This commit is contained in:
_Neo_
2026-03-30 20:22:03 +03:00
parent 903cb3f22f
commit 4c38af62ae
5 changed files with 155 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Ryujinx/Input/AvaloniaKeyboardDriver.cs
View File

@@ -74,7 +74,7 @@ namespace Ryujinx.Ava.Input
return null;
}
return new AvaloniaKeyboard(this, _keyboardIdentifers[0], LocaleManager.Instance[LocaleKeys.KeyboardLayout_InputType_Keyboard], mode);
return new AvaloniaKeyboard(this, _keyboardIdentifers[0], LocaleManager.Instance[LocaleKeys.KeyboardLayout_AllKeyboards], mode);
}
public IEnumerable<IGamepad> GetGamepads() => [GetGamepad("0")];

4
src/Ryujinx/UI/Helpers/Converters/KeyValueConverter.cs
View File

@@ -38,14 +38,14 @@ namespace Ryujinx.Ava.UI.Helpers
{ GamepadInputId.SingleRightTrigger0, LocaleKeys.GamepadSingleRightTrigger0},
{ GamepadInputId.SingleLeftTrigger1, LocaleKeys.GamepadSingleLeftTrigger1},
{ GamepadInputId.SingleRightTrigger1, LocaleKeys.GamepadSingleRightTrigger1},
{ GamepadInputId.Unbound, LocaleKeys.KeyboardLayout_Key_Unbound},
{ GamepadInputId.Unbound, LocaleKeys.KeyboardLayout_KeyUnbound},
};
private static readonly Dictionary<StickInputId, LocaleKeys> _stickInputIdMap = new()
{
{ StickInputId.Left, LocaleKeys.StickLeft},
{ StickInputId.Right, LocaleKeys.StickRight},
{ StickInputId.Unbound, LocaleKeys.KeyboardLayout_Key_Unbound},
{ StickInputId.Unbound, LocaleKeys.KeyboardLayout_KeyUnbound},
};
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)

150
src/Ryujinx/UI/Helpers/KeyboardLayoutLocaleHelper.cs
View File

@@ -10,79 +10,79 @@ namespace Ryujinx.Ava.UI.Helpers
{
private static readonly Dictionary<InputKey, LocaleKeys> _sharedLocalizedKeysMap = new()
{
[InputKey.Unknown] = LocaleKeys.KeyboardLayout_Key_Unknown,
[InputKey.ShiftLeft] = LocaleKeys.KeyboardLayout_Key_ShiftLeft,
[InputKey.ShiftRight] = LocaleKeys.KeyboardLayout_Key_ShiftRight,
[InputKey.ControlLeft] = LocaleKeys.KeyboardLayout_Key_ControlLeft,
[InputKey.ControlRight] = LocaleKeys.KeyboardLayout_Key_ControlRight,
[InputKey.AltLeft] = LocaleKeys.KeyboardLayout_Key_AltLeft,
[InputKey.AltRight] = LocaleKeys.KeyboardLayout_Key_AltRight,
[InputKey.WinLeft] = LocaleKeys.KeyboardLayout_Key_WinLeft,
[InputKey.WinRight] = LocaleKeys.KeyboardLayout_Key_WinRight,
[InputKey.Up] = LocaleKeys.KeyboardLayout_Key_Up,
[InputKey.Down] = LocaleKeys.KeyboardLayout_Key_Down,
[InputKey.Left] = LocaleKeys.KeyboardLayout_Key_Left,
[InputKey.Right] = LocaleKeys.KeyboardLayout_Key_Right,
[InputKey.Enter] = LocaleKeys.KeyboardLayout_Key_Enter,
[InputKey.Escape] = LocaleKeys.KeyboardLayout_Key_Escape,
[InputKey.Space] = LocaleKeys.KeyboardLayout_Key_Space,
[InputKey.Tab] = LocaleKeys.KeyboardLayout_Key_Tab,
[InputKey.BackSpace] = LocaleKeys.KeyboardLayout_Key_BackSpace,
[InputKey.Insert] = LocaleKeys.KeyboardLayout_Key_Insert,
[InputKey.Delete] = LocaleKeys.KeyboardLayout_Key_Delete,
[InputKey.PageUp] = LocaleKeys.KeyboardLayout_Key_PageUp,
[InputKey.PageDown] = LocaleKeys.KeyboardLayout_Key_PageDown,
[InputKey.Home] = LocaleKeys.KeyboardLayout_Key_Home,
[InputKey.End] = LocaleKeys.KeyboardLayout_Key_End,
[InputKey.CapsLock] = LocaleKeys.KeyboardLayout_Key_CapsLock,
[InputKey.ScrollLock] = LocaleKeys.KeyboardLayout_Key_ScrollLock,
[InputKey.PrintScreen] = LocaleKeys.KeyboardLayout_Key_PrintScreen,
[InputKey.Pause] = LocaleKeys.KeyboardLayout_Key_Pause,
[InputKey.NumLock] = LocaleKeys.KeyboardLayout_Key_NumLock,
[InputKey.Clear] = LocaleKeys.KeyboardLayout_Key_Clear,
[InputKey.Keypad0] = LocaleKeys.KeyboardLayout_Key_Keypad0,
[InputKey.Keypad1] = LocaleKeys.KeyboardLayout_Key_Keypad1,
[InputKey.Keypad2] = LocaleKeys.KeyboardLayout_Key_Keypad2,
[InputKey.Keypad3] = LocaleKeys.KeyboardLayout_Key_Keypad3,
[InputKey.Keypad4] = LocaleKeys.KeyboardLayout_Key_Keypad4,
[InputKey.Keypad5] = LocaleKeys.KeyboardLayout_Key_Keypad5,
[InputKey.Keypad6] = LocaleKeys.KeyboardLayout_Key_Keypad6,
[InputKey.Keypad7] = LocaleKeys.KeyboardLayout_Key_Keypad7,
[InputKey.Keypad8] = LocaleKeys.KeyboardLayout_Key_Keypad8,
[InputKey.Keypad9] = LocaleKeys.KeyboardLayout_Key_Keypad9,
[InputKey.KeypadDivide] = LocaleKeys.KeyboardLayout_Key_KeypadDivide,
[InputKey.KeypadMultiply] = LocaleKeys.KeyboardLayout_Key_KeypadMultiply,
[InputKey.KeypadSubtract] = LocaleKeys.KeyboardLayout_Key_KeypadSubtract,
[InputKey.KeypadAdd] = LocaleKeys.KeyboardLayout_Key_KeypadAdd,
[InputKey.KeypadDecimal] = LocaleKeys.KeyboardLayout_Key_KeypadDecimal,
[InputKey.KeypadEnter] = LocaleKeys.KeyboardLayout_Key_KeypadEnter,
[InputKey.Unbound] = LocaleKeys.KeyboardLayout_Key_Unbound,
[InputKey.Unknown] = LocaleKeys.KeyboardLayout_KeyUnknown,
[InputKey.ShiftLeft] = LocaleKeys.KeyboardLayout_KeyShiftLeft,
[InputKey.ShiftRight] = LocaleKeys.KeyboardLayout_KeyShiftRight,
[InputKey.ControlLeft] = LocaleKeys.KeyboardLayout_KeyControlLeft,
[InputKey.ControlRight] = LocaleKeys.KeyboardLayout_KeyControlRight,
[InputKey.AltLeft] = LocaleKeys.KeyboardLayout_KeyAltLeft,
[InputKey.AltRight] = LocaleKeys.KeyboardLayout_KeyAltRight,
[InputKey.WinLeft] = LocaleKeys.KeyboardLayout_KeyWinLeft,
[InputKey.WinRight] = LocaleKeys.KeyboardLayout_KeyWinRight,
[InputKey.Up] = LocaleKeys.KeyboardLayout_KeyUp,
[InputKey.Down] = LocaleKeys.KeyboardLayout_KeyDown,
[InputKey.Left] = LocaleKeys.KeyboardLayout_KeyLeft,
[InputKey.Right] = LocaleKeys.KeyboardLayout_KeyRight,
[InputKey.Enter] = LocaleKeys.KeyboardLayout_KeyEnter,
[InputKey.Escape] = LocaleKeys.KeyboardLayout_KeyEscape,
[InputKey.Space] = LocaleKeys.KeyboardLayout_KeySpace,
[InputKey.Tab] = LocaleKeys.KeyboardLayout_KeyTab,
[InputKey.BackSpace] = LocaleKeys.KeyboardLayout_KeyBackSpace,
[InputKey.Insert] = LocaleKeys.KeyboardLayout_KeyInsert,
[InputKey.Delete] = LocaleKeys.KeyboardLayout_KeyDelete,
[InputKey.PageUp] = LocaleKeys.KeyboardLayout_KeyPageUp,
[InputKey.PageDown] = LocaleKeys.KeyboardLayout_KeyPageDown,
[InputKey.Home] = LocaleKeys.KeyboardLayout_KeyHome,
[InputKey.End] = LocaleKeys.KeyboardLayout_KeyEnd,
[InputKey.CapsLock] = LocaleKeys.KeyboardLayout_KeyCapsLock,
[InputKey.ScrollLock] = LocaleKeys.KeyboardLayout_KeyScrollLock,
[InputKey.PrintScreen] = LocaleKeys.KeyboardLayout_KeyPrintScreen,
[InputKey.Pause] = LocaleKeys.KeyboardLayout_KeyPause,
[InputKey.NumLock] = LocaleKeys.KeyboardLayout_KeyNumLock,
[InputKey.Clear] = LocaleKeys.KeyboardLayout_KeyClear,
[InputKey.Keypad0] = LocaleKeys.KeyboardLayout_KeyKeypad0,
[InputKey.Keypad1] = LocaleKeys.KeyboardLayout_KeyKeypad1,
[InputKey.Keypad2] = LocaleKeys.KeyboardLayout_KeyKeypad2,
[InputKey.Keypad3] = LocaleKeys.KeyboardLayout_KeyKeypad3,
[InputKey.Keypad4] = LocaleKeys.KeyboardLayout_KeyKeypad4,
[InputKey.Keypad5] = LocaleKeys.KeyboardLayout_KeyKeypad5,
[InputKey.Keypad6] = LocaleKeys.KeyboardLayout_KeyKeypad6,
[InputKey.Keypad7] = LocaleKeys.KeyboardLayout_KeyKeypad7,
[InputKey.Keypad8] = LocaleKeys.KeyboardLayout_KeyKeypad8,
[InputKey.Keypad9] = LocaleKeys.KeyboardLayout_KeyKeypad9,
[InputKey.KeypadDivide] = LocaleKeys.KeyboardLayout_KeyKeypadDivide,
[InputKey.KeypadMultiply] = LocaleKeys.KeyboardLayout_KeyKeypadMultiply,
[InputKey.KeypadSubtract] = LocaleKeys.KeyboardLayout_KeyKeypadSubtract,
[InputKey.KeypadAdd] = LocaleKeys.KeyboardLayout_KeyKeypadAdd,
[InputKey.KeypadDecimal] = LocaleKeys.KeyboardLayout_KeyKeypadDecimal,
[InputKey.KeypadEnter] = LocaleKeys.KeyboardLayout_KeyKeypadEnter,
[InputKey.Unbound] = LocaleKeys.KeyboardLayout_KeyUnbound,
};
private static readonly Dictionary<InputKey, LocaleKeys> _semanticPrintableKeysMap = new()
{
[InputKey.Number0] = LocaleKeys.KeyboardLayout_Key_Number0,
[InputKey.Number1] = LocaleKeys.KeyboardLayout_Key_Number1,
[InputKey.Number2] = LocaleKeys.KeyboardLayout_Key_Number2,
[InputKey.Number3] = LocaleKeys.KeyboardLayout_Key_Number3,
[InputKey.Number4] = LocaleKeys.KeyboardLayout_Key_Number4,
[InputKey.Number5] = LocaleKeys.KeyboardLayout_Key_Number5,
[InputKey.Number6] = LocaleKeys.KeyboardLayout_Key_Number6,
[InputKey.Number7] = LocaleKeys.KeyboardLayout_Key_Number7,
[InputKey.Number8] = LocaleKeys.KeyboardLayout_Key_Number8,
[InputKey.Number9] = LocaleKeys.KeyboardLayout_Key_Number9,
[InputKey.Tilde] = LocaleKeys.KeyboardLayout_Key_Tilde,
[InputKey.Grave] = LocaleKeys.KeyboardLayout_Key_Grave,
[InputKey.Minus] = LocaleKeys.KeyboardLayout_Key_Minus,
[InputKey.Plus] = LocaleKeys.KeyboardLayout_Key_Plus,
[InputKey.BracketLeft] = LocaleKeys.KeyboardLayout_Key_BracketLeft,
[InputKey.BracketRight] = LocaleKeys.KeyboardLayout_Key_BracketRight,
[InputKey.Semicolon] = LocaleKeys.KeyboardLayout_Key_Semicolon,
[InputKey.Quote] = LocaleKeys.KeyboardLayout_Key_Quote,
[InputKey.Comma] = LocaleKeys.KeyboardLayout_Key_Comma,
[InputKey.Period] = LocaleKeys.KeyboardLayout_Key_Period,
[InputKey.Slash] = LocaleKeys.KeyboardLayout_Key_Slash,
[InputKey.BackSlash] = LocaleKeys.KeyboardLayout_Key_BackSlash,
[InputKey.Number0] = LocaleKeys.KeyboardLayout_KeyNumber0,
[InputKey.Number1] = LocaleKeys.KeyboardLayout_KeyNumber1,
[InputKey.Number2] = LocaleKeys.KeyboardLayout_KeyNumber2,
[InputKey.Number3] = LocaleKeys.KeyboardLayout_KeyNumber3,
[InputKey.Number4] = LocaleKeys.KeyboardLayout_KeyNumber4,
[InputKey.Number5] = LocaleKeys.KeyboardLayout_KeyNumber5,
[InputKey.Number6] = LocaleKeys.KeyboardLayout_KeyNumber6,
[InputKey.Number7] = LocaleKeys.KeyboardLayout_KeyNumber7,
[InputKey.Number8] = LocaleKeys.KeyboardLayout_KeyNumber8,
[InputKey.Number9] = LocaleKeys.KeyboardLayout_KeyNumber9,
[InputKey.Tilde] = LocaleKeys.KeyboardLayout_KeyTilde,
[InputKey.Grave] = LocaleKeys.KeyboardLayout_KeyGrave,
[InputKey.Minus] = LocaleKeys.KeyboardLayout_KeyMinus,
[InputKey.Plus] = LocaleKeys.KeyboardLayout_KeyPlus,
[InputKey.BracketLeft] = LocaleKeys.KeyboardLayout_KeyBracketLeft,
[InputKey.BracketRight] = LocaleKeys.KeyboardLayout_KeyBracketRight,
[InputKey.Semicolon] = LocaleKeys.KeyboardLayout_KeySemicolon,
[InputKey.Quote] = LocaleKeys.KeyboardLayout_KeyQuote,
[InputKey.Comma] = LocaleKeys.KeyboardLayout_KeyComma,
[InputKey.Period] = LocaleKeys.KeyboardLayout_KeyPeriod,
[InputKey.Slash] = LocaleKeys.KeyboardLayout_KeySlash,
[InputKey.BackSlash] = LocaleKeys.KeyboardLayout_KeyBackSlash,
};
public static bool TryGetSemanticLabel(InputKey key, out string label)
@@ -126,12 +126,12 @@ namespace Ryujinx.Ava.UI.Helpers
{
localeKey = localeKey switch
{
LocaleKeys.KeyboardLayout_Key_ControlLeft => LocaleKeys.KeyboardLayout_Key_Mac_ControlLeft,
LocaleKeys.KeyboardLayout_Key_ControlRight => LocaleKeys.KeyboardLayout_Key_Mac_ControlRight,
LocaleKeys.KeyboardLayout_Key_AltLeft => LocaleKeys.KeyboardLayout_Key_Mac_AltLeft,
LocaleKeys.KeyboardLayout_Key_AltRight => LocaleKeys.KeyboardLayout_Key_Mac_AltRight,
LocaleKeys.KeyboardLayout_Key_WinLeft => LocaleKeys.KeyboardLayout_Key_Mac_WinLeft,
LocaleKeys.KeyboardLayout_Key_WinRight => LocaleKeys.KeyboardLayout_Key_Mac_WinRight,
LocaleKeys.KeyboardLayout_KeyControlLeft => LocaleKeys.KeyboardLayout_KeyMacControlLeft,
LocaleKeys.KeyboardLayout_KeyControlRight => LocaleKeys.KeyboardLayout_KeyMacControlRight,
LocaleKeys.KeyboardLayout_KeyAltLeft => LocaleKeys.KeyboardLayout_KeyMacAltLeft,
LocaleKeys.KeyboardLayout_KeyAltRight => LocaleKeys.KeyboardLayout_KeyMacAltRight,
LocaleKeys.KeyboardLayout_KeyWinLeft => LocaleKeys.KeyboardLayout_KeyMacWinLeft,
LocaleKeys.KeyboardLayout_KeyWinRight => LocaleKeys.KeyboardLayout_KeyMacWinRight,
_ => localeKey
};
}