mchapman/Ryujinx-greemdev
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed irrelevant functions.

Browse Source 
Renamed variables to correct names
This commit is contained in:
Vova
2025-02-12 12:44:38 +10:00
parent af13f4bb3b
commit c21e63eb02
17 changed files with 70 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml.cs
View File

@@ -391,10 +391,10 @@ namespace Ryujinx.Ava.UI.Controls
{
if (sender is MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
{
await new UserConfigWindows(viewModel).ShowDialog((Window)viewModel.TopLevel);
await new GameSpecificSettingsWindow(viewModel).ShowDialog((Window)viewModel.TopLevel);
//just checking for file presence
viewModel.SelectedApplication.UserConfig = File.Exists(Program.GetDirGameUserConfig(viewModel.SelectedApplication.IdString,false,false));
viewModel.SelectedApplication.HasIndependentConfiguration = File.Exists(Program.GetDirGameUserConfig(viewModel.SelectedApplication.IdString,false,false));
viewModel.RefreshView();
}

4
src/Ryujinx/UI/Controls/ApplicationGridView.axaml
View File

@@ -80,7 +80,7 @@
TextAlignment="Center"
TextWrapping="Wrap" />
<TextBlock
IsVisible="{Binding UserConfig}"
IsVisible="{Binding HasIndependentConfiguration}"
Text="{ext:Locale UserConfigurationHeader}"
TextAlignment="Center"
TextWrapping="Wrap"
@@ -105,7 +105,7 @@
Width="90"
Height="20"
CornerRadius="4"
IsVisible="{Binding UserConfig}"
IsVisible="{Binding HasIndependentConfiguration}"
Background="{DynamicResource ThemeContentBackgroundColor}">
<TextBlock
HorizontalAlignment="Center"

2
src/Ryujinx/UI/Controls/ApplicationListView.axaml
View File

@@ -159,7 +159,7 @@
TextWrapping="Wrap"/>
<TextBlock
HorizontalAlignment="Stretch"
IsVisible="{Binding UserConfig}"
IsVisible="{Binding HasIndependentConfiguration}"
Text="{ext:Locale UserConfigurationHeader}"
TextAlignment="Start"
TextWrapping="Wrap"

2
src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
View File

@@ -107,7 +107,7 @@ namespace Ryujinx.Ava.UI.ViewModels
[ObservableProperty] private ApplicationContextMenu _gridAppContextMenu;
[ObservableProperty] private bool _updateAvailable;
public static AsyncRelayCommand UpdateCommand => Commands.Create(async () =>
public static AsyncRelayCommand UpdateCommand { get; } = Commands.Create(async () =>
{
if (Updater.CanUpdate(true))
await Updater.BeginUpdateAsync(true);

1
src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
View File

@@ -400,7 +400,6 @@ namespace Ryujinx.Ava.UI.ViewModels
{
Task.Run(LoadTimeZones);
DirtyHacks = new SettingsHacksViewModel(this);
}
}

10
src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs
View File

@@ -51,12 +51,8 @@ namespace Ryujinx.Ava.UI.Views.Main
XciTrimmerMenuItem.Command = Commands.Create(XCITrimmerWindow.Show);
AboutWindowMenuItem.Command = Commands.Create(AboutWindow.Show);
CompatibilityListMenuItem.Command = Commands.Create(() => CompatibilityList.Show());
UpdateMenuItem.Command = Commands.Create(async () =>
{
if (Updater.CanUpdate(true))
await Updater.BeginUpdateAsync(true);
});
UpdateMenuItem.Command = MainWindowViewModel.UpdateCommand;
FaqMenuItem.Command =
SetupGuideMenuItem.Command =
@@ -150,7 +146,7 @@ namespace Ryujinx.Ava.UI.Views.Main
else
{
// If there is a custom configuration in the folder
await new UserConfigWindows(ViewModel, userConfigExist).ShowDialog((Window)ViewModel.TopLevel);
await new GameSpecificSettingsWindow(ViewModel, userConfigExist).ShowDialog((Window)ViewModel.TopLevel);
}
}

4
src/Ryujinx/UI/Views/Main/MainStatusBarView.axaml
View File

@@ -291,9 +291,11 @@
</MultiBinding>
</StackPanel.IsVisible>
<Button Margin="0, 0, 5, 0"
Command="{Binding UpdateCommand}">
Command="{Binding UpdateCommand}"
Background="{DynamicResource SystemAccentColor}">
<TextBlock
Margin="-5"
Foreground="Black"
HorizontalAlignment="Right"
VerticalAlignment="Center"
Text="{ext:Locale UpdaterBackgroundStatusBarButtonText}" />

2
src/Ryujinx/UI/Windows/AboutWindow.axaml
View File

@@ -125,7 +125,7 @@
Background="Transparent"
Click="Button_OnClick"
CornerRadius="15"
Tag="https://discord.gg/dHPrkBkkyA"
Tag="https://discord.gg/PEuzjrFXUA"
ToolTip.Tip="{ext:Locale AboutDiscordUrlTooltipMessage}">
<Image Source="{Binding DiscordLogo}" />
</Button>

2
src/Ryujinx/UI/Windows/UserConfigWindows.axaml → src/Ryujinx/UI/Windows/GameSpecificSettingsWindow.axaml
View File

@@ -1,5 +1,5 @@
<window:StyleableAppWindow
x:Class="Ryujinx.Ava.UI.Windows.UserConfigWindows"
x:Class="Ryujinx.Ava.UI.Windows.GameSpecificSettingsWindow"
xmlns="https://github.com/avaloniaui"
xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"

4
src/Ryujinx/UI/Windows/UserConfigWindows.axaml.cs → src/Ryujinx/UI/Windows/GameSpecificSettingsWindow.axaml.cs
View File

@@ -24,11 +24,11 @@ using Key = Avalonia.Input.Key;
namespace Ryujinx.Ava.UI.Windows
{
public partial class UserConfigWindows : StyleableAppWindow
public partial class GameSpecificSettingsWindow : StyleableAppWindow
{
internal readonly SettingsViewModel ViewModel;
public UserConfigWindows(MainWindowViewModel viewModel, bool findUserConfigDir = true)
public GameSpecificSettingsWindow(MainWindowViewModel viewModel, bool findUserConfigDir = true)
{
Title = string.Format(LocaleManager.Instance[LocaleKeys.SettingsWithInfo], viewModel.SelectedApplication.Name, viewModel.SelectedApplication.IdString);