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/Windows | |
| 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/Windows')
| -rw-r--r-- | Ryujinx.Ava/UI/Windows/AboutWindow.axaml.cs | 8 | ||||
| -rw-r--r-- | Ryujinx.Ava/UI/Windows/AmiiboWindow.axaml.cs | 4 | ||||
| -rw-r--r-- | Ryujinx.Ava/UI/Windows/CheatWindow.axaml.cs | 6 | ||||
| -rw-r--r-- | Ryujinx.Ava/UI/Windows/ControllerSettingsWindow.axaml.cs | 10 | ||||
| -rw-r--r-- | Ryujinx.Ava/UI/Windows/DownloadableContentManagerWindow.axaml.cs | 12 | ||||
| -rw-r--r-- | Ryujinx.Ava/UI/Windows/MainWindow.axaml.cs | 30 | ||||
| -rw-r--r-- | Ryujinx.Ava/UI/Windows/MotionSettingsWindow.axaml.cs | 6 | ||||
| -rw-r--r-- | Ryujinx.Ava/UI/Windows/RumbleSettingsWindow.axaml.cs | 6 | ||||
| -rw-r--r-- | Ryujinx.Ava/UI/Windows/SettingsWindow.axaml.cs | 2 | ||||
| -rw-r--r-- | Ryujinx.Ava/UI/Windows/TitleUpdateWindow.axaml.cs | 12 |
10 files changed, 48 insertions, 48 deletions
diff --git a/Ryujinx.Ava/UI/Windows/AboutWindow.axaml.cs b/Ryujinx.Ava/UI/Windows/AboutWindow.axaml.cs index 2fb17e3a..99280b87 100644 --- a/Ryujinx.Ava/UI/Windows/AboutWindow.axaml.cs +++ b/Ryujinx.Ava/UI/Windows/AboutWindow.axaml.cs @@ -17,7 +17,7 @@ namespace Ryujinx.Ava.UI.Windows { if (Program.PreviewerDetached) { - Title = $"Ryujinx {Program.Version} - " + LocaleManager.Instance["MenuBarHelpAbout"]; + Title = $"Ryujinx {Program.Version} - " + LocaleManager.Instance[LocaleKeys.MenuBarHelpAbout]; } Version = Program.Version; @@ -32,7 +32,7 @@ namespace Ryujinx.Ava.UI.Windows public string Supporters { get; set; } public string Version { get; set; } - public string Developers => string.Format(LocaleManager.Instance["AboutPageDeveloperListMore"], "gdkchan, Ac_K, Thog, rip in peri peri, LDj3SNuD, emmaus, Thealexbarney, Xpl0itR, GoffyDude, »jD«"); + public string Developers => string.Format(LocaleManager.Instance[LocaleKeys.AboutPageDeveloperListMore], "gdkchan, Ac_K, Thog, rip in peri peri, LDj3SNuD, emmaus, Thealexbarney, Xpl0itR, GoffyDude, »jD«"); private void Button_OnClick(object sender, RoutedEventArgs e) { @@ -46,7 +46,7 @@ namespace Ryujinx.Ava.UI.Windows { if (!NetworkInterface.GetIsNetworkAvailable()) { - Supporters = LocaleManager.Instance["ConnectionError"]; + Supporters = LocaleManager.Instance[LocaleKeys.ConnectionError]; return; } @@ -61,7 +61,7 @@ namespace Ryujinx.Ava.UI.Windows } catch { - Supporters = LocaleManager.Instance["ApiError"]; + Supporters = LocaleManager.Instance[LocaleKeys.ApiError]; } await Dispatcher.UIThread.InvokeAsync(() => SupportersTextBlock.Text = Supporters); diff --git a/Ryujinx.Ava/UI/Windows/AmiiboWindow.axaml.cs b/Ryujinx.Ava/UI/Windows/AmiiboWindow.axaml.cs index 68d16f35..5368a133 100644 --- a/Ryujinx.Ava/UI/Windows/AmiiboWindow.axaml.cs +++ b/Ryujinx.Ava/UI/Windows/AmiiboWindow.axaml.cs @@ -17,7 +17,7 @@ namespace Ryujinx.Ava.UI.Windows InitializeComponent(); - Title = $"Ryujinx {Program.Version} - " + LocaleManager.Instance["Amiibo"]; + Title = $"Ryujinx {Program.Version} - " + LocaleManager.Instance[LocaleKeys.Amiibo]; } public AmiiboWindow() @@ -30,7 +30,7 @@ namespace Ryujinx.Ava.UI.Windows if (Program.PreviewerDetached) { - Title = $"Ryujinx {Program.Version} - " + LocaleManager.Instance["Amiibo"]; + Title = $"Ryujinx {Program.Version} - " + LocaleManager.Instance[LocaleKeys.Amiibo]; } } diff --git a/Ryujinx.Ava/UI/Windows/CheatWindow.axaml.cs b/Ryujinx.Ava/UI/Windows/CheatWindow.axaml.cs index d31212c1..b27d20d3 100644 --- a/Ryujinx.Ava/UI/Windows/CheatWindow.axaml.cs +++ b/Ryujinx.Ava/UI/Windows/CheatWindow.axaml.cs @@ -24,14 +24,14 @@ namespace Ryujinx.Ava.UI.Windows InitializeComponent(); - Title = $"Ryujinx {Program.Version} - " + LocaleManager.Instance["CheatWindowTitle"]; + Title = $"Ryujinx {Program.Version} - " + LocaleManager.Instance[LocaleKeys.CheatWindowTitle]; } public CheatWindow(VirtualFileSystem virtualFileSystem, string titleId, string titleName) { LoadedCheats = new AvaloniaList<CheatsList>(); - Heading = string.Format(LocaleManager.Instance["CheatWindowHeading"], titleName, titleId.ToUpper()); + Heading = string.Format(LocaleManager.Instance[LocaleKeys.CheatWindowHeading], titleName, titleId.ToUpper()); InitializeComponent(); @@ -86,7 +86,7 @@ namespace Ryujinx.Ava.UI.Windows DataContext = this; - Title = $"Ryujinx {Program.Version} - " + LocaleManager.Instance["CheatWindowTitle"]; + Title = $"Ryujinx {Program.Version} - " + LocaleManager.Instance[LocaleKeys.CheatWindowTitle]; } public void Save() diff --git a/Ryujinx.Ava/UI/Windows/ControllerSettingsWindow.axaml.cs b/Ryujinx.Ava/UI/Windows/ControllerSettingsWindow.axaml.cs index df083085..2864b6da 100644 --- a/Ryujinx.Ava/UI/Windows/ControllerSettingsWindow.axaml.cs +++ b/Ryujinx.Ava/UI/Windows/ControllerSettingsWindow.axaml.cs @@ -148,11 +148,11 @@ namespace Ryujinx.Ava.UI.Windows _dialogOpen = true; var result = await ContentDialogHelper.CreateConfirmationDialog( - LocaleManager.Instance["DialogControllerSettingsModifiedConfirmMessage"], - LocaleManager.Instance["DialogControllerSettingsModifiedConfirmSubMessage"], - LocaleManager.Instance["InputDialogYes"], - LocaleManager.Instance["InputDialogNo"], - LocaleManager.Instance["RyujinxConfirm"]); + LocaleManager.Instance[LocaleKeys.DialogControllerSettingsModifiedConfirmMessage], + LocaleManager.Instance[LocaleKeys.DialogControllerSettingsModifiedConfirmSubMessage], + LocaleManager.Instance[LocaleKeys.InputDialogYes], + LocaleManager.Instance[LocaleKeys.InputDialogNo], + LocaleManager.Instance[LocaleKeys.RyujinxConfirm]); if (result == UserResult.Yes) { diff --git a/Ryujinx.Ava/UI/Windows/DownloadableContentManagerWindow.axaml.cs b/Ryujinx.Ava/UI/Windows/DownloadableContentManagerWindow.axaml.cs index 11be9383..fa9d70e2 100644 --- a/Ryujinx.Ava/UI/Windows/DownloadableContentManagerWindow.axaml.cs +++ b/Ryujinx.Ava/UI/Windows/DownloadableContentManagerWindow.axaml.cs @@ -43,7 +43,7 @@ namespace Ryujinx.Ava.UI.Windows InitializeComponent(); - Title = $"Ryujinx {Program.Version} - {LocaleManager.Instance["DlcWindowTitle"]} - {_titleName} ({_titleId:X16})"; + Title = $"Ryujinx {Program.Version} - {LocaleManager.Instance[LocaleKeys.DlcWindowTitle]} - {_titleName} ({_titleId:X16})"; } public DownloadableContentManagerWindow(VirtualFileSystem virtualFileSystem, ulong titleId, string titleName) @@ -73,7 +73,7 @@ namespace Ryujinx.Ava.UI.Windows DlcDataGrid.SelectionChanged += DlcDataGrid_SelectionChanged; - Title = $"Ryujinx {Program.Version} - {LocaleManager.Instance["DlcWindowTitle"]} - {_titleName} ({_titleId:X16})"; + Title = $"Ryujinx {Program.Version} - {LocaleManager.Instance[LocaleKeys.DlcWindowTitle]} - {_titleName} ({_titleId:X16})"; LoadDownloadableContents(); PrintHeading(); @@ -86,7 +86,7 @@ namespace Ryujinx.Ava.UI.Windows private void PrintHeading() { - Heading.Text = string.Format(LocaleManager.Instance["DlcWindowHeading"], _downloadableContents.Count, _titleName, _titleId.ToString("X16")); + Heading.Text = string.Format(LocaleManager.Instance[LocaleKeys.DlcWindowHeading], _downloadableContents.Count, _titleName, _titleId.ToString("X16")); } private void LoadDownloadableContents() @@ -133,7 +133,7 @@ namespace Ryujinx.Ava.UI.Windows { Dispatcher.UIThread.InvokeAsync(async () => { - await ContentDialogHelper.CreateErrorDialog(string.Format(LocaleManager.Instance["DialogDlcLoadNcaErrorMessage"], ex.Message, containerPath)); + await ContentDialogHelper.CreateErrorDialog(string.Format(LocaleManager.Instance[LocaleKeys.DialogDlcLoadNcaErrorMessage], ex.Message, containerPath)); }); } @@ -181,7 +181,7 @@ namespace Ryujinx.Ava.UI.Windows if (!containsDownloadableContent) { - await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance["DialogDlcNoDlcErrorMessage"]); + await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance[LocaleKeys.DialogDlcNoDlcErrorMessage]); } } @@ -241,7 +241,7 @@ namespace Ryujinx.Ava.UI.Windows { OpenFileDialog dialog = new OpenFileDialog() { - Title = LocaleManager.Instance["SelectDlcDialogTitle"], + Title = LocaleManager.Instance[LocaleKeys.SelectDlcDialogTitle], AllowMultiple = true }; diff --git a/Ryujinx.Ava/UI/Windows/MainWindow.axaml.cs b/Ryujinx.Ava/UI/Windows/MainWindow.axaml.cs index 08332da8..b2d822c3 100644 --- a/Ryujinx.Ava/UI/Windows/MainWindow.axaml.cs +++ b/Ryujinx.Ava/UI/Windows/MainWindow.axaml.cs @@ -179,12 +179,12 @@ namespace Ryujinx.Ava.UI.Windows { if (ConfigurationState.Instance.Logger.EnableTrace.Value) { - string mainMessage = LocaleManager.Instance["DialogPerformanceCheckLoggingEnabledMessage"]; - string secondaryMessage = LocaleManager.Instance["DialogPerformanceCheckLoggingEnabledConfirmMessage"]; + string mainMessage = LocaleManager.Instance[LocaleKeys.DialogPerformanceCheckLoggingEnabledMessage]; + string secondaryMessage = LocaleManager.Instance[LocaleKeys.DialogPerformanceCheckLoggingEnabledConfirmMessage]; UserResult result = await ContentDialogHelper.CreateConfirmationDialog(mainMessage, secondaryMessage, - LocaleManager.Instance["InputDialogYes"], LocaleManager.Instance["InputDialogNo"], - LocaleManager.Instance["RyujinxConfirm"]); + LocaleManager.Instance[LocaleKeys.InputDialogYes], LocaleManager.Instance[LocaleKeys.InputDialogNo], + LocaleManager.Instance[LocaleKeys.RyujinxConfirm]); if (result != UserResult.Yes) { @@ -196,13 +196,13 @@ namespace Ryujinx.Ava.UI.Windows if (!string.IsNullOrWhiteSpace(ConfigurationState.Instance.Graphics.ShadersDumpPath.Value)) { - string mainMessage = LocaleManager.Instance["DialogPerformanceCheckShaderDumpEnabledMessage"]; + string mainMessage = LocaleManager.Instance[LocaleKeys.DialogPerformanceCheckShaderDumpEnabledMessage]; string secondaryMessage = - LocaleManager.Instance["DialogPerformanceCheckShaderDumpEnabledConfirmMessage"]; + LocaleManager.Instance[LocaleKeys.DialogPerformanceCheckShaderDumpEnabledConfirmMessage]; UserResult result = await ContentDialogHelper.CreateConfirmationDialog(mainMessage, secondaryMessage, - LocaleManager.Instance["InputDialogYes"], LocaleManager.Instance["InputDialogNo"], - LocaleManager.Instance["RyujinxConfirm"]); + LocaleManager.Instance[LocaleKeys.InputDialogYes], LocaleManager.Instance[LocaleKeys.InputDialogNo], + LocaleManager.Instance[LocaleKeys.RyujinxConfirm]); if (result != UserResult.Yes) { @@ -227,11 +227,11 @@ namespace Ryujinx.Ava.UI.Windows if (AppHost != null) { await ContentDialogHelper.CreateInfoDialog( - LocaleManager.Instance["DialogLoadAppGameAlreadyLoadedMessage"], - LocaleManager.Instance["DialogLoadAppGameAlreadyLoadedSubMessage"], - LocaleManager.Instance["InputDialogOk"], + LocaleManager.Instance[LocaleKeys.DialogLoadAppGameAlreadyLoadedMessage], + LocaleManager.Instance[LocaleKeys.DialogLoadAppGameAlreadyLoadedSubMessage], + LocaleManager.Instance[LocaleKeys.InputDialogOk], "", - LocaleManager.Instance["RyujinxInfo"]); + LocaleManager.Instance[LocaleKeys.RyujinxInfo]); return; } @@ -274,7 +274,7 @@ namespace Ryujinx.Ava.UI.Windows } CanUpdate = false; - ViewModel.LoadHeading = string.IsNullOrWhiteSpace(titleName) ? string.Format(LocaleManager.Instance["LoadingHeading"], AppHost.Device.Application.TitleName) : titleName; + ViewModel.LoadHeading = string.IsNullOrWhiteSpace(titleName) ? string.Format(LocaleManager.Instance[LocaleKeys.LoadingHeading], AppHost.Device.Application.TitleName) : titleName; ViewModel.TitleName = string.IsNullOrWhiteSpace(titleName) ? AppHost.Device.Application.TitleName : titleName; SwitchToGameControl(startFullscreen); @@ -500,14 +500,14 @@ namespace Ryujinx.Ava.UI.Windows if (version != null) { - LocaleManager.Instance.UpdateDynamicValue("StatusBarSystemVersion", + LocaleManager.Instance.UpdateDynamicValue(LocaleKeys.StatusBarSystemVersion, version.VersionString); hasApplet = version.Major > 3; } else { - LocaleManager.Instance.UpdateDynamicValue("StatusBarSystemVersion", "0.0"); + LocaleManager.Instance.UpdateDynamicValue(LocaleKeys.StatusBarSystemVersion, "0.0"); } ViewModel.IsAppletMenuActive = hasApplet; diff --git a/Ryujinx.Ava/UI/Windows/MotionSettingsWindow.axaml.cs b/Ryujinx.Ava/UI/Windows/MotionSettingsWindow.axaml.cs index 215525fc..c686e7c3 100644 --- a/Ryujinx.Ava/UI/Windows/MotionSettingsWindow.axaml.cs +++ b/Ryujinx.Ava/UI/Windows/MotionSettingsWindow.axaml.cs @@ -45,10 +45,10 @@ namespace Ryujinx.Ava.UI.Windows ContentDialog contentDialog = new ContentDialog { - Title = LocaleManager.Instance["ControllerMotionTitle"], - PrimaryButtonText = LocaleManager.Instance["ControllerSettingsSave"], + Title = LocaleManager.Instance[LocaleKeys.ControllerMotionTitle], + PrimaryButtonText = LocaleManager.Instance[LocaleKeys.ControllerSettingsSave], SecondaryButtonText = "", - CloseButtonText = LocaleManager.Instance["ControllerSettingsClose"], + CloseButtonText = LocaleManager.Instance[LocaleKeys.ControllerSettingsClose], Content = content }; contentDialog.PrimaryButtonClick += (sender, args) => diff --git a/Ryujinx.Ava/UI/Windows/RumbleSettingsWindow.axaml.cs b/Ryujinx.Ava/UI/Windows/RumbleSettingsWindow.axaml.cs index f645ae35..178109d6 100644 --- a/Ryujinx.Ava/UI/Windows/RumbleSettingsWindow.axaml.cs +++ b/Ryujinx.Ava/UI/Windows/RumbleSettingsWindow.axaml.cs @@ -37,10 +37,10 @@ namespace Ryujinx.Ava.UI.Windows ContentDialog contentDialog = new ContentDialog { - Title = LocaleManager.Instance["ControllerRumbleTitle"], - PrimaryButtonText = LocaleManager.Instance["ControllerSettingsSave"], + Title = LocaleManager.Instance[LocaleKeys.ControllerRumbleTitle], + PrimaryButtonText = LocaleManager.Instance[LocaleKeys.ControllerSettingsSave], SecondaryButtonText = "", - CloseButtonText = LocaleManager.Instance["ControllerSettingsClose"], + CloseButtonText = LocaleManager.Instance[LocaleKeys.ControllerSettingsClose], Content = content, }; diff --git a/Ryujinx.Ava/UI/Windows/SettingsWindow.axaml.cs b/Ryujinx.Ava/UI/Windows/SettingsWindow.axaml.cs index f3aa1d5e..ae489b86 100644 --- a/Ryujinx.Ava/UI/Windows/SettingsWindow.axaml.cs +++ b/Ryujinx.Ava/UI/Windows/SettingsWindow.axaml.cs @@ -29,7 +29,7 @@ namespace Ryujinx.Ava.UI.Windows public SettingsWindow(VirtualFileSystem virtualFileSystem, ContentManager contentManager) { - Title = $"Ryujinx {Program.Version} - {LocaleManager.Instance["Settings"]}"; + Title = $"Ryujinx {Program.Version} - {LocaleManager.Instance[LocaleKeys.Settings]}"; ViewModel = new SettingsViewModel(virtualFileSystem, contentManager, this); DataContext = ViewModel; diff --git a/Ryujinx.Ava/UI/Windows/TitleUpdateWindow.axaml.cs b/Ryujinx.Ava/UI/Windows/TitleUpdateWindow.axaml.cs index 03c2b098..29dc5351 100644 --- a/Ryujinx.Ava/UI/Windows/TitleUpdateWindow.axaml.cs +++ b/Ryujinx.Ava/UI/Windows/TitleUpdateWindow.axaml.cs @@ -43,7 +43,7 @@ namespace Ryujinx.Ava.UI.Windows InitializeComponent(); - Title = $"Ryujinx {Program.Version} - {LocaleManager.Instance["UpdateWindowTitle"]} - {_titleName} ({_titleId:X16})"; + Title = $"Ryujinx {Program.Version} - {LocaleManager.Instance[LocaleKeys.UpdateWindowTitle]} - {_titleName} ({_titleId:X16})"; } public TitleUpdateWindow(VirtualFileSystem virtualFileSystem, ulong titleId, string titleName) @@ -73,7 +73,7 @@ namespace Ryujinx.Ava.UI.Windows InitializeComponent(); - Title = $"Ryujinx {Program.Version} - {LocaleManager.Instance["UpdateWindowTitle"]} - {_titleName} ({_titleId:X16})"; + Title = $"Ryujinx {Program.Version} - {LocaleManager.Instance[LocaleKeys.UpdateWindowTitle]} - {_titleName} ({_titleId:X16})"; LoadUpdates(); PrintHeading(); @@ -81,7 +81,7 @@ namespace Ryujinx.Ava.UI.Windows private void PrintHeading() { - Heading.Text = string.Format(LocaleManager.Instance["GameUpdateWindowHeading"], _titleUpdates.Count, _titleName, _titleId.ToString("X16")); + Heading.Text = string.Format(LocaleManager.Instance[LocaleKeys.GameUpdateWindowHeading], _titleUpdates.Count, _titleName, _titleId.ToString("X16")); } private void LoadUpdates() @@ -148,7 +148,7 @@ namespace Ryujinx.Ava.UI.Windows { Dispatcher.UIThread.Post(async () => { - await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance["DialogUpdateAddUpdateErrorMessage"]); + await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance[LocaleKeys.DialogUpdateAddUpdateErrorMessage]); }); } } @@ -156,7 +156,7 @@ namespace Ryujinx.Ava.UI.Windows { Dispatcher.UIThread.Post(async () => { - await ContentDialogHelper.CreateErrorDialog(string.Format(LocaleManager.Instance["DialogDlcLoadNcaErrorMessage"], ex.Message, path)); + await ContentDialogHelper.CreateErrorDialog(string.Format(LocaleManager.Instance[LocaleKeys.DialogDlcLoadNcaErrorMessage], ex.Message, path)); }); } } @@ -193,7 +193,7 @@ namespace Ryujinx.Ava.UI.Windows { OpenFileDialog dialog = new() { - Title = LocaleManager.Instance["SelectUpdateDialogTitle"], + Title = LocaleManager.Instance[LocaleKeys.SelectUpdateDialogTitle], AllowMultiple = true }; |
