mirror of
https://github.com/GreemDev/Ryujinx.git
synced 2024-11-28 11:50:50 +01:00
934b5a64e5
* Fix redundancies * Add back elses * Loading Screen fixes * Redesign User Profile Manager - Backported long selection bar in Grid/List view not working - Backported UserSelector is jank * Fix SelectionIndicator * Fix DataType * Fix SaveManager bug * Remove debug log * Load saves on UIThread * Reduce UI thread blocking * Fix locale keys * Use block namespaces * Fix close button width * Make UserProfile ordering consistent * Alphabetical order * Adjust layout, remove green circle for blue selector * Fix some inconsistencies * Fix no inital selected profile * Adjust appearance of edit button * Adjust SaveManager * Remove redundant warning dialog * Make firmware avatar selector clearer * View redesign again :hero_depressed: * Consistency adjustments * Adjust margins * Make `UserProfileImageSelector` consistent * Make `UserFirmwareAvatarSelector` consistent * Fix long grid view selector * Switch case * Remove long selection bar Handled in #4178 * Consistency * Started dialog titles * Fixes * Remaining titles * Update Ryujinx.Ava/UI/Controls/NavigationDialogHost.axaml Co-authored-by: Mary-nyan <thog@protonmail.com> * Fix build * Hide UserRecoverer if no LostProfiles are found * UserEditor Avatar Placeholder * Watermark + locale adjustment * Border radius * Remove unnecessary styles * Fix firmware avatar image order * Cleanup `ColorPickerButton` * Make `UserId` copy/paste able * Make `FirmwareAvatarSelector` 6 images wide * Make selection bar better * Unsaved changes dialogue * Fix indentation * Remove extra check * Address suggestions * Reorganise - Remove unused views - Rename views to match convention - Fix weird namespacing * Update Ryujinx.Ava/UI/Views/User/UserFirmwareAvatarSelectorView.axaml Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/UI/Views/User/UserFirmwareAvatarSelectorView.axaml Co-authored-by: Ac_K <Acoustik666@gmail.com> * UserRecovererView empty placeholder * Update Ryujinx.Ava/UI/Views/User/UserSelectorView.axaml.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/UI/Views/User/UserSaveManagerView.axaml.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/UI/Views/User/UserSaveManagerView.axaml.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/UI/Views/User/UserSaveManagerView.axaml.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/UI/Views/User/UserRecovererView.axaml.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/UI/Views/User/UserFirmwareAvatarSelectorView.axaml.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/UI/ViewModels/UserFirmwareAvatarSelectorViewModel.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/UI/ViewModels/UserFirmwareAvatarSelectorViewModel.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/UI/ViewModels/UserFirmwareAvatarSelectorViewModel.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/UI/Models/UserProfile.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/UI/Controls/NavigationDialogHost.axaml.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Update Ryujinx.Ava/UI/Controls/NavigationDialogHost.axaml.cs Co-authored-by: Ac_K <Acoustik666@gmail.com> * Remove AddModel * Update Ryujinx.Ava/Assets/Locales/en_US.json Co-authored-by: Ac_K <Acoustik666@gmail.com> * Fix bug Co-authored-by: Mary-nyan <thog@protonmail.com> Co-authored-by: Ac_K <Acoustik666@gmail.com>
190 lines
8.6 KiB
XML
190 lines
8.6 KiB
XML
<Project Sdk="Microsoft.NET.Sdk">
|
|
<PropertyGroup>
|
|
<TargetFramework>net7.0</TargetFramework>
|
|
<RuntimeIdentifiers>win10-x64;osx-x64;linux-x64</RuntimeIdentifiers>
|
|
<OutputType>Exe</OutputType>
|
|
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
|
<Version>1.0.0-dirty</Version>
|
|
<DefineConstants Condition=" '$(ExtraDefineConstants)' != '' ">$(DefineConstants);$(ExtraDefineConstants)</DefineConstants>
|
|
<RootNamespace>Ryujinx.Ava</RootNamespace>
|
|
<ApplicationIcon>Ryujinx.ico</ApplicationIcon>
|
|
<TieredPGO>true</TieredPGO>
|
|
</PropertyGroup>
|
|
|
|
<PropertyGroup Condition="'$(RuntimeIdentifier)' != ''">
|
|
<PublishSingleFile>true</PublishSingleFile>
|
|
<PublishTrimmed>true</PublishTrimmed>
|
|
<TrimMode>partial</TrimMode>
|
|
</PropertyGroup>
|
|
|
|
<ItemGroup>
|
|
<PackageReference Include="Avalonia" />
|
|
<PackageReference Include="Avalonia.Desktop" />
|
|
<PackageReference Include="Avalonia.Diagnostics" />
|
|
<PackageReference Include="Avalonia.Controls.DataGrid" />
|
|
<PackageReference Include="Avalonia.Markup.Xaml.Loader" />
|
|
<PackageReference Include="Avalonia.Svg" />
|
|
<PackageReference Include="Avalonia.Svg.Skia" />
|
|
<PackageReference Include="jp2masa.Avalonia.Flexbox" />
|
|
<PackageReference Include="DynamicData" />
|
|
<PackageReference Include="FluentAvaloniaUI" />
|
|
<PackageReference Include="XamlNameReferenceGenerator" />
|
|
|
|
<PackageReference Include="OpenTK.Core" />
|
|
<PackageReference Include="Ryujinx.Audio.OpenAL.Dependencies" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'osx-x64' AND '$(RuntimeIdentifier)' != 'osx-arm64'" />
|
|
<PackageReference Include="Ryujinx.Graphics.Nvdec.Dependencies" />
|
|
<PackageReference Include="Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'win10-x64'" />
|
|
<PackageReference Include="Silk.NET.Vulkan" />
|
|
<PackageReference Include="Silk.NET.Vulkan.Extensions.EXT" />
|
|
<PackageReference Include="Silk.NET.Vulkan.Extensions.KHR" />
|
|
<PackageReference Include="SPB" />
|
|
<PackageReference Include="SharpZipLib" />
|
|
<PackageReference Include="SixLabors.ImageSharp" />
|
|
|
|
<!--NOTE: DO NOT REMOVE, THIS IS REQUIRED AS A RESULT OF A TRIMMING ISSUE IN AVALONIA -->
|
|
<PackageReference Include="System.Drawing.Common" />
|
|
</ItemGroup>
|
|
|
|
<ItemGroup>
|
|
<ProjectReference Include="..\Ryujinx.Audio.Backends.SDL2\Ryujinx.Audio.Backends.SDL2.csproj" />
|
|
<ProjectReference Include="..\Ryujinx.Graphics.Vulkan\Ryujinx.Graphics.Vulkan.csproj" />
|
|
<ProjectReference Include="..\Ryujinx.Input\Ryujinx.Input.csproj" />
|
|
<ProjectReference Include="..\Ryujinx.Input.SDL2\Ryujinx.Input.SDL2.csproj" />
|
|
<ProjectReference Include="..\Ryujinx.Audio.Backends.OpenAL\Ryujinx.Audio.Backends.OpenAL.csproj" />
|
|
<ProjectReference Include="..\Ryujinx.Audio.Backends.SoundIo\Ryujinx.Audio.Backends.SoundIo.csproj" />
|
|
<ProjectReference Include="..\Ryujinx.Common\Ryujinx.Common.csproj" />
|
|
<ProjectReference Include="..\Ryujinx.HLE\Ryujinx.HLE.csproj" />
|
|
<ProjectReference Include="..\ARMeilleure\ARMeilleure.csproj" />
|
|
<ProjectReference Include="..\Ryujinx.Graphics.OpenGL\Ryujinx.Graphics.OpenGL.csproj" />
|
|
<ProjectReference Include="..\Ryujinx.Graphics.Gpu\Ryujinx.Graphics.Gpu.csproj" />
|
|
<ProjectReference Include="..\Ryujinx.Ui.Common\Ryujinx.Ui.Common.csproj" />
|
|
<ProjectReference Include="..\Ryujinx.Ui.LocaleGenerator\Ryujinx.Ui.LocaleGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
|
|
</ItemGroup>
|
|
|
|
<ItemGroup>
|
|
<Content Include="..\distribution\windows\alsoft.ini" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'osx-x64'">
|
|
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
|
<TargetPath>alsoft.ini</TargetPath>
|
|
</Content>
|
|
<Content Include="..\distribution\legal\THIRDPARTY.md">
|
|
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
|
<TargetPath>THIRDPARTY.md</TargetPath>
|
|
</Content>
|
|
<Content Include="..\LICENSE.txt">
|
|
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
|
<TargetPath>LICENSE.txt</TargetPath>
|
|
</Content>
|
|
</ItemGroup>
|
|
|
|
<ItemGroup Condition="'$(RuntimeIdentifier)' == 'linux-x64'">
|
|
<Content Include="..\distribution\linux\Ryujinx.sh">
|
|
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
|
</Content>
|
|
<Content Include="..\distribution\linux\mime\Ryujinx.xml">
|
|
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
|
<TargetPath>mime\Ryujinx.xml</TargetPath>
|
|
</Content>
|
|
</ItemGroup>
|
|
|
|
<ItemGroup>
|
|
<AvaloniaResource Include="Ui\**\*.xaml">
|
|
<SubType>Designer</SubType>
|
|
</AvaloniaResource>
|
|
<AvaloniaResource Include="Assets\Fonts\SegoeFluentIcons.ttf" />
|
|
<AvaloniaResource Include="Assets\Styles\BaseLight.xaml">
|
|
<Generator>MSBuild:Compile</Generator>
|
|
</AvaloniaResource>
|
|
<AvaloniaResource Include="Assets\Styles\BaseDark.xaml">
|
|
<Generator>MSBuild:Compile</Generator>
|
|
</AvaloniaResource>
|
|
<AvaloniaResource Include="Assets\Styles\Styles.xaml" />
|
|
|
|
<Compile Update="App.axaml.cs">
|
|
<DependentUpon>App.axaml</DependentUpon>
|
|
<SubType>Code</SubType>
|
|
</Compile>
|
|
<Compile Update="Ui\Windows\MainWindow.axaml.cs">
|
|
<DependentUpon>MainWindow.axaml</DependentUpon>
|
|
<SubType>Code</SubType>
|
|
</Compile>
|
|
<Compile Update="Ui\Windows\AboutWindow.axaml.cs">
|
|
<DependentUpon>AboutWindow.axaml</DependentUpon>
|
|
<SubType>Code</SubType>
|
|
</Compile>
|
|
<Compile Update="Ui\Applet\ErrorAppletWindow.axaml.cs">
|
|
<DependentUpon>ProfileWindow.axaml</DependentUpon>
|
|
<SubType>Code</SubType>
|
|
</Compile>
|
|
<Compile Update="Ui\Applet\SwkbdAppletWindow.axaml.cs">
|
|
<DependentUpon>ProfileWindow.axaml</DependentUpon>
|
|
<SubType>Code</SubType>
|
|
</Compile>
|
|
<Compile Update="Ui\Controls\InputDialog.axaml.cs">
|
|
<DependentUpon>InputDialog.axaml</DependentUpon>
|
|
<SubType>Code</SubType>
|
|
</Compile>
|
|
<Compile Update="Ui\Windows\ContentDialogOverlay.xaml.cs">
|
|
<DependentUpon>ContentDialogOverlay.xaml</DependentUpon>
|
|
</Compile>
|
|
<Compile Update="Ui\Controls\GameListView.axaml.cs">
|
|
<DependentUpon>GameListView.axaml</DependentUpon>
|
|
<SubType>Code</SubType>
|
|
</Compile>
|
|
<Compile Update="UI\Views\User\UserEditorView.axaml.cs">
|
|
<DependentUpon>UserEditor.axaml</DependentUpon>
|
|
<SubType>Code</SubType>
|
|
</Compile>
|
|
<Compile Update="UI\Views\User\UserRecovererView.axaml.cs">
|
|
<DependentUpon>UserRecoverer.axaml</DependentUpon>
|
|
<SubType>Code</SubType>
|
|
</Compile>
|
|
<Compile Update="UI\Views\User\UserSelectorView.axaml.cs">
|
|
<DependentUpon>UserSelector.axaml</DependentUpon>
|
|
<SubType>Code</SubType>
|
|
</Compile>
|
|
</ItemGroup>
|
|
|
|
<ItemGroup>
|
|
<None Remove="Assets\Locales\el_GR.json" />
|
|
<None Remove="Assets\Locales\en_US.json" />
|
|
<None Remove="Assets\Locales\es_ES.json" />
|
|
<None Remove="Assets\Locales\fr_FR.json" />
|
|
<None Remove="Assets\Locales\de_DE.json" />
|
|
<None Remove="Assets\Locales\it_IT.json" />
|
|
<None Remove="Assets\Locales\ja_JP.json" />
|
|
<None Remove="Assets\Locales\ko_KR.json" />
|
|
<None Remove="Assets\Locales\pl_PL.json" />
|
|
<None Remove="Assets\Locales\pt_BR.json" />
|
|
<None Remove="Assets\Locales\ru_RU.json" />
|
|
<None Remove="Assets\Locales\tr_TR.json" />
|
|
<None Remove="Assets\Locales\uk_UA.json" />
|
|
<None Remove="Assets\Locales\zh_CN.json" />
|
|
<None Remove="Assets\Locales\zh_TW.json" />
|
|
<None Remove="Assets\Styles\Styles.xaml" />
|
|
<None Remove="Assets\Styles\BaseDark.xaml" />
|
|
<None Remove="Assets\Styles\BaseLight.xaml" />
|
|
</ItemGroup>
|
|
|
|
<ItemGroup>
|
|
<EmbeddedResource Include="Assets\Locales\el_GR.json" />
|
|
<EmbeddedResource Include="Assets\Locales\en_US.json" />
|
|
<EmbeddedResource Include="Assets\Locales\es_ES.json" />
|
|
<EmbeddedResource Include="Assets\Locales\fr_FR.json" />
|
|
<EmbeddedResource Include="Assets\Locales\de_DE.json" />
|
|
<EmbeddedResource Include="Assets\Locales\it_IT.json" />
|
|
<EmbeddedResource Include="Assets\Locales\ja_JP.json" />
|
|
<EmbeddedResource Include="Assets\Locales\ko_KR.json" />
|
|
<EmbeddedResource Include="Assets\Locales\pl_PL.json" />
|
|
<EmbeddedResource Include="Assets\Locales\pt_BR.json" />
|
|
<EmbeddedResource Include="Assets\Locales\ru_RU.json" />
|
|
<EmbeddedResource Include="Assets\Locales\tr_TR.json" />
|
|
<EmbeddedResource Include="Assets\Locales\uk_UA.json" />
|
|
<EmbeddedResource Include="Assets\Locales\zh_CN.json" />
|
|
<EmbeddedResource Include="Assets\Locales\zh_TW.json" />
|
|
<EmbeddedResource Include="Assets\Styles\Styles.xaml" />
|
|
</ItemGroup>
|
|
<ItemGroup>
|
|
<AdditionalFiles Include="Assets\Locales\en_US.json" />
|
|
</ItemGroup>
|
|
</Project>
|