mirror of
https://git.ryujinx.app/ryubing/ryujinx.git
synced 2026-06-12 15:29:15 +00:00
Minor cleanup
Going over changed files and adjusting structure and looks
This commit is contained in:
@@ -17,7 +17,7 @@
|
|||||||
<viewModels:ProfileSelectorDialogViewModel />
|
<viewModels:ProfileSelectorDialogViewModel />
|
||||||
</Design.DataContext>
|
</Design.DataContext>
|
||||||
<Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" RowDefinitions="*,Auto">
|
<Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" RowDefinitions="*,Auto">
|
||||||
<Border BorderThickness="0" Padding="-3">
|
<Border Padding="-3" BorderThickness="0">
|
||||||
<ListBox
|
<ListBox
|
||||||
HorizontalAlignment="Center"
|
HorizontalAlignment="Center"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
Command="{Binding RunApplication}"
|
Command="{Binding RunApplication}"
|
||||||
CommandParameter="{Binding}"
|
CommandParameter="{Binding}"
|
||||||
Header="{ext:Locale GameListContextMenuRunApplication}"
|
Header="{ext:Locale GameListContextMenuRunApplication}"
|
||||||
Icon="{ext:Icon fa-solid fa-play}"/>
|
Icon="{ext:Icon fa-solid fa-play}" />
|
||||||
<MenuItem
|
<MenuItem
|
||||||
Command="{Binding ToggleFavorite}"
|
Command="{Binding ToggleFavorite}"
|
||||||
CommandParameter="{Binding}"
|
CommandParameter="{Binding}"
|
||||||
@@ -30,15 +30,15 @@
|
|||||||
ToolTip.Tip="{ext:Locale EditCustomConfigurationToolTip}" />
|
ToolTip.Tip="{ext:Locale EditCustomConfigurationToolTip}" />
|
||||||
<MenuItem
|
<MenuItem
|
||||||
Command="{Binding EditGameConfiguration}"
|
Command="{Binding EditGameConfiguration}"
|
||||||
CommandParameter="{Binding}"
|
CommandParameter="{Binding}"
|
||||||
IsVisible="{Binding !SelectedApplication.HasIndependentConfiguration}"
|
IsVisible="{Binding !SelectedApplication.HasIndependentConfiguration}"
|
||||||
Header="{ext:Locale GameListContextMenuCreateCustomConfiguration}"
|
Header="{ext:Locale GameListContextMenuCreateCustomConfiguration}"
|
||||||
Icon="{ext:Icon fa-solid fa-gear}"
|
Icon="{ext:Icon fa-solid fa-gear}"
|
||||||
ToolTip.Tip="{ext:Locale CreateCustomConfigurationToolTip}" />
|
ToolTip.Tip="{ext:Locale CreateCustomConfigurationToolTip}" />
|
||||||
<MenuItem
|
<MenuItem
|
||||||
IsVisible="{Binding HasCompatibilityEntry}"
|
|
||||||
Command="{Binding OpenApplicationCompatibility}"
|
Command="{Binding OpenApplicationCompatibility}"
|
||||||
CommandParameter="{Binding}"
|
CommandParameter="{Binding}"
|
||||||
|
IsVisible="{Binding HasCompatibilityEntry}"
|
||||||
Header="{ext:Locale GameListContextMenuShowCompatEntry}"
|
Header="{ext:Locale GameListContextMenuShowCompatEntry}"
|
||||||
Icon="{ext:Icon fa-solid fa-database}"
|
Icon="{ext:Icon fa-solid fa-database}"
|
||||||
ToolTip.Tip="{ext:Locale GameListContextMenuShowCompatEntryToolTip}"/>
|
ToolTip.Tip="{ext:Locale GameListContextMenuShowCompatEntryToolTip}"/>
|
||||||
@@ -104,8 +104,8 @@
|
|||||||
Command="{Binding TrimXci}"
|
Command="{Binding TrimXci}"
|
||||||
CommandParameter="{Binding}"
|
CommandParameter="{Binding}"
|
||||||
Header="{ext:Locale GameListContextMenuTrimXCI}"
|
Header="{ext:Locale GameListContextMenuTrimXCI}"
|
||||||
IsEnabled="{Binding TrimXCIEnabled}"
|
|
||||||
Icon="{ext:Icon fa-solid fa-scissors}"
|
Icon="{ext:Icon fa-solid fa-scissors}"
|
||||||
|
IsEnabled="{Binding TrimXCIEnabled}"
|
||||||
ToolTip.Tip="{ext:Locale GameListContextMenuTrimXCIToolTip}" />
|
ToolTip.Tip="{ext:Locale GameListContextMenuTrimXCIToolTip}" />
|
||||||
<MenuItem Header="{ext:Locale GameListContextMenuCacheManagement}" Icon="{ext:Icon fa-solid fa-memory}">
|
<MenuItem Header="{ext:Locale GameListContextMenuCacheManagement}" Icon="{ext:Icon fa-solid fa-memory}">
|
||||||
<MenuItem
|
<MenuItem
|
||||||
@@ -151,9 +151,9 @@
|
|||||||
Header="{ext:Locale GameListContextMenuExtractDataRomFS}"
|
Header="{ext:Locale GameListContextMenuExtractDataRomFS}"
|
||||||
ToolTip.Tip="{ext:Locale GameListContextMenuExtractDataRomFSToolTip}" />
|
ToolTip.Tip="{ext:Locale GameListContextMenuExtractDataRomFSToolTip}" />
|
||||||
<MenuItem
|
<MenuItem
|
||||||
IsVisible="{Binding HasDlc}"
|
|
||||||
Command="{Binding ExtractApplicationAocRomFs}"
|
Command="{Binding ExtractApplicationAocRomFs}"
|
||||||
CommandParameter="{Binding}"
|
CommandParameter="{Binding}"
|
||||||
|
IsVisible="{Binding HasDlc}"
|
||||||
Header="{ext:Locale GameListContextMenuExtractDataAocRomFS}"
|
Header="{ext:Locale GameListContextMenuExtractDataAocRomFS}"
|
||||||
ToolTip.Tip="{ext:Locale GameListContextMenuExtractDataAocRomFSToolTip}" />
|
ToolTip.Tip="{ext:Locale GameListContextMenuExtractDataAocRomFSToolTip}" />
|
||||||
<MenuItem
|
<MenuItem
|
||||||
|
|||||||
@@ -8,8 +8,8 @@
|
|||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
|
xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
|
||||||
xmlns:models="clr-namespace:Ryujinx.Ava.UI.Models"
|
xmlns:models="clr-namespace:Ryujinx.Ava.UI.Models"
|
||||||
MinWidth="500"
|
|
||||||
mc:Ignorable="d"
|
mc:Ignorable="d"
|
||||||
|
MinWidth="500"
|
||||||
Focusable="True"
|
Focusable="True"
|
||||||
x:DataType="models:TempProfile">
|
x:DataType="models:TempProfile">
|
||||||
<Grid Margin="0,10,0,0" ColumnDefinitions="Auto,*" RowDefinitions="*,Auto">
|
<Grid Margin="0,10,0,0" ColumnDefinitions="Auto,*" RowDefinitions="*,Auto">
|
||||||
|
|||||||
@@ -1,19 +1,19 @@
|
|||||||
<UserControl
|
<UserControl
|
||||||
|
x:Class="Ryujinx.Ava.UI.Views.User.UserFirmwareAvatarSelectorView"
|
||||||
xmlns="https://github.com/avaloniaui"
|
xmlns="https://github.com/avaloniaui"
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
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:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
|
xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
|
||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
|
xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
|
||||||
|
xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
|
||||||
|
d:DesignHeight="350"
|
||||||
|
d:DesignWidth="578"
|
||||||
mc:Ignorable="d"
|
mc:Ignorable="d"
|
||||||
Width="528"
|
Width="528"
|
||||||
d:DesignWidth="578"
|
Focusable="True"
|
||||||
d:DesignHeight="350"
|
x:DataType="viewModels:UserFirmwareAvatarSelectorViewModel">
|
||||||
x:Class="Ryujinx.Ava.UI.Views.User.UserFirmwareAvatarSelectorView"
|
|
||||||
xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
|
|
||||||
xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
|
|
||||||
xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
|
|
||||||
x:DataType="viewModels:UserFirmwareAvatarSelectorViewModel"
|
|
||||||
Focusable="True">
|
|
||||||
<Design.DataContext>
|
<Design.DataContext>
|
||||||
<viewModels:UserFirmwareAvatarSelectorViewModel />
|
<viewModels:UserFirmwareAvatarSelectorViewModel />
|
||||||
</Design.DataContext>
|
</Design.DataContext>
|
||||||
|
|||||||
@@ -2,9 +2,9 @@ using Avalonia.Interactivity;
|
|||||||
using Avalonia.Threading;
|
using Avalonia.Threading;
|
||||||
using FluentAvalonia.UI.Controls;
|
using FluentAvalonia.UI.Controls;
|
||||||
using FluentAvalonia.UI.Navigation;
|
using FluentAvalonia.UI.Navigation;
|
||||||
|
using Ryujinx.Ava.Common.Locale;
|
||||||
using Ryujinx.Ava.UI.Controls;
|
using Ryujinx.Ava.UI.Controls;
|
||||||
using Ryujinx.Ava.UI.Models;
|
using Ryujinx.Ava.UI.Models;
|
||||||
using Ryujinx.Ava.Common.Locale;
|
|
||||||
using Ryujinx.Ava.UI.ViewModels;
|
using Ryujinx.Ava.UI.ViewModels;
|
||||||
using Ryujinx.HLE.FileSystem;
|
using Ryujinx.HLE.FileSystem;
|
||||||
using SkiaSharp;
|
using SkiaSharp;
|
||||||
|
|||||||
@@ -1,19 +1,19 @@
|
|||||||
<UserControl
|
<UserControl
|
||||||
|
x:Class="Ryujinx.Ava.UI.Views.User.UserRecovererView"
|
||||||
xmlns="https://github.com/avaloniaui"
|
xmlns="https://github.com/avaloniaui"
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
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:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
|
xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
|
||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
mc:Ignorable="d"
|
xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
|
||||||
d:DesignWidth="550"
|
d:DesignWidth="550"
|
||||||
d:DesignHeight="450"
|
d:DesignHeight="450"
|
||||||
|
mc:Ignorable="d"
|
||||||
Width="500"
|
Width="500"
|
||||||
Height="400"
|
Height="400"
|
||||||
xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
|
Focusable="True"
|
||||||
xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
|
x:DataType="viewModels:UserProfileViewModel">
|
||||||
xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
|
|
||||||
x:Class="Ryujinx.Ava.UI.Views.User.UserRecovererView"
|
|
||||||
x:DataType="viewModels:UserProfileViewModel"
|
|
||||||
Focusable="True">
|
|
||||||
<Design.DataContext>
|
<Design.DataContext>
|
||||||
<viewModels:UserProfileViewModel />
|
<viewModels:UserProfileViewModel />
|
||||||
</Design.DataContext>
|
</Design.DataContext>
|
||||||
|
|||||||
@@ -1,10 +1,11 @@
|
|||||||
<UserControl
|
<UserControl
|
||||||
|
x:Class="Ryujinx.Ava.UI.Views.User.UserSaveManagerView"
|
||||||
xmlns="https://github.com/avaloniaui"
|
xmlns="https://github.com/avaloniaui"
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
|
||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
|
||||||
xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
|
|
||||||
xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
|
xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
|
||||||
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
|
xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
|
||||||
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
|
xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
|
||||||
xmlns:models="clr-namespace:Ryujinx.Ava.UI.Models"
|
xmlns:models="clr-namespace:Ryujinx.Ava.UI.Models"
|
||||||
xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
|
xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
|
||||||
@@ -13,7 +14,6 @@
|
|||||||
d:DesignHeight="500"
|
d:DesignHeight="500"
|
||||||
Height="450"
|
Height="450"
|
||||||
Width="550"
|
Width="550"
|
||||||
x:Class="Ryujinx.Ava.UI.Views.User.UserSaveManagerView"
|
|
||||||
x:DataType="viewModels:UserSaveManagerViewModel"
|
x:DataType="viewModels:UserSaveManagerViewModel"
|
||||||
Focusable="True">
|
Focusable="True">
|
||||||
<Design.DataContext>
|
<Design.DataContext>
|
||||||
|
|||||||
@@ -4,15 +4,15 @@
|
|||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
|
xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
|
||||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
|
xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
|
||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
|
xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
|
||||||
xmlns:models="clr-namespace:Ryujinx.Ava.UI.Models"
|
xmlns:models="clr-namespace:Ryujinx.Ava.UI.Models"
|
||||||
xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
|
xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
|
||||||
xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
|
|
||||||
d:DesignHeight="450"
|
d:DesignHeight="450"
|
||||||
MinWidth="500"
|
|
||||||
d:DesignWidth="800"
|
d:DesignWidth="800"
|
||||||
mc:Ignorable="d"
|
mc:Ignorable="d"
|
||||||
|
MinWidth="500"
|
||||||
Focusable="True"
|
Focusable="True"
|
||||||
x:DataType="viewModels:UserProfileViewModel">
|
x:DataType="viewModels:UserProfileViewModel">
|
||||||
<Design.DataContext>
|
<Design.DataContext>
|
||||||
@@ -88,10 +88,10 @@
|
|||||||
Background="{DynamicResource ThemeContentBackgroundColor}"
|
Background="{DynamicResource ThemeContentBackgroundColor}"
|
||||||
IsVisible="{Binding IsPointerOver}">
|
IsVisible="{Binding IsPointerOver}">
|
||||||
<Button
|
<Button
|
||||||
MaxHeight="24"
|
|
||||||
MaxWidth="24"
|
|
||||||
MinHeight="24"
|
MinHeight="24"
|
||||||
MinWidth="24"
|
MinWidth="24"
|
||||||
|
MaxHeight="24"
|
||||||
|
MaxWidth="24"
|
||||||
CornerRadius="12"
|
CornerRadius="12"
|
||||||
Padding="0"
|
Padding="0"
|
||||||
Click="EditUser">
|
Click="EditUser">
|
||||||
|
|||||||
Reference in New Issue
Block a user