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/Helpers | |
| 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/Helpers')
| -rw-r--r-- | Ryujinx.Ava/UI/Helpers/ContentDialogHelper.cs | 36 | ||||
| -rw-r--r-- | Ryujinx.Ava/UI/Helpers/UserErrorDialog.cs | 34 |
2 files changed, 35 insertions, 35 deletions
diff --git a/Ryujinx.Ava/UI/Helpers/ContentDialogHelper.cs b/Ryujinx.Ava/UI/Helpers/ContentDialogHelper.cs index cf30d99b..a098a8ea 100644 --- a/Ryujinx.Ava/UI/Helpers/ContentDialogHelper.cs +++ b/Ryujinx.Ava/UI/Helpers/ContentDialogHelper.cs @@ -170,7 +170,7 @@ namespace Ryujinx.Ava.UI.Helpers secondaryButton, closeButton, iconSymbol, - primaryButton == LocaleManager.Instance["InputDialogYes"] ? UserResult.Yes : UserResult.Ok, + primaryButton == LocaleManager.Instance[LocaleKeys.InputDialogYes] ? UserResult.Yes : UserResult.Ok, deferResetEvent, doWhileDeferred, DeferClose); @@ -188,7 +188,7 @@ namespace Ryujinx.Ava.UI.Helpers var deferral = args.GetDeferral(); - result = primaryButton == LocaleManager.Instance["InputDialogYes"] ? UserResult.Yes : UserResult.Ok; + result = primaryButton == LocaleManager.Instance[LocaleKeys.InputDialogYes] ? UserResult.Yes : UserResult.Ok; sender.PrimaryButtonClick -= DeferClose; @@ -281,7 +281,7 @@ namespace Ryujinx.Ava.UI.Helpers UserResult primaryButtonResult = UserResult.Yes) { return await ShowContentDialog( - string.IsNullOrWhiteSpace(title) ? LocaleManager.Instance["DialogConfirmationTitle"] : title, + string.IsNullOrWhiteSpace(title) ? LocaleManager.Instance[LocaleKeys.DialogConfirmationTitle] : title, primaryText, secondaryText, acceptButtonText, @@ -299,24 +299,24 @@ namespace Ryujinx.Ava.UI.Helpers internal static async Task CreateUpdaterInfoDialog(string primary, string secondaryText) { await ShowContentDialog( - LocaleManager.Instance["DialogUpdaterTitle"], + LocaleManager.Instance[LocaleKeys.DialogUpdaterTitle], primary, secondaryText, "", "", - LocaleManager.Instance["InputDialogOk"], + LocaleManager.Instance[LocaleKeys.InputDialogOk], (int)Symbol.Important); } internal static async Task CreateWarningDialog(string primary, string secondaryText) { await ShowContentDialog( - LocaleManager.Instance["DialogWarningTitle"], + LocaleManager.Instance[LocaleKeys.DialogWarningTitle], primary, secondaryText, "", "", - LocaleManager.Instance["InputDialogOk"], + LocaleManager.Instance[LocaleKeys.InputDialogOk], (int)Symbol.Important); } @@ -325,12 +325,12 @@ namespace Ryujinx.Ava.UI.Helpers Logger.Error?.Print(LogClass.Application, errorMessage); await ShowContentDialog( - LocaleManager.Instance["DialogErrorTitle"], - LocaleManager.Instance["DialogErrorMessage"], + LocaleManager.Instance[LocaleKeys.DialogErrorTitle], + LocaleManager.Instance[LocaleKeys.DialogErrorMessage], errorMessage, secondaryErrorMessage, "", - LocaleManager.Instance["InputDialogOk"], + LocaleManager.Instance[LocaleKeys.InputDialogOk], (int)Symbol.Dismiss); } @@ -348,9 +348,9 @@ namespace Ryujinx.Ava.UI.Helpers title, primary, secondaryText, - LocaleManager.Instance["InputDialogYes"], + LocaleManager.Instance[LocaleKeys.InputDialogYes], "", - LocaleManager.Instance["InputDialogNo"], + LocaleManager.Instance[LocaleKeys.InputDialogNo], (int)Symbol.Help, UserResult.Yes); @@ -362,17 +362,17 @@ namespace Ryujinx.Ava.UI.Helpers internal static async Task<bool> CreateExitDialog() { return await CreateChoiceDialog( - LocaleManager.Instance["DialogExitTitle"], - LocaleManager.Instance["DialogExitMessage"], - LocaleManager.Instance["DialogExitSubMessage"]); + LocaleManager.Instance[LocaleKeys.DialogExitTitle], + LocaleManager.Instance[LocaleKeys.DialogExitMessage], + LocaleManager.Instance[LocaleKeys.DialogExitSubMessage]); } internal static async Task<bool> CreateStopEmulationDialog() { return await CreateChoiceDialog( - LocaleManager.Instance["DialogStopEmulationTitle"], - LocaleManager.Instance["DialogStopEmulationMessage"], - LocaleManager.Instance["DialogExitSubMessage"]); + LocaleManager.Instance[LocaleKeys.DialogStopEmulationTitle], + LocaleManager.Instance[LocaleKeys.DialogStopEmulationMessage], + LocaleManager.Instance[LocaleKeys.DialogExitSubMessage]); } internal static async Task<string> CreateInputDialog( diff --git a/Ryujinx.Ava/UI/Helpers/UserErrorDialog.cs b/Ryujinx.Ava/UI/Helpers/UserErrorDialog.cs index ab8d6edc..06ec8e30 100644 --- a/Ryujinx.Ava/UI/Helpers/UserErrorDialog.cs +++ b/Ryujinx.Ava/UI/Helpers/UserErrorDialog.cs @@ -19,12 +19,12 @@ namespace Ryujinx.Ava.UI.Helpers { return error switch { - UserError.NoKeys => LocaleManager.Instance["UserErrorNoKeys"], - UserError.NoFirmware => LocaleManager.Instance["UserErrorNoFirmware"], - UserError.FirmwareParsingFailed => LocaleManager.Instance["UserErrorFirmwareParsingFailed"], - UserError.ApplicationNotFound => LocaleManager.Instance["UserErrorApplicationNotFound"], - UserError.Unknown => LocaleManager.Instance["UserErrorUnknown"], - _ => LocaleManager.Instance["UserErrorUndefined"] + UserError.NoKeys => LocaleManager.Instance[LocaleKeys.UserErrorNoKeys], + UserError.NoFirmware => LocaleManager.Instance[LocaleKeys.UserErrorNoFirmware], + UserError.FirmwareParsingFailed => LocaleManager.Instance[LocaleKeys.UserErrorFirmwareParsingFailed], + UserError.ApplicationNotFound => LocaleManager.Instance[LocaleKeys.UserErrorApplicationNotFound], + UserError.Unknown => LocaleManager.Instance[LocaleKeys.UserErrorUnknown], + _ => LocaleManager.Instance[LocaleKeys.UserErrorUndefined] }; } @@ -32,12 +32,12 @@ namespace Ryujinx.Ava.UI.Helpers { return error switch { - UserError.NoKeys => LocaleManager.Instance["UserErrorNoKeysDescription"], - UserError.NoFirmware => LocaleManager.Instance["UserErrorNoFirmwareDescription"], - UserError.FirmwareParsingFailed => LocaleManager.Instance["UserErrorFirmwareParsingFailedDescription"], - UserError.ApplicationNotFound => LocaleManager.Instance["UserErrorApplicationNotFoundDescription"], - UserError.Unknown => LocaleManager.Instance["UserErrorUnknownDescription"], - _ => LocaleManager.Instance["UserErrorUndefinedDescription"] + UserError.NoKeys => LocaleManager.Instance[LocaleKeys.UserErrorNoKeysDescription], + UserError.NoFirmware => LocaleManager.Instance[LocaleKeys.UserErrorNoFirmwareDescription], + UserError.FirmwareParsingFailed => LocaleManager.Instance[LocaleKeys.UserErrorFirmwareParsingFailedDescription], + UserError.ApplicationNotFound => LocaleManager.Instance[LocaleKeys.UserErrorApplicationNotFoundDescription], + UserError.Unknown => LocaleManager.Instance[LocaleKeys.UserErrorUnknownDescription], + _ => LocaleManager.Instance[LocaleKeys.UserErrorUndefinedDescription] }; } @@ -73,14 +73,14 @@ namespace Ryujinx.Ava.UI.Helpers bool isInSetupGuide = IsCoveredBySetupGuide(error); - string setupButtonLabel = isInSetupGuide ? LocaleManager.Instance["OpenSetupGuideMessage"] : ""; + string setupButtonLabel = isInSetupGuide ? LocaleManager.Instance[LocaleKeys.OpenSetupGuideMessage] : ""; var result = await ContentDialogHelper.CreateInfoDialog( - string.Format(LocaleManager.Instance["DialogUserErrorDialogMessage"], errorCode, GetErrorTitle(error)), + string.Format(LocaleManager.Instance[LocaleKeys.DialogUserErrorDialogMessage], errorCode, GetErrorTitle(error)), GetErrorDescription(error) + (isInSetupGuide - ? LocaleManager.Instance["DialogUserErrorDialogInfoMessage"] - : ""), setupButtonLabel, LocaleManager.Instance["InputDialogOk"], - string.Format(LocaleManager.Instance["DialogUserErrorDialogTitle"], errorCode)); + ? LocaleManager.Instance[LocaleKeys.DialogUserErrorDialogInfoMessage] + : ""), setupButtonLabel, LocaleManager.Instance[LocaleKeys.InputDialogOk], + string.Format(LocaleManager.Instance[LocaleKeys.DialogUserErrorDialogTitle], errorCode)); if (result == UserResult.Ok) { |
