Merge branch 'Ryubing:master' into master

Sort alphabetically,
Remove title IDs in "issue_title" column,
and remove all entries without a playability status.

src/Ryujinx/Assets/Styles/Styles.xaml

@@ -402,7 +402,7 @@
         <x:Double x:Key="ControlContentThemeFontSize">13</x:Double>
         <x:Double x:Key="MenuItemHeight">26</x:Double>
         <x:Double x:Key="TabItemMinHeight">28</x:Double>
-        <x:Double x:Key="ContentDialogMaxWidth">700</x:Double>
+        <x:Double x:Key="ContentDialogMaxWidth">900</x:Double>
         <x:Double x:Key="ContentDialogMaxHeight">756</x:Double>
     </Styles.Resources>
 </Styles>

src/Ryujinx/Assets/locales.json

@@ -1564,7 +1564,7 @@
         "pl_PL": "Wersja",
         "pt_BR": "Versão",
         "ru_RU": "Версия",
-        "sv_SE": "",
+        "sv_SE": "Version",
         "th_TH": "เวอร์ชั่น",
         "tr_TR": "Sürüm",
         "uk_UA": "Версія",
@@ -3264,7 +3264,7 @@
         "pl_PL": "",
         "pt_BR": "Sistema",
         "ru_RU": "Система",
-        "sv_SE": "",
+        "sv_SE": "System",
         "th_TH": "ระบบ",
         "tr_TR": "Sistem",
         "uk_UA": "Система",
@@ -3339,7 +3339,7 @@
         "pl_PL": "Japonia",
         "pt_BR": "Japão",
         "ru_RU": "Япония",
-        "sv_SE": "",
+        "sv_SE": "Japan",
         "th_TH": "ญี่ปุ่น",
         "tr_TR": "Japonya",
         "uk_UA": "Японія",
@@ -3364,7 +3364,7 @@
         "pl_PL": "Stany Zjednoczone",
         "pt_BR": "EUA",
         "ru_RU": "США",
-        "sv_SE": "",
+        "sv_SE": "USA",
         "th_TH": "สหรัฐอเมริกา",
         "tr_TR": "ABD",
         "uk_UA": "США",
@@ -3464,7 +3464,7 @@
         "pl_PL": "",
         "pt_BR": "Coreia",
         "ru_RU": "Корея",
-        "sv_SE": "",
+        "sv_SE": "Korea",
         "th_TH": "เกาหลี",
         "tr_TR": "Kore",
         "uk_UA": "Корея",
@@ -3489,7 +3489,7 @@
         "pl_PL": "Tajwan",
         "pt_BR": "",
         "ru_RU": "Тайвань",
-        "sv_SE": "",
+        "sv_SE": "Taiwan",
         "th_TH": "ไต้หวัน",
         "tr_TR": "Tayvan",
         "uk_UA": "Тайвань",
@@ -4139,7 +4139,7 @@
         "pl_PL": "Atrapa",
         "pt_BR": "Nenhuma",
         "ru_RU": "Без звука",
-        "sv_SE": "",
+        "sv_SE": "Ingenting",
         "th_TH": "",
         "tr_TR": "Yapay",
         "uk_UA": "",
@@ -5664,7 +5664,7 @@
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "",
-        "sv_SE": "",
+        "sv_SE": "Ok",
         "th_TH": "ตกลง",
         "tr_TR": "Tamam",
         "uk_UA": "Гаразд",
@@ -12439,7 +12439,7 @@
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "",
-        "sv_SE": "",
+        "sv_SE": "{0}: {1}",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
@@ -14289,7 +14289,7 @@
         "pl_PL": "Seria Amiibo",
         "pt_BR": "Franquia Amiibo",
         "ru_RU": "Серия Amiibo",
-        "sv_SE": "",
+        "sv_SE": "Amiibo-serien",
         "th_TH": "",
         "tr_TR": "Amiibo Serisi",
         "uk_UA": "Серія Amiibo",
@@ -17439,7 +17439,7 @@
         "pl_PL": "Wersja {0}",
         "pt_BR": "Versão {0}",
         "ru_RU": "Версия {0}",
-        "sv_SE": "",
+        "sv_SE": "Version {0}",
         "th_TH": "เวอร์ชั่น {0}",
         "tr_TR": "Sürüm {0}",
         "uk_UA": "Версія {0}",
@@ -17664,7 +17664,7 @@
         "pl_PL": "",
         "pt_BR": "Ryujinx - Informação",
         "ru_RU": "Ryujinx - Информация",
-        "sv_SE": "",
+        "sv_SE": "Ryujinx - Info",
         "th_TH": "Ryujinx – ข้อมูล",
         "tr_TR": "Ryujinx - Bilgi",
         "uk_UA": "Ryujin x - Інформація",
@@ -19639,7 +19639,7 @@
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "{0:n0} Мб",
-        "sv_SE": "",
+        "sv_SE": "{0:n0} Mb",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "{0:n0} Мб",
@@ -20914,7 +20914,7 @@
         "pl_PL": "Głoś",
         "pt_BR": "",
         "ru_RU": "Громкость",
-        "sv_SE": "",
+        "sv_SE": "Vol",
         "th_TH": "ระดับเสียง",
         "tr_TR": "Ses",
         "uk_UA": "Гуч.",
@@ -22214,7 +22214,7 @@
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "Вертикальная синхронизация:",
-        "sv_SE": "",
+        "sv_SE": "VSync:",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "Вертикальна синхронізація (VSync):",
@@ -22823,4 +22823,4 @@
       }
     }
   ]
-}
+}

src/Ryujinx/Ryujinx.csproj

@@ -171,12 +171,6 @@
   <ItemGroup>
     <AdditionalFiles Include="Assets\locales.json" />
   </ItemGroup>
-  <ItemGroup>
-    <Compile Update="Utilities\Compat\CompatibilityContentDialog.axaml.cs">
-      <DependentUpon>CompatibilityContentDialog.axaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
   <ItemGroup>
     <Folder Include="Assets\Fonts\Mono\" />
   </ItemGroup>

src/Ryujinx/Utilities/Compat/CompatibilityContentDialog.axaml

@@ -1,20 +0,0 @@
-<ui:ContentDialog xmlns="https://github.com/avaloniaui"
-                  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:local="using:Ryujinx.Ava.Utilities.Compat"
-                  xmlns:ui="using:FluentAvalonia.UI.Controls"
-                  xmlns:ext="using:Ryujinx.Ava.Common.Markup"
-                  x:Class="Ryujinx.Ava.Utilities.Compat.CompatibilityContentDialog"
-                  mc:Ignorable="d" d:DesignWidth="600" d:DesignHeight="400"
-                  CloseButtonText="{ext:Locale SettingsButtonClose}" 
-                  DefaultButton="Close"
-                  x:DataType="local:CompatibilityViewModel">
-    <ui:ContentDialog.DataContext>
-        <local:CompatibilityViewModel/>
-    </ui:ContentDialog.DataContext>
-    <ui:ContentDialog.Resources>
-        <x:Double x:Key="ContentDialogMaxWidth">900</x:Double>
-    </ui:ContentDialog.Resources>
-</ui:ContentDialog>
-

src/Ryujinx/Utilities/Compat/CompatibilityContentDialog.axaml.cs

@@ -1,13 +0,0 @@
-using FluentAvalonia.UI.Controls;
-using System;
-
-namespace Ryujinx.Ava.Utilities.Compat
-{
-    public partial class CompatibilityContentDialog : ContentDialog
-    {
-        protected override Type StyleKeyOverride => typeof(ContentDialog);
-        
-        public CompatibilityContentDialog() => InitializeComponent();
-    }
-}
-

src/Ryujinx/Utilities/Compat/CompatibilityCsv.cs

@@ -3,6 +3,7 @@ using nietras.SeparatedValues;
 using Ryujinx.Ava.Common.Locale;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Text;
 
@@ -32,21 +33,22 @@ namespace Ryujinx.Ava.Utilities.Compat
     {
         public CompatibilityEntry(SepReaderHeader header, SepReader.Row row)
         {
-            IssueNumber = row[header.IndexOf("issue_number")].Parse<int>();
+            if (row.ColCount != header.ColNames.Count)
-
+                throw new InvalidDataException($"CSV row {row.RowIndex} ({row.ToString()}) has mismatched column count");
-            var titleIdRow = row[header.IndexOf("extracted_game_id")].ToString();
+            
+            var titleIdRow = ColStr(row[header.IndexOf("\"extracted_game_id\"")]);
             TitleId = !string.IsNullOrEmpty(titleIdRow) 
                 ? titleIdRow 
                 : default(Optional<string>);
 
-            var issueTitleRow = row[header.IndexOf("issue_title")].ToString();
+            var issueTitleRow = ColStr(row[header.IndexOf("\"issue_title\"")]);
             if (TitleId.HasValue)
                 issueTitleRow = issueTitleRow.ReplaceIgnoreCase($" - {TitleId}", string.Empty);
 
             GameName = issueTitleRow.Trim().Trim('"');
 
-            IssueLabels = row[header.IndexOf("issue_labels")].ToString().Split(';');
+            IssueLabels = ColStr(row[header.IndexOf("\"issue_labels\"")]).Split(';');
-            Status = row[header.IndexOf("extracted_status")].ToString().ToLower() switch
+            Status = ColStr(row[header.IndexOf("\"extracted_status\"")]).ToLower() switch
             {
                 "playable" => LocaleKeys.CompatibilityListPlayable,
                 "ingame" => LocaleKeys.CompatibilityListIngame,
@@ -56,23 +58,23 @@ namespace Ryujinx.Ava.Utilities.Compat
                 _ => null
             };
 
-            if (row[header.IndexOf("last_event_date")].TryParse<DateTime>(out var dt))
+            if (DateTime.TryParse(ColStr(row[header.IndexOf("\"last_event_date\"")]), out var dt))
                 LastEvent = dt;
 
-            if (row[header.IndexOf("events_count")].TryParse<int>(out var eventsCount))
+            return;
-                EventCount = eventsCount;
+            
+            string ColStr(SepReader.Col col) => col.ToString().Trim('"');
         }
-
+        
-        public int IssueNumber { get; }
         public string GameName { get; }
         public Optional<string> TitleId { get; }
         public string[] IssueLabels { get; }
         public LocaleKeys? Status { get; }
         public DateTime LastEvent { get; }
-        public int EventCount { get; }
 
         public string LocalizedStatus => LocaleManager.Instance[Status!.Value];
-        public string FormattedTitleId => TitleId.OrElse(new string(' ', 16));
+        public string FormattedTitleId => TitleId
+            .OrElse(new string(' ', 16));
 
         public string FormattedIssueLabels => IssueLabels
             .Where(it => !it.StartsWithIgnoreCase("status"))
@@ -82,13 +84,11 @@ namespace Ryujinx.Ava.Utilities.Compat
         public override string ToString()
         {
             var sb = new StringBuilder("CompatibilityEntry: {");
-            sb.Append($"{nameof(IssueNumber)}={IssueNumber}, ");
             sb.Append($"{nameof(GameName)}=\"{GameName}\", ");
             sb.Append($"{nameof(TitleId)}={TitleId}, ");
             sb.Append($"{nameof(IssueLabels)}=\"{IssueLabels}\", ");
             sb.Append($"{nameof(Status)}=\"{Status}\", ");
-            sb.Append($"{nameof(LastEvent)}=\"{LastEvent}\", ");
+            sb.Append($"{nameof(LastEvent)}=\"{LastEvent}\"");
-            sb.Append($"{nameof(EventCount)}={EventCount}");
             sb.Append('}');
 
             return sb.ToString();

src/Ryujinx/Utilities/Compat/CompatibilityList.axaml

@@ -47,9 +47,8 @@
                             <Grid Width="750" ColumnDefinitions="Auto,Auto,Auto,*"
                                   Margin="5">
                                 <TextBlock Grid.Column="0"
-                                           FontFamily="{StaticResource JetBrainsMono}"
                                            Text="{Binding GameName}"
-                                           Width="333"
+                                           Width="320"
                                            TextWrapping="Wrap" />
                                 <TextBlock Grid.Column="1"
                                            Width="135"
@@ -60,14 +59,12 @@
                                 <TextBlock Grid.Column="2"
                                            Padding="7, 0"
                                            VerticalAlignment="Center"
-                                           FontFamily="{StaticResource JetBrainsMono}"
                                            Text="{Binding LocalizedStatus}"
                                            Width="85"
                                            Foreground="{Binding Status, Converter={x:Static helpers:PlayabilityStatusConverter.Shared}}"
                                            TextWrapping="NoWrap" />
                                 <TextBlock Grid.Column="3"
                                            VerticalAlignment="Center"
-                                           FontFamily="{StaticResource JetBrainsMono}"
                                            Text="{Binding FormattedIssueLabels}"
                                            TextWrapping="WrapWithOverflow" />
                             </Grid>

src/Ryujinx/Utilities/Compat/CompatibilityList.axaml.cs

@@ -1,6 +1,8 @@
 using Avalonia.Controls;
 using Avalonia.Styling;
+using FluentAvalonia.UI.Controls;
 using nietras.SeparatedValues;
+using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Helpers;
 using System.IO;
 using System.Reflection;
@@ -19,11 +21,17 @@ namespace Ryujinx.Ava.Utilities.Compat
                 csvStream.Position = 0;
 
                 CompatibilityCsv.Shared = new CompatibilityCsv(Sep.Reader().From(csvStream));
-            } 
+            }
             
-            CompatibilityContentDialog contentDialog = new()
+            ContentDialog contentDialog = new()
             {
-                Content = new CompatibilityList { DataContext = new CompatibilityViewModel(RyujinxApp.MainWindow.ViewModel.ApplicationLibrary) }
+                PrimaryButtonText = string.Empty,
+                SecondaryButtonText = string.Empty,
+                CloseButtonText = LocaleManager.Instance[LocaleKeys.SettingsButtonClose],
+                Content = new CompatibilityList
+                {
+                    DataContext = new CompatibilityViewModel(RyujinxApp.MainWindow.ViewModel.ApplicationLibrary)
+                }
             };
 
             Style closeButton = new(x => x.Name("CloseButton"));