diff --git a/Ryujinx/Ui/MainWindow.cs b/Ryujinx/Ui/MainWindow.cs index 38d0d24361..77cfd87c0c 100644 --- a/Ryujinx/Ui/MainWindow.cs +++ b/Ryujinx/Ui/MainWindow.cs @@ -59,6 +59,7 @@ namespace Ryujinx.Ui [GUI] TreeView _gameTable; [GUI] TreeSelection _gameTableSelection; [GUI] Label _progressLabel; + [GUI] Label _firmwareVersionLabel; [GUI] LevelBar _progressBar; #pragma warning restore CS0649 #pragma warning restore IDE0044 @@ -137,6 +138,8 @@ namespace Ryujinx.Ui #pragma warning disable CS4014 UpdateGameTable(); #pragma warning restore CS4014 + + Task.Run(RefreshFirmwareLabel); } internal static void ApplyTheme() @@ -592,6 +595,18 @@ namespace Ryujinx.Ui HandleInstallerDialog(directoryChooser); } + private void RefreshFirmwareLabel() + { + var currentFirmware = _device.System.GetCurrentFirmwareVersion(); + + GLib.Idle.Add(new GLib.IdleHandler(() => + { + _firmwareVersionLabel.Text = currentFirmware != null ? currentFirmware.VersionString : "0.0.0"; + + return false; + })); + } + private void HandleInstallerDialog(FileChooserDialog fileChooser) { if (fileChooser.Run() == (int)ResponseType.Accept) @@ -629,7 +644,7 @@ namespace Ryujinx.Ui if (currentVersion != null) { - dialogMessage += $"This will replace the current system version {currentVersion.VersionString}."; + dialogMessage += $"This will replace the current system version {currentVersion.VersionString}. "; } dialogMessage += "Do you want to continue?"; @@ -694,7 +709,7 @@ namespace Ryujinx.Ui dialog.Text = $"Install Firmware {firmwareVersion.VersionString} Failed."; dialog.SecondaryText = $"An error occured while installing system version {firmwareVersion.VersionString}." + - "Please check logs for more info."; + " Please check logs for more info."; Logger.PrintError(LogClass.Application, ex.Message); @@ -704,6 +719,10 @@ namespace Ryujinx.Ui return false; })); } + finally + { + RefreshFirmwareLabel(); + } }); thread.Start(); diff --git a/Ryujinx/Ui/MainWindow.glade b/Ryujinx/Ui/MainWindow.glade index ef29582835..8e2eab9391 100644 --- a/Ryujinx/Ui/MainWindow.glade +++ b/Ryujinx/Ui/MainWindow.glade @@ -1,5 +1,5 @@ - + @@ -8,9 +8,6 @@ center 1280 750 - - - True @@ -408,7 +405,7 @@ True False - 5 + 10 5 2 2 @@ -426,7 +423,7 @@ True False start - 5 + 10 5 @@ -435,6 +432,57 @@ 2 + + + True + False + + + False + True + 3 + + + + + True + False + 5 + + + True + False + System Version + + + False + True + 0 + + + + + 50 + True + False + 5 + 5 + + + False + True + end + 1 + + + + + False + True + end + 4 + + False @@ -451,5 +499,8 @@ + + +