Added a window with settings for shortcuts.
Added new arguments for shortcuts. When starting a game with arguments, a separate independent setting will be used
This commit is contained in:
Vova
104
src/Ryujinx/UI/Windows/ArgumentsConfigWindows.axaml
Normal file
104
src/Ryujinx/UI/Windows/ArgumentsConfigWindows.axaml
Normal file
@@ -0,0 +1,104 @@
|
||||
<window:StyleableAppWindow
|
||||
x:Class="Ryujinx.Ava.UI.Windows.ArgumentsConfigWindows"
|
||||
xmlns="https://github.com/avaloniaui"
|
||||
xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:window="clr-namespace:Ryujinx.Ava.UI.Windows"
|
||||
xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
|
||||
xmlns:settings="clr-namespace:Ryujinx.Ava.UI.Views.Settings"
|
||||
xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
|
||||
Width="1100"
|
||||
Height="768"
|
||||
MinWidth="800"
|
||||
MinHeight="480"
|
||||
WindowStartupLocation="CenterOwner"
|
||||
x:DataType="viewModels:SettingsViewModel"
|
||||
mc:Ignorable="d"
|
||||
Focusable="True">
|
||||
<Design.DataContext>
|
||||
<viewModels:SettingsViewModel />
|
||||
</Design.DataContext>
|
||||
<Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" MinWidth="600" RowDefinitions="Auto,*,Auto">
|
||||
<ContentPresenter
|
||||
x:Name="ContentPresenter"
|
||||
Grid.Row="1"
|
||||
IsVisible="False"
|
||||
KeyboardNavigation.IsTabStop="False"/>
|
||||
<Grid Name="Pages" IsVisible="False" Grid.Row="2">
|
||||
<settings:SettingsApplyOverride Name="AllSettings" />
|
||||
</Grid>
|
||||
<ui:NavigationView
|
||||
Grid.Row="1"
|
||||
IsSettingsVisible="False"
|
||||
Name="NavPanel"
|
||||
IsBackEnabled="False"
|
||||
PaneDisplayMode="Left"
|
||||
Margin="2,10,10,0"
|
||||
VerticalAlignment="Stretch"
|
||||
HorizontalAlignment="Stretch"
|
||||
OpenPaneLength="200"
|
||||
IsPaneToggleButtonVisible="False">
|
||||
|
||||
<!-- For image -->
|
||||
<ui:NavigationView.PaneHeader>
|
||||
<Grid HorizontalAlignment="Center" VerticalAlignment="Center">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="5"/>
|
||||
</Grid.RowDefinitions>
|
||||
<TextBlock Text="{Binding GameId}"
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
Margin="0,0,0,10"
|
||||
TextAlignment="Center" Grid.Row="0" />
|
||||
<Image Source="{Binding GameIcon}"
|
||||
Width="160"
|
||||
Height="160"
|
||||
Grid.Row="1"
|
||||
Margin="0,0,0,10"
|
||||
HorizontalAlignment="Center" />
|
||||
<TextBlock Text="{Binding GameTitle}"
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
Margin="0,0,0,10"
|
||||
TextAlignment="Center" Grid.Row="2" />
|
||||
<Separator Height="1" Grid.Row="3" Margin="0,0,0,10" HorizontalAlignment="Stretch"/>
|
||||
</Grid>
|
||||
</ui:NavigationView.PaneHeader>
|
||||
|
||||
<ui:NavigationView.MenuItems>
|
||||
<ui:NavigationViewItem
|
||||
Margin="2,10,10,0"
|
||||
Content="{ext:Locale Settings}"
|
||||
Tag="AllSettings">
|
||||
<ui:NavigationViewItem.IconSource>
|
||||
<ui:FontIconSource
|
||||
FontFamily="avares://Ryujinx/Assets/Fonts#Segoe Fluent Icons"
|
||||
Glyph="{helpers:GlyphValueConverter Chip}" />
|
||||
</ui:NavigationViewItem.IconSource>
|
||||
</ui:NavigationViewItem>
|
||||
</ui:NavigationView.MenuItems>
|
||||
</ui:NavigationView>
|
||||
|
||||
<ReversibleStackPanel
|
||||
Grid.Row="2"
|
||||
Margin="10"
|
||||
Spacing="10"
|
||||
Orientation="Horizontal"
|
||||
HorizontalAlignment="Right"
|
||||
ReverseOrder="{Binding IsMacOS}">
|
||||
<Button
|
||||
Content="{ext:Locale GameListContextMenuCreateShortcut}"
|
||||
Command="{Binding CreateShortcut}" />
|
||||
<Button
|
||||
HotKey="Escape"
|
||||
Content="{ext:Locale ControllerSettingsClose}"
|
||||
Command="{Binding CancelButton}" />
|
||||
</ReversibleStackPanel>
|
||||
</Grid>
|
||||
</window:StyleableAppWindow>
|
||||
167
src/Ryujinx/UI/Windows/ArgumentsConfigWindows.axaml.cs
Normal file
167
src/Ryujinx/UI/Windows/ArgumentsConfigWindows.axaml.cs
Normal file
@@ -0,0 +1,167 @@
|
||||
using Avalonia;
|
||||
using Avalonia.Controls;
|
||||
using Avalonia.Controls.Shapes;
|
||||
using Avalonia.Input;
|
||||
using Avalonia.Media.Imaging;
|
||||
using FluentAvalonia.Core;
|
||||
using FluentAvalonia.UI.Controls;
|
||||
using Projektanker.Icons.Avalonia;
|
||||
using Ryujinx.Ava.Common.Locale;
|
||||
using Ryujinx.Ava.UI.Models;
|
||||
using Ryujinx.Ava.UI.ViewModels;
|
||||
using Ryujinx.Ava.UI.ViewModels.Input;
|
||||
using Ryujinx.Ava.Utilities;
|
||||
using Ryujinx.Ava.Utilities.Configuration;
|
||||
using Ryujinx.Common.Configuration;
|
||||
using Ryujinx.HLE.FileSystem;
|
||||
using Ryujinx.HLE.HOS.SystemState;
|
||||
using Ryujinx.Input;
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using Key = Avalonia.Input.Key;
|
||||
|
||||
|
||||
namespace Ryujinx.Ava.UI.Windows
|
||||
{
|
||||
public partial class ArgumentsConfigWindows : StyleableAppWindow
|
||||
{
|
||||
internal readonly SettingsViewModel ViewModel;
|
||||
public string GamePath { get; }
|
||||
public string GameName { get; }
|
||||
public string GameId { get; }
|
||||
public byte[] GameIconData { get; }
|
||||
|
||||
public static int OverrideBackendThreading { get; private set; }
|
||||
public static int OverrideGraphicsBackend { get; private set; }
|
||||
public static int OverrideSystemLanguage { get; private set; }
|
||||
public static int OverrideSystemRegion { get; private set; }
|
||||
public static bool OverridePPTC { get; private set; }
|
||||
public static int OverrideMemoryManagerMode { get; private set; }
|
||||
|
||||
|
||||
public ArgumentsConfigWindows(MainWindowViewModel viewModel)
|
||||
{
|
||||
Title = RyujinxApp.FormatTitle(LocaleKeys.Settings);
|
||||
|
||||
DataContext = ViewModel = new SettingsViewModel(
|
||||
viewModel.VirtualFileSystem,
|
||||
viewModel.ContentManager,
|
||||
viewModel.SelectedApplication.Path,
|
||||
viewModel.SelectedApplication.Name,
|
||||
viewModel.SelectedApplication.IdString,
|
||||
viewModel.SelectedApplication.Icon);
|
||||
|
||||
GamePath = viewModel.SelectedApplication.Path;
|
||||
GameName = viewModel.SelectedApplication.Name;
|
||||
GameId = viewModel.SelectedApplication.IdString;
|
||||
GameIconData = viewModel.SelectedApplication.Icon;
|
||||
|
||||
OverrideBackendThreading = ViewModel.GraphicsBackendMultithreadingIndex;
|
||||
OverrideGraphicsBackend = ViewModel.GraphicsBackendIndex;
|
||||
OverrideSystemLanguage = ViewModel.Language;
|
||||
OverrideSystemRegion = ViewModel.Region;
|
||||
OverridePPTC = ViewModel.EnablePptc;
|
||||
OverrideMemoryManagerMode = ViewModel.MemoryMode;
|
||||
|
||||
ViewModel.CloseWindow += Close;
|
||||
ViewModel.CompareSettingsEvent += CompareConfiguration;
|
||||
|
||||
InitializeComponent();
|
||||
Load();
|
||||
|
||||
#if DEBUG
|
||||
this.AttachDevTools(new KeyGesture(Key.F12, KeyModifiers.Alt));
|
||||
#endif
|
||||
}
|
||||
|
||||
public void CompareConfiguration()
|
||||
{
|
||||
ShortcutHelper.CreateAppShortcut(
|
||||
GamePath,
|
||||
GameName,
|
||||
GameId,
|
||||
GameIconData,
|
||||
SetArguments()
|
||||
);
|
||||
}
|
||||
|
||||
private string SetArguments() {
|
||||
|
||||
string line = "";
|
||||
|
||||
if (OverrideBackendThreading != ViewModel.GraphicsBackendMultithreadingIndex)
|
||||
{
|
||||
string _result = Enum.GetName(typeof(BackendThreading), ViewModel.GraphicsBackendMultithreadingIndex);
|
||||
line += " --backend-threading " + _result;
|
||||
}
|
||||
|
||||
if (OverrideGraphicsBackend != ViewModel.GraphicsBackendIndex)
|
||||
{
|
||||
string _result = Enum.GetName(typeof(GraphicsBackend), ViewModel.GraphicsBackendIndex);
|
||||
line += " -g " + _result;
|
||||
}
|
||||
|
||||
if (OverridePPTC != ViewModel.EnablePptc)
|
||||
{
|
||||
string _result = ViewModel.EnablePptc.ToString();
|
||||
line += " --pptc " + _result;
|
||||
}
|
||||
|
||||
if (OverrideMemoryManagerMode != ViewModel.MemoryMode)
|
||||
{
|
||||
string _result = Enum.GetName(typeof(MemoryManagerMode), ViewModel.MemoryMode);
|
||||
line += " -m " + _result;
|
||||
}
|
||||
|
||||
if (OverrideSystemRegion != ViewModel.Region)
|
||||
{
|
||||
string _result = Enum.GetName(typeof(RegionCode), ViewModel.Region);
|
||||
line += " --system-region " + _result;
|
||||
}
|
||||
|
||||
if (OverrideSystemLanguage != ViewModel.Language)
|
||||
{
|
||||
string _result = Enum.GetName(typeof(SystemLanguage), ViewModel.Language);
|
||||
line += " --system-language " + _result;
|
||||
}
|
||||
|
||||
return line;
|
||||
}
|
||||
|
||||
private void Load()
|
||||
{
|
||||
Pages.Children.Clear();
|
||||
NavPanel.SelectionChanged += NavPanelOnSelectionChanged;
|
||||
NavPanel.SelectedItem = NavPanel.MenuItems.ElementAt(0);
|
||||
|
||||
}
|
||||
|
||||
private void NavPanelOnSelectionChanged(object sender, NavigationViewSelectionChangedEventArgs e)
|
||||
{
|
||||
|
||||
if (e.SelectedItem is NavigationViewItem navItem && navItem.Tag is not null)
|
||||
{
|
||||
switch (navItem.Tag.ToString())
|
||||
{
|
||||
case nameof(AllSettings):
|
||||
NavPanel.Content = AllSettings;
|
||||
break;
|
||||
default:
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
protected override void OnClosing(WindowClosingEventArgs e)
|
||||
{
|
||||
|
||||
foreach (IGamepad gamepad in RyujinxApp.MainWindow.InputManager.GamepadDriver.GetGamepads())
|
||||
{
|
||||
gamepad?.ClearLed();
|
||||
}
|
||||
|
||||
base.OnClosing(e);
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user