JJBanana13/ryujinx
1
0
Fork 0
mirror of https://git.ryujinx.app/ryubing/ryujinx.git synced 2026-05-05 04:45:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

content & viewmodel object creation helper with out param, touch up firmware install step

Browse Source
This commit is contained in:
GreemDev
2025-11-22 18:35:37 -06:00
parent 325e13a490
commit 9b0fa3bf6d
3 changed files with 40 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/Ryujinx/UI/SetupWizard/RyujinxSetupWizard.cs
View File

@@ -49,10 +49,9 @@ namespace Ryujinx.Ava.UI.SetupWizard
if (!mwvm.VirtualFileSystem.HasKeySet)
{
Retry:
SetupKeysPageViewModel kpvm = new();
bool result = await NextPage()
.WithTitle(LocaleKeys.SetupWizardKeysPageTitle)
.WithContent<SetupKeysPage>(kpvm)
.WithContent<SetupKeysPage, SetupKeysPageViewModel>(out SetupKeysPageViewModel kpvm)
.Show();
if (!result)
@@ -77,15 +76,14 @@ namespace Ryujinx.Ava.UI.SetupWizard
{
if (!mwvm.VirtualFileSystem.HasKeySet)
{
NotificationHelper.ShowError("Keys still seem to not be installed. Are you sure they're in that folder?");
NotificationHelper.ShowError("Keys still seem to not be installed. Please try again.");
return false;
}
Retry:
SetupFirmwarePageViewModel fwvm = new();
bool result = await NextPage()
.WithTitle(LocaleKeys.SetupWizardFirmwarePageTitle)
.WithContent<SetupFirmwarePage>(fwvm)
.WithContent<SetupFirmwarePage, SetupFirmwarePageViewModel>(out SetupFirmwarePageViewModel fwvm)
.Show();
if (!result)
@@ -98,11 +96,22 @@ namespace Ryujinx.Ava.UI.SetupWizard
{
mwvm.ContentManager.InstallFirmware(fwvm.FirmwareSourcePath);
SystemVersion installedFwVer = mwvm.ContentManager.GetCurrentFirmwareVersion();
NotificationHelper.ShowInformation(
"Firmware installed",
$"Installed firmware version {installedFwVer.VersionString}."
);
mwvm.RefreshFirmwareStatus(installedFwVer);
if (installedFwVer != null)
{
NotificationHelper.ShowInformation(
"Firmware installed",
$"Installed firmware version {installedFwVer.VersionString}."
);
}
else
{
NotificationHelper.ShowError(
"Firmware not installed",
$"It seems some error occurred when trying to install the firmware at path '{fwvm.FirmwareSourcePath}'. " +
"\nPlease check the log or try again."
);
}
mwvm.RefreshFirmwareStatus(installedFwVer, allowNullVersion: true);
// Purge Applet Cache.