JJBanana13/ryujinx
1
0
Fork 0
mirror of https://git.ryujinx.app/ryubing/ryujinx.git synced 2026-06-02 10:29:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
GreemDev
2025-11-21 00:24:48 -06:00
parent b033adbde7
commit ee10cbf735
8 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Ryujinx/Systems/SetupWizard/BaseSetupWizard.cs
View File

@@ -1,6 +1,5 @@
using Avalonia.Controls.Presenters; using Avalonia.Controls.Presenters;
using Ryujinx.Ava.Common.Locale; using Ryujinx.Ava.Common.Locale;
using Ryujinx.Systems.SetupWizard;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace Ryujinx.Ava.Systems.SetupWizard namespace Ryujinx.Ava.Systems.SetupWizard

2
src/Ryujinx/Systems/SetupWizard/SetupWizardPage.cs
View File

@@ -3,7 +3,7 @@ using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input; using CommunityToolkit.Mvvm.Input;
using Ryujinx.Ava.Common.Locale; using Ryujinx.Ava.Common.Locale;
using Ryujinx.Ava.UI.ViewModels; using Ryujinx.Ava.UI.ViewModels;
using Ryujinx.Systems.SetupWizard; using Ryujinx.Ava.Systems.SetupWizard;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;

2
src/Ryujinx/Systems/SetupWizard/SetupWizardPageBuilder.cs
View File

@@ -5,7 +5,7 @@ using Ryujinx.Ava.Common.Locale;
using Ryujinx.Ava.Systems.SetupWizard; using Ryujinx.Ava.Systems.SetupWizard;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace Ryujinx.Systems.SetupWizard namespace Ryujinx.Ava.Systems.SetupWizard
{ {
public class SetupWizardPageBuilder(ContentPresenter presenter, bool isFirstPage = false) public class SetupWizardPageBuilder(ContentPresenter presenter, bool isFirstPage = false)
{ {

2
src/Ryujinx/Systems/SetupWizard/SetupWizardPageView.axaml
View File

@@ -9,7 +9,7 @@
xmlns:wiz="using:Ryujinx.Ava.Systems.SetupWizard" xmlns:wiz="using:Ryujinx.Ava.Systems.SetupWizard"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:DataType="wiz:SetupWizardPage" x:DataType="wiz:SetupWizardPage"
x:Class="Ryujinx.Systems.SetupWizard.SetupWizardPageView"> x:Class="Ryujinx.Ava.Systems.SetupWizard.SetupWizardPageView">
<Grid RowDefinitions="*,Auto" Margin="60"> <Grid RowDefinitions="*,Auto" Margin="60">
<ScrollViewer> <ScrollViewer>
<Grid RowDefinitions="Auto,*,Auto"> <Grid RowDefinitions="Auto,*,Auto">

2
src/Ryujinx/Systems/SetupWizard/SetupWizardPageView.axaml.cs
View File

@@ -4,7 +4,7 @@ using Avalonia.Markup.Xaml;
using Ryujinx.Ava.Systems.SetupWizard; using Ryujinx.Ava.Systems.SetupWizard;
using Ryujinx.Ava.UI.Controls; using Ryujinx.Ava.UI.Controls;
namespace Ryujinx.Systems.SetupWizard namespace Ryujinx.Ava.Systems.SetupWizard
{ {
public partial class SetupWizardPageView : RyujinxControl<SetupWizardPage> public partial class SetupWizardPageView : RyujinxControl<SetupWizardPage>
{ {

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

@@ -3,13 +3,11 @@ using Ryujinx.Ava.Common.Locale;
using Ryujinx.Ava.Systems.Configuration; using Ryujinx.Ava.Systems.Configuration;
using Ryujinx.Ava.Systems.SetupWizard; using Ryujinx.Ava.Systems.SetupWizard;
using Ryujinx.Ava.UI.ViewModels; using Ryujinx.Ava.UI.ViewModels;
using Ryujinx.Common.Logging;
using Ryujinx.UI.SetupWizard; using Ryujinx.UI.SetupWizard;
using Ryujinx.UI.SetupWizard.Pages; using Ryujinx.UI.SetupWizard.Pages;
using System; using System;
using System.IO; using System.IO;
using System.Threading.Tasks; using System.Threading.Tasks;
using Logger = Ryujinx.Common.Logging.Logger;
namespace Ryujinx.Ava.UI.SetupWizard namespace Ryujinx.Ava.UI.SetupWizard
{ {

3
src/Ryujinx/UI/SetupWizard/RyujinxSetupWizardWindow.axaml.cs
View File

@@ -1,5 +1,6 @@
using Ryujinx.Ava; using Ryujinx.Ava;
using Ryujinx.Ava.Systems.Configuration; using Ryujinx.Ava.Systems.Configuration;
using Ryujinx.Ava.Systems.SetupWizard;
using Ryujinx.Ava.UI.SetupWizard; using Ryujinx.Ava.UI.SetupWizard;
using Ryujinx.Ava.UI.ViewModels; using Ryujinx.Ava.UI.ViewModels;
using Ryujinx.Ava.UI.Windows; using Ryujinx.Ava.UI.Windows;
@@ -24,7 +25,7 @@ namespace Ryujinx.UI.SetupWizard
} }
} }
public static RyujinxSetupWizardWindow CreateWindow(MainWindowViewModel mwvm, out RyujinxSetupWizard setupWizard) public static RyujinxSetupWizardWindow CreateWindow(MainWindowViewModel mwvm, out BaseSetupWizard setupWizard)
{ {
RyujinxSetupWizardWindow window = new(); RyujinxSetupWizardWindow window = new();
window.DataContext = setupWizard = new RyujinxSetupWizard(window.WizardPresenter, mwvm, () => window.DataContext = setupWizard = new RyujinxSetupWizard(window.WizardPresenter, mwvm, () =>

7
src/Ryujinx/UI/Windows/MainWindow.axaml.cs
View File

@@ -15,6 +15,7 @@ using Ryujinx.Ava.Systems;
using Ryujinx.Ava.Systems.AppLibrary; using Ryujinx.Ava.Systems.AppLibrary;
using Ryujinx.Ava.Systems.Configuration; using Ryujinx.Ava.Systems.Configuration;
using Ryujinx.Ava.Systems.Configuration.UI; using Ryujinx.Ava.Systems.Configuration.UI;
using Ryujinx.Ava.Systems.SetupWizard;
using Ryujinx.Ava.UI.Applet; using Ryujinx.Ava.UI.Applet;
using Ryujinx.Ava.UI.Helpers; using Ryujinx.Ava.UI.Helpers;
using Ryujinx.Ava.UI.Models; using Ryujinx.Ava.UI.Models;
@@ -145,8 +146,10 @@ namespace Ryujinx.Ava.UI.Windows
if (Program.IsFirstStart && RyujinxSetupWizardWindow.CanShowSetupWizard) if (Program.IsFirstStart && RyujinxSetupWizardWindow.CanShowSetupWizard)
{ {
Task windowTask = ShowAsync(RyujinxSetupWizardWindow.CreateWindow(ViewModel, out var wiz), this); Task windowTask = ShowAsync(
_ = wiz.Start(); RyujinxSetupWizardWindow.CreateWindow(ViewModel, out BaseSetupWizard wiz),
this);
_ = wiz.Start().AsTask();
await windowTask; await windowTask;
} }
}); });