diff options
| author | Emmanuel Hansen <emmausssss@gmail.com> | 2023-01-03 18:45:08 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-03 19:45:08 +0100 |
| commit | 02714a1291e1b548908ffd7adcd537897bf6f541 (patch) | |
| tree | 4c0aec3e5024115bb994811067733528345b9234 /Ryujinx.Ava/UI/Applet | |
| parent | 09c9686498c7c987c94f33c79732c7592045e035 (diff) | |
Avalonia - Add source generator for locale items (#3999)
* Add source generator for locale keys
* use locale keys in Ui subdir
Diffstat (limited to 'Ryujinx.Ava/UI/Applet')
| -rw-r--r-- | Ryujinx.Ava/UI/Applet/AvaHostUiHandler.cs | 18 | ||||
| -rw-r--r-- | Ryujinx.Ava/UI/Applet/ErrorAppletWindow.axaml.cs | 2 | ||||
| -rw-r--r-- | Ryujinx.Ava/UI/Applet/SwkbdAppletDialog.axaml.cs | 6 |
3 files changed, 13 insertions, 13 deletions
diff --git a/Ryujinx.Ava/UI/Applet/AvaHostUiHandler.cs b/Ryujinx.Ava/UI/Applet/AvaHostUiHandler.cs index a8e76275..f4d9bc80 100644 --- a/Ryujinx.Ava/UI/Applet/AvaHostUiHandler.cs +++ b/Ryujinx.Ava/UI/Applet/AvaHostUiHandler.cs @@ -33,15 +33,15 @@ namespace Ryujinx.Ava.UI.Applet ? args.PlayerCountMin.ToString() : $"{args.PlayerCountMin}-{args.PlayerCountMax}"; - string key = args.PlayerCountMin == args.PlayerCountMax ? "DialogControllerAppletMessage" : "DialogControllerAppletMessagePlayerRange"; + LocaleKeys key = args.PlayerCountMin == args.PlayerCountMax ? LocaleKeys.DialogControllerAppletMessage : LocaleKeys.DialogControllerAppletMessagePlayerRange; string message = string.Format(LocaleManager.Instance[key], playerCount, args.SupportedStyles, string.Join(", ", args.SupportedPlayers), - args.IsDocked ? LocaleManager.Instance["DialogControllerAppletDockModeSet"] : ""); + args.IsDocked ? LocaleManager.Instance[LocaleKeys.DialogControllerAppletDockModeSet] : ""); - return DisplayMessageDialog(LocaleManager.Instance["DialogControllerAppletTitle"], message); + return DisplayMessageDialog(LocaleManager.Instance[LocaleKeys.DialogControllerAppletTitle], message); } public bool DisplayMessageDialog(string title, string message) @@ -62,9 +62,9 @@ namespace Ryujinx.Ava.UI.Applet title, message, "", - LocaleManager.Instance["DialogOpenSettingsWindowLabel"], + LocaleManager.Instance[LocaleKeys.DialogOpenSettingsWindowLabel], "", - LocaleManager.Instance["SettingsButtonClose"], + LocaleManager.Instance[LocaleKeys.SettingsButtonClose], (int)Symbol.Important, deferEvent, async (window) => @@ -92,7 +92,7 @@ namespace Ryujinx.Ava.UI.Applet } catch (Exception ex) { - await ContentDialogHelper.CreateErrorDialog(string.Format(LocaleManager.Instance["DialogMessageDialogErrorExceptionMessage"], ex)); + await ContentDialogHelper.CreateErrorDialog(string.Format(LocaleManager.Instance[LocaleKeys.DialogMessageDialogErrorExceptionMessage], ex)); dialogCloseEvent.Set(); } @@ -115,7 +115,7 @@ namespace Ryujinx.Ava.UI.Applet { try { - var response = await SwkbdAppletDialog.ShowInputDialog(_parent, LocaleManager.Instance["SoftwareKeyboard"], args); + var response = await SwkbdAppletDialog.ShowInputDialog(_parent, LocaleManager.Instance[LocaleKeys.SoftwareKeyboard], args); if (response.Result == UserResult.Ok) { @@ -126,7 +126,7 @@ namespace Ryujinx.Ava.UI.Applet catch (Exception ex) { error = true; - await ContentDialogHelper.CreateErrorDialog(string.Format(LocaleManager.Instance["DialogSoftwareKeyboardErrorExceptionMessage"], ex)); + await ContentDialogHelper.CreateErrorDialog(string.Format(LocaleManager.Instance[LocaleKeys.DialogSoftwareKeyboardErrorExceptionMessage], ex)); } finally { @@ -181,7 +181,7 @@ namespace Ryujinx.Ava.UI.Applet catch (Exception ex) { dialogCloseEvent.Set(); - await ContentDialogHelper.CreateErrorDialog(string.Format(LocaleManager.Instance["DialogErrorAppletErrorExceptionMessage"], ex)); + await ContentDialogHelper.CreateErrorDialog(string.Format(LocaleManager.Instance[LocaleKeys.DialogErrorAppletErrorExceptionMessage], ex)); } }); diff --git a/Ryujinx.Ava/UI/Applet/ErrorAppletWindow.axaml.cs b/Ryujinx.Ava/UI/Applet/ErrorAppletWindow.axaml.cs index a17826f8..4134797b 100644 --- a/Ryujinx.Ava/UI/Applet/ErrorAppletWindow.axaml.cs +++ b/Ryujinx.Ava/UI/Applet/ErrorAppletWindow.axaml.cs @@ -34,7 +34,7 @@ namespace Ryujinx.Ava.UI.Applet } else { - AddButton(LocaleManager.Instance["InputDialogOk"], 0); + AddButton(LocaleManager.Instance[LocaleKeys.InputDialogOk], 0); } } diff --git a/Ryujinx.Ava/UI/Applet/SwkbdAppletDialog.axaml.cs b/Ryujinx.Ava/UI/Applet/SwkbdAppletDialog.axaml.cs index 80be2979..78e6f237 100644 --- a/Ryujinx.Ava/UI/Applet/SwkbdAppletDialog.axaml.cs +++ b/Ryujinx.Ava/UI/Applet/SwkbdAppletDialog.axaml.cs @@ -86,7 +86,7 @@ namespace Ryujinx.Ava.UI.Controls contentDialog.PrimaryButtonText = args.SubmitText; contentDialog.IsPrimaryButtonEnabled = content._checkLength(content.Message.Length); contentDialog.SecondaryButtonText = ""; - contentDialog.CloseButtonText = LocaleManager.Instance["InputDialogCancel"]; + contentDialog.CloseButtonText = LocaleManager.Instance[LocaleKeys.InputDialogCancel]; contentDialog.Content = content; TypedEventHandler<ContentDialog, ContentDialogClosedEventArgs> handler = (sender, eventArgs) => @@ -139,14 +139,14 @@ namespace Ryujinx.Ava.UI.Controls else if (_inputMin > 0 && _inputMax == int.MaxValue) { Error.IsVisible = true; - Error.Text = string.Format(LocaleManager.Instance["SwkbdMinCharacters"], _inputMin); + Error.Text = string.Format(LocaleManager.Instance[LocaleKeys.SwkbdMinCharacters], _inputMin); _checkLength = length => _inputMin <= length; } else { Error.IsVisible = true; - Error.Text = string.Format(LocaleManager.Instance["SwkbdMinRangeCharacters"], _inputMin, _inputMax); + Error.Text = string.Format(LocaleManager.Instance[LocaleKeys.SwkbdMinRangeCharacters], _inputMin, _inputMax); _checkLength = length => _inputMin <= length && length <= _inputMax; } |
